diff --git a/6502/C64/Makefile b/6502/C64/Makefile
index 3d52595..38a23fe 100644
--- a/6502/C64/Makefile
+++ b/6502/C64/Makefile
@@ -32,9 +32,9 @@ test64: test-c64.result
 
 # Temporary bincmp target while the old and the new binaries are still
 # expected to be binary identical.
-bincmp:
+bincmp: cbmfiles/c64-vf-latest cbmfiles/c16-vf-latest
 	cmp cbmfiles/c64-vf-latest cbmfiles/c64-volksforth83
-	cmp cbmfiles/c16p-vf-latest cbmfiles/c16-volksforth83
+	cmp cbmfiles/c16-vf-latest cbmfiles/c16-volksforth83
 
 run-devenv: emulator/devenv.T64
 	emulator/run-in-vice.sh devenv
@@ -56,15 +56,15 @@ cbmfiles/c64-vf-latest: emulator/tcbase.T64 emulator/build-vf.sh \
     disks/vforth4_2.d64 disks/tc38q.d64 $(vf_fth_files_petscii)
 	emulator/build-vf.sh vf-c64-main.fth c64-vf-latest
 
-# C16 with 32 kB RAM - called (C16- in the sources.
+# C16 with 64 kB RAM or Plus4 - called (C16+ in the sources.
 cbmfiles/c16-vf-latest: emulator/tcbase.T64 emulator/build-vf.sh \
     disks/vforth4_2.d64 disks/tc38q.d64 $(vf_fth_files_petscii)
 	emulator/build-vf.sh vf-c16-main.fth c16-vf-latest
 
-# C16 with 64 kB RAM or Plus4 - called (C16+ in the sources.
-cbmfiles/c16p-vf-latest: emulator/tcbase.T64 emulator/build-vf.sh \
+# C16 with 32 kB RAM - called (C16- in the sources.
+cbmfiles/c16-vf-32k: emulator/tcbase.T64 emulator/build-vf.sh \
     disks/vforth4_2.d64 disks/tc38q.d64 $(vf_fth_files_petscii)
-	emulator/build-vf.sh vf-c16p-main.fth c16p-vf-latest
+	emulator/build-vf.sh vf-c16-32k.fth c16-vf-32k
 
 
 # Core test targets
diff --git a/6502/C64/cbmfiles/c16-vf-latest b/6502/C64/cbmfiles/c16-vf-latest
index 473cd3b..0b38587 100644
Binary files a/6502/C64/cbmfiles/c16-vf-latest and b/6502/C64/cbmfiles/c16-vf-latest differ
diff --git a/6502/C64/cbmfiles/c16p-vf-latest b/6502/C64/cbmfiles/c16p-vf-latest
deleted file mode 100644
index 0b38587..0000000
Binary files a/6502/C64/cbmfiles/c16p-vf-latest and /dev/null differ
diff --git a/6502/C64/src/vf-c16p-main.fth b/6502/C64/src/vf-c16-32k.fth
similarity index 60%
rename from 6502/C64/src/vf-c16p-main.fth
rename to 6502/C64/src/vf-c16-32k.fth
index 2bb8569..075599e 100644
--- a/6502/C64/src/vf-c16p-main.fth
+++ b/6502/C64/src/vf-c16-32k.fth
@@ -22,22 +22,13 @@ cr .( Host is: )
 
 \      : (C64  ; immediate
        : (C16  ; immediate
-       : (C16+ ; immediate
-\      : (C16- ; immediate
+\      : (C16+ ; immediate
+       : (C16- ; immediate
 
        : (C64  [compile] ( ; immediate
 \      : (C16  [compile] ( ; immediate
-\      : (C16+ [compile] ( ; immediate
-       : (C16- [compile] ( ; immediate
-
-\ *** Block No. 10, Hexblock a
-
-\ load/remove  JSR-Macros    clv14.4.87)
-
-Assembler also definitions
-
-\needs C16+Jsr          8 load
-' C16+Jsr Is Jsr .( JSR Is:C16+  )
+       : (C16+ [compile] ( ; immediate
+\      : (C16- [compile] ( ; immediate
 
 
 include vf-main.fth
diff --git a/6502/C64/src/vf-c16-main.fth b/6502/C64/src/vf-c16-main.fth
index 075599e..2bb8569 100644
--- a/6502/C64/src/vf-c16-main.fth
+++ b/6502/C64/src/vf-c16-main.fth
@@ -22,13 +22,22 @@ cr .( Host is: )
 
 \      : (C64  ; immediate
        : (C16  ; immediate
-\      : (C16+ ; immediate
-       : (C16- ; immediate
+       : (C16+ ; immediate
+\      : (C16- ; immediate
 
        : (C64  [compile] ( ; immediate
 \      : (C16  [compile] ( ; immediate
-       : (C16+ [compile] ( ; immediate
-\      : (C16- [compile] ( ; immediate
+\      : (C16+ [compile] ( ; immediate
+       : (C16- [compile] ( ; immediate
+
+\ *** Block No. 10, Hexblock a
+
+\ load/remove  JSR-Macros    clv14.4.87)
+
+Assembler also definitions
+
+\needs C16+Jsr          8 load
+' C16+Jsr Is Jsr .( JSR Is:C16+  )
 
 
 include vf-main.fth