8 files changed, 25 insertions, 29 deletions

diff --git a/keyboards/spaceman/2_milk/config.h b/keyboards/spaceman/2_milk/config.h
index 5c264f44ac..01786911ce 100644
--- a/keyboards/spaceman/2_milk/config.h
+++ b/keyboards/spaceman/2_milk/config.h
@@ -16,13 +16,6 @@
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5342 // "SB"
-#define PRODUCT_ID      0x3225 // "2%"
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Spaceman
-#define PRODUCT         2% Milk
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 1
diff --git a/keyboards/spaceman/2_milk/info.json b/keyboards/spaceman/2_milk/info.json
index 288bc0144c..8cdf474517 100644
--- a/keyboards/spaceman/2_milk/info.json
+++ b/keyboards/spaceman/2_milk/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "2% Milk",
+  "manufacturer": "Spaceman",
   "url": "",
   "maintainer": "Spaceman",
+  "usb": {
+    "vid": "0x5342",
+    "pid": "0x3225",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [ {"x": 0, "y": 0 }, {"x": 0, "y": 1 }]
diff --git a/keyboards/spaceman/pancake/rev1/config.h b/keyboards/spaceman/pancake/rev1/config.h
index e05a618e4a..46eb28d6ba 100644
--- a/keyboards/spaceman/pancake/rev1/config.h
+++ b/keyboards/spaceman/pancake/rev1/config.h
@@ -16,13 +16,6 @@
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5342 // SB 
-#define PRODUCT_ID      0x504B // PK
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Spaceman
-#define PRODUCT         Pancake
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12
diff --git a/keyboards/spaceman/pancake/rev1/info.json b/keyboards/spaceman/pancake/rev1/info.json
index 7462b5bf6b..b05601cfa4 100644
--- a/keyboards/spaceman/pancake/rev1/info.json
+++ b/keyboards/spaceman/pancake/rev1/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Pancake",
+  "manufacturer": "Spaceman",
   "url": "",
   "maintainer": "Spaceman",
+  "usb": {
+    "vid": "0x5342",
+    "pid": "0x504B",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_planck_mit": {
       "layout": [ 
diff --git a/keyboards/spaceman/pancake/rev2/config.h b/keyboards/spaceman/pancake/rev2/config.h
index a4d3b439c4..f63b136140 100644
--- a/keyboards/spaceman/pancake/rev2/config.h
+++ b/keyboards/spaceman/pancake/rev2/config.h
@@ -16,13 +16,6 @@
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5342 // SB
-#define PRODUCT_ID      0x5032 // P2
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    Spaceman
-#define PRODUCT         Pancake 2
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12
diff --git a/keyboards/spaceman/pancake/rev2/info.json b/keyboards/spaceman/pancake/rev2/info.json
index a5a4aad132..300d0f6090 100644
--- a/keyboards/spaceman/pancake/rev2/info.json
+++ b/keyboards/spaceman/pancake/rev2/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Pancake 2",
+  "manufacturer": "Spaceman",
   "url": "",
   "maintainer": "Spaceman",
+  "usb": {
+    "vid": "0x5342",
+    "pid": "0x5032",
+    "device_version": "0.0.2"
+  },
   "layouts": {
                 "LAYOUT_ortho_4x12": {
       "layout": [ 
diff --git a/keyboards/spaceman/yun65/config.h b/keyboards/spaceman/yun65/config.h
index def4bb9576..05fce09fb0 100644
--- a/keyboards/spaceman/yun65/config.h
+++ b/keyboards/spaceman/yun65/config.h
@@ -16,13 +16,6 @@
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5342 // "SB"
-#define PRODUCT_ID      0x594E // "YN"
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Spaceman
-#define PRODUCT         Yun 65
-
 /* Key Matrix perameter */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
diff --git a/keyboards/spaceman/yun65/info.json b/keyboards/spaceman/yun65/info.json
index 113b6983a6..0caaa1521e 100644
--- a/keyboards/spaceman/yun65/info.json
+++ b/keyboards/spaceman/yun65/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "yun65",
+  "keyboard_name": "Yun 65",
+  "manufacturer": "Spaceman",
   "url": "",
   "maintainer": "Spaceman",
+  "usb": {
+    "vid": "0x5342",
+    "pid": "0x594E",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [