Index: tests/returns.test
===================================================================
diff -u -rf0295d889aaf71709c63243685897dc3f11048f1 -re3a84e351aaf79c02a63cc0741dde7b9bd550849
--- tests/returns.test	(.../returns.test)	(revision f0295d889aaf71709c63243685897dc3f11048f1)
+++ tests/returns.test	(.../returns.test)	(revision e3a84e351aaf79c02a63cc0741dde7b9bd550849)
@@ -25,11 +25,11 @@
 	:create c1
     }
 
-    ::nsf::methodproperty C bar-ok1 returns integer
-    ::nsf::methodproperty C bar-ok2 returns integer
-    ::nsf::methodproperty C bar-nok returns integer
-    ::nsf::methodproperty C incr returns integer
-    ::nsf::methodproperty C lappend returns integer
+    ::nsf::method::property C bar-ok1 returns integer
+    ::nsf::method::property C bar-ok2 returns integer
+    ::nsf::method::property C bar-nok returns integer
+    ::nsf::method::property C incr returns integer
+    ::nsf::method::property C lappend returns integer
 
     ? {c1 bar-ok1 1 2} 1
     ? {c1 bar-ok2 1 2} 1
@@ -41,13 +41,13 @@
     ? {c1 lappend l e1} {expected integer but got "e1" as return value}
 
     # query the returns value
-    ? {::nsf::methodproperty C lappend returns} integer
+    ? {::nsf::method::property C lappend returns} integer
 
     # reset it to emtpy
-    ? {::nsf::methodproperty C lappend returns ""} ""
-    ? {::nsf::methodproperty C bar-ok1 returns ""} ""
-    ? {::nsf::methodproperty C bar-ok2 returns ""} ""
-    ? {::nsf::methodproperty C bar-nok returns ""} ""
+    ? {::nsf::method::property C lappend returns ""} ""
+    ? {::nsf::method::property C bar-ok1 returns ""} ""
+    ? {::nsf::method::property C bar-ok2 returns ""} ""
+    ? {::nsf::method::property C bar-nok returns ""} ""
 
     # no checking 
     ? {c1 bar-ok1 1 2} 1
@@ -56,8 +56,8 @@
     ? {c1 lappend l e2} "e1 e2"
 
     # query returns "", if there is no returns checking
-    ? {::nsf::methodproperty C lappend returns} ""
-    ? {::nsf::methodproperty ::nx::Object method returns} ""
+    ? {::nsf::method::property C lappend returns} ""
+    ? {::nsf::method::property ::nx::Object method returns} ""
 
 }
 
@@ -81,11 +81,11 @@
 	:create c1
     }
 
-    ::nsf::methodproperty C bar-ok1 returns range,arg=1-3
-    ::nsf::methodproperty C bar-ok2 returns range,arg=1-3
-    ::nsf::methodproperty C bar-nok returns range,arg=1-3
-    ::nsf::methodproperty C incr returns range,arg=1-30
-    ::nsf::methodproperty C lappend returns range,arg=1-30
+    ::nsf::method::property C bar-ok1 returns range,arg=1-3
+    ::nsf::method::property C bar-ok2 returns range,arg=1-3
+    ::nsf::method::property C bar-nok returns range,arg=1-3
+    ::nsf::method::property C incr returns range,arg=1-30
+    ::nsf::method::property C lappend returns range,arg=1-30
 
     ? {c1 bar-ok1 1 2} 1
     ? {c1 bar-ok2 1 2} 1
@@ -117,10 +117,10 @@
 	:create c1
     }
 
-    ::nsf::methodproperty C bar-ok1 returns sex
-    ::nsf::methodproperty C bar-ok2 returns sex
-    ::nsf::methodproperty C bar-nok returns sex
-    ::nsf::methodproperty C set returns sex
+    ::nsf::method::property C bar-ok1 returns sex
+    ::nsf::method::property C bar-ok2 returns sex
+    ::nsf::method::property C bar-nok returns sex
+    ::nsf::method::property C set returns sex
 
     ? {c1 bar-ok1 1 2} male
     ? {c1 bar-ok2 female 2} female
