Index: tests/methods.test
===================================================================
diff -u -r75383021cb9f2f2db883583779a02eef6f1801f5 -r275da34d3d7a874a451eced58242b738c8a37d1a
--- tests/methods.test	(.../methods.test)	(revision 75383021cb9f2f2db883583779a02eef6f1801f5)
+++ tests/methods.test	(.../methods.test)	(revision 275da34d3d7a874a451eced58242b738c8a37d1a)
@@ -206,54 +206,55 @@
 
   # register the mixin on C as a object mixin and define a mixinguard
   puts stderr XXXX=[nx::Class info method definition mixin]
-  C mixin set M
-  C mixin guard M {1 == 1}
+  C mixins set M
+  C mixins guard M {1 == 1}
   ? {C info mixin guard M} "1 == 1"
-  C mixin guard M {}
+  C mixins guard M {}
   ? {C info mixin guard M} ""
 
   # now the same as class mixin and class mixin guard
-  C object mixin set M
-  C object mixin guard M {1 == 1}
+  C object mixins set M
+  C object mixins guard M {1 == 1}
   ? {C info object mixin guard M} "1 == 1"
-  C object mixin guard M {}
+  C object mixins guard M {}
   ? {C info object mixin guard M} ""
 }
 
 nx::test case mixin-via-objectparam {
   # add an object and class mixin via object-parameter and via slots
   foreach c {M1 M2 M3 M4 M5} {nx::Class create $c}
 
-  nx::Class create C -mixin M1 -object-mixin M2 {
-    :mixin add M3
-    :object mixin add M4
+  nx::Class create C -mixin M1 -object-mixins M2 {
+    :mixins add M3
+    :object mixins add M4
   }
   
   ? {lsort [C info object mixin classes]} "::M2 ::M4"
   ? {lsort [C info mixin classes]} "::M1 ::M3"
 
-  ? {lsort [C object mixin get]} "::M2 ::M4"
-  ? {lsort [C mixin get]} "::M1 ::M3"
+  ? {lsort [C object mixins get]} "::M2 ::M4"
+  ? {lsort [C mixins get]} "::M1 ::M3"
 
-  ? {lsort [C object mixin]} {wrong # args: use "::C object mixin add|clear|delete|get|guard|set"}
-  ? {lsort [C mixin]} {wrong # args: use "::C mixin add|clear|delete|get|guard|set"}
+  ? {lsort [C object mixins]} {wrong # args: use "::C object mixins add|clear|delete|get|guard|set"}
+  ? {lsort [C mixins]} {wrong # args: use "::C mixins add|clear|delete|get|guard|set"}
+  ? {lsort [C mixins x]} {submethod x undefined for mixins: use "::C mixins add|clear|delete|get|guard|set"}
 
   ? {catch {C mixin M5} errorMsg} 1
   ? {lsort [C info mixin classes]} "::M1 ::M3"
 
   ? {catch {C object mixin M5} errorMsg} 1
   ? {lsort [C info object mixin classes]} "::M2 ::M4"
 
-  ? {C mixin set M5} ::M5
+  ? {C mixins set M5} ::M5
   ? {lsort [C info mixin classes]} "::M5"
 
-  ? {C object mixin set M5} "::M5"
+  ? {C object mixins set M5} "::M5"
   ? {lsort [C info object mixin classes]} "::M5"
 
   ? {C configure -mixin M1} ""
   ? {C cget -mixin} "::M1"
 
-  ? {C configure -object-mixin M2} ""
+  ? {C configure -object-mixins M2} ""
   ? {C cget -object-mixin} "::M2"
 }
 
@@ -273,7 +274,7 @@
     }
   }
   
-  o object mixin set M
+  o object mixins set M
   ? {o bar -x 13 -y 14} "x 13 y 14 {-x 13 -y 14} -- x 13 y 14 {-x 13 -y 14}"
   ? {o bar -y 14 -x 13} "x 13 y 14 {-y 14 -x 13} -- x 13 y 14 {-y 14 -x 13}"
 }
@@ -1185,7 +1186,7 @@
   ? {c1 foo} 1
   ? {c1 bar} 2
 
-  db object mixin set Profile
+  db object mixins set Profile
   ? {c1 foo} 1
   ? {c1 bar} 2
 
@@ -1249,7 +1250,7 @@
   ? bar0 2
   ? bar 2
 
-  ns_cache object mixin set Profile
+  ns_cache object mixins set Profile
   
   # the version with tcl-uplevel should fail
   ? bar0 {can't read "x": no such variable}