Index: Makefile.in
===================================================================
diff -u -raf4326a00a0f2d0b2f1e0369af71637f48c2d56a -r00e168b160c8ad9d3785b0f32972577ac980c73a
--- Makefile.in	(.../Makefile.in)	(revision af4326a00a0f2d0b2f1e0369af71637f48c2d56a)
+++ Makefile.in	(.../Makefile.in)	(revision 00e168b160c8ad9d3785b0f32972577ac980c73a)
@@ -260,7 +260,7 @@
 
 install-aol: install-binaries install-libraries
 	$(INSTALL) $(src_generic_dir)/aol-xotcl.tcl \
-		$(DESTDIR)/$(aol_prefix)/modules/tcl/xotcl.tcl
+		$(DESTDIR)/$(aol_prefix)/tcl/xotcl.tcl
 
 
 #========================================================================
Index: TODO
===================================================================
diff -u -raf4326a00a0f2d0b2f1e0369af71637f48c2d56a -r00e168b160c8ad9d3785b0f32972577ac980c73a
--- TODO	(.../TODO)	(revision af4326a00a0f2d0b2f1e0369af71637f48c2d56a)
+++ TODO	(.../TODO)	(revision 00e168b160c8ad9d3785b0f32972577ac980c73a)
@@ -847,16 +847,20 @@
 - moved and transformed to next tests/object-system.xotcl -> tests/object-system.tcl
 - changed pkgIndex reference for .so file from next ot nx
 
+- changed stubs from xotcl to nx
+
 TODO: 
 - nameing
     * .c-code:
       . rename source files from xotcl{Int}.{ch}->next*.* | next-scripting*.* ?
         Stefan, meinung dazu? Notwending|Empfehlenswert|nicht? 
         bei den TEA definitionen stand was von max. 8zeichen für source code namen.
         andere optionen?
-      . prefix for exported symbols (XOTcl_ -> ?)
-      . prefix for symbols (XOTcl->?)
-      . prefix for symbols (XO->?)
+      . prefix for exported symbols (XOTcl_ -> Nx_ ?)
+      . prefix for symbols (XOTcl->Nx ?)
+      . prefix for symbols (XO->NX ?)
+      . library nameing libnext* or libnx*
+
     * file extension for next scripting .tcl
     * namespace prefix 
        next scripting language: ::nx::*
@@ -902,13 +906,6 @@
 - migrate further test from .xotcl to .tcl (based on next instead of xotcl)
 - check ::xotcl references in serializer
 
-- Change Prefixes in X-code from xotcl->
-  Current plan
-    XO NX
-    Xo Nx
-    XOTcl_ Nx_
-    XOTcl Nx
-
 - copy decls for objectMethod and classMethod  as comments
   to xotcl.c, fix and check order
 
Index: generic/aol-xotcl.tcl
===================================================================
diff -u -r335be502582c8dbf25ed808978d56a8fde39c991 -r00e168b160c8ad9d3785b0f32972577ac980c73a
--- generic/aol-xotcl.tcl	(.../aol-xotcl.tcl)	(revision 335be502582c8dbf25ed808978d56a8fde39c991)
+++ generic/aol-xotcl.tcl	(.../aol-xotcl.tcl)	(revision 00e168b160c8ad9d3785b0f32972577ac980c73a)
@@ -6,7 +6,7 @@
 # the "lib" directory within the AOLserver tree.
 #
 
-package require XOTcl; xotcl::use xotcl1
+package require XOTcl; namespace import -force ::xotcl::*
 package require xotcl::serializer
 ns_log notice "XOTcl version $::xotcl::version$::xotcl::patchlevel loaded"
 
@@ -44,7 +44,7 @@
 	"namespace import -force ::xotcl::*" \n \
 	$objects \n $import]
     # just for debugging purposes
-    if {0} {
+    if {1} {
       set f [open [::xotcl::tmpdir]/__aolserver-blueprint.tcl w]
       puts $f $script
       close $f
Index: library/lib/xotcl.tcl
===================================================================
diff -u -r35c67391973a07983d0b0dfe70706e6a69fbdbfc -r00e168b160c8ad9d3785b0f32972577ac980c73a
--- library/lib/xotcl.tcl	(.../xotcl.tcl)	(revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc)
+++ library/lib/xotcl.tcl	(.../xotcl.tcl)	(revision 00e168b160c8ad9d3785b0f32972577ac980c73a)
@@ -791,6 +791,7 @@
   
   if {[info exists cmd]} {unset cmd}
 
+  proc ::xotcl::configure args {::nx::core::configure {*}$args}
 
   # Documentation stub object -> just ignore per default.
   # if xoDoc is loaded, documentation will be activated
Index: unix/pkgIndex.unix.in
===================================================================
diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r00e168b160c8ad9d3785b0f32972577ac980c73a
--- unix/pkgIndex.unix.in	(.../pkgIndex.unix.in)	(revision c72f9f638677608fab1502cd696c8f2d6b2952f9)
+++ unix/pkgIndex.unix.in	(.../pkgIndex.unix.in)	(revision 00e168b160c8ad9d3785b0f32972577ac980c73a)
@@ -1,4 +1,4 @@
-  package ifneeded XOTcl @PACKAGE_VERSION@ [list load \
-    [file join $dir @PKG_LIB_FILE@] XOTcl]
+  package ifneeded nx @PACKAGE_VERSION@ [list load \
+    [file join $dir @PKG_LIB_FILE@] nx]