Index: tests/method-modifiers.tcl
===================================================================
diff -u -r6166d76909482a0a4c1296cb959462d71c688922 -rf3cb5afe6aa1b6761b4a9909058f64ff7d64ab92
--- tests/method-modifiers.tcl	(.../method-modifiers.tcl)	(revision 6166d76909482a0a4c1296cb959462d71c688922)
+++ tests/method-modifiers.tcl	(.../method-modifiers.tcl)	(revision f3cb5afe6aa1b6761b4a9909058f64ff7d64ab92)
@@ -62,7 +62,7 @@
 C public setter s0
 C protected setter s1
 ? {c1 s0 0} 0
-? {::nx::core::dispatch c1 s1 1} 1
+? {::nsf::dispatch c1 s1 1} 1
 C object setter s3
 ? {C s3 3} 3
 
@@ -73,31 +73,31 @@
   ? {c2 plain_method} "plain_method"
   ? {c2 public_method} "public_method"
   ? {catch {c2 protected_method}} 1
-  ? {::nx::core::dispatch c2 protected_method} "protected_method"
+  ? {::nsf::dispatch c2 protected_method} "protected_method"
 }
 
 # class level forwards
 Test case class-level-forwards {
   ? {c2 plain_forward} "plain_method"
   ? {c2 public_forward} "public_method"
   ? {catch {c2 protected_forward}} 1
-  ? {::nx::core::dispatch c2 protected_forward} "protected_method"
+  ? {::nsf::dispatch c2 protected_forward} "protected_method"
 }
 
 # class level setter
 Test case class-level-setter {
   ? {c2 plain_setter 1} "1"
   ? {c2 public_setter 2} "2"
   ? {catch {c2 protected_setter 3}} 1
-  ? {::nx::core::dispatch c2 protected_setter 4} "4"
+  ? {::nsf::dispatch c2 protected_setter 4} "4"
 }
 
 # class level alias ....TODO: wanted behavior of [current method]? not "plain_alias"?
 Test case class-level-alias {
   ? {c2 plain_alias} "plain_method"
   ? {c2 public_alias} "public_method"
   ? {catch {c2 protected_alias}} 1
-  ? {::nx::core::dispatch c2 protected_alias} "protected_method"
+  ? {::nsf::dispatch c2 protected_alias} "protected_method"
 }
 
 ###########
@@ -107,31 +107,31 @@
   ? {C plain_object_method} "plain_object_method"
   ? {C public_object_method} "public_object_method"
   ? {catch {C protected_object_method}} 1
-  ? {::nx::core::dispatch C protected_object_method} "protected_object_method"
+  ? {::nsf::dispatch C protected_object_method} "protected_object_method"
 }
 
 # class-object level forwards
 Test case class-object-level-forwards {
   ? {C plain_object_forward} "plain_object_method"
   ? {C public_object_forward} "public_object_method"
   ? {catch {C protected_object_forward}} 1
-  ? {::nx::core::dispatch C protected_object_forward} "protected_object_method"
+  ? {::nsf::dispatch C protected_object_forward} "protected_object_method"
 }
 
 # class-object level setter
 Test case class-object-level-setter {
   ? {C plain_object_setter 1} "1"
   ? {C public_object_setter 2} "2"
   ? {catch {C protected_object_setter 3}} 1
-  ? {::nx::core::dispatch C protected_object_setter 4} "4"
+  ? {::nsf::dispatch C protected_object_setter 4} "4"
 }
 
 # class-object level alias ....TODO: wanted behavior of [current method]? not "plain_alias"?
 Test case class-object-level-alias {
   ? {C plain_object_alias} "plain_object_method"
   ? {C public_object_alias} "public_object_method"
   ? {catch {C protected_object_alias}} 1
-  ? {::nx::core::dispatch C protected_object_alias} "protected_object_method"
+  ? {::nsf::dispatch C protected_object_alias} "protected_object_method"
 }
 
 ###########
@@ -141,30 +141,30 @@
   ? {c1 plain_object_method} "plain_object_method"
   ? {c1 public_object_method} "public_object_method"
   ? {catch {c1 protected_object_method}} 1
-  ? {::nx::core::dispatch c1 protected_object_method} "protected_object_method"
+  ? {::nsf::dispatch c1 protected_object_method} "protected_object_method"
 }
 
 # object level forwards
 Test case object-level-forwards {
   ? {c1 plain_object_forward} "plain_object_method"
   ? {c1 public_object_forward} "public_object_method"
   ? {catch {c1 protected_object_forward}} 1
-  ? {::nx::core::dispatch c1 protected_object_forward} "protected_object_method"
+  ? {::nsf::dispatch c1 protected_object_forward} "protected_object_method"
 }
 
 # object level setter
 Test case object-level-setter
 ? {c1 plain_object_setter 1} "1"
 ? {c1 public_object_setter 2} "2"
 ? {catch {c1 protected_object_setter 3}} 1
-? {::nx::core::dispatch c1 protected_object_setter 4} "4"
+? {::nsf::dispatch c1 protected_object_setter 4} "4"
 
 # object level alias ....TODO: wanted behavior of [current method]? not "plain_alias"?
 Test case object-level-alias {
   ? {c1 plain_object_alias} "plain_object_method"
   ? {c1 public_object_alias} "public_object_method"
   ? {catch {c1 protected_object_alias}} 1
-  ? {::nx::core::dispatch c1 protected_object_alias} "protected_object_method"
+  ? {::nsf::dispatch c1 protected_object_alias} "protected_object_method"
 
   ? {lsort [c1 info methods]} \
       "plain_object_alias plain_object_forward plain_object_method plain_object_setter public_object_alias public_object_forward public_object_method public_object_setter"
@@ -236,7 +236,7 @@
   
   Class create C {
     set x [:attribute a]
-    ? [list set _ $x] "::nx::core::classes::C::a"
+    ? [list set _ $x] "::nsf::classes::C::a"
 
     # attribute with default
     :attribute {b b1}