Index: tests/methods.test
===================================================================
diff -u -re528761906857b0f8307d5bc9b94878168234965 -rc6057c18970d5bc19fe0f1f760ef0d29898ecfdd
--- tests/methods.test	(.../methods.test)	(revision e528761906857b0f8307d5bc9b94878168234965)
+++ tests/methods.test	(.../methods.test)	(revision c6057c18970d5bc19fe0f1f760ef0d29898ecfdd)
@@ -65,7 +65,7 @@
 C public attribute s0
 C protected attribute s1
 ? {c1 s0 0} 0
-? {::nsf::dispatch c1 s1 1} 1
+? {::nsf::object::dispatch c1 s1 1} 1
 C class attribute s3
 ? {C s3 3} 3
 
@@ -76,31 +76,31 @@
   ? {c2 plain_method} "plain_method"
   ? {c2 public_method} "public_method"
   ? {catch {c2 protected_method}} 1
-  ? {::nsf::dispatch c2 protected_method} "protected_method"
+  ? {::nsf::object::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
-  ? {::nsf::dispatch c2 protected_forward} "protected_method"
+  ? {::nsf::object::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
-  ? {::nsf::dispatch c2 protected_setter 4} "4"
+  ? {::nsf::object::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
-  ? {::nsf::dispatch c2 protected_alias} "protected_method"
+  ? {::nsf::object::dispatch c2 protected_alias} "protected_method"
 }
 
 ###########
@@ -110,31 +110,31 @@
   ? {C plain_object_method} "plain_object_method"
   ? {C public_object_method} "public_object_method"
   ? {catch {C protected_object_method}} 1
-  ? {::nsf::dispatch C protected_object_method} "protected_object_method"
+  ? {::nsf::object::dispatch C protected_object_method} "protected_object_method"
 }
 
 # class 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
-  ? {::nsf::dispatch C protected_object_forward} "protected_object_method"
+  ? {::nsf::object::dispatch C protected_object_forward} "protected_object_method"
 }
 
 # class 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
-  ? {::nsf::dispatch C protected_object_setter 4} "4"
+  ? {::nsf::object::dispatch C protected_object_setter 4} "4"
 }
 
 # class 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
-  ? {::nsf::dispatch C protected_object_alias} "protected_object_method"
+  ? {::nsf::object::dispatch C protected_object_alias} "protected_object_method"
 }
 
 ###########
@@ -144,31 +144,31 @@
   ? {c1 plain_object_method} "plain_object_method"
   ? {c1 public_object_method} "public_object_method"
   ? {catch {c1 protected_object_method}} 1
-  ? {::nsf::dispatch c1 protected_object_method} "protected_object_method"
+  ? {::nsf::object::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
-  ? {::nsf::dispatch c1 protected_object_forward} "protected_object_method"
+  ? {::nsf::object::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
-  ? {::nsf::dispatch c1 protected_object_setter 4} "4"
+  ? {::nsf::object::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
-  ? {::nsf::dispatch c1 protected_object_alias} "protected_object_method"
+  ? {::nsf::object::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"