@@ -132,10 +132,10 @@
 
     ? {c1 set x hugo} {expected sex but got hugo}
 
-    ::nsf::methodproperty C bar-ok1 returns sex,convert
-    ::nsf::methodproperty C bar-ok2 returns sex,convert
-    ::nsf::methodproperty C bar-nok returns sex,convert
-    ::nsf::methodproperty C set returns sex,convert
+    ::nsf::method::property C bar-ok1 returns sex,convert
+    ::nsf::method::property C bar-ok2 returns sex,convert
+    ::nsf::method::property C bar-nok returns sex,convert
+    ::nsf::method::property C set returns sex,convert
 
     ? {c1 bar-ok1 1 2} m
     ? {c1 bar-ok2 female 2} f
@@ -167,11 +167,11 @@
 	:create c1
     }
 
-    ::nsf::methodproperty C bar-ok1 returns integer
-    ::nsf::methodproperty C bar-ok2 returns integer
-    ::nsf::methodproperty C bar-nok returns integer
-    ::nsf::methodproperty C incr returns integer
-    ::nsf::methodproperty C lappend returns integer
+    ::nsf::method::property C bar-ok1 returns integer
+    ::nsf::method::property C bar-ok2 returns integer
+    ::nsf::method::property C bar-nok returns integer
+    ::nsf::method::property C incr returns integer
+    ::nsf::method::property C lappend returns integer
 
     ? {c1 bar-ok1 1 2} 1
     ? {c1 bar-ok2 1 2} 1
@@ -183,18 +183,18 @@
     ? {c1 lappend l e1} e1
 
     # query the returns value
-    ? {::nsf::methodproperty C lappend returns} integer
+    ? {::nsf::method::property C lappend returns} integer
 
     # reset it to emtpy
-    ? {::nsf::methodproperty C lappend returns ""} ""
+    ? {::nsf::method::property C lappend returns ""} ""
 
     c1 eval {set :l e1}
     # no checking on lappend
     ? {c1 lappend l e2} "e1 e2"
 
     # query returns "", if there is no returns checking
-    ? {::nsf::methodproperty C lappend returns} ""
-    ? {::nsf::methodproperty ::nx::Object method returns} ""
+    ? {::nsf::method::property C lappend returns} ""
+    ? {::nsf::method::property ::nx::Object method returns} ""
 }
 
 Test parameter count 10
@@ -217,11 +217,11 @@
 	:create c1
     }
 
-    ::nsf::methodproperty C bar-ok1 returns range,arg=1-3
-    ::nsf::methodproperty C bar-ok2 returns range,arg=1-3
-    ::nsf::methodproperty C bar-nok returns range,arg=1-3
-    ::nsf::methodproperty C incr returns range,arg=1-30
-    ::nsf::methodproperty C lappend returns range,arg=1-30
+    ::nsf::method::property C bar-ok1 returns range,arg=1-3
+    ::nsf::method::property C bar-ok2 returns range,arg=1-3
+    ::nsf::method::property C bar-nok returns range,arg=1-3
+    ::nsf::method::property C incr returns range,arg=1-30
+    ::nsf::method::property C lappend returns range,arg=1-30
 
     ? {c1 bar-ok1 1 2} 1
     ? {c1 bar-ok2 1 2} 1
@@ -256,10 +256,10 @@
     #
     # turn off checker
     #
-    ::nsf::methodproperty C bar-ok1 returns sex
-    ::nsf::methodproperty C bar-ok2 returns sex
-    ::nsf::methodproperty C bar-nok returns sex
-    ::nsf::methodproperty C set returns sex
+    ::nsf::method::property C bar-ok1 returns sex
+    ::nsf::method::property C bar-ok2 returns sex
+    ::nsf::method::property C bar-nok returns sex
+    ::nsf::method::property C set returns sex
 
     ? {c1 bar-ok1 1 2} male
     ? {c1 bar-ok2 female 2} female
@@ -274,10 +274,10 @@
     #
     # don't turn off converter
     #
