diff --git a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolHelper.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolHelper.java
index 452302fdec..03245be178 100644
--- a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolHelper.java
+++ b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolHelper.java
@@ -89,7 +89,7 @@ public static final String getResourceDir(String toolName) {
     }
     
     public static final String getResourceFile(String toolName, String fileName) {
-        return String.format("%s/%s", getResourceDir(toolName), fileName);
+        return String.format("%s/%s", getResourceDir(toolName.replace('-', '_')), fileName);
     }
     
     private static final Path getInstallDescriptorPath(String toolName, String version) {
diff --git a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/bugtracker-utility/extra-files/bin/FortifyBugTrackerUtility b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/bugtracker_utility/extra-files/bin/FortifyBugTrackerUtility
similarity index 100%
rename from fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/bugtracker-utility/extra-files/bin/FortifyBugTrackerUtility
rename to fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/bugtracker_utility/extra-files/bin/FortifyBugTrackerUtility
diff --git a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/bugtracker-utility/extra-files/bin/FortifyBugTrackerUtility.bat b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/bugtracker_utility/extra-files/bin/FortifyBugTrackerUtility.bat
similarity index 100%
rename from fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/bugtracker-utility/extra-files/bin/FortifyBugTrackerUtility.bat
rename to fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/bugtracker_utility/extra-files/bin/FortifyBugTrackerUtility.bat
diff --git a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/extra-files/bin/FoDUpload b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod_uploader/extra-files/bin/FoDUpload
similarity index 100%
rename from fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/extra-files/bin/FoDUpload
rename to fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod_uploader/extra-files/bin/FoDUpload
diff --git a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/extra-files/bin/FoDUpload.bat b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod_uploader/extra-files/bin/FoDUpload.bat
similarity index 100%
rename from fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/extra-files/bin/FoDUpload.bat
rename to fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod_uploader/extra-files/bin/FoDUpload.bat
diff --git a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/extra-files/bin/FortifyVulnerabilityExporter b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln_exporter/extra-files/bin/FortifyVulnerabilityExporter
similarity index 100%
rename from fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/extra-files/bin/FortifyVulnerabilityExporter
rename to fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln_exporter/extra-files/bin/FortifyVulnerabilityExporter
diff --git a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/extra-files/bin/FortifyVulnerabilityExporter.bat b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln_exporter/extra-files/bin/FortifyVulnerabilityExporter.bat
similarity index 100%
rename from fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/extra-files/bin/FortifyVulnerabilityExporter.bat
rename to fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln_exporter/extra-files/bin/FortifyVulnerabilityExporter.bat