Index: tests/interceptor-slot.test
===================================================================
diff -u -red6c291a4217ee648c4fb8264ce45c757a51578f -rb3018d3be0f1524a3f1709edc0e2ddb5d8bc4c0b
--- tests/interceptor-slot.test	(.../interceptor-slot.test)	(revision ed6c291a4217ee648c4fb8264ce45c757a51578f)
+++ tests/interceptor-slot.test	(.../interceptor-slot.test)	(revision b3018d3be0f1524a3f1709edc0e2ddb5d8bc4c0b)
@@ -60,7 +60,7 @@
 #
 ::nsf::relation C object-mixin M
 ? {C info precedence} "::M ::nx::Class ::nx::Object"
-? {C class-object info mixin classes} "::M"
+? {C class info mixin classes} "::M"
 ::nsf::relation C object-mixin ""
 ? {C info precedence} "::nx::Class ::nx::Object"
 
@@ -70,48 +70,48 @@
 #
 # C object-mixin M
 # ? {C info precedence} "::M ::nx::Class ::nx::Object"
-# ? {C class-object info mixin classes} "::M"
+# ? {C class info mixin classes} "::M"
 # C object-mixin ""
 # ? {C info precedence} "::nx::Class ::nx::Object"
 
 #
-# add and remove class-object mixin for classes via modifier "object" and
+# add and remove class mixin for classes via modifier "object" and
 # "mixin"
 #
-C class-object mixin M
+C class mixin M
 ? {C info precedence} "::M ::nx::Class ::nx::Object"
-? {C class-object info mixin classes} "::M"
-C class-object mixin ""
+? {C class info mixin classes} "::M"
+C class mixin ""
 ? {C info precedence} "::nx::Class ::nx::Object"
 
 #
-#  add and remove class-object mixin for classes via class-object mixin add
+#  add and remove class mixin for classes via class mixin add
 #
-C class-object mixin add M
+C class mixin add M
 ? {C info precedence} "::M ::nx::Class ::nx::Object"
-? {C class-object info mixin classes} "::M"
-C class-object mixin ""
+? {C class info mixin classes} "::M"
+C class mixin ""
 ? {C info precedence} "::nx::Class ::nx::Object"
 
 #
 # adding per-object mixins for classes via "object mixin add M"
 #
-C class-object mixin add M 
+C class mixin add M 
 ? {C info precedence} "::M ::nx::Class ::nx::Object"
 ? {::nsf::relation C object-mixin} ::M
-? {catch {C class-object mixin add UNKNOWN}} 1
+? {catch {C class mixin add UNKNOWN}} 1
 ? {::nsf::relation C object-mixin} "::M"
-C class-object mixin ""
+C class mixin ""
 ? {C info precedence} "::nx::Class ::nx::Object"
 
 #
 # adding per-object mixins for classes via "object mixin M"
 #
-C class-object mixin M 
+C class mixin M 
 ? {C info precedence} "::M ::nx::Class ::nx::Object"
 
 # forwarder with 0 arguments + flag
-? {C class-object mixin} "::M"
+? {C class mixin} "::M"
 
 
 Test case mixin-add {
@@ -123,17 +123,17 @@
   Class create C1 
 
   ? {C1 info lookup method mixin} "::nsf::classes::nx::Class::mixin"
-  C1 class-object mixin M1
+  C1 class mixin M1
   ? {C1 info precedence} "::M1 ::nx::Class ::nx::Object"
   C1 create c11
   ? {c11 info precedence} "::C1 ::nx::Object"
-  C1 class-object mixin add M11
+  C1 class mixin add M11
   ? {C1 info precedence} "::M11 ::M1 ::nx::Class ::nx::Object"
   Object create o -mixin M1
   ? {o info precedence} "::M1 ::nx::Object"
 
   Class create O 
-  O class-object mixin M1
+  O class mixin M1
   ? {O info precedence} "::M1 ::nx::Class ::nx::Object"
   Class create O -object-mixin M1
   ? {O info precedence} "::M1 ::nx::Class ::nx::Object"