Index: vhTest/Fake/AXimpl/FileWriter.cls.xml
===================================================================
diff -u -r42242 -r44527
--- vhTest/Fake/AXimpl/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 42242)
+++ vhTest/Fake/AXimpl/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 44527)
@@ -19,6 +19,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GetTimeStamp">
+<ReturnType>TECH.String</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="GetStream">
 <ReturnType>%GlobalCharacterStream</ReturnType>
 <Implementation><![CDATA[	Quit ""
FishEye: Tag 44527 refers to a dead (removed) revision in file `vhTestFiles/UnitTests/AXimpl.Generator.Generate/Test/TestVerkoopcreditnota-export/AIF/SalesInvoice/Create/SalesInvoice-Create 586689  - VHBE - 20160501_091500.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 44527 refers to a dead (removed) revision in file `vhTestFiles/UnitTests/AXimpl.Generator.Generate/Test/TestCustomer-Update/AIF/Customer/Create/Customer-UpdatePart2 K1234  - VHBE - 20160501_091500.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: AXimpl/FileWriter.cls.xml
===================================================================
diff -u -r42112 -r44527
--- AXimpl/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 42112)
+++ AXimpl/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 44527)
@@ -91,6 +91,12 @@
 <Implementation><![CDATA[	quit ..FileWriter.GetStream()
 ]]></Implementation>
 </Method>
+
+<Method name="GetTimeStamp">
+<ReturnType>TECH.String</ReturnType>
+<Implementation><![CDATA[	 Quit $TR($ZDT(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog(),8,,6)," .:","__")
+]]></Implementation>
+</Method>
 </Class>
 
 
FishEye: Tag 44527 refers to a dead (removed) revision in file `vhTestFiles/UnitTests/AXimpl.Generator.Generate/Test/TestCustomer-Create/AIF/Customer/Create/Customer-Create K1234  - VHBE - 20160501_091500.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 44527 refers to a dead (removed) revision in file `vhTestFiles/UnitTests/AXimpl.Generator.Generate/Test/TestVerkoopfactuur-export/AIF/SalesInvoice/Create/SalesInvoice-Create 300500  - VHBE - 20160501_091500.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: AXimpl/Generator.cls.xml
===================================================================
diff -u -r44513 -r44527
--- AXimpl/Generator.cls.xml	(.../Generator.cls.xml)	(revision 44513)
+++ AXimpl/Generator.cls.xml	(.../Generator.cls.xml)	(revision 44527)
@@ -97,7 +97,7 @@
 		#dim RequestEnvelope As %CacheString = ..RequestComposer.Compose(Request)
 	
 		#dim Path As %String = ##class(TECH.Files).AppendSubPath(##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_OUT_RequestPath"),..ConfigOut.GetSubPath(Request))
-		#dim Filename As %String = $replace(Request.Command,"/","-")_" "_..GeefSubject(Request.SubjectId)_" "_" - "_RequestEnvelope.Header.Company_" - "_##class(TECH.Files).GeefCurrentTimeStamp()_".xml"
+		#dim Filename As %String = $replace(Request.Command,"/","-")_" "_..GeefSubject(Request.SubjectId)_" "_" - "_RequestEnvelope.Header.Company_" - "_..FileWriter.GetTimeStamp()_".xml"
 		#dim FullFilename As %String = ##class(TECH.Files).AppendFile(Path,Filename)
 		
 		do ..FileWriter.Open(FullFilename,$$$True)
FishEye: Tag 44527 refers to a dead (removed) revision in file `vhTestFiles/UnitTests/AXimpl.Generator.Generate/Test/TestCustomer-Read/AIF/Customer/Update/Customer-UpdatePart1 K1234  - VHBE - 20160501_091500.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhTest/Mock/AXimpl/FileWriter.cls.xml
===================================================================
diff -u -r42244 -r44527
--- vhTest/Mock/AXimpl/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 42244)
+++ vhTest/Mock/AXimpl/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 44527)
@@ -26,6 +26,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GetTimeStamp">
+<ReturnType>TECH.String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GetTimeStamp")
+]]></Implementation>
+</Method>
+
 <Method name="Open">
 <FormalSpec>BestandVolledigeNaam:%String,WriteImmediate:%Boolean=1</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("Open",BestandVolledigeNaam,WriteImmediate)