4 files changed, 14 insertions, 16 deletions
diff --git a/keyboards/sam/s80/config.h b/keyboards/sam/s80/config.h
index 1df34a48dd..55dff94e3f 100644
--- a/keyboards/sam/s80/config.h
+++ b/keyboards/sam/s80/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x534D
-#define PRODUCT_ID      0x3830
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Sam
-#define PRODUCT         s80
-
 /* key matrix size */
 #define MATRIX_ROWS 11
 #define MATRIX_COLS 9
diff --git a/keyboards/sam/s80/info.json b/keyboards/sam/s80/info.json
index af109e1787..6dd583ddd6 100644
--- a/keyboards/sam/s80/info.json
+++ b/keyboards/sam/s80/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "s80 wkl",
+    "keyboard_name": "s8",
+    "manufacturer": "Sam",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x534D",
+        "pid": "0x3830",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/sam/sg81m/config.h b/keyboards/sam/sg81m/config.h
index a0dca89211..da483a7cf5 100644
--- a/keyboards/sam/sg81m/config.h
+++ b/keyboards/sam/sg81m/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x534D //SM
-#define PRODUCT_ID      0x3831 //81
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Sam
-#define PRODUCT         SG81M
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 14
diff --git a/keyboards/sam/sg81m/info.json b/keyboards/sam/sg81m/info.json
index 439d8562e9..59561a84f3 100644
--- a/keyboards/sam/sg81m/info.json
+++ b/keyboards/sam/sg81m/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "sam sg81m",
+    "keyboard_name": "SG81M",
+    "manufacturer": "Sam",
     "url": "",
     "maintainer": "CMMS-Freather",
+    "usb": {
+        "vid": "0x534D",
+        "pid": "0x3831",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_7u_space": {
             "layout": [