--- a/VSEPackageFileSourceWriter.st	Mon Feb 02 12:34:11 2015 +0100
+++ b/VSEPackageFileSourceWriter.st	Mon Feb 02 12:34:18 2015 +0100
@@ -270,7 +270,7 @@
 !VSEPackageFileSourceWriter methodsFor:'utilities'!
 
 fileOutPackage:packageID on:aStream
-    |classesToFileout methodsToFileOut|
+    |classesToFileout methodsToFileOut rewriter|
 
     aStream lineEndCRLF.
 
@@ -278,6 +278,9 @@
     classesToFileout := classesToFileout reject:[:cls | cls isSubclassOf: ProjectDefinition ].
     classesToFileout topologicalSort:[:a :b | b isSubclassOf:a].
 
+    rewriter := self class vseSourceRewriter new.
+    rewriter classNamesToRewrite:classNameTranslations.
+
     methodsToFileOut := self extensionMethodsFor:packageID.
 
     classesToFileout do:[:eachClass |
@@ -295,7 +298,7 @@
 
         method := rewriteQuery method.
         source := rewriteQuery source.
-        source := self class vseSourceRewriter rewriteMethod:method.
+        source := rewriter rewriteMethod:method.
         rewriteQuery proceedWith:source.
     ] do:[
         classesToFileout do:[:eachClass |
@@ -313,10 +316,10 @@
 !VSEPackageFileSourceWriter class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/VSEPackageFileSourceWriter.st,v 1.4 2015-01-28 17:01:05 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/VSEPackageFileSourceWriter.st,v 1.5 2015-02-02 11:34:18 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/VSEPackageFileSourceWriter.st,v 1.4 2015-01-28 17:01:05 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/VSEPackageFileSourceWriter.st,v 1.5 2015-02-02 11:34:18 cg Exp $'
 ! !