--- a/Tools_ClassList.st	Mon Sep 02 19:56:33 2013 +0200
+++ b/Tools_ClassList.st	Tue Sep 03 16:14:28 2013 +0100
@@ -513,7 +513,7 @@
         ^ self.
     ].
 
-    changedObject == Smalltalk ifTrue:[
+    changedObject == environment ifTrue:[
         something == #methodInClass ifTrue:[
             ^ self "no interest" 
         ].    
@@ -822,7 +822,7 @@
 
     classListValue := classList value.
 
-    changedObject == Smalltalk ifTrue:[
+    changedObject == environment ifTrue:[
         something == #classComment ifTrue:[
             ^ self.
         ].
@@ -1186,7 +1186,7 @@
 
     inGeneratorHolder isNil ifTrue:[
         "/ for standAlone testing
-        generator := Smalltalk allClasses.
+        generator := environment allClasses.
         (self hideUnloadedClasses value) ifTrue:[
             generator := generator select:[:cls | cls isLoaded]
         ].
@@ -1315,7 +1315,7 @@
 
     inGeneratorHolder isNil ifTrue:[
         "/ for standAlone testing
-        generator := Smalltalk allClasses.
+        generator := environment allClasses.
         (self hideUnloadedClasses value) ifTrue:[
             generator := generator select:[:cls | cls isLoaded]
         ].
@@ -1412,14 +1412,14 @@
 !
 
 makeDependent
-    Smalltalk addDependent:self.
+    environment addDependent:self.
     ChangeSet addDependent:self.
 
     "Created: / 5.2.2000 / 13:42:17 / cg"
 !
 
 makeIndependent
-    Smalltalk removeDependent:self.
+    environment removeDependent:self.
     ChangeSet removeDependent:self.
 !
 
@@ -1628,7 +1628,7 @@
 	    |newClass|
 
 	    meta := cls isMeta.
-	    newClass := Smalltalk at:(cls theNonMetaclass name).
+	    newClass := environment at:(cls theNonMetaclass name).
 	    newClass isNil ifTrue:[
 		newClass := cls
 	    ] ifFalse:[
@@ -1645,7 +1645,7 @@
 
 	    cls notNil ifTrue:[
 		meta := cls isMeta.
-		newClass := Smalltalk at:(cls theNonMetaclass name).
+		newClass := environment at:(cls theNonMetaclass name).
 		newClass isNil ifTrue:[
 		    newClass := cls
 		] ifFalse:[
@@ -1723,7 +1723,7 @@
 
         newSelectionIndices := prevSelection 
                             collect:[:item | |cls|
-                                             cls := Smalltalk at:item theNonMetaclass name.   
+                                             cls := environment at:item theNonMetaclass name.   
                                              newList identityIndexOf:cls]
                             thenSelect:[:index | index ~~ 0].