diff --git a/common/assembler.fs b/common/assembler.fs
index 4c1e42c..e2c3e0a 100644
--- a/common/assembler.fs
+++ b/common/assembler.fs
@@ -15,11 +15,9 @@
 ( Lazy loaded assembler/disassembler framework )
 : assembler r|
 
-also asm
-also forth definitions
-vocabulary assembler
+current @
 also internals
-also assembler definitions
+also asm definitions
 
 -1 1 rshift invert constant high-bit
 : odd? ( n -- f ) 1 and ;
@@ -111,7 +109,11 @@ variable istep
 : disasm1 ( a -- a ) 0 istep ! ['] matchit for-ops istep @ 8 / + ;
 : disasm ( a n -- ) for aft disasm1 then next drop ;
 
-previous previous previous previous
+previous previous
+also forth definitions
+: assembler asm ;
+previous
 assembler
+current !
 
 | evaluate ;
diff --git a/esp32/xtensa-assembler.fs b/esp32/xtensa-assembler.fs
index a9b4922..4264913 100644
--- a/esp32/xtensa-assembler.fs
+++ b/esp32/xtensa-assembler.fs
@@ -15,10 +15,9 @@
 ( Lazy loaded xtensa assembler )
 : xtensa-assembler r|
 
-also assembler
-also forth definitions
-vocabulary xtensa-assembler
-also xtensa-assembler definitions
+current @
+also assembler definitions
+vocabulary xtensa xtensa definitions
 
 16 names a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15
 : nop ;
@@ -271,8 +270,11 @@ o l o l  o o o o  o l l o  ssss  tttt     o o o o  OP WITLB,
 o o o l  o o l l  sr             tttt     o o o o  OP WSR,
 l l l l  o o l l  sr             tttt     o o o o  OP WUR,
 
-previous previous previous
+also forth definitions
+: xtensa-assembler xtensa ;
+previous previous
 xtensa-assembler
+current !
 
 | evaluate ;