--- a/Tools_ClassGeneratorList.st	Mon Sep 02 19:56:33 2013 +0200
+++ b/Tools_ClassGeneratorList.st	Tue Sep 03 16:14:28 2013 +0100
@@ -257,7 +257,7 @@
 delayedUpdate:something with:aParameter from:changedObject
     |cls sel pkg mthd orgMode|
 
-    changedObject == Smalltalk ifTrue:[
+    changedObject == environment ifTrue:[
         orgMode := organizerMode value.
 
         orgMode == OrganizerCanvas organizerModeCategory ifTrue:[
@@ -346,7 +346,7 @@
     hideUnloadedClasses := self hideUnloadedClasses value.
 
     categories := Set new.
-    Smalltalk allClassesDo:[:cls |
+    environment allClassesDo:[:cls |
         (hideUnloadedClasses not or:[cls isLoaded])
         ifTrue:[
             categories add:cls category.
@@ -381,7 +381,7 @@
     allNamespaces := IdentitySet new.
 
     (self hideUnloadedClasses value) ifTrue:[
-        Smalltalk allClassesDo:[:eachClass |
+        environment allClassesDo:[:eachClass |
             eachClass isLoaded ifTrue:[
                 allNamespaces add:(eachClass theNonMetaclass topNameSpace)
             ].
@@ -416,9 +416,9 @@
     allProjects := IdentitySet new.
 
     (self hideUnloadedClasses value) ifTrue:[
-        allProjects := Smalltalk allLoadedProjectIDs.
+        allProjects := environment allLoadedProjectIDs.
     ] ifFalse:[
-        allProjects := Smalltalk allProjectIDs.
+        allProjects := environment allProjectIDs.
     ].
 
     "/ those are simulated - in ST/X, empty projects do not
@@ -437,12 +437,12 @@
 !
 
 makeDependent
-    Smalltalk addDependent:self
+    environment addDependent:self
 
 !
 
 makeIndependent
-    Smalltalk removeDependent:self.
+    environment removeDependent:self.
 
 !