diff --git a/combiner/allwpilib/combine.gradle b/combiner/allwpilib/combine.gradle
index d274666..5af4369 100644
--- a/combiner/allwpilib/combine.gradle
+++ b/combiner/allwpilib/combine.gradle
@@ -48,7 +48,7 @@ def pubVersion = file(fileFinder.getFileNames(new File(projectDir, 'products').a
 
 println pubVersion
 
-String regex = "([_M_]*)_GROUP_([^\\.]+)_ID_([^\\.]+)_CLS([^\\.]*)."
+String regex = "_GROUP_([^\\.]+)_ID_([^\\.]+)_CLS([^\\.]*)."
 Pattern pattern = Pattern.compile(regex, Pattern.MULTILINE);
 
 def groups = [:]
@@ -62,11 +62,9 @@ for (File it : allFiles) {
     continue
   }
 
-  def generateAll = matcher.group(1) == '_M_'
-
-  def groupId = matcher.group(2)
-  def artifactId = matcher.group(3)
-  def classifier = matcher.group(4)
+  def groupId = matcher.group(1)
+  def artifactId = matcher.group(2)
+  def classifier = matcher.group(3)
 
   if (!classifier.empty) {
     classifier = classifier.substring(1)
@@ -85,7 +83,7 @@ for (File it : allFiles) {
     group[artifactId] = id
   }
 
-  id << new Tuple(classifier, generateAll, it)
+  id << new Tuple(classifier, it)
 
 }
 
@@ -95,7 +93,7 @@ publishing {
       value.each { key2, value2->
         "${key}${key2}"(MavenPublication) {
           value2.each { t->
-            artifact (t.get(2)) {
+            artifact (t.get(1)) {
               if (!t.get(0).empty) {
                 classifier = t.get(0)
               }