--- a/Tools_HierarchicalClassList.st	Mon Sep 02 19:56:33 2013 +0200
+++ b/Tools_HierarchicalClassList.st	Tue Sep 03 16:14:28 2013 +0100
@@ -160,7 +160,7 @@
     self updateList.
 
     selectedClassesHolder value ~= prevSelection ifTrue:[
-	newSelection := prevSelection collect:[:eachOldClass | Smalltalk classNamed:(eachOldClass name)].
+	newSelection := prevSelection collect:[:eachOldClass | environment classNamed:(eachOldClass name)].
 	selectedClassesHolder value:newSelection.
     ]
 
@@ -175,7 +175,7 @@
     prevTop notNil ifTrue:[
 	wasMeta := prevTop isMeta.
 	newTop := prevTop theNonMetaclass.
-	[newTop notNil and:[(Smalltalk at:newTop name) ~= newTop]] whileTrue:[
+	[newTop notNil and:[(environment at:newTop name) ~= newTop]] whileTrue:[
 	    newTop := newTop superclass.
 	].
 	wasMeta ifTrue:[
@@ -221,7 +221,7 @@
     |theClasses|
 
     aSuperclass isNil ifTrue:[
-	theClasses := Smalltalk allClasses select:[:cls | cls superclass isNil]
+	theClasses := environment allClasses select:[:cls | cls superclass isNil]
     ] ifFalse:[
 	theClasses := aSuperclass subclasses.
     ].