diff --git a/datalogtool/publish.gradle b/datalogtool/publish.gradle
index ae75905e7e..6e6f079bc9 100644
--- a/datalogtool/publish.gradle
+++ b/datalogtool/publish.gradle
@@ -34,7 +34,7 @@ model {
                             description("Copies the DataLogTool executable to the outputs directory.")
                             destinationDirectory = outputsFolder
 
-                            archiveBaseName = '_M_' + zipBaseName
+                            archiveBaseName = zipBaseName
                             duplicatesStrategy = 'exclude'
                             archiveClassifier = nativeUtils.getPublishClassifier(binary)
 
diff --git a/glass/publish.gradle b/glass/publish.gradle
index f7c59716d6..ab8df4f9ac 100644
--- a/glass/publish.gradle
+++ b/glass/publish.gradle
@@ -89,7 +89,7 @@ model {
                             description("Copies the Glass executable to the outputs directory.")
                             destinationDirectory = outputsFolder
 
-                            archiveBaseName = '_M_' + zipBaseName
+                            archiveBaseName = zipBaseName
                             duplicatesStrategy = 'exclude'
                             archiveClassifier = nativeUtils.getPublishClassifier(binary)
 
diff --git a/outlineviewer/publish.gradle b/outlineviewer/publish.gradle
index 4cfb7bf14a..4b5d287fc6 100644
--- a/outlineviewer/publish.gradle
+++ b/outlineviewer/publish.gradle
@@ -34,7 +34,7 @@ model {
                             description("Copies the OutlineViewer executable to the outputs directory.")
                             destinationDirectory = outputsFolder
 
-                            archiveBaseName = '_M_' + zipBaseName
+                            archiveBaseName = zipBaseName
                             duplicatesStrategy = 'exclude'
                             archiveClassifier = nativeUtils.getPublishClassifier(binary)
 
diff --git a/processstarter/publish.gradle b/processstarter/publish.gradle
index 925fa96476..49b4bd42fe 100644
--- a/processstarter/publish.gradle
+++ b/processstarter/publish.gradle
@@ -33,7 +33,7 @@ model {
                             description("Copies the processstarter executable to the outputs directory.")
                             destinationDirectory = outputsFolder
 
-                            archiveBaseName = '_M_' + zipBaseName
+                            archiveBaseName = zipBaseName
                             duplicatesStrategy = 'exclude'
                             archiveClassifier = nativeUtils.getPublishClassifier(binary)
 
diff --git a/roborioteamnumbersetter/publish.gradle b/roborioteamnumbersetter/publish.gradle
index 83d798d406..7b147195ae 100644
--- a/roborioteamnumbersetter/publish.gradle
+++ b/roborioteamnumbersetter/publish.gradle
@@ -34,7 +34,7 @@ model {
                             description("Copies the roboRIOTeamNumberSetter executable to the outputs directory.")
                             destinationDirectory = outputsFolder
 
-                            archiveBaseName = '_M_' + zipBaseName
+                            archiveBaseName = zipBaseName
                             duplicatesStrategy = 'exclude'
                             archiveClassifier = nativeUtils.getPublishClassifier(binary)
 
diff --git a/shared/config.gradle b/shared/config.gradle
index bdac3fafff..408c0f71ef 100644
--- a/shared/config.gradle
+++ b/shared/config.gradle
@@ -131,7 +131,7 @@ ext.createComponentZipTasks = { components, names, base, type, project, func ->
             description = 'Creates component archive for platform ' + key
             destinationDirectory = outputsFolder
             archiveClassifier = key
-            archiveBaseName = '_M_' + base
+            archiveBaseName = base
             duplicatesStrategy = 'exclude'
 
             from(licenseFile) {
diff --git a/sysid/publish.gradle b/sysid/publish.gradle
index 1356946441..568abea3dd 100644
--- a/sysid/publish.gradle
+++ b/sysid/publish.gradle
@@ -77,7 +77,7 @@ model {
                             description("Copies the SysId executable to the outputs directory.")
                             destinationDirectory = outputsFolder
 
-                            archiveBaseName = '_M_' + zipBaseName
+                            archiveBaseName = zipBaseName
                             duplicatesStrategy = 'exclude'
                             archiveClassifier = nativeUtils.getPublishClassifier(binary)