Index: build/test/tests/17-zipseek.tcl
==================================================================
--- build/test/tests/17-zipseek.tcl
+++ build/test/tests/17-zipseek.tcl
@@ -1,12 +1,9 @@
 #!/usr/bin/env tclsh
 
-package require starkit
-starkit::startup
-
 # Open some file inside the tclkit that will be stored in compressed form
-set fd [open [file join $::starkit::topdir boot.tcl]]
+set fd [open [file join $::tcl_library init.tcl]]
 
 gets $fd line1
 
 if {[catch {seek $fd 0} result]} {
     puts "Got:      $result"

Index: kitsh/buildsrc/kitsh-0.0/boot.tcl
==================================================================
--- kitsh/buildsrc/kitsh-0.0/boot.tcl
+++ kitsh/buildsrc/kitsh-0.0/boot.tcl
@@ -142,13 +142,13 @@
   
 	# load config settings file if present
 	namespace eval ::vfs { variable tclkit_version 1 }
 	catch { uplevel #0 [list source [file join $mountpoint config.tcl]] }
 
-	# Set-up starkit::topdir correctly
-	namespace eval ::starkit { variable topdir }
-	set ::starkit::topdir $mountpoint
+	# Set-up starkit::tclkitroot
+	namespace eval ::starkit { variable tclkitroot }
+	set ::starkit::tclkitroot $mountpoint
 
 	# Perform expected initialization
 	uplevel #0 [list source [file join $tcl_library init.tcl]]
   
 	# reset auto_path, so that init.tcl's search outside of tclkit is cancelled