--- a/Smalltalk.st	Wed Sep 04 12:34:31 2002 +0200
+++ b/Smalltalk.st	Wed Sep 04 12:37:33 2002 +0200
@@ -646,7 +646,7 @@
      Return nil if not present 
      (this will be changed to trigger an error - better use #at:ifAbsent:)"
 
-    "/ aKey class == String ifTrue:[self halt].
+    aKey class == String ifTrue:[self halt].
 
 %{  /* NOCONTEXT */
     RETURN ( __GLOBAL_GET(aKey) );
@@ -1102,11 +1102,7 @@
     ].
 
     oldName := aClass name.
-    aClass isPrivate ifTrue:[
-        oldNameSpace := aClass topOwningClass nameSpace.
-    ] ifFalse:[
-        oldNameSpace := aClass nameSpace.
-    ].
+    oldNameSpace := aClass topNameSpace.
     oldBaseName := aClass nameWithoutNameSpacePrefix.
     oldBaseNameWithoutPrefix := aClass nameWithoutPrefix.
     oldSym := oldName asSymbol.
@@ -1209,11 +1205,7 @@
 
     "/ clear the namespace (for namespace query to work)
     aClass setEnvironment:nil.
-    aClass isPrivate ifTrue:[
-        newNameSpace := aClass topOwningClass nameSpace.
-    ] ifFalse:[    
-        newNameSpace := aClass nameSpace.
-    ].
+    newNameSpace := aClass topNameSpace.
 
     privateClasses size > 0 ifTrue:[
         "/ must rename privateClasses as well
@@ -6278,5 +6270,5 @@
 !Smalltalk class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.537 2002-08-16 11:49:15 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.538 2002-09-04 10:37:33 cg Exp $'
 ! !