4 files changed, 14 insertions, 17 deletions
diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h
index cb671bfab7..69c87cd154 100644
--- a/keyboards/geekboards/macropad_v2/config.h
+++ b/keyboards/geekboards/macropad_v2/config.h
@@ -15,13 +15,6 @@
  */
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x0483
-#define PRODUCT_ID      0xA372
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    GeekBoards
-#define PRODUCT         Macropad v2
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 4
diff --git a/keyboards/geekboards/macropad_v2/info.json b/keyboards/geekboards/macropad_v2/info.json
index 770ebbb0f4..b62620af9b 100644
--- a/keyboards/geekboards/macropad_v2/info.json
+++ b/keyboards/geekboards/macropad_v2/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "macropad_v2",
+  "keyboard_name": "Macropad v2",
+  "manufacturer": "GeebBoards",
   "url": "https://geekboards.ru/",
   "maintainer": "ruddy17",
+  "usb": {
+    "vid": "0x0483",
+    "pid": "0xA372",
+    "device_version": "0.0.2"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/geekboards/tester/config.h b/keyboards/geekboards/tester/config.h
index ac3b95c7e7..47cb82f215 100644
--- a/keyboards/geekboards/tester/config.h
+++ b/keyboards/geekboards/tester/config.h
@@ -2,14 +2,6 @@
 
 #include "config_common.h"
 
-
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x1319
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Geekboards
-#define PRODUCT         Geekboards Tester
-
-
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 4
 
diff --git a/keyboards/geekboards/tester/info.json b/keyboards/geekboards/tester/info.json
index 9882aa6850..2da610fb3f 100644
--- a/keyboards/geekboards/tester/info.json
+++ b/keyboards/geekboards/tester/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Geekboards 8-keys macropad",
+    "keyboard_name": "Tester",
+    "manufacturer": "Geekboards",
     "url": "",
     "maintainer": "moyi4681",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1319",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [