Index: tests/object-system.tcl
===================================================================
diff -u -r18122dd21b99cf0d5b4cd01635048641a23aa051 -r3754364287df2dfdf79b81dfa69224eae19cf691
--- tests/object-system.tcl	(.../object-system.tcl)	(revision 18122dd21b99cf0d5b4cd01635048641a23aa051)
+++ tests/object-system.tcl	(.../object-system.tcl)	(revision 3754364287df2dfdf79b81dfa69224eae19cf691)
@@ -17,57 +17,57 @@
 }
 
 ? {::nsf::isobject Object} 1
-? {::nsf::objectproperty Object class} 1
-? {::nsf::objectproperty Object metaclass} 0
+? {::nsf::objectproperty class Object} 1
+? {::nsf::objectproperty metaclass Object} 0
 ? {Object info superclass} ""
 ? {Object info class} ::nx::Class
 
 ? {::nsf::isobject Class} 1
-? {::nsf::objectproperty Class class} 1
-? {::nsf::objectproperty Class metaclass} 1
+? {::nsf::objectproperty class Class} 1
+? {::nsf::objectproperty metaclass Class} 1
 ? {Class info superclass} ::nx::Object
 ? {Class info class} ::nx::Class
 
 
 Object create o
 ? {::nsf::isobject Object} 1
-? {::nsf::objectproperty o class} 0
-? {::nsf::objectproperty o metaclass} 0
+? {::nsf::objectproperty class o} 0
+? {::nsf::objectproperty metaclass o} 0
 ? {o info class} ::nx::Object
 ? {Object info instances o} ::o
 ? {Object info instances ::o} ::o
 
 Class create C0
-? {::nsf::objectproperty C0 class} 1
-? {::nsf::objectproperty C0 metaclass} 0
+? {::nsf::objectproperty class C0} 1
+? {::nsf::objectproperty metaclass C0} 0
 ? {C0 info superclass} ::nx::Object
 ? {C0 info class} ::nx::Class
 #? {lsort [Class info vars]} "__default_metaclass __default_superclass"
 
 Class create M -superclass ::nx::Class
 ? {::nsf::isobject M} 1
-? {::nsf::objectproperty M class} 1
-? {::nsf::objectproperty M metaclass} 1
+? {::nsf::objectproperty class M} 1
+? {::nsf::objectproperty metaclass M} 1
 ? {M info superclass} ::nx::Class
 ? {M info class} ::nx::Class
 
 M create C
 ? {::nsf::isobject C} 1
-? {::nsf::objectproperty C class} 1
-? {::nsf::objectproperty C metaclass} 0
+? {::nsf::objectproperty class C} 1
+? {::nsf::objectproperty metaclass C} 0
 ? {C info superclass} ::nx::Object
 ? {C info class} ::M
 
 C create c1
 ? {::nsf::isobject c1} 1
-? {::nsf::objectproperty c1 class} 0
-? {::nsf::objectproperty c1 metaclass} 0
+? {::nsf::objectproperty class c1} 0
+? {::nsf::objectproperty metaclass c1} 0
 ? {c1 info class} ::C
 
 Class create M2 -superclass M
 ? {::nsf::isobject M2} 1
-? {::nsf::objectproperty M2 class} 1
-? {::nsf::objectproperty M2 metaclass} 1
+? {::nsf::objectproperty class M2} 1
+? {::nsf::objectproperty metaclass M2} 1
 ? {M2 info superclass} ::M
 ? {M2 info class} ::nx::Class
 
@@ -79,22 +79,23 @@
 # meta-class and set subclass of M to the root meta-class
 M destroy
 ? {::nsf::isobject C} 1
-? {::nsf::objectproperty C class} 1
-? {::nsf::objectproperty C metaclass} 0
+? {::nsf::objectproperty class C} 1
+? {::nsf::objectproperty metaclass C} 0
 ? {C info superclass} ::nx::Object
 ? {C info class} ::nx::Class
 
-? {::nsf::objectproperty M2 metaclass} 1
+? {::nsf::objectproperty metaclass M2} 1
 ? {M2 info superclass} ::nx::Class
 ? {m2 info superclass} ::nx::Object
 ? {m2 info class} ::M2
 
 
 # destroy class M, reclass class instances to the base class
 C destroy
-? {::nsf::objectproperty c1 objec} 1
-? {::nsf::objectproperty c1 class} 0
-? {::nsf::objectproperty c1 metaclass} 0
+? {::nsf::isobject c1} 1
+? {::nsf::objectproperty object c1} 1
+? {::nsf::objectproperty class c1} 0
+? {::nsf::objectproperty metaclass c1} 0
 ? {c1 info class} ::nx::Object
 
 # basic parameter tests
@@ -147,14 +148,14 @@
 ::nsf::createobjectsystem ::object ::class
 
 ? {::nsf::isobject ::object} 1
-? {::nsf::objectproperty ::object class} 1
-? {::nsf::objectproperty ::object metaclass} 0
+? {::nsf::objectproperty class ::object} 1
+? {::nsf::objectproperty metaclass ::object} 0
 ? {::nsf::relation ::object class} ::class
 ? {::nsf::relation ::object superclass} ""
 
 ? {::nsf::isobject ::class} 1
-? {::nsf::objectproperty ::class class} 1
-? {::nsf::objectproperty ::class metaclass} 1
+? {::nsf::objectproperty class ::class} 1
+? {::nsf::objectproperty metaclass ::class} 1
 ? {::nsf::relation ::class class} ::class
 ? {::nsf::relation ::class superclass} ::object
 
@@ -166,34 +167,34 @@
 ::class + C
 
 ? {::nsf::isobject ::C} 1
-? {::nsf::objectproperty ::C class} 1
-? {::nsf::objectproperty ::C metaclass} 0
+? {::nsf::objectproperty class ::C} 1
+? {::nsf::objectproperty metaclass ::C} 0
 ? {::nsf::relation ::C class} ::class
 ? {::nsf::relation ::C superclass} ::object
 
 # create an instance of C
 C + c1
 
 ? {::nsf::isobject ::c1} 1
-? {::nsf::objectproperty ::c1 class} 0
-? {::nsf::objectproperty ::c1 metaclass} 0
+? {::nsf::objectproperty class ::c1} 0
+? {::nsf::objectproperty metaclass ::c1} 0
 ? {::nsf::relation ::c1 class} ::C
 
 # destroy instance and class
 c1 -
 
 ? {::nsf::isobject ::c1} 0
-? {::nsf::objectproperty ::C class} 1
+? {::nsf::objectproperty class ::C} 1
 
 C -
 
-? {::nsf::objectproperty ::C class} 0
+? {::nsf::objectproperty class ::C} 0
 
 ::nx::Class create ::C
 
-? {catch {::nsf::objectproperty ::C type ::UNKNOWN}} 1
+? {catch {::nsf::objectproperty type ::C ::UNKNOWN}} 1
 ? {catch {::C info is type ::xyz::Bar}} 1
-? {catch {::nsf::objectproperty ::CCCC type ::nx::Object}} 1
+? {catch {::nsf::objectproperty type ::CCCC ::nx::Object}} 1
 
 ::C destroy