@@ -73,11 +73,11 @@
 #endif
 #ifdef KIT_INCLUDES_ZLIB
 Tcl_AppInitProc Zlib_Init;
 #endif
 #ifdef KIT_STORAGE_CVFS
-Tcl_AppInitProc Vfs_kitdll_data_tcl_Init;
+Tcl_AppInitProc Cvfs_data_tcl_Init;
 #endif
 #ifdef TCL_THREADS
 Tcl_AppInitProc	Thread_Init;
 #endif
 #ifdef _WIN32
@@ -186,15 +186,15 @@
 #endif /* KIT_STORAGE_ZIP */
 #ifdef KIT_STORAGE_CVFS
 	"set ::tclKitStorage \"cvfs\"\n"
 	"load {} rechan\n"
 	"load {} vfs\n"
-	"load {} vfs_kitdll_data_tcl\n"
-#include "vfs_kitdll.tcl.h"
+	"load {} cvfs_data_tcl\n"
+#include "cvfs.tcl.h"
 	"if {![info exists s]} {\n"
 		"catch {\n"
-			"set s [::vfs::kitdll::data::getData tcl boot.tcl]\n"
+			"set s [::vfs::cvfs::data::getData tcl boot.tcl]\n"
 		"}\n"
 	"}\n"
 #endif /* KIT_STORAGE_CVFS */
 #ifndef TCLKIT_DLL
 	"if {![info exists s]} {\n"
@@ -353,11 +353,11 @@
 	Tcl_StaticPackage(0, "vfs", Vfs_Init, NULL);
 #ifdef KIT_INCLUDES_ZLIB
 	Tcl_StaticPackage(0, "zlib", Zlib_Init, NULL);
 #endif
 #ifdef KIT_STORAGE_CVFS
-	Tcl_StaticPackage(0, "vfs_kitdll_data_tcl", Vfs_kitdll_data_tcl_Init, NULL);
+	Tcl_StaticPackage(0, "cvfs_data_tcl", Cvfs_data_tcl_Init, NULL);
 #endif
 #ifdef TCL_THREADS
 	Tcl_StaticPackage(0, "Thread", Thread_Init, NULL);
 #endif
 #ifdef _WIN32