Index: Makefile.in
===================================================================
diff -u -ra7b06fee23b709e9b7033e1de5b31cd81b00ead0 -r7d86dbc79d2d53c5b29ed292f781a059e521c9b3
--- Makefile.in	(.../Makefile.in)	(revision a7b06fee23b709e9b7033e1de5b31cd81b00ead0)
+++ Makefile.in	(.../Makefile.in)	(revision 7d86dbc79d2d53c5b29ed292f781a059e521c9b3)
@@ -396,19 +396,19 @@
 	$(TCLSH) $(src_test_dir_native)/mixinoftest.tcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
 
 test-xotcl: $(TCLSH_PROG)
-	$(TCLSH) $(xotcl_src_test_dir)/tests/testo.xotcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
-	$(TCLSH) $(xotcl_src_test_dir)/tests/speedtest.xotcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
-	$(TCLSH) $(xotcl_src_test_dir)/tests/testx.xotcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
-	$(TCLSH) $(xotcl_src_test_dir)/tests/slottest.xotcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(xotcl_src_test_dir)/testo.xotcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(xotcl_src_test_dir)/speedtest.xotcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(xotcl_src_test_dir)/testx.xotcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(xotcl_src_test_dir)/slottest.xotcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
 
 test-http: $(TCLSH_PROG)
-	$(TCLSH) $(xotcl_src_test_dir)/tests/xocomm.test -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(xotcl_src_test_dir)/xocomm.test -libdir $(PLATFORM_DIR) $(TESTFLAGS)
 
 test-actiweb: $(TCLSH_PROG)
-	$(TCLSH) $(xotcl_src_test_dir)/tests/actiweb.test -libdir $(PLATFORM_DIR) $(TESTFLAGS)
-	$(TCLSH) $(xotcl_src_test_dir)/tests/persistence.test -libdir $(PLATFORM_DIR) $(TESTFLAGS)
-	$(TCLSH) $(xotcl_src_test_dir)/tests/UNIVERSAL.test -libdir $(PLATFORM_DIR) $(TESTFLAGS)
-	$(TCLSH) $(xotcl_src_test_dir)/tests/xoRDF.test -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(xotcl_src_test_dir)/actiweb.test -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(xotcl_src_test_dir)/persistence.test -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(xotcl_src_test_dir)/UNIVERSAL.test -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(xotcl_src_test_dir)/xoRDF.test -libdir $(PLATFORM_DIR) $(TESTFLAGS)
 	@rm -rf receiver
 
 depend:
@@ -459,7 +459,7 @@
 #========================================================================
 
 pkgIndex.tcl: $(PKG_LIB_FILE)
-	@echo package ifneeded nx $(PACKAGE_VERSION) [list load [file join \$$dir . $(PKG_LIB_FILE)] nx] > pkgIndex.tcl
+	@echo package ifneeded nsf $(PACKAGE_VERSION) [list load [file join \$$dir . $(PKG_LIB_FILE)] nx] > pkgIndex.tcl
 
 install-pkgIndex:
 #	@echo package ifneeded nx $(PACKAGE_VERSION) [list load [file join \$$dir .. "$(PKG_LIB_FILE)"] nx] > "$(pkglibdir)/pkgIndex.tcl"