Index: generic/nsf.c
===================================================================
diff -u -r240cd3e5e7bfd197336735684cbac012ad84563b -rb337f38c9e541e733674aac902eddb0fe44c0164
--- generic/nsf.c	(.../nsf.c)	(revision 240cd3e5e7bfd197336735684cbac012ad84563b)
+++ generic/nsf.c	(.../nsf.c)	(revision b337f38c9e541e733674aac902eddb0fe44c0164)
@@ -18217,7 +18217,7 @@
  * MethodSourceMatches --
  *
  *    Check, whether the provided class or object (mutually exclusive) matches
- *    with the required method source (typically all|application|baseclasses).
+ *    with the required method source (typically all|application|system).
  *
  * Results:
  *    Returns true or false
@@ -18244,7 +18244,7 @@
   }
 
   isBaseClass = IsBaseClass(&cl->object);
-  if (withSource == SourceBaseclassesIdx && isBaseClass) {
+  if (withSource == SourceSystemIdx && isBaseClass) {
     return 1;
   } else if (withSource == SourceApplicationIdx && !isBaseClass) {
     return 1;
@@ -23929,7 +23929,7 @@
   {-argName "-type" -nrargs 1 -typeName "methodtype" -type "all|scripted|builtin|alias|forwarder|object|setter"}
   {-argName "-nomixins"}
   {-argName "-path" -nrargs 0}
-  {-argName "-source" -nrargs 1 -type "all|application|baseclasses"}
+  {-argName "-source" -nrargs 1 -type "all|application|system"}
   {-argName "pattern" -required 0}
 }
 */
@@ -24030,7 +24030,7 @@
 
 /*
 objectInfoMethod lookupslots NsfObjInfoLookupSlotsMethod {
-  {-argName "-source" -nrargs 1 -type "all|application|baseclasses" -default all}
+  {-argName "-source" -nrargs 1 -type "all|application|system" -default all}
   {-argName "-type" -required 0 -nrargs 1 -type class}
   {-argName "pattern" -required 0}
 }
@@ -24524,7 +24524,7 @@
   {-argName "-closure" -nrargs 0}
   {-argName "-type" -typeName "methodtype" -nrargs 1 -type "all|scripted|builtin|alias|forwarder|object|setter"}
   {-argName "-path" -nrargs 0}
-  {-argName "-source" -nrargs 1 -type "all|application|baseclasses"}
+  {-argName "-source" -nrargs 1 -type "all|application|system"}
   {-argName "pattern"}
 }
 */
@@ -24711,7 +24711,7 @@
 /*
 classInfoMethod slots NsfClassInfoSlotobjectsMethod {
   {-argName "-closure" -nrargs 0}
-  {-argName "-source" -nrargs 1 -type "all|application|baseclasses"}
+  {-argName "-source" -nrargs 1 -type "all|application|system"}
   {-argName "-type" -required 0 -nrargs 1 -type class}
   {-argName "pattern" -required 0}
 }