diff --git a/custom-checks/checkstyle/src/main/java/org/openhab/tools/analysis/checkstyle/OhInfXmlValidationCheck.java b/custom-checks/checkstyle/src/main/java/org/openhab/tools/analysis/checkstyle/OhInfXmlValidationCheck.java
index c44faa26..1c22ac98 100644
--- a/custom-checks/checkstyle/src/main/java/org/openhab/tools/analysis/checkstyle/OhInfXmlValidationCheck.java
+++ b/custom-checks/checkstyle/src/main/java/org/openhab/tools/analysis/checkstyle/OhInfXmlValidationCheck.java
@@ -149,7 +149,7 @@ private void validateXmlAgainstSchema(File xmlFile, Schema schema) {
                 // Removing the type of the logged message (For example - "cvc-complex-type.2.4.b: ...").
                 message = message.substring(message.indexOf(":") + 2);
                 int lineNumber = exception.getLineNumber();
-                log(lineNumber, message, xmlFile.getPath());
+                logMessage(xmlFile.getAbsolutePath(), lineNumber, xmlFile.getName(), message);
             } catch (IOException | SAXException e) {
                 logger.error("Problem occurred while parsing the file {}", xmlFile.getName(), e);
             }
diff --git a/custom-checks/checkstyle/src/main/java/org/openhab/tools/analysis/checkstyle/OnlyTabIndentationCheck.java b/custom-checks/checkstyle/src/main/java/org/openhab/tools/analysis/checkstyle/OnlyTabIndentationCheck.java
index f56c6681..3bcef977 100644
--- a/custom-checks/checkstyle/src/main/java/org/openhab/tools/analysis/checkstyle/OnlyTabIndentationCheck.java
+++ b/custom-checks/checkstyle/src/main/java/org/openhab/tools/analysis/checkstyle/OnlyTabIndentationCheck.java
@@ -42,19 +42,19 @@ public void setFileTypes(String[] value) {
 
     @Override
     protected void processFiltered(File file, FileText fileText) {
-        processTabIndentationCheck(fileText);
+        processTabIndentationCheck(file, fileText);
     }
 
-    private void processTabIndentationCheck(FileText fileText) {
+    private void processTabIndentationCheck(File file, FileText fileText) {
         for (int lineNumber = 0; lineNumber < fileText.size(); lineNumber++) {
             String line = fileText.get(lineNumber);
             // if line is empty and does not contain only tabs for indentation
             if (line.trim().isEmpty() && !doesLineContainOnlyTabs(line)) {
                 if (onlyShowFirstWarning) {
-                    logMessage(lineNumber);
+                    logMessage(file, lineNumber);
                     return;
                 }
-                logMessage(lineNumber);
+                logMessage(file, lineNumber);
                 continue;
             }
             int indexNonWhitespaceCharacter = line.indexOf(line.trim());
@@ -63,10 +63,10 @@ private void processTabIndentationCheck(FileText fileText) {
                 String lineBeforeCharacter = line.substring(0, indexNonWhitespaceCharacter);
                 if (!doesLineContainOnlyTabs(lineBeforeCharacter)) {
                     if (onlyShowFirstWarning) {
-                        logMessage(lineNumber);
+                        logMessage(file, lineNumber);
                         return;
                     }
-                    logMessage(lineNumber);
+                    logMessage(file, lineNumber);
                 }
             }
         }
@@ -87,7 +87,7 @@ private boolean doesLineContainOnlyTabs(String lineBeforeCharacter) {
      *
      * @param lineNumber the line number where the message should be logged
      */
-    private void logMessage(int lineNumber) {
-        log(lineNumber + 1, WARNING_MESSAGE);
+    private void logMessage(File file, int lineNumber) {
+        logMessage(file.getAbsolutePath(), lineNumber + 1, file.getName(), WARNING_MESSAGE);
     }
 }
diff --git a/custom-checks/checkstyle/src/main/java/org/openhab/tools/analysis/checkstyle/api/AbstractOhInfXmlCheck.java b/custom-checks/checkstyle/src/main/java/org/openhab/tools/analysis/checkstyle/api/AbstractOhInfXmlCheck.java
index 0c18488d..e83674e5 100644
--- a/custom-checks/checkstyle/src/main/java/org/openhab/tools/analysis/checkstyle/api/AbstractOhInfXmlCheck.java
+++ b/custom-checks/checkstyle/src/main/java/org/openhab/tools/analysis/checkstyle/api/AbstractOhInfXmlCheck.java
@@ -66,7 +66,7 @@ protected void processFiltered(final File file, final FileText fileText) throws
     private void processXmlFile(final FileText xmlFileText) throws CheckstyleException {
         final File xmlFile = xmlFileText.getFile();
         if (isEmpty(xmlFileText)) {
-            log(0, MessageFormat.format(MESSAGE_EMPTY_FILE, xmlFile.getName()), xmlFile.getPath());
+            logMessage(xmlFile.getAbsolutePath(), 0, xmlFile.getName(), MESSAGE_EMPTY_FILE);
         } else {
             final File fileParentDirectory = xmlFile.getParentFile();
             final boolean isOHParentDirectory = OH_INF_DIRECTORY.equals(fileParentDirectory.getParentFile().getName());
diff --git a/sat-plugin/src/main/resources/report/prepare_checkstyle.xslt b/sat-plugin/src/main/resources/report/prepare_checkstyle.xslt
index 22c68b6d..1fcff8f0 100644
--- a/sat-plugin/src/main/resources/report/prepare_checkstyle.xslt
+++ b/sat-plugin/src/main/resources/report/prepare_checkstyle.xslt
@@ -34,9 +34,37 @@
 	<xsl:template match="file">
 		<xsl:variable name="new_name">
 		<xsl:choose>
-			<xsl:when test="contains(@name,'feature.xml')">
+			<xsl:when test="ends-with(@name,'.xml')">
+			    <!-- this should find the last occurrence of /src/ and construct
+				a new path from parent folder's name, /src/ and remaining path/filename
+				 -->
 				<xsl:variable name="temp_name" select="translate(@name, '\', '/')" />
-				<xsl:value-of select="concat('src/', substring-after($temp_name, '/src/'))" />
+				<xsl:variable name="after_last_src">
+					<xsl:call-template name="substring-after-last">
+						<xsl:with-param name="input" select="$temp_name" />
+						<xsl:with-param name="marker" select="'/src/'" />
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:variable name="before_last_src" select="substring-before($temp_name, concat('/src/', $after_last_src))" />
+				<xsl:variable name="parent">
+					<xsl:choose>
+						<xsl:when test="string-length($before_last_src) &gt; 0">
+							<xsl:call-template name="substring-after-last">
+								<xsl:with-param name="input" select="$before_last_src" />
+								<xsl:with-param name="marker" select="'/'" />
+							</xsl:call-template>
+						</xsl:when>
+						<xsl:otherwise />
+					</xsl:choose>
+				</xsl:variable>
+				<xsl:choose>
+					<xsl:when test="string-length($parent) &gt; 0">
+						<xsl:value-of select="concat($parent, '/src/', $after_last_src)" />
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="concat('src/', $after_last_src)" />
+					</xsl:otherwise>
+				</xsl:choose>
 			</xsl:when>
 			<xsl:when test="contains(@name,'src')">
 				<xsl:variable name="temp_name" select="translate(@name, '/', '.')" />