diff --git a/6502/C64/src/notmpheap.fth b/6502/C64/src/notmpheap.fth
index 48c32d5..eb0fdef 100644
--- a/6502/C64/src/notmpheap.fth
+++ b/6502/C64/src/notmpheap.fth
@@ -8,4 +8,4 @@
 ' |on  alias ||on
 ' |off alias ||off
 
-' noop alias tmpclear
+' noop alias tmp-clear
diff --git a/6502/C64/src/tmpheap.fth b/6502/C64/src/tmpheap.fth
index 4237e9c..bc04975 100644
--- a/6502/C64/src/tmpheap.fth
+++ b/6502/C64/src/tmpheap.fth
@@ -31,11 +31,11 @@ reset-tmp-heap
    tmpheap> @ over - ;
 
 | : tmp-heapmove1x   ( from size -- from offset )
-   tmp-heapmove  ?heapmovetx off ;
+   tmp-heapmove  ?headmove-xt off ;
 
-: ||     ['] tmp-heapmove1x  ?heapmovetx ! ;
-: ||on   ['] tmp-heapmove    ?heapmovetx ! ;
-: ||off  ?heapmovetx off ;
+: ||     ['] tmp-heapmove1x  ?headmove-xt ! ;
+: ||on   ['] tmp-heapmove    ?headmove-xt ! ;
+: ||off  ?headmove-xt off ;
 
 
 | : remove-tmp-words-in-voc  ( voc -- )
@@ -51,7 +51,7 @@ reset-tmp-heap
  voc-link  BEGIN  @ ?dup
   WHILE  dup 4 - remove-tmp-words-in-voc REPEAT  ;
 
-: tmpclear  ( -- )
+: tmp-clear  ( -- )
   remove-tmp-words
   \ Uncomment the following line to help determine the ideal tmpheap
   \ size for your project.
diff --git a/6502/C64/src/vf-cbm-core.fth b/6502/C64/src/vf-cbm-core.fth
index 5cb5d52..0703da6 100644
--- a/6502/C64/src/vf-cbm-core.fth
+++ b/6502/C64/src/vf-cbm-core.fth
@@ -1650,7 +1650,7 @@ Label docreate
 \ *** Block No. 76, Hexblock 4c
 4c fthpage
 
-\ warning  ?heapmovetx  |  |on |off  Create
+\ warning  ?headmove-xt  |  |on |off  Create
 
 Variable warning  0 warning !
 
@@ -1660,18 +1660,18 @@ Variable warning  0 warning !
  IF space  last @ .name ." exists " ?cr
  THEN  ;
 
-Variable ?heapmovetx  0 ?heapmovetx !
+Variable ?headmove-xt  0 ?headmove-xt !
 
 | : heapmove   ( from size -- offset )
    over >r  dup hallot ( from size ) heap swap cmove ( )
    heap r> - ;
 
 | : heapmove1x   ( from size -- offset )
-   heapmove  ?heapmovetx off ;
+   heapmove  ?headmove-xt off ;
 
-: |     ['] heapmove1x  ?heapmovetx ! ;
-: |on   ['] heapmove    ?heapmovetx ! ;
-: |off  ?heapmovetx off ;
+: |     ['] heapmove1x  ?headmove-xt ! ;
+: |on   ['] heapmove    ?headmove-xt ! ;
+: |off  ?headmove-xt off ;
 
 : Create
  here
@@ -1679,10 +1679,10 @@ Variable ?heapmovetx  0 ?heapmovetx !
  name c@
  dup 1 $20 uwithin not  Abort" invalid name"
  here last !  1+ allot  exists?
- ?heapmovetx @
+ ?headmove-xt @
  IF dup  6502-align/1 ,  \ Pointer to code
     dup  here  over -
-    ?heapmovetx perform  last +!
+    ?headmove-xt perform  last +!
     $20 flag! 6502-align/1 dp !
  ELSE  6502-align/2  drop
  THEN  reveal  0 ,
diff --git a/6502/C64/src/x16tmpheap.fth b/6502/C64/src/x16tmpheap.fth
index e6f7c7c..ac650f7 100644
--- a/6502/C64/src/x16tmpheap.fth
+++ b/6502/C64/src/x16tmpheap.fth
@@ -29,11 +29,11 @@ User ]tmpheap
    tmpheap> @ over - ;
 
 | : tmp-heapmove1x   ( from size -- from offset )
-   tmp-heapmove  ?heapmovetx off ;
+   tmp-heapmove  ?headmove-xt off ;
 
-: ||     ['] tmp-heapmove1x  ?heapmovetx ! ;
-: ||on   ['] tmp-heapmove    ?heapmovetx ! ;
-: ||off  ?heapmovetx off ;
+: ||     ['] tmp-heapmove1x  ?headmove-xt ! ;
+: ||on   ['] tmp-heapmove    ?headmove-xt ! ;
+: ||off  ?headmove-xt off ;
 
 
 | : remove-tmp-words-in-voc  ( voc -- )
@@ -49,7 +49,7 @@ User ]tmpheap
  voc-link  BEGIN  @ ?dup
   WHILE  dup 4 - remove-tmp-words-in-voc REPEAT  ;
 
-: tmpclear  ( -- )
+: tmp-clear  ( -- )
   remove-tmp-words
   \ Uncomment the following line to help determine the ideal tmpheap
   \ size for your project.