@@ -2,11 +2,11 @@
 
 #ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 #endif
 
-typedef struct kitdll_data *(cmd_getData_t)(const char *, unsigned long);
+typedef struct cvfs_data *(cmd_getData_t)(const char *, unsigned long);
 typedef unsigned long (cmd_getChildren_t)(const char *, unsigned long *, unsigned long);
 
 /* Your implementation must provide these */
 static cmd_getData_t *getCmdData(const char *hashkey);
 static cmd_getChildren_t *getCmdChildren(const char *hashkey);
@@ -13,11 +13,11 @@
 
 /* Tcl Commands */
 static int getMetadata(ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
 	cmd_getData_t *cmd_getData;
 	cmd_getChildren_t *cmd_getChildren;
-	struct kitdll_data *finfo = NULL;
+	struct cvfs_data *finfo = NULL;
 	Tcl_Obj *ret_list, *ret_list_items[20];
 	unsigned long num_children;
 	const char *hashkey;
 	const char *file;
 
@@ -50,11 +50,11 @@
 	/* Values that can be derived from "finfo" */
 	ret_list_items[0] = Tcl_NewStringObj("type", 4);
 	ret_list_items[2] = Tcl_NewStringObj("mode", 4);
 	ret_list_items[4] = Tcl_NewStringObj("nlink", 5);
 
-	if (finfo->type == KITDLL_FILETYPE_DIR) {
+	if (finfo->type == CVFS_FILETYPE_DIR) {
 		num_children = cmd_getChildren(file, NULL, 0);
 
 		ret_list_items[1] = Tcl_NewStringObj("directory", 9);
 		ret_list_items[3] = Tcl_NewLongObj(040555);
 		ret_list_items[5] = Tcl_NewLongObj(num_children);
@@ -92,11 +92,11 @@
 
 	return(TCL_OK);
 }
 
 static int getData(ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
-	struct kitdll_data *finfo = NULL;
+	struct cvfs_data *finfo = NULL;
 	cmd_getData_t *cmd_getData;
 	const char *hashkey;
 	const char *file;
 	const char *end_str;
 	Tcl_Obj *ret_str;
@@ -148,11 +148,11 @@
 		Tcl_SetResult(interp, "No such file or directory", TCL_STATIC);
 
 		return(TCL_ERROR);
 	}
 
-	if (finfo->type != KITDLL_FILETYPE_FILE) {
+	if (finfo->type != CVFS_FILETYPE_FILE) {
 		Tcl_SetResult(interp, "Not a file", TCL_STATIC);
 
 		return(TCL_ERROR);
 	}
 
@@ -184,11 +184,11 @@
 
 	return(TCL_OK);
 }
 
 static int getChildren(ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
-	struct kitdll_data *finfo = NULL;
+	struct cvfs_data *finfo = NULL;
 	cmd_getChildren_t *cmd_getChildren;
 	cmd_getData_t *cmd_getData;
 	unsigned long num_children, idx;
 	unsigned long *children;
 	const char *hashkey;
@@ -220,11 +220,11 @@
 		Tcl_SetResult(interp, "No such file or directory", TCL_STATIC);
 
 		return(TCL_ERROR);
 	}
 
-	if (finfo->type != KITDLL_FILETYPE_DIR) {
+	if (finfo->type != CVFS_FILETYPE_DIR) {
 		Tcl_SetResult(interp, "Not a directory", TCL_STATIC);
 
 		return(TCL_ERROR);
 	}