diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 038d4d588e..debbf2c047 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -1215,6 +1215,12 @@
     "setta21": {
         "target": "salicylic_acid3/setta21"
     },
+    "soda/mango": {
+        "target": "magic_force/mf17"
+    },
+    "soda/pocket": {
+        "target": "magic_force/mf34"
+    },
     "space_space/rev1": {
         "target": "qpockets/space_space/rev1"
     },
diff --git a/keyboards/soda/mango/config.h b/keyboards/magic_force/mf17/config.h
similarity index 100%
rename from keyboards/soda/mango/config.h
rename to keyboards/magic_force/mf17/config.h
diff --git a/keyboards/soda/mango/info.json b/keyboards/magic_force/mf17/info.json
similarity index 98%
rename from keyboards/soda/mango/info.json
rename to keyboards/magic_force/mf17/info.json
index 9de040efba..397a5c879a 100644
--- a/keyboards/soda/mango/info.json
+++ b/keyboards/magic_force/mf17/info.json
@@ -1,8 +1,8 @@
 {
-    "manufacturer": "Soda",
-    "keyboard_name": "Mango",
+    "manufacturer": "MagicForce",
+    "keyboard_name": "MF17",
     "url": "https://github.com/gezhaoyou",
-    "maintainer": "JeayoKeh",
+    "maintainer": "MagicForce",
     "diode_direction": "ROW2COL",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/soda/mango/keymaps/default/keymap.c b/keyboards/magic_force/mf17/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/soda/mango/keymaps/default/keymap.c
rename to keyboards/magic_force/mf17/keymaps/default/keymap.c
diff --git a/keyboards/soda/mango/keymaps/via/keymap.c b/keyboards/magic_force/mf17/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/soda/mango/keymaps/via/keymap.c
rename to keyboards/magic_force/mf17/keymaps/via/keymap.c
diff --git a/keyboards/soda/mango/keymaps/via/rules.mk b/keyboards/magic_force/mf17/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/soda/mango/keymaps/via/rules.mk
rename to keyboards/magic_force/mf17/keymaps/via/rules.mk
diff --git a/keyboards/soda/mango/readme.md b/keyboards/magic_force/mf17/readme.md
similarity index 90%
rename from keyboards/soda/mango/readme.md
rename to keyboards/magic_force/mf17/readme.md
index 1a1eb6bccc..bb75cadfe9 100644
--- a/keyboards/soda/mango/readme.md
+++ b/keyboards/magic_force/mf17/readme.md
@@ -1,17 +1,16 @@
-# mango-17
+# MF-17
 
 A customizable 17  keyboard, support both HOTSWAP and SOLDER.
 
 * Keyboard Maintainer: [gezhaoyou](https://github.com/gezhaoyou)
 * Hardware Supported: [gezhaoyou](https://github.com/gezhaoyou)
-
 Make example for this keyboard (after setting up your build environment):
 
-    make soda/mango:default
+    make magic_force/mf17:default
 
 Flashing example for this keyboard:
 
-    make soda/mango:default:flash
+    make magic_force/mf17:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/soda/mango/rules.mk b/keyboards/magic_force/mf17/rules.mk
similarity index 100%
rename from keyboards/soda/mango/rules.mk
rename to keyboards/magic_force/mf17/rules.mk
diff --git a/keyboards/soda/pocket/chconf.h b/keyboards/magic_force/mf34/chconf.h
similarity index 100%
rename from keyboards/soda/pocket/chconf.h
rename to keyboards/magic_force/mf34/chconf.h
diff --git a/keyboards/soda/pocket/config.h b/keyboards/magic_force/mf34/config.h
similarity index 100%
rename from keyboards/soda/pocket/config.h
rename to keyboards/magic_force/mf34/config.h
diff --git a/keyboards/soda/pocket/info.json b/keyboards/magic_force/mf34/info.json
similarity index 96%
rename from keyboards/soda/pocket/info.json
rename to keyboards/magic_force/mf34/info.json
index 9ae9f1b0de..86b08087cb 100644
--- a/keyboards/soda/pocket/info.json
+++ b/keyboards/magic_force/mf34/info.json
@@ -1,8 +1,8 @@
 {
-    "keyboard_name": "Pocket",
+    "keyboard_name": "MagicForce",
     "url": "",
-    "maintainer": "qmk",
-    "manufacturer": "gezhaoyou",
+    "maintainer": "MagicForce",
+    "manufacturer": "MagicForce",
     "usb": {
         "vid": "0x1A53",
         "pid": "0x4F51",
diff --git a/keyboards/soda/pocket/keymaps/default/keymap.c b/keyboards/magic_force/mf34/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/soda/pocket/keymaps/default/keymap.c
rename to keyboards/magic_force/mf34/keymaps/default/keymap.c
diff --git a/keyboards/soda/pocket/keymaps/via/keymap.c b/keyboards/magic_force/mf34/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/soda/pocket/keymaps/via/keymap.c
rename to keyboards/magic_force/mf34/keymaps/via/keymap.c
diff --git a/keyboards/soda/pocket/keymaps/via/rules.mk b/keyboards/magic_force/mf34/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/soda/pocket/keymaps/via/rules.mk
rename to keyboards/magic_force/mf34/keymaps/via/rules.mk
diff --git a/keyboards/soda/pocket/mcuconf.h b/keyboards/magic_force/mf34/mcuconf.h
similarity index 100%
rename from keyboards/soda/pocket/mcuconf.h
rename to keyboards/magic_force/mf34/mcuconf.h
diff --git a/keyboards/soda/pocket/pocket.c b/keyboards/magic_force/mf34/mf34.c
similarity index 100%
rename from keyboards/soda/pocket/pocket.c
rename to keyboards/magic_force/mf34/mf34.c
diff --git a/keyboards/soda/pocket/readme.md b/keyboards/magic_force/mf34/readme.md
similarity index 90%
rename from keyboards/soda/pocket/readme.md
rename to keyboards/magic_force/mf34/readme.md
index dcb97c92b0..25a72d644f 100644
--- a/keyboards/soda/pocket/readme.md
+++ b/keyboards/magic_force/mf34/readme.md
@@ -1,4 +1,4 @@
-# Pocket-34
+# MF-34
 
 A customizable 34  keyboard, support both HOTSWAP and SOLDER.
 
@@ -7,11 +7,11 @@ A customizable 34  keyboard, support both HOTSWAP and SOLDER.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make soda/pocket:default
+    make magic_force/mf34:default
 
 Flashing example for this keyboard:
 
-    make soda/pocket:default:flash
+    make magic_force/mf34:default:flash
 
 ## Bootloader
 
diff --git a/keyboards/soda/pocket/rules.mk b/keyboards/magic_force/mf34/rules.mk
similarity index 100%
rename from keyboards/soda/pocket/rules.mk
rename to keyboards/magic_force/mf34/rules.mk