Index: kitcreator
==================================================================
--- kitcreator
+++ kitcreator
@@ -33,11 +33,11 @@
 done
 
 # We're all done if we're in clean or distclean mode
 if [ "${mode}" = "clean" -o "${mode}" = "distclean" ]; then
 	rm -f tclkit-*
-	rm -f libtcl-*.*
+	rm -f libtclkit-*.*
 
 	exit 0
 fi
 
 # Add packages implied by the additional arguments
@@ -89,11 +89,11 @@
 
 if [ "${buildfailed}" != "0" ]; then
 	echo 'WARNING: Build is likely incomplete or failed.' >&2
 fi
 
-for kitdllfile in 'kitdll/build'/kitdll-*/libtcl.*; do
+for kitdllfile in 'kitdll/build'/kitdll-*/libtclkit.*; do
 	cp "${kitdllfile}" "$(echo "${kitdllfile}" | sed "s@^.*/@@;s@\..*\$@-${TCLVERS}&@")" >/dev/null 2>/dev/null
 done
 cp 'kitsh/build'/kitsh-*/kit "tclkit-${TCLVERS}"
 
 exit "${buildfailed}"

Index: kitdll/buildsrc/kitdll-0.0/Makefile.in
==================================================================
--- kitdll/buildsrc/kitdll-0.0/Makefile.in
+++ kitdll/buildsrc/kitdll-0.0/Makefile.in
@@ -7,11 +7,11 @@
 STATICLIBS = @ARCHS@
 OBJS = vfs_kitdll_data_tcl.o kitInit.o rechan.o pwb.o
 TCLSH_NATIVE = tclsh
 
 # Default target
-all: libtcl.@SHOBJEXT@
+all: libtclkit.@SHOBJEXT@
 
 # 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
@@ -25,21 +25,21 @@
 ## Extensions
 rechan.o: rechan.c
 pwb.o: pwb.c
 
 ## DLL Build
-libtcl.@SHOBJEXT@: $(OBJS)
-	$(CC) $(CPPFLAGS) $(CFLAGS) -o libtcl.@SHOBJEXT@ $(OBJS) $(LDFLAGS) $(SHOBJLDFLAGS) -Wl,--whole-archive $(STATICLIBS) -Wl,--no-whole-archive $(LIBS)
+libtclkit.@SHOBJEXT@: $(OBJS)
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o libtclkit.@SHOBJEXT@ $(OBJS) $(LDFLAGS) $(SHOBJLDFLAGS) -Wl,--whole-archive $(STATICLIBS) -Wl,--no-whole-archive $(LIBS)
 
 # Test driver
 tclsh.o: tclsh.c
-tclsh: tclsh.o libtcl.@SHOBJEXT@
-	$(CC) $(CPPFLAGS) $(CFLAGS) -o tclsh tclsh.o -L. -ltcl -Wl,-R,`pwd`
+tclsh: tclsh.o libtclkit.@SHOBJEXT@
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o tclsh tclsh.o -L. -ltclkit -Wl,-R,`pwd`
 
 # Cleanup routeines
 clean:
-	rm -f libtcl.@SHOBJEXT@
+	rm -f libtclkit.@SHOBJEXT@
 	rm -f $(OBJS)
 	rm -f vfs_kitdll_data_tcl.c
 	rm -f vfs_kitdll.tcl.h
 	rm -f tclsh.o tclsh