4 files changed, 13 insertions, 15 deletions
diff --git a/keyboards/keebzdotnet/fme/config.h b/keyboards/keebzdotnet/fme/config.h
index bbc273fa07..a756fea926 100644
--- a/keyboards/keebzdotnet/fme/config.h
+++ b/keyboards/keebzdotnet/fme/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4B5A
-#define PRODUCT_ID      0x8008
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    keebzdotnet
-#define PRODUCT         FMe
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 5
diff --git a/keyboards/keebzdotnet/fme/info.json b/keyboards/keebzdotnet/fme/info.json
index f07d3fd791..3c24379865 100644
--- a/keyboards/keebzdotnet/fme/info.json
+++ b/keyboards/keebzdotnet/fme/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "FMe",
+    "manufacturer": "keebzdotnet",
     "url": "",
     "maintainer": "keebzdotnet",
+    "usb": {
+        "vid": "0x4B5A",
+        "pid": "0x8008",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_all"
     },
diff --git a/keyboards/keebzdotnet/wazowski/config.h b/keyboards/keebzdotnet/wazowski/config.h
index fe8b5cbcd5..fb9fc9c118 100644
--- a/keyboards/keebzdotnet/wazowski/config.h
+++ b/keyboards/keebzdotnet/wazowski/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4B5A // "KZ"
-#define PRODUCT_ID 0x53FC
-#define DEVICE_VER 0x0001
-#define MANUFACTURER keebzdotnet
-#define PRODUCT wazowski 23-19
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 5
diff --git a/keyboards/keebzdotnet/wazowski/info.json b/keyboards/keebzdotnet/wazowski/info.json
index 2081cf92d3..699a588cf4 100644
--- a/keyboards/keebzdotnet/wazowski/info.json
+++ b/keyboards/keebzdotnet/wazowski/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "wazowski",
+    "keyboard_name": "wazowski 23-19",
+    "manufacturer": "keebzdotnet",
     "url": "https://www.keebz.net/shop/wazoski-pcb",
     "maintainer": "keebzdotnet",
+    "usb": {
+        "vid": "0x4B5A",
+        "pid": "0x53FC",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [