Index: generic/predefined.h
===================================================================
diff -u -rfa0f6eb39d86da65a0c8f994a30d625d635172ad -r7050a52ac53992d9a3aec12e48b0fa58a26449e6
--- generic/predefined.h	(.../predefined.h)	(revision fa0f6eb39d86da65a0c8f994a30d625d635172ad)
+++ generic/predefined.h	(.../predefined.h)	(revision 7050a52ac53992d9a3aec12e48b0fa58a26449e6)
@@ -480,15 +480,15 @@
 "set cl [[$origin info class] create $dest -noinit]\n"
 "set obj $cl\n"
 "$cl superclass [$origin info superclass]\n"
-"$cl instinvar  [$origin info instinvar]\n"
-"$cl instfilter [$origin info instfilter -guards]\n"
-"$cl instmixin  [$origin info instmixin]\n"
+"::xotcl::assertion $cl class-invar [::xotcl::assertion $origin class-invar]\n"
+"::xotcl::relation $cl class-filter [::xotcl::relation $origin class-filter]\n"
+"::xotcl::relation $cl class-mixin [::xotcl::relation $origin class-mixin]\n"
 ".copyNSVarsAndCmds ::xotcl::classes$origin ::xotcl::classes$dest} else {\n"
 "set obj [[$origin info class] create $dest -noinit]}\n"
-"$obj invar  [$origin info invar]\n"
-"$obj check  [$origin info check]\n"
-"$obj mixin  [$origin info mixin]\n"
-"$obj filter [$origin info filter -guards]\n"
+"::xotcl::assertion $obj check [::xotcl::assertion $origin check]\n"
+"::xotcl::assertion $obj object-invar [::xotcl::assertion $origin object-invar]\n"
+"::xotcl::relation $obj object-filter [::xotcl::relation $origin object-filter]\n"
+"::xotcl::relation $obj object-mixin [::xotcl::relation $origin object-mixin]\n"
 "if {[$origin info hasnamespace]} {\n"
 "$obj requireNamespace}} else {\n"
 "namespace eval $dest {}}\n"