diff --git a/AddressLibDecoder/xmake.lua b/AddressLibDecoder/xmake.lua
index 70b49b75..5cfe4090 100644
--- a/AddressLibDecoder/xmake.lua
+++ b/AddressLibDecoder/xmake.lua
@@ -1,9 +1,9 @@
-target("addresslibdecoder")
+target("commonlibf4-addresslibdecoder")
     -- set build by default
     set_default(false)
 
     -- set build group
-    set_group("tool")
+    set_group("commonlibf4/tool")
     
     -- add packages
     add_packages("rsm-mmio")
diff --git a/AddressLibGen/xmake.lua b/AddressLibGen/xmake.lua
index d1aab293..1f7bb409 100644
--- a/AddressLibGen/xmake.lua
+++ b/AddressLibGen/xmake.lua
@@ -1,9 +1,9 @@
-target("addresslibgen")
+target("commonlibf4-addresslibgen")
     -- set build by default
     set_default(false)
 
     -- set build group
-    set_group("tool")
+    set_group("commonlibf4/tool")
 
     -- add source files
     add_files("src/**.cpp")
diff --git a/CommonLibF4/xmake.lua b/CommonLibF4/xmake.lua
index 6b663d4a..af90b687 100644
--- a/CommonLibF4/xmake.lua
+++ b/CommonLibF4/xmake.lua
@@ -9,6 +9,9 @@ end)
 target("commonlibf4", function()
     set_kind("static")
 
+    -- set build group
+    set_group("commonlibf4")
+
     -- add packages
     add_packages("rsm-binary-io", "rsm-mmio", "spdlog", { public = true })
 
diff --git a/RTTIDump/xmake.lua b/RTTIDump/xmake.lua
index 8ef2e6fd..26064ea0 100644
--- a/RTTIDump/xmake.lua
+++ b/RTTIDump/xmake.lua
@@ -1,4 +1,4 @@
-target("rttidump")
+target("commonlibf4-rttidump")
     -- set build kind
     set_kind("shared")
 
@@ -6,7 +6,7 @@ target("rttidump")
     set_default(false)
 
     -- set build group
-    set_group("plugin")
+    set_group("commonlibf4/plugin")
 
     -- add dependencies
     add_deps("commonlibf4")