-    ::nsf::methodproperty C bar-ok1 returns sex,convert
-    ::nsf::methodproperty C bar-ok2 returns sex,convert
-    ::nsf::methodproperty C bar-nok returns sex,convert
-    ::nsf::methodproperty C set returns sex,convert
+    ::nsf::method::property C bar-ok1 returns sex,convert
+    ::nsf::method::property C bar-ok2 returns sex,convert
+    ::nsf::method::property C bar-nok returns sex,convert
+    ::nsf::method::property C set returns sex,convert
 
     ? {c1 bar-ok1 1 2} m
     ? {c1 bar-ok2 female 2} f
@@ -317,7 +317,7 @@
     ? {c1 bar-ok2 1 2} 1
     ? {c1 ++ 1000} 1001
     ? {c1 | a} {expected integer but got "a" as return value}
-    ? {::nsf::methodproperty ::C ::nsf::classes::C::bar-nok returns} integer
+    ? {::nsf::method::property ::C ::nsf::classes::C::bar-nok returns} integer
     ? {c1 bar-nok 1 2} {expected integer but got "a" as return value}
 
     ? {C instances} ::c1
@@ -328,15 +328,15 @@
     ? {c1 lappend l e1} {expected integer but got "e1" as return value}
 
     # query the returns value
-    ? {::nsf::methodproperty C lappend returns} integer
+    ? {::nsf::method::property C lappend returns} integer
 
     # reset it to emtpy
-    ? {::nsf::methodproperty C lappend returns ""} ""
-    ? {::nsf::methodproperty C bar-ok1 returns ""} ""
-    ? {::nsf::methodproperty C bar-ok2 returns ""} ""
-    ? {::nsf::methodproperty C bar-nok returns ""} ""
-    ? {::nsf::methodproperty C ++ returns ""} ""
-    ? {::nsf::methodproperty C | returns ""} ""
+    ? {::nsf::method::property C lappend returns ""} ""
+    ? {::nsf::method::property C bar-ok1 returns ""} ""
+    ? {::nsf::method::property C bar-ok2 returns ""} ""
+    ? {::nsf::method::property C bar-nok returns ""} ""
+    ? {::nsf::method::property C ++ returns ""} ""
+    ? {::nsf::method::property C | returns ""} ""
 
     # no checking 
     ? {c1 bar-ok1 1 2} 1
@@ -347,8 +347,8 @@
     ? {c1 | a} "a"
 
     # query returns "", if there is no returns checking
-    ? {::nsf::methodproperty C lappend returns} ""
-    ? {::nsf::methodproperty ::nx::Object method returns} ""
+    ? {::nsf::method::property C lappend returns} ""
+    ? {::nsf::method::property ::nx::Object method returns} ""
 
 }
 
@@ -357,18 +357,18 @@
     # 1: Create an empty or checker-free parameter spec
     :method foo {} {;}
     ? [:info method parameter foo] ""
-    # 2: A call to ::nsf::methodproperty which might require NsfParamDefs
-    ? [list ::nsf::methodproperty [::nx::current] foo returns] ""
+    # 2: A call to ::nsf::method::property which might require NsfParamDefs
+    ? [list ::nsf::method::property [::nx::current] foo returns] ""
     # 3: Check, if "info method parameter" still works
     ? [:info method parameter foo] ""
-    ? [list ::nsf::methodproperty [::nx::current] foo returns] ""
+    ? [list ::nsf::method::property [::nx::current] foo returns] ""
     # 4: Set methodproperty to some value and check again
-    ::nsf::methodproperty [::nx::current] foo returns int
-    ? [list ::nsf::methodproperty [::nx::current] foo returns] "int"
+    ::nsf::method::property [::nx::current] foo returns int
+    ? [list ::nsf::method::property [::nx::current] foo returns] "int"
     ? [:info method parameter foo] ""
     # 5: Reset methodproperty and query again
-    ::nsf::methodproperty [::nx::current] foo returns ""
-    ? [list ::nsf::methodproperty [::nx::current] foo returns] ""
+    ::nsf::method::property [::nx::current] foo returns ""
+    ? [list ::nsf::method::property [::nx::current] foo returns] ""
     ? [:info method parameter foo] ""
   }
 }
\ No newline at end of file