--- a/Tools_ClassCategoryList.st	Fri Sep 06 12:08:37 2013 +0100
+++ b/Tools_ClassCategoryList.st	Fri Sep 06 15:49:08 2013 +0100
@@ -275,7 +275,7 @@
 
     selectedCategories := self selectedCategoriesStrings.
 
-    changedObject == Smalltalk ifTrue:[
+    changedObject == environment ifTrue:[
         ((something == #classVariables) 
         or:[something == #classDefinition]) ifTrue:[
             listValid == true ifTrue:[
@@ -452,7 +452,7 @@
 update:something with:aParameter from:changedObject
     |categoryOfClass|
 
-    changedObject == Smalltalk ifTrue:[
+    changedObject == environment ifTrue:[
         (something == #methodInClass 
         or:[ something == #classComment
         or:[ something == #methodDictionary
@@ -627,7 +627,7 @@
     ^ Iterator on:[:whatToDo |
             showChangedClasses ifTrue:[ changedClasses := ChangeSet current changedClasses ].
 
-            Smalltalk allClassesDo:[:cls |
+            environment allClassesDo:[:cls |
                 (cls isRealNameSpace) ifFalse:[
                     (inclusionTest value:cls) ifTrue:[
                         (nameSpaceFilter isNil
@@ -702,7 +702,7 @@
 
     classes := IdentitySet new.
     inGeneratorHolder isNil ifTrue:[
-        Smalltalk allClassesDo:[:cls | 
+        environment allClassesDo:[:cls | 
             |cat isLoaded|
 
             (cls isRealNameSpace) ifFalse:[
@@ -764,7 +764,7 @@
         setOfCategories := Set withAll:generator.
         generator do:[:cat | categories add:cat string].
         
-        Smalltalk allClassesDo:[:each |
+        environment allClassesDo:[:each |
             |cat|
 
             each isNameSpace ifFalse:[
@@ -852,14 +852,14 @@
 !
 
 makeDependent
-    Smalltalk addDependent:self.
+    environment addDependent:self.
     ChangeSet addDependent:self.
 
     "Created: / 5.2.2000 / 13:42:13 / cg"
 !
 
 makeIndependent
-    Smalltalk removeDependent:self.
+    environment removeDependent:self.
     ChangeSet removeDependent:self.
 
     "Created: / 5.2.2000 / 13:42:13 / cg"
@@ -1009,10 +1009,10 @@
 !ClassCategoryList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassCategoryList.st,v 1.49 2013-07-20 10:27:15 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassCategoryList.st,v 1.50 2013-09-05 10:46:11 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassCategoryList.st,v 1.49 2013-07-20 10:27:15 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassCategoryList.st,v 1.50 2013-09-05 10:46:11 vrany Exp $'
 ! !