diff --git a/MultiTool.Shared/Winline/WebServiceData.vb b/MultiTool.Shared/Winline/WebServiceData.vb
index 8d6a7a5..3eb89c5 100644
--- a/MultiTool.Shared/Winline/WebServiceData.vb
+++ b/MultiTool.Shared/Winline/WebServiceData.vb
@@ -56,7 +56,7 @@ Namespace Winline
             ' --- Build all teh filenamez and pathz
 
             Dim oBaseFileName As String = FileEx.GetDateTimeString()
-            Dim oFileName = FileEx.GetFilenameWithSuffix(oBaseFileName, "Request", "xml")
+            Dim oFileName = FileEx.GetFilenameWithSuffix(oBaseFileName, $"{pTemplate.Name}-Request", "xml")
 
             ' --- Get and create path for request/response files
             Dim oOutputDirectory = FileEx.CreateDateDirectory(pTemplate.OutputWebserviceDirectory)
@@ -136,7 +136,7 @@ Namespace Winline
             Select Case oContentType
                 Case "text/xml"
                     Dim oOutputDirectory = FileEx.CreateDateDirectory(pTemplate.OutputWebserviceDirectory)
-                    WriteResponseFileWithPrefix(oOutputDirectory, pBaseFileNAme, oResponseBody, "xml", "Response")
+                    WriteResponseFileWithSuffix(oOutputDirectory, pBaseFileNAme, oResponseBody, "xml", $"{pTemplate.Name}-Response")
 
                     Dim oBytes As Byte() = Encoding.UTF8.GetBytes(oResponseBody)
                     Using oStream As New IO.MemoryStream(oBytes)
@@ -165,7 +165,7 @@ Namespace Winline
                     End Using
 
                 Case "text/html"
-                    WriteResponseFileWithSuffix(pTemplate.OutputWebserviceDirectory, pBaseFileNAme, oResponseBody, "txt", "Response")
+                    WriteResponseFileWithSuffix(pTemplate.OutputWebserviceDirectory, pBaseFileNAme, oResponseBody, "txt", $"{pTemplate.Name}-Response")
 
                     Throw New WebServiceException(oResponseBody)
 
@@ -223,7 +223,7 @@ Namespace Winline
             ' --- Build all teh filenamez and pathz
 
             Dim oBaseFileName As String = FileEx.GetDateTimeString()
-            Dim oFileName = FileEx.GetFilenameWithSuffix(oBaseFileName, "Request", "xml")
+            Dim oFileName = FileEx.GetFilenameWithSuffix(oBaseFileName, $"{pTemplate.Name}-Request", "xml")
 
             ' Save the filename to the document
             pDocument.FilenameExport = oFileName
@@ -276,21 +276,23 @@ 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")
 
             oResponseBody = ApplyItemFunctionsForExport(pDocument, pTemplate, pMandator, oResponseBody)
 
-            ' TODO: Change WriteResponseFile as TEMPLATENAME-DATE.xml
-
             Select Case oContentType
                 Case "text/xml"
-                    WriteResponseFileWithSuffix(pTemplate.OutputWebserviceDirectory, pBaseFileName, oResponseBody, "xml", "Response")
-                    WriteResponseFileWithPrefix(pTemplate.OutputXmlFileDirectory, pBaseFileName, oResponseBody, "xml", pTemplate.Name)
-                    WriteResponseFileWithPrefix(FileEx.CreateDateDirectory(pTemplate.ArchiveDirectory), pBaseFileName, oResponseBody, "xml", pTemplate.Name)
+                    ' Webservice
+                    WriteResponseFileWithSuffix(pTemplate.OutputWebserviceDirectory, pBaseFileName, oResponseBody, "xml", oSuffix)
+                    ' XML
+                    WriteResponseFileWithSuffix(pTemplate.OutputXmlFileDirectory, pBaseFileName, oResponseBody, "xml", oSuffix)
+                    ' Archive
+                    WriteResponseFileWithSuffix(FileEx.CreateDateDirectory(pTemplate.ArchiveDirectory), pBaseFileName, oResponseBody, "xml", oSuffix)
 
                 Case "text/html"
-                    WriteResponseFileWithSuffix(pTemplate.OutputWebserviceDirectory, pBaseFileName, oResponseBody, "txt", "Response")
+                    WriteResponseFileWithSuffix(pTemplate.OutputWebserviceDirectory, pBaseFileName, oResponseBody, "txt", oSuffix)
 
                     Throw New ApplicationException(oResponseBody)