--- a/ChangeSet.st	Wed Jul 05 10:55:37 2017 +0200
+++ b/ChangeSet.st	Wed Jul 05 10:56:05 2017 +0200
@@ -4093,7 +4093,7 @@
     "/         avoid sourcePosition-shifts when checked out later.
     "/         (RCS expands this string, so its size is not constant)
     "/
-    collectionOfCategories := meta categories asSortedCollection.
+    collectionOfCategories := meta methodCategories asSortedCollection.
 
     allMetaClassSelectors := meta methodDictionary keys.
     versionSelectors := allMetaClassSelectors select:[:selector | AbstractSourceCodeManager isVersionMethodSelector:selector ].
@@ -4208,9 +4208,9 @@
 
     "Created: / 15-11-1995 / 12:53:06 / cg"
     "Modified: / 01-04-1997 / 16:01:05 / stefan"
-    "Modified: / 29-09-2011 / 14:53:49 / cg"
     "Created: / 15-03-2012 / 17:39:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 01-05-2013 / 09:17:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 05-07-2017 / 10:50:30 / cg"
 !
 
 fileOutAllDefinitionsOf:nonMetaInfo on:aStream
@@ -4294,29 +4294,29 @@
 
     meta := metaInfos at: aClass name.
 
-    collectionOfCategories := meta categories asSortedCollection.
+    collectionOfCategories := meta methodCategories asSortedCollection.
     collectionOfCategories notNil ifTrue:[
-	collectionOfCategories do:[:aCategory |
-	    self fileOutCategory:aCategory of:meta  methodFilter:methodFilter on:aStream.
+        collectionOfCategories do:[:aCategory |
+            self fileOutCategory:aCategory of:meta  methodFilter:methodFilter on:aStream.
 "/            aStream cr.
-	]
+        ]
     ].
-    collectionOfCategories := aClass categories asSortedCollection.
+    collectionOfCategories := aClass methodCategories asSortedCollection.
     collectionOfCategories notNil ifTrue:[
-	collectionOfCategories do:[:aCategory |
-	    self fileOutCategory:aCategory of:aClass methodFilter:methodFilter on:aStream.
+        collectionOfCategories do:[:aCategory |
+            self fileOutCategory:aCategory of:aClass methodFilter:methodFilter on:aStream.
 "/            aStream cr.
-	]
+        ]
     ].
 
     (self privateClassesSortedOf: aClass) do:[:privateClass |
-	self fileOutAllMethodsOf:privateClass on:aStream methodFilter:methodFilter
+        self fileOutAllMethodsOf:privateClass on:aStream methodFilter:methodFilter
     ].
 
     "Created: / 15-10-1996 / 11:13:00 / cg"
-    "Modified: / 22-03-1997 / 16:12:17 / cg"
     "Created: / 19-03-2012 / 18:21:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 01-05-2013 / 09:06:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 05-07-2017 / 10:50:34 / cg"
 !
 
 fileOutMethod:change on:aStream