--- a/ClassChange.st	Tue Apr 16 09:44:57 2013 +0200
+++ b/ClassChange.st	Wed Apr 17 10:19:24 2013 +0200
@@ -192,17 +192,7 @@
 !
 
 className
-    |ns|
-
-    "/ used to be ^ className;
-    "/
-    "/ now include a translation from vw namespace to stx nameSpace
-
-    ns := self nameSpaceName.
-    (ns isNil or:[ns = 'Smalltalk']) ifTrue:[^ className].
-    ^ ns , '::' , (self classNameWithoutNamespace)
-
-    "Modified: / 29-01-2011 / 11:33:26 / cg"
+    ^ className
 !
 
 className:aString 
@@ -246,7 +236,7 @@
 classNameWithoutNamespace
     "return the className of the change"
 
-    ^ self cutNameSpaceOf:className
+    ^ self cutMyNameSpaceOf: "cutNameSpaceOf:"className
 
     "Modified: / 06-10-2011 / 16:58:34 / cg"
 !
@@ -306,10 +296,13 @@
     |ns|
 
     ns := nameSpaceOverride.
-    ns isNil ifTrue:[
+    Class nameSpaceQuerySignal isHandled ifTrue:[
         ns := Class nameSpaceQuerySignal query.
-        ns == Smalltalk ifTrue:[^ nil].
+    ] ifFalse:[
+        "/ self halt
     ].
+    ns isNil ifTrue:[^ nil].
+    "/ ns == Smalltalk ifTrue:[^ nil].
     ^ ns name
 
     "Created: / 07-09-2011 / 20:45:43 / cg"
@@ -451,11 +444,11 @@
 !ClassChange class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/ClassChange.st,v 1.71 2013-04-15 08:42:41 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ClassChange.st,v 1.72 2013-04-16 14:00:38 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/ClassChange.st,v 1.71 2013-04-15 08:42:41 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ClassChange.st,v 1.72 2013-04-16 14:00:38 cg Exp $'
 !
 
 version_HG