--- a/Class.st	Fri Jan 03 19:52:44 1997 +0100
+++ b/Class.st	Fri Jan 03 21:13:15 1997 +0100
@@ -2258,7 +2258,7 @@
             and:[superclass owningClass isNil]) ifTrue:[
                 s := superclass nameWithoutPrefix
             ] ifFalse:[
-                s := superclass name
+                s := superclass nameWithoutNameSpacePrefix
             ]
         ]
     ].
@@ -2298,11 +2298,15 @@
     ] ifFalse:[
         "/ a private class
         aStream nextPutAll:'privateIn:'.
-        aStream nextPutAll:owner name.
+        fullName ifTrue:[
+            aStream nextPutAll:owner name.
+        ] ifFalse:[
+            aStream nextPutAll:owner nameWithoutNameSpacePrefix.
+        ]
     ].
     aStream cr
 
-    "Modified: 3.1.1997 / 16:46:01 / cg"
+    "Modified: 3.1.1997 / 20:43:50 / cg"
 !
 
 basicFileOutInstvarTypeKeywordOn:aStream
@@ -3119,24 +3123,22 @@
 
     |nm|
 
-    nm := self name.
-    self owningClass isNil ifTrue:[
-        FileOutNameSpaceQuerySignal raise == false ifTrue:[
-            nm := self nameWithoutPrefix
-        ]
+    FileOutNameSpaceQuerySignal raise == false ifTrue:[
+        nm := self nameWithoutNameSpacePrefix
+    ] ifFalse:[
+        nm := self name.
     ].
+
     self isMeta ifTrue:[
         (nm endsWith:' class') ifTrue:[
             nm := nm copyWithoutLast:6.
-            aStream nextPutAll:nm; nextPutAll:' class'
-        ] ifFalse:[
-            aStream nextPutAll:nm 
-        ].
-    ] ifFalse:[
-        nm printOn:aStream
-    ]
-
-    "Modified: 3.1.1997 / 13:30:19 / cg"
+            aStream nextPutAll:nm; nextPutAll:' class'.
+            ^ self
+        ]
+    ].
+    aStream nextPutAll:nm.
+
+    "Modified: 3.1.1997 / 20:41:26 / cg"
 !
 
 printClassVarNamesOn:aStream indent:indent
@@ -4551,6 +4553,6 @@
 !Class class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.232 1997-01-03 18:49:52 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.233 1997-01-03 20:13:15 cg Exp $'
 ! !
 Class initialize!