diff --git a/MultiTool.Shared/Winline/WebServiceData.vb b/MultiTool.Shared/Winline/WebServiceData.vb
index 75c7c90..c0db361 100644
--- a/MultiTool.Shared/Winline/WebServiceData.vb
+++ b/MultiTool.Shared/Winline/WebServiceData.vb
@@ -54,9 +54,8 @@ Namespace Winline
             RaiseEvent WebServiceProgress(Me, "Einstellungen laden")
 
             ' --- Build all teh filenamez and pathz
-
             Dim oBaseFileName As String = FileEx.GetDateTimeString()
-            Dim oFileName = FileEx.GetFilenameWithSuffix(oBaseFileName, $"{pTemplate.Name}-Request", "xml")
+            Dim oFileName = FileEx.GetFilenameWithPrefix(oBaseFileName, pTemplate.Name, "xml")
 
             ' --- Get and create path for request/response files
             Dim oOutputDirectory = FileEx.CreateDateDirectory(pTemplate.OutputWebserviceDirectory)
@@ -221,9 +220,8 @@ Namespace Winline
             Dim oWS = Config
 
             ' --- Build all teh filenamez and pathz
-
             Dim oBaseFileName As String = FileEx.GetDateTimeString()
-            Dim oFileName = FileEx.GetFilenameWithSuffix(oBaseFileName, $"{pTemplate.Name}-Request", "xml")
+            Dim oFileName = FileEx.GetFilenameWithPrefix(oBaseFileName, pTemplate.Name, "xml")
 
             ' Save the filename to the document
             pDocument.FilenameExport = oFileName
@@ -276,7 +274,6 @@ Namespace Winline
             Dim oResponseBody As String = Await pResponse.Content.ReadAsStringAsync()
             Dim oContentType = pResponse.Content.Headers.ContentType.MediaType
             Dim oSerializer = Serializer.GetSerializer(GetType(Templates.Entities.MESOWebServiceResult))
-            Dim oSuffix = $"{pTemplate.Name}-Response"
 
             RaiseEvent WebServiceProgress(Me, "Antwort verarbeiten")
 
@@ -285,14 +282,14 @@ Namespace Winline
             Select Case oContentType
                 Case "text/xml"
                     ' Webservice
-                    WriteResponseFileWithSuffix(pTemplate.OutputWebserviceDirectory, pBaseFileName, oResponseBody, "xml", oSuffix)
+                    WriteResponseFileWithSuffix(pTemplate.OutputWebserviceDirectory, pBaseFileName, oResponseBody, "xml", pTemplate.Name)
                     ' XML
-                    WriteResponseFileWithSuffix(pTemplate.OutputXmlFileDirectory, pBaseFileName, oResponseBody, "xml", oSuffix)
+                    WriteResponseFileWithSuffix(pTemplate.OutputXmlFileDirectory, pBaseFileName, oResponseBody, "xml", pTemplate.Name)
                     ' Archive
-                    WriteResponseFileWithSuffix(FileEx.CreateDateDirectory(pTemplate.ArchiveDirectory), pBaseFileName, oResponseBody, "xml", oSuffix)
+                    WriteResponseFileWithSuffix(FileEx.CreateDateDirectory(pTemplate.ArchiveDirectory), pBaseFileName, oResponseBody, "xml", pTemplate.Name)
 
                 Case "text/html"
-                    WriteResponseFileWithSuffix(pTemplate.OutputWebserviceDirectory, pBaseFileName, oResponseBody, "txt", oSuffix)
+                    WriteResponseFileWithSuffix(pTemplate.OutputWebserviceDirectory, pBaseFileName, oResponseBody, "txt", pTemplate.Name)
 
                     Throw New ApplicationException(oResponseBody)
 
@@ -365,6 +362,7 @@ Namespace Winline
         End Function
 #End Region
 
+
         Private Function WriteResponseFileWithSuffix(pPath As String, pBaseFileName As String, pResponseBody As String, pExtension As String, pSuffix As String) As Boolean
             Try
                 Dim oRequestFileName As String = FileEx.GetFilenameWithSuffix(pBaseFileName, pSuffix, pExtension)