@@ -1,97 +1,97 @@
 #! /usr/bin/env tcl
 
 package require vfs
 
-namespace eval ::vfs::kitdll {}
+namespace eval ::vfs::cvfs {}
 
 # Convience functions
-proc ::vfs::kitdll::Mount {hashkey local} {
-	vfs::filesystem mount $local [list ::vfs::kitdll::vfshandler $hashkey]
+proc ::vfs::cvfs::Mount {hashkey local} {
+	vfs::filesystem mount $local [list ::vfs::cvfs::vfshandler $hashkey]
 	catch {
-		vfs::RegisterMount $local [list ::vfs::kitdll::Unmount]
+		vfs::RegisterMount $local [list ::vfs::cvfs::Unmount]
 	}
 }
 
-proc ::vfs::kitdll::Unmount {local} {
+proc ::vfs::cvfs::Unmount {local} {
 	vfs::filesystem unmount $local
 }
 
 # Implementation
 ## I/O Handlers (pass to appropriate hashkey)
-namespace eval ::vfs::kitdll::data {}
-proc ::vfs::kitdll::data::getChildren args {
+namespace eval ::vfs::cvfs::data {}
+proc ::vfs::cvfs::data::getChildren args {
 	set hashkey [lindex $args 0]
 
-	set cmd "::vfs::kitdll::data::${hashkey}::getChildren"
+	set cmd "::vfs::cvfs::data::${hashkey}::getChildren"
 	set cmd [linsert $args 0 $cmd]
 
 	eval $cmd
 }
 
-proc ::vfs::kitdll::data::getMetadata args {
+proc ::vfs::cvfs::data::getMetadata args {
 	set hashkey [lindex $args 0]
 
-	set cmd "::vfs::kitdll::data::${hashkey}::getMetadata"
+	set cmd "::vfs::cvfs::data::${hashkey}::getMetadata"
 	set cmd [linsert $args 0 $cmd]
 
 	eval $cmd
 }
 
-proc ::vfs::kitdll::data::getData args {
+proc ::vfs::cvfs::data::getData args {
 	set hashkey [lindex $args 0]
 
-	set cmd "::vfs::kitdll::data::${hashkey}::getData"
+	set cmd "::vfs::cvfs::data::${hashkey}::getData"
 	set cmd [linsert $args 0 $cmd]
 
 	eval $cmd
 }
 
 ## VFS and Chan I/O
 ### Dispatchers
-proc ::vfs::kitdll::vfshandler {hashkey subcmd args} {
+proc ::vfs::cvfs::vfshandler {hashkey subcmd args} {
 	set cmd $args
-	set cmd [linsert $cmd 0 "::vfs::kitdll::vfsop_${subcmd}" $hashkey]
+	set cmd [linsert $cmd 0 "::vfs::cvfs::vfsop_${subcmd}" $hashkey]
 
 	return [eval $cmd]
 }
 
-proc ::vfs::kitdll::chanhandler {hashkey subcmd args} {
+proc ::vfs::cvfs::chanhandler {hashkey subcmd args} {
 	set cmd $args
-	set cmd [linsert $cmd 0 "::vfs::kitdll::chanop_${subcmd}" $hashkey]
+	set cmd [linsert $cmd 0 "::vfs::cvfs::chanop_${subcmd}" $hashkey]
 
 	return [eval $cmd]
 }
 
 ### Actual handlers
 #### Channel operation handlers
-proc ::vfs::kitdll::chanop_initialize {hashkey chanId mode} {
+proc ::vfs::cvfs::chanop_initialize {hashkey chanId mode} {
 	return [list initialize finalize watch read seek]
 }
 
-proc ::vfs::kitdll::chanop_finalize {hashkey chanId} {
-	unset -nocomplain ::vfs::kitdll::chandata([list $hashkey $chanId])
+proc ::vfs::cvfs::chanop_finalize {hashkey chanId} {
+	unset -nocomplain ::vfs::cvfs::chandata([list $hashkey $chanId])
 
 	return
 }
 
-proc ::vfs::kitdll::chanop_watch {hashkey chanId eventSpec} {
-	array set chaninfo $::vfs::kitdll::chandata([list $hashkey $chanId])
+proc ::vfs::cvfs::chanop_watch {hashkey chanId eventSpec} {
+	array set chaninfo $::vfs::cvfs::chandata([list $hashkey $chanId])
 
 	set chaninfo(watching) $eventSpec
 
-	set ::vfs::kitdll::chandata([list $hashkey $chanId]) [array get chaninfo]
+	set ::vfs::cvfs::chandata([list $hashkey $chanId]) [array get chaninfo]
 
 	if {[lsearch -exact $chaninfo(watching) "read"] != -1} {
 		after 0 [list catch "chan postevent $chanId [list {read}]"]
 	}
 
 	return
 }
 
-proc ::vfs::kitdll::chanop_read {hashkey chanId bytes} {
-	array set chaninfo $::vfs::kitdll::chandata([list $hashkey $chanId])
+proc ::vfs::cvfs::chanop_read {hashkey chanId bytes} {
+	array set chaninfo $::vfs::cvfs::chandata([list $hashkey $chanId])
 
 	set pos $chaninfo(pos)
 	set len $chaninfo(len)
 
 	if {[lsearch -exact $chaninfo(watching) "read"] != -1} {
@@ -105,24 +105,24 @@
 	set end [expr {$pos + $bytes}]
 	if {$end > $len} {
 		set end $len
 	}
 
-	set data [::vfs::kitdll::data::getData $hashkey $chaninfo(file) $pos $end]
+	set data [::vfs::cvfs::data::getData $hashkey $chaninfo(file) $pos $end]
 
 	set dataLen [string length $data]
 	incr pos $dataLen
 
 	set chaninfo(pos) $pos
 
-	set ::vfs::kitdll::chandata([list $hashkey $chanId]) [array get chaninfo]
+	set ::vfs::cvfs::chandata([list $hashkey $chanId]) [array get chaninfo]
 
 	return $data
 }
 
-proc ::vfs::kitdll::chanop_seek {hashkey chanId offset origin} {
-	array set chaninfo $::vfs::kitdll::chandata([list $hashkey $chanId])
+proc ::vfs::cvfs::chanop_seek {hashkey chanId offset origin} {
+	array set chaninfo $::vfs::cvfs::chandata([list $hashkey $chanId])
 
 	set pos $chaninfo(pos)
 	set len $chaninfo(len)
 
 	switch -- $origin {
@@ -144,53 +144,53 @@
 	if {$pos > $len} {
 		set pos $len
 	}
 
 	set chaninfo(pos) $pos
-	set ::vfs::kitdll::chandata([list $hashkey $chanId]) [array get chaninfo]
+	set ::vfs::cvfs::chandata([list $hashkey $chanId]) [array get chaninfo]
 
 	return $pos
 }
 
 #### VFS operation handlers
-proc ::vfs::kitdll::vfsop_stat {hashkey root relative actualpath} {
+proc ::vfs::cvfs::vfsop_stat {hashkey root relative actualpath} {
 	catch {
-		set ret [::vfs::kitdll::data::getMetadata $hashkey $relative]
+		set ret [::vfs::cvfs::data::getMetadata $hashkey $relative]
 	}
 
 	if {![info exists ret]} {
 		vfs::filesystem posixerror $::vfs::posix(ENOENT)
 	}
 
 	return $ret
 }
 
-proc ::vfs::kitdll::vfsop_access {hashkey root relative actualpath mode} {
-	set ret [::vfs::kitdll::data::getMetadata $hashkey $relative]
+proc ::vfs::cvfs::vfsop_access {hashkey root relative actualpath mode} {
+	set ret [::vfs::cvfs::data::getMetadata $hashkey $relative]
 
 	if {$mode & 0x2} {
 		vfs::filesystem posixerror $::vfs::posix(EROFS)
 	}
 
 	return 1
 }
 
-proc ::vfs::kitdll::vfsop_matchindirectory {hashkey root relative actualpath pattern types} {
+proc ::vfs::cvfs::vfsop_matchindirectory {hashkey root relative actualpath pattern types} {
 	set ret [list]
 
 	catch {
-		array set metadata [::vfs::kitdll::data::getMetadata $hashkey $relative]
+		array set metadata [::vfs::cvfs::data::getMetadata $hashkey $relative]
 	}
 
 	if {![info exists metadata]} {
 		return [list]
 	}
 
 	if {$pattern == ""} {
 		set children [list $relative]
 	} else {
-		set children [::vfs::kitdll::data::getChildren $hashkey $relative]
+		set children [::vfs::cvfs::data::getChildren $hashkey $relative]
 	}
 
 	foreach child $children {
 		if {$pattern != ""} {
 			if {![string match $pattern $child]} {
@@ -198,11 +198,11 @@
 			}
 		}
 
 		unset -nocomplain metadata
 		catch {
-			array set metadata [::vfs::kitdll::data::getMetadata $hashkey $child]
+			array set metadata [::vfs::cvfs::data::getMetadata $hashkey $child]
 		}
 
 		if {[string index $root end] == "/"} {
 			set child "${root}${child}"
 		} else {
@@ -240,11 +240,11 @@
 	}
 
 	return $ret
 }
 
-proc ::vfs::kitdll::vfsop_fileattributes {hashkey root relative actualpath {index -1} {value ""}} {
+proc ::vfs::cvfs::vfsop_fileattributes {hashkey root relative actualpath {index -1} {value ""}} {
 	set attrs [list -owner -group -permissions]
 
 	if {$value != ""} {
 		vfs::filesystem posixerror $::vfs::posix(EROFS)
 	}
@@ -251,11 +251,11 @@
 
 	if {$index == -1} {
 		return $attrs
 	}
 
-	array set metadata [::vfs::kitdll::data::getMetadata $hashkey $relative]
+	array set metadata [::vfs::cvfs::data::getMetadata $hashkey $relative]
 
 	set attr [lindex $attrs $index]
 
 	switch -- $attr {
 		"-owner" {
@@ -274,17 +274,17 @@
 	}
 
 	return -code error "Invalid index"
 }
 
-proc ::vfs::kitdll::vfsop_open {hashkey root relative actualpath mode permissions} {
+proc ::vfs::cvfs::vfsop_open {hashkey root relative actualpath mode permissions} {
 	if {$mode != "" && $mode != "r"} {
 		vfs::filesystem posixerror $::vfs::posix(EROFS)
 	}
 
 	catch {
-		array set metadata [::vfs::kitdll::data::getMetadata $hashkey $relative]
+		array set metadata [::vfs::cvfs::data::getMetadata $hashkey $relative]
 	}
 
 	if {![info exists metadata]} {
 		vfs::filesystem posixerror $::vfs::posix(ENOENT)
 	}
@@ -292,13 +292,13 @@
 	if {$metadata(type) == "directory"} {
 		vfs::filesystem posixerror $::vfs::posix(EISDIR)
 	}
 
 	if {[info command chan] != ""} {
-		set chan [chan create [list "read"] [list ::vfs::kitdll::chanhandler $hashkey]]
+		set chan [chan create [list "read"] [list ::vfs::cvfs::chanhandler $hashkey]]
 
-		set ::vfs::kitdll::chandata([list $hashkey $chan]) [list file $relative pos 0 len $metadata(size) watching ""]
+		set ::vfs::cvfs::chandata([list $hashkey $chan]) [list file $relative pos 0 len $metadata(size) watching ""]
 
 		return [list $chan]
 	}
 
 	if {[info command rechan] == ""} {
@@ -306,30 +306,30 @@
 			package require rechan
 		}
 	}
 
 	if {[info command rechan] != ""} {
-		set chan [rechan [list ::vfs::kitdll::chanhandler $hashkey] 2]
+		set chan [rechan [list ::vfs::cvfs::chanhandler $hashkey] 2]
 
-		set ::vfs::kitdll::chandata([list $hashkey $chan]) [list file $relative pos 0 len $metadata(size) watching ""]
+		set ::vfs::cvfs::chandata([list $hashkey $chan]) [list file $relative pos 0 len $metadata(size) watching ""]
 
 		return [list $chan]
 	}
 
 	return -code error "No way to generate a channel, need either Tcl 8.5+, \"rechan\""
 }
 
 ##### No-Ops since we are a readonly filesystem
-proc ::vfs::kitdll::vfsop_createdirectory {args} {
+proc ::vfs::cvfs::vfsop_createdirectory {args} {
+	vfs::filesystem posixerror $::vfs::posix(EROFS)
+}
+proc ::vfs::cvfs::vfsop_deletefile {args} {
 	vfs::filesystem posixerror $::vfs::posix(EROFS)
 }
-proc ::vfs::kitdll::vfsop_deletefile {args} {
+proc ::vfs::cvfs::vfsop_removedirectory {args} {
 	vfs::filesystem posixerror $::vfs::posix(EROFS)
 }
-proc ::vfs::kitdll::vfsop_removedirectory {args} {
-	vfs::filesystem posixerror $::vfs::posix(EROFS)
-}
-proc ::vfs::kitdll::vfsop_utime {} {
+proc ::vfs::cvfs::vfsop_utime {} {
 	vfs::filesystem posixerror $::vfs::posix(EROFS)
 }
 
-package provide vfs::kitdll 1.0
+package provide vfs::cvfs 1.0