diff --git a/6502/C64/Makefile b/6502/C64/Makefile
index c72ef17..030088c 100644
--- a/6502/C64/Makefile
+++ b/6502/C64/Makefile
@@ -5,10 +5,10 @@
 
 vf_blk_d64_files = $(wildcard disks/*.d64)
 vf_blk_fth_files = $(patsubst %.d64, %.fth, $(vf_blk_d64_files))
-vf_fth_files = $(wildcard src/vf-*.fth src/v4th-*.fth)
+vf_fth_files = $(wildcard src/vf-*.fth src/v4th*.fth)
 vf_fth_files_petscii = $(patsubst src/%, cbmfiles/%, $(vf_fth_files))
 vf_flavours = \
-    vf-full-c64 vf-full-c16+ vf-full-c16- \
+    v4thblk-c64 v4thblk-c16+ v4thblk-c16- \
     v4th-c64 v4th-c16+ v4th-c16- v4th-x16
 vf_binaries = $(patsubst %, cbmfiles/%, $(vf_flavours))
 
@@ -38,7 +38,7 @@ test: $(test_resuls)
 
 test64: full64 lite64
 
-full64: test-vf-full-c64.result
+full64: test-v4thblk-c64.result
 
 lite64: test-v4th-c64.result
 
@@ -67,14 +67,14 @@ $(vf_binaries):  emulator/tcbase.T64 emulator/build-vf.sh \
 
 $(vf_binaries):  cbmfiles/logtofile.fth
 
-cbmfiles/vf-full-c64:
-	emulator/build-vf.sh vf-full-c64
+cbmfiles/v4thblk-c64:
+	emulator/build-vf.sh v4thblk-c64
 
-cbmfiles/vf-full-c16+:
-	emulator/build-vf.sh vf-full-c16+
+cbmfiles/v4thblk-c16+:
+	emulator/build-vf.sh v4thblk-c16+
 
-cbmfiles/vf-full-c16-:
-	emulator/build-vf.sh vf-full-c16-
+cbmfiles/v4thblk-c16-:
+	emulator/build-vf.sh v4thblk-c16-
 
 cbmfiles/v4th-c64:
 	emulator/build-vf.sh v4th-c64
@@ -93,9 +93,9 @@ cbmfiles/v4th-x16:
 
 $(test_logs): $(test_files_petscii) emulator/run-in-vice.sh
 
-test-vf-full-c64.log: emulator/vf-full-c64.T64 disks/scratch.d64
+test-v4thblk-c64.log: emulator/v4thblk-c64.T64 disks/scratch.d64
 	rm -f cbmfiles/test.log
-	DISK9=scratch emulator/run-in-vice.sh vf-full-c64 \
+	DISK9=scratch emulator/run-in-vice.sh v4thblk-c64 \
 	  "include run-full-tests.fth\n1234567890\n"
 	petscii2ascii cbmfiles/test.log $@
 
@@ -105,9 +105,9 @@ test-v4th-c64.log: emulator/v4th-c64.T64
 	  "include run-lite-tests.fth\n1234567890\n"
 	petscii2ascii cbmfiles/test.log $@
 
-test-vf-full-c16+.log: emulator/vf-full-c16+.T64 disks/scratch.d64
+test-v4thblk-c16+.log: emulator/v4thblk-c16+.T64 disks/scratch.d64
 	rm -f cbmfiles/test.log
-	VICE=xplus4 emulator/run-in-vice.sh vf-full-c16+ \
+	VICE=xplus4 emulator/run-in-vice.sh v4thblk-c16+ \
 	  "include run-full-tests.fth\n1234567890\n"
 	petscii2ascii cbmfiles/test.log $@
 
@@ -117,9 +117,9 @@ test-v4th-c16+.log: emulator/v4th-c16+.T64
 	  "include run-lite-tests.fth\n1234567890\n"
 	petscii2ascii cbmfiles/test.log $@
 
-test-vf-full-c16-.log: emulator/vf-full-c16-.T64
+test-v4thblk-c16-.log: emulator/v4thblk-c16-.T64
 	rm -f cbmfiles/test.log
-	VICE=xplus4 emulator/run-in-vice.sh vf-full-c16- \
+	VICE=xplus4 emulator/run-in-vice.sh v4thblk-c16- \
 	  "include run-min-tests.fth\n1234567890\n"
 	petscii2ascii cbmfiles/test.log $@
 
@@ -150,7 +150,7 @@ emulator/sdcard.img: emulator/sdcard.sfdisk
 	mformat -i $@.tmp -F
 	mv $@.tmp $@
 
-test-vf-full-c64.golden: $(patsubst %, tests/golden/%.golden, \
+test-v4thblk-c64.golden: $(patsubst %, tests/golden/%.golden, \
     prelim core coreext double block report-blk)
 	cat $? > $@
 
@@ -158,7 +158,7 @@ test-v4th-c64.golden: $(patsubst %, tests/golden/%.golden, \
     prelim core coreext double report-noblk)
 	cat $? > $@
 
-test-vf-full-c16+.golden: $(patsubst %, tests/golden/%.golden, \
+test-v4thblk-c16+.golden: $(patsubst %, tests/golden/%.golden, \
     prelim core coreext double block report-blk)
 	cat $? > $@
 
@@ -166,7 +166,7 @@ test-v4th-c16+.golden: $(patsubst %, tests/golden/%.golden, \
     prelim core coreext double report-noblk)
 	cat $? > $@
 
-test-vf-full-c16-.golden: $(patsubst %, tests/golden/%.golden, \
+test-v4thblk-c16-.golden: $(patsubst %, tests/golden/%.golden, \
     prelim core)
 	cat $? > $@
 
diff --git a/6502/C64/cbmfiles/v4th-c16+ b/6502/C64/cbmfiles/v4th-c16+
index b6bc078..fd10bdb 100644
Binary files a/6502/C64/cbmfiles/v4th-c16+ and b/6502/C64/cbmfiles/v4th-c16+ differ
diff --git a/6502/C64/cbmfiles/v4th-c16- b/6502/C64/cbmfiles/v4th-c16-
index ee75013..6ca1c4d 100644
Binary files a/6502/C64/cbmfiles/v4th-c16- and b/6502/C64/cbmfiles/v4th-c16- differ
diff --git a/6502/C64/cbmfiles/v4th-c64 b/6502/C64/cbmfiles/v4th-c64
index 1feb802..ffa7748 100644
Binary files a/6502/C64/cbmfiles/v4th-c64 and b/6502/C64/cbmfiles/v4th-c64 differ
diff --git a/6502/C64/cbmfiles/v4th-x16 b/6502/C64/cbmfiles/v4th-x16
index 09f551b..72e70f0 100644
Binary files a/6502/C64/cbmfiles/v4th-x16 and b/6502/C64/cbmfiles/v4th-x16 differ
diff --git a/6502/C64/cbmfiles/vf-full-c16+ b/6502/C64/cbmfiles/v4thblk-c16+
similarity index 99%
rename from 6502/C64/cbmfiles/vf-full-c16+
rename to 6502/C64/cbmfiles/v4thblk-c16+
index 18d87c5..3206c94 100644
Binary files a/6502/C64/cbmfiles/vf-full-c16+ and b/6502/C64/cbmfiles/v4thblk-c16+ differ
diff --git a/6502/C64/cbmfiles/vf-full-c16- b/6502/C64/cbmfiles/v4thblk-c16-
similarity index 99%
rename from 6502/C64/cbmfiles/vf-full-c16-
rename to 6502/C64/cbmfiles/v4thblk-c16-
index 4d60aab..045df50 100644
Binary files a/6502/C64/cbmfiles/vf-full-c16- and b/6502/C64/cbmfiles/v4thblk-c16- differ
diff --git a/6502/C64/cbmfiles/vf-full-c64 b/6502/C64/cbmfiles/v4thblk-c64
similarity index 99%
rename from 6502/C64/cbmfiles/vf-full-c64
rename to 6502/C64/cbmfiles/v4thblk-c64
index 8867887..923d7bb 100644
Binary files a/6502/C64/cbmfiles/vf-full-c64 and b/6502/C64/cbmfiles/v4thblk-c64 differ
diff --git a/6502/C64/src/vf-full-c16+.fth b/6502/C64/src/v4thblk-c16+.fth
similarity index 93%
rename from 6502/C64/src/vf-full-c16+.fth
rename to 6502/C64/src/v4thblk-c16+.fth
index b166789..1a512b2 100644
--- a/6502/C64/src/vf-full-c16+.fth
+++ b/6502/C64/src/v4thblk-c16+.fth
@@ -8,7 +8,7 @@
 
 include vf-tc-prep.fth
 
-\log logopen" vf-full-c16+.log"
+\log logopen" v4thblk-c16+.log"
 
 include vf-trg-c16+.fth
 
diff --git a/6502/C64/src/vf-full-c16-.fth b/6502/C64/src/v4thblk-c16-.fth
similarity index 93%
rename from 6502/C64/src/vf-full-c16-.fth
rename to 6502/C64/src/v4thblk-c16-.fth
index 3441dbc..b4a958a 100644
--- a/6502/C64/src/vf-full-c16-.fth
+++ b/6502/C64/src/v4thblk-c16-.fth
@@ -8,7 +8,7 @@
 
 include vf-tc-prep.fth
 
-\log logopen" vf-full-c16-.log"
+\log logopen" v4thblk-c16-.log"
 
 include vf-trg-c16-.fth
 
diff --git a/6502/C64/src/vf-full-c64.fth b/6502/C64/src/v4thblk-c64.fth
similarity index 93%
rename from 6502/C64/src/vf-full-c64.fth
rename to 6502/C64/src/v4thblk-c64.fth
index 8c2535f..b645129 100644
--- a/6502/C64/src/vf-full-c64.fth
+++ b/6502/C64/src/v4thblk-c64.fth
@@ -8,7 +8,7 @@
 
 include vf-tc-prep.fth
 
-\log logopen" vf-full-c64.log"
+\log logopen" v4thblk-c64.log"
 
 include vf-trg-c64.fth