Index: generic/nsf.c
===================================================================
diff -u -rc09fd1356ee0d275a8e0fa921744f052493f1a79 -r65f8883a4596ea98365b7de1652700e3ac7394cc
--- generic/nsf.c	(.../nsf.c)	(revision c09fd1356ee0d275a8e0fa921744f052493f1a79)
+++ generic/nsf.c	(.../nsf.c)	(revision 65f8883a4596ea98365b7de1652700e3ac7394cc)
@@ -14541,7 +14541,7 @@
 }
 
 /*
-nsfCmd alias NsfAliasCmd {
+nsfCmd method::alias NsfAliasCmd {
   {-argName "object" -type object}
   {-argName "-per-object"}
   {-argName "methodName"}
@@ -14710,7 +14710,7 @@
 }
 
 /*
-nsfCmd assertion NsfAssertionCmd {
+nsfCmd method::assertion NsfAssertionCmd {
   {-argName "object" -type object}
   {-argName "assertionsubcmd" -required 1 -type "check|object-invar|class-invar"}
   {-argName "arg" -required 0 -type tclobj}
@@ -15117,7 +15117,7 @@
 }
 
 /*
-nsfCmd existsvar NsfExistsVarCmd {
+nsfCmd var::exists NsfExistsVarCmd {
   {-argName "object" -required 1 -type object}
   {-argName "varname" -required 1}
 }
@@ -15174,7 +15174,7 @@
 }
 
 /*
-nsfCmd forward NsfForwardCmd {
+nsfCmd method::forward NsfForwardCmd {
   {-argName "object" -required 1 -type object}
   {-argName "-per-object"}
   {-argName "method" -required 1 -type tclobj}
@@ -15230,7 +15230,7 @@
 }
 
 /*
-nsfCmd importvar NsfImportvarCmd {
+nsfCmd var::import NsfImportvarCmd {
   {-argName "object" -type object}
   {-argName "args" -type args}
 }
@@ -15369,7 +15369,7 @@
 
 
 /*
-nsfCmd method NsfMethodCmd {
+nsfCmd method::create NsfMethodCmd {
   {-argName "object" -required 1 -type object}
   {-argName "-inner-namespace"}
   {-argName "-per-object"}
@@ -15398,7 +15398,7 @@
 }
 
 /*
-nsfCmd methodproperty NsfMethodPropertyCmd {
+nsfCmd ::method::property NsfMethodPropertyCmd {
   {-argName "object" -required 1 -type object}
   {-argName "-per-object"}
   {-argName "methodName" -required 1 -type tclobj}
@@ -16384,7 +16384,7 @@
 }
 
 /*
-nsfCmd setvar NsfSetVarCmd {
+nsfCmd var::set NsfSetVarCmd {
   {-argName "object" -required 1 -type object}
   {-argName "varname" -required 1 -type tclobj}
   {-argName "value" -required 0 -type tclobj}
@@ -16401,7 +16401,7 @@
 }
 
 /*
-nsfCmd setter NsfSetterCmd {
+nsfCmd method::setter NsfSetterCmd {
   {-argName "object" -required 1 -type object}
   {-argName "-per-object"}
   {-argName "parameter" -type tclobj}