diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml
index c61e6e3..045f25f 100644
--- a/.gitea/workflows/test.yaml
+++ b/.gitea/workflows/test.yaml
@@ -11,5 +11,5 @@ jobs:
       - name: eunit
         run: |
           . /opt/act_runner/erts/27.2/activate
-          make
-          ./rebar3 eunit
+          make dialyzer
+          make eunit
diff --git a/include/gmb_heap.hrl b/include/gmb_heap.hrl
index 78a1811..2e83bff 100644
--- a/include/gmb_heap.hrl
+++ b/include/gmb_heap.hrl
@@ -1,6 +1,6 @@
 
--record(pmap, {key_t  :: gmb_gmvm_data:type(),
-               val_t  :: gmb_gmvm_data:type(),
+-record(pmap, {key_t  :: gmb_aevm_data:type(),
+               val_t  :: gmb_aevm_data:type(),
                parent :: none | non_neg_integer(),
                size   = 0 :: non_neg_integer(),
                data   :: #{gmb_heap:binary_value() => gmb_heap:binary_value() | tombstone}
diff --git a/include/gmb_typerep_def.hrl b/include/gmb_typerep_def.hrl
index 4d0dab7..22ca582 100644
--- a/include/gmb_typerep_def.hrl
+++ b/include/gmb_typerep_def.hrl
@@ -1,5 +1,5 @@
 
--define(Type(), gmb_gmvm_data:type()).
+-define(Type(), gmb_aevm_data:type()).
 
 -define(TYPEREP_WORD_TAG,   0).
 -define(TYPEREP_STRING_TAG, 1).