--- a/MCStReader.st	Wed Mar 07 17:23:53 2018 +0100
+++ b/MCStReader.st	Wed Mar 07 17:24:00 2018 +0100
@@ -1,5 +1,9 @@
+"{ Encoding: utf8 }"
+
 "{ Package: 'stx:goodies/monticello' }"
 
+"{ NameSpace: Smalltalk }"
+
 MCSnapshotReader subclass:#MCStReader
 	instanceVariableNames:''
 	classVariableNames:''
@@ -208,10 +212,10 @@
                 traitComposition: traitCompositionString
                 classTraitComposition: classTraitCompositionString
                 category: aChange category "/ (tokens at: lastIndex)
-                instVarNames: aChange instanceVariableNames asCollectionOfWords "/ ((tokens at: lastIndex - 6) findTokens: ' ')
-                classVarNames: aChange classVariableNames asCollectionOfWords "/ ((tokens at: lastIndex - 4) findTokens: ' ')
+                instVarNames: aChange instanceVariableNames "asCollectionOfWords" "/ ((tokens at: lastIndex - 6) findTokens: ' ')
+                classVarNames: aChange classVariableNames "asCollectionOfWords" "/ ((tokens at: lastIndex - 4) findTokens: ' ')
                 poolDictionaryNames: aChange poolDictionaries asCollectionOfWords "/ ((tokens at: lastIndex - 2) findTokens: ' ')
-                classInstVarNames: (aChange classInstanceVariableNames ? '') asCollectionOfWords "/ (self classInstVarNamesFor: aPseudoClass)
+                classInstVarNames: (aChange classInstanceVariableNames ? #()) "asCollectionOfWords" "/ (self classInstVarNamesFor: aPseudoClass)
                 type: (self typeOfSubclass: (tokens at: 2))
                 comment: nil "/ (self commentFor: aPseudoClass)
                 commentStamp: nil "/ (self commentStampFor: aPseudoClass)
@@ -226,7 +230,7 @@
     |nonMetaName defn|
 
     self assert:(aChange className endsWith:' class').
-    nonMetaName := aChange className copyWithoutLast:' class' size.
+    nonMetaName := aChange className copyButLast:' class' size.
 
     defn := definitions detectLast:[:def | def isClassDefinition and:[def className = nonMetaName]].
     defn classInstVarNames: (aChange classInstVarNames).
@@ -256,14 +260,14 @@
 !MCStReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCStReader.st,v 1.9 2014-12-23 19:48:43 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCStReader.st,v 1.9 2014-12-23 19:48:43 cg Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
-    ^ '$Id: MCStReader.st,v 1.9 2014-12-23 19:48:43 cg Exp $'
+    ^ '$Id$'
 ! !