4 files changed, 14 insertions, 18 deletions
diff --git a/keyboards/keebsforall/freebirdnp/lite/config.h b/keyboards/keebsforall/freebirdnp/lite/config.h
index 317132eff3..6630124423 100644
--- a/keyboards/keebsforall/freebirdnp/lite/config.h
+++ b/keyboards/keebsforall/freebirdnp/lite/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       0x6B66
-#define PRODUCT_ID      0x1013
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    KeebsForAll
-#define PRODUCT         Freebird Numpad Lite
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 4
diff --git a/keyboards/keebsforall/freebirdnp/lite/info.json b/keyboards/keebsforall/freebirdnp/lite/info.json
index 1553264e08..4cab1d4cdb 100644
--- a/keyboards/keebsforall/freebirdnp/lite/info.json
+++ b/keyboards/keebsforall/freebirdnp/lite/info.json
@@ -1,8 +1,13 @@
 {
-    "keyboard_name": "FreebirdNP Lite",
+    "keyboard_name": "Freebird Numpad Lite",
+    "manufacturer": "KeebsForAll",
     "url": "https://keebsforall.com/products/fb-numpad-lite",
     "maintainer": "e11i0t23",
-    "manufacturer": "KeebsForAll",
+    "usb": {
+        "vid": "0x6B66",
+        "pid": "0x1013",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_numpad_5x4": {
             "layout": [
diff --git a/keyboards/keebsforall/freebirdnp/pro/config.h b/keyboards/keebsforall/freebirdnp/pro/config.h
index 53ced8ac03..b7c850c83d 100644
--- a/keyboards/keebsforall/freebirdnp/pro/config.h
+++ b/keyboards/keebsforall/freebirdnp/pro/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       0x6B66
-#define PRODUCT_ID      0x1014
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    KeebsForAll
-#define PRODUCT         Freebird Numpad
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 4
diff --git a/keyboards/keebsforall/freebirdnp/pro/info.json b/keyboards/keebsforall/freebirdnp/pro/info.json
index ed2a6e0b41..c2432d6adc 100644
--- a/keyboards/keebsforall/freebirdnp/pro/info.json
+++ b/keyboards/keebsforall/freebirdnp/pro/info.json
@@ -1,8 +1,13 @@
 {
-    "keyboard_name": "FreebirdNP Pro",
+    "keyboard_name": "Freebird Numpad Pro",
+    "manufacturer": "KeebsForAll",
     "url": "https://keebsforall.com/products/fb-numpad-pro",
     "maintainer": "e11i0t23",
-    "manufacturer": "KeebsForAll",
+    "usb": {
+        "vid": "0x6B66",
+        "pid": "0x1014",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [