@@ -15,17 +15,17 @@
 EXTRA_VFS_OBJS = @EXTRA_VFS_OBJS@
 TCLSH_NATIVE = tclsh
 
 # Build targets
 ## VFS Build
-vfs_kitdll_data_tcl.o: vfs_kitdll_data_tcl.c
-vfs_kitdll_data_tcl.c: dir2c.tcl starpack.vfs vfs_kitdll_data.c
-	"$(TCLSH_NATIVE)" dir2c.tcl tcl starpack.vfs > vfs_kitdll_data_tcl.c
+cvfs_data_tcl.o: cvfs_data_tcl.c
+cvfs_data_tcl.c: dir2c.tcl starpack.vfs cvfs_data.c
+	"$(TCLSH_NATIVE)" dir2c.tcl tcl starpack.vfs > cvfs_data_tcl.c
 
 ## Tcl scripts that need to be converted to C headers
-vfs_kitdll.tcl.h: vfs_kitdll.tcl
-	"$(TCLSH_NATIVE)" ./stringify.tcl vfs_kitdll.tcl > vfs_kitdll.tcl.h
+cvfs.tcl.h: cvfs.tcl
+	"$(TCLSH_NATIVE)" ./stringify.tcl cvfs.tcl > cvfs.tcl.h
 
 boot.tcl.h: boot.tcl
 	"$(TCLSH_NATIVE)" ./stringify.tcl boot.tcl > boot.tcl.h
 
 zipvfs.tcl.h: zipvfs.tcl
@@ -44,21 +44,21 @@
 # Cleanup routines
 clean:
 	rm -f kit kit.res.o
 	rm -f libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@
 	rm -f $(OBJS) $(EXTRA_OBJS) $(EXTRA_VFS_OBJS)
-	rm -f vfs_kitdll_data_tcl.c
-	rm -f vfs_kitdll.tcl.h
+	rm -f cvfs_data_tcl.c cvfs_data_tcl.o
+	rm -f cvfs.tcl.h
 	rm -f tclsh.o tclsh tclsh.exe
 	rm -f wish.o wish wish.exe
 
 distclean: clean
 	rm -f Makefile Makefile.in Makefile.common
 	rm -f config.status config.log
 	rm -f *~
-	rm -rf autom4te.cache
 	rm -rf starpack.vfs
+	rm -rf autom4te.cache
 
 mrproper: distclean
 	rm -f configure config.h boot.tcl.h zipvfs.tcl.h
 
 .PHONY: all clean distclean mrproper