Index: generic/xotcl.decls
===================================================================
diff -u -rb385d44db9e33f36d1629fbb0b82cf94d8dffe72 -r1c11937f4f0aea905fbedfbb9c2d1782b08833f5
--- generic/xotcl.decls	(.../xotcl.decls)	(revision b385d44db9e33f36d1629fbb0b82cf94d8dffe72)
+++ generic/xotcl.decls	(.../xotcl.decls)	(revision 1c11937f4f0aea905fbedfbb9c2d1782b08833f5)
@@ -56,20 +56,20 @@
     int XOTclDeleteClass(Tcl_Interp *interp, struct XOTcl_Class *cl)
 }
 #declare 11 generic {
-#    int XOTclAddPMethod(Tcl_Interp *interp, struct XOTcl_Object *obj, 
+#    int XOTclAddObjectMethod(Tcl_Interp *interp, struct XOTcl_Object *obj, 
 #                         CONST char* nm, Tcl_ObjCmdProc* proc,
 #	                 ClientData cd, Tcl_CmdDeleteProc *dp)
 #}
 #declare 12 generic {
-#    int XOTclAddIMethod(Tcl_Interp *interp, struct XOTcl_Class *cl, 
+#    int XOTclAddClassMethod(Tcl_Interp *interp, struct XOTcl_Class *cl, 
 #                         CONST char* nm, Tcl_ObjCmdProc* proc,
 #	                 ClientData cd, Tcl_CmdDeleteProc *dp)
 #}
 declare 13 generic {
-    int XOTclRemovePMethod(Tcl_Interp *interp,struct XOTcl_Object *obj, CONST char *nm)
+    int XOTclRemoveObjectMethod(Tcl_Interp *interp,struct XOTcl_Object *obj, CONST char *nm)
 }
 declare 14 generic {
-    int XOTclRemoveIMethod(Tcl_Interp *interp, struct XOTcl_Class *cl, CONST char *nm)
+    int XOTclRemoveClassMethod(Tcl_Interp *interp, struct XOTcl_Class *cl, CONST char *nm)
 }
 declare 15 generic {
     Tcl_Obj *XOTclOSetInstVar(struct XOTcl_Object *obj, Tcl_Interp *interp,
@@ -169,7 +169,7 @@
 	                 ClientData cd, Tcl_CmdDeleteProc *dp, int flags)
 }
 declare 42 generic {
-   int XOTclAddInstanceMethod(Tcl_Interp *interp, struct XOTcl_Class *cl, 
+   int XOTclAddClassMethod(Tcl_Interp *interp, struct XOTcl_Class *cl, 
                          CONST char *nm, Tcl_ObjCmdProc *proc,
 	                 ClientData cd, Tcl_CmdDeleteProc *dp, int flags)
 }