--- a/Tools__ClassList.st	Tue Oct 08 14:36:30 2013 +0100
+++ b/Tools__ClassList.st	Mon Oct 14 22:45:44 2013 +0100
@@ -1494,7 +1494,7 @@
     aClassList do:[:cls |
         cls isJavaClass ifTrue:[
             javaClassCountsByBame 
-                at: cls name 
+                at: cls binaryName 
                 put: (javaClassCountsByBame at: cls ifAbsent:[0]) + 1
         ]
     ].
@@ -1511,7 +1511,7 @@
 
                             nm := self nameListEntryFor:cls withNameSpace:showNamespaces.
                             cls isJavaClass ifTrue:[
-                                (javaClassCountsByBame at: cls name) > 1 ifTrue:[
+                                (javaClassCountsByBame at: cls binaryName) > 1 ifTrue:[
                                     | cl clstring |
 
                                     cl := cls classLoader.
@@ -1680,17 +1680,7 @@
             |newClass|
 
             meta := cls isMeta.
-            "/ Sigh, special care has to be taken for Java classes as
-            "/ for them, !!!!!! (environment at: javaClass name) ~~ javaClass !!!!!!
-            cls theNonMetaclass isJavaClass ifTrue:[
-                "/ Can't use JavaVM>>classNamed:definedBy: for Java classes because environment
-                "/ could not be Java class. Do a full search instead, sigh...
-                newClass := environment allClasses 
-                            detect:[:each|each isJavaClass and:[each name == cls theNonMetaclass name and:[each classLoader == cls theNonMetaclass classLoader]]]
-                            ifNone:[nil].
-            ] ifFalse:[
-                newClass := environment at:(cls theNonMetaclass name).
-            ].
+            newClass := environment at:(cls theNonMetaclass name).
             newClass isNil ifTrue:[
                 newClass := cls
             ] ifFalse:[
@@ -1707,17 +1697,7 @@
 
             cls notNil ifTrue:[
                 meta := cls isMeta.
-                "/ Sigh, special care has to be taken for Java classes as
-                "/ for them, !!!!!! (environment at: javaClass name) ~~ javaClass !!!!!!
-                cls theNonMetaclass isJavaClass ifTrue:[
-                    "/ Can't use JavaVM>>classNamed:definedBy: for Java classes because environment
-                    "/ could not be Java class. Do a full search instead, sigh...
-                    newClass := environment allClasses 
-                                detect:[:each|each isJavaClass and:[each name == cls theNonMetaclass name and:[each classLoader == cls theNonMetaclass classLoader]]]
-                                ifNone:[nil].                    
-                ] ifFalse:[
-                    newClass := environment at:(cls theNonMetaclass name).
-                ].
+                newClass := environment at:(cls theNonMetaclass name).
                 newClass isNil ifTrue:[
                     newClass := cls
                 ] ifFalse:[
@@ -1799,11 +1779,7 @@
                             collect:[:item | 
                                 |cls|
 
-                                item theNonMetaclass isJavaClass ifTrue:[
-                                    cls := environment allClasses detect:[:each | each name = item theNonMetaclass name and:[each classLoader == item theNonMetaclass classLoader]] ifNone:[nil].
-                                ] ifFalse:[
-                                    cls := environment at:item theNonMetaclass name.   
-                                ].
+                                cls := environment at:item theNonMetaclass name.   
                                 newList identityIndexOf:cls]
                             thenSelect:[:index | index ~~ 0].