--- a/ClassChange.st	Wed Jun 18 23:29:13 2003 +0200
+++ b/ClassChange.st	Thu Jun 19 00:48:06 2003 +0200
@@ -170,7 +170,8 @@
     "/ now include a translation from vw namespace to stx nameSpace
 
     ns := self nameSpaceName.
-    ns = 'Smalltalk' ifTrue:[^ self className].
+    (ns isNil or:[ns = 'Smalltalk']) ifTrue:[^ self className].
+
     ^ ns , '::' , self className
 !
 
@@ -216,13 +217,17 @@
 !ClassChange methodsFor:'queries'!
 
 cutNameSpaceOf:aString
-    |dotIndex|
+    |dotIndex colonIndex|
 
     aString notNil ifTrue:[
         dotIndex := aString indexOf:$..
         dotIndex ~~ 0 ifTrue:[
             ^ aString copyFrom:dotIndex+1
         ].
+        colonIndex := aString indexOf:$:.
+        colonIndex ~~ 0 ifTrue:[
+            ^ aString copyFrom:colonIndex+2
+        ].
     ].
     ^ aString
 !
@@ -246,5 +251,5 @@
 !ClassChange class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/ClassChange.st,v 1.37 2003-06-18 21:29:13 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ClassChange.st,v 1.38 2003-06-18 22:48:06 cg Exp $'
 ! !