diff --git a/build-logic/src/main/java/net/pixaurora/kit_tunes/build_logic/ProjectMetadata.java b/build-logic/src/main/java/net/pixaurora/kit_tunes/build_logic/ProjectMetadata.java
index 2194b3e..6b42b36 100644
--- a/build-logic/src/main/java/net/pixaurora/kit_tunes/build_logic/ProjectMetadata.java
+++ b/build-logic/src/main/java/net/pixaurora/kit_tunes/build_logic/ProjectMetadata.java
@@ -16,7 +16,7 @@ public String modId() {
         Optional<String> subModId = properties.optionalString(Property.SUB_MOD_ID);
 
         if (subModId.isPresent()) {
-            return "kitten" + "_" + subModId.get();
+            return modId + "_" + subModId.get();
         } else {
             return modId;
         }
diff --git a/build-logic/src/main/java/net/pixaurora/kit_tunes/build_logic/Property.java b/build-logic/src/main/java/net/pixaurora/kit_tunes/build_logic/Property.java
index a4e7c80..1b72eff 100644
--- a/build-logic/src/main/java/net/pixaurora/kit_tunes/build_logic/Property.java
+++ b/build-logic/src/main/java/net/pixaurora/kit_tunes/build_logic/Property.java
@@ -1,7 +1,7 @@
 package net.pixaurora.kit_tunes.build_logic;
 
 public enum Property {
-    BASE_MOD_ID("archives_base_name"),
+    BASE_MOD_ID("base_mod_name"),
 	SUB_MOD_ID("sub_mod_name"),
 	MOD_VERSION("mod_version"),
     UPDATE_TITLE("update_title"),
diff --git a/gradle.properties b/gradle.properties
index 09373a5..cd82814 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,6 +8,6 @@ mod_version = 0.1.0
 update_title = axolotl
 
 maven_group = net.pixaurora
-archives_base_name = kit_tunes
+base_mod_name = kit_tunes
 
 minecraft_version = 1.20.4
diff --git a/kit-tunes/gradle.properties b/kit-tunes/gradle.properties
index 944d9b3..36943ed 100644
--- a/kit-tunes/gradle.properties
+++ b/kit-tunes/gradle.properties
@@ -1 +1 @@
-main_project=
+main_project =
diff --git a/kitten-heart/gradle.properties b/kitten-heart/gradle.properties
index f6cedc9..8946d39 100644
--- a/kitten-heart/gradle.properties
+++ b/kitten-heart/gradle.properties
@@ -1,2 +1,3 @@
 # Mod properties
-sub_mod_name = core
+base_mod_name = kitten
+sub_mod_name = heart
diff --git a/kitten-square/r1.17.0/gradle.properties b/kitten-square/r1.17.0/gradle.properties
index 4bfe845..570b516 100644
--- a/kitten-square/r1.17.0/gradle.properties
+++ b/kitten-square/r1.17.0/gradle.properties
@@ -1,5 +1,7 @@
 # Mod properties
-sub_mod_name = ui
+base_mod_name = kitten
+sub_mod_name = square
+
 minecraft_version_min = 1.17.0
 
 minecraft_version = 1.17
diff --git a/kitten-square/r1.20.4/gradle.properties b/kitten-square/r1.20.4/gradle.properties
index f74739b..28c4f8b 100644
--- a/kitten-square/r1.20.4/gradle.properties
+++ b/kitten-square/r1.20.4/gradle.properties
@@ -1,5 +1,7 @@
 # Mod properties
-sub_mod_name = ui
+base_mod_name = kitten
+sub_mod_name = square
+
 minecraft_version_min = 1.20.4
 
 minecraft_version = 1.20.4
diff --git a/kitten-square/r1.21.0/gradle.properties b/kitten-square/r1.21.0/gradle.properties
index c869e7b..e562eaf 100644
--- a/kitten-square/r1.21.0/gradle.properties
+++ b/kitten-square/r1.21.0/gradle.properties
@@ -1,5 +1,7 @@
 # Mod properties
-sub_mod_name = ui
+base_mod_name = kitten
+sub_mod_name = square
+
 minecraft_version_min = 1.21.0
 
 minecraft_version = 1.21
diff --git a/kitten-star/r1.17.0/gradle.properties b/kitten-star/r1.17.0/gradle.properties
index e1049a3..2afef6c 100644
--- a/kitten-star/r1.17.0/gradle.properties
+++ b/kitten-star/r1.17.0/gradle.properties
@@ -1,5 +1,7 @@
 # Mod properties
+base_mod_name = kitten
 sub_mod_name = star
+
 minecraft_version_min = 1.17.0
 
 minecraft_version = 1.17
diff --git a/kitten-star/r1.20.4/gradle.properties b/kitten-star/r1.20.4/gradle.properties
index 3639936..88418d1 100644
--- a/kitten-star/r1.20.4/gradle.properties
+++ b/kitten-star/r1.20.4/gradle.properties
@@ -1,5 +1,7 @@
 # Mod properties
+base_mod_name = kitten
 sub_mod_name = star
+
 minecraft_version_min = 1.20.4
 
 minecraft_version = 1.20.4