diff --git a/6502/C64/Makefile b/6502/C64/Makefile
index b322042..3d52595 100644
--- a/6502/C64/Makefile
+++ b/6502/C64/Makefile
@@ -48,8 +48,8 @@ run-testbase16: emulator/testbase16.T64
 
 # Targetcompiler targets
 
-cbmfiles/tcbase: emulator/c64-testbase.T64 emulator/build-tcbase.sh \
-    disks/tc38q.d64 cbmfiles/tc-base.fth
+cbmfiles/tcbase: emulator/c64-volksforth83.T64 emulator/build-tcbase.sh \
+    disks/tc38q.d64 disks/file-words.d64 cbmfiles/tc-base.fth
 	emulator/build-tcbase.sh
 
 cbmfiles/c64-vf-latest: emulator/tcbase.T64 emulator/build-vf.sh \
@@ -99,8 +99,8 @@ cbmfiles/c64-testbase: emulator/run-in-vice.sh emulator/build-testbase.sh \
 	emulator/build-testbase.sh c64 $(VERSION)
 
 cbmfiles/c16-testbase: emulator/run-in-vice.sh emulator/build-testbase.sh \
-    emulator/c16-$(VERSION).T64 disks/file-words.d64
-	VICE=xplus4 emulator/build-testbase.sh c16 $(VERSION)
+    emulator/c16p-$(VERSION).T64 disks/file-words.d64
+	VICE=xplus4 emulator/build-testbase.sh c16p $(VERSION)
 
 
 # Generic T64 tape image rule
diff --git a/6502/C64/emulator/build-tcbase.sh b/6502/C64/emulator/build-tcbase.sh
index 45bf1a6..9bdc6f4 100755
--- a/6502/C64/emulator/build-tcbase.sh
+++ b/6502/C64/emulator/build-tcbase.sh
@@ -9,8 +9,9 @@ basedir="$(realpath --relative-to="$PWD" "${emulatordir}/..")"
 
 rm -f "${basedir}/cbmfiles/tcbase"
 
-keybuf="2 drive 4 load\ninclude tc-base.fth\n\
+keybuf="3 drive 20 load\n3 drive 10 load\nsave\n\
+2 drive 4 load\ninclude tc-base.fth\n\
 savesystem tcbase\ndos s0:notdone\n"
 
-DISK10=tc38q "${emulatordir}/run-in-vice.sh" \
-  "c64-testbase" "${keybuf}"
+DISK10=tc38q DISK11=file-words "${emulatordir}/run-in-vice.sh" \
+  "c64-volksforth83" "${keybuf}"