diff --git a/mesh-america/keymind-cascade-logging-v1.16.0-provider.json b/mesh-america/keymind-cascade-logging-v1.16.0-provider.json
index 3f8097fd..c877cc3b 100644
--- a/mesh-america/keymind-cascade-logging-v1.16.0-provider.json
+++ b/mesh-america/keymind-cascade-logging-v1.16.0-provider.json
@@ -67,6 +67,9 @@
     "uniteng": {
       "name": "UnitEng"
     },
+    "waveshare": {
+      "name": "Waveshare"
+    },
     "wehooper4": {
       "name": "SolarXiao / wehooper4"
     },
@@ -2253,7 +2256,7 @@
     },
     {
       "maker": "heltec",
-      "name": "Heltec LoRa 32 V2",
+      "name": "Heltec v2",
       "type": "esp32",
       "firmware": [
         {
@@ -2513,7 +2516,7 @@
     },
     {
       "maker": "heltec",
-      "name": "Heltec LoRa 32 V3",
+      "name": "Heltec v3",
       "type": "esp32",
       "firmware": [
         {
@@ -6125,7 +6128,7 @@
     },
     {
       "maker": "heltec",
-      "name": "Heltec Wireless Stick Lite V3",
+      "name": "Heltec WSL3",
       "type": "esp32",
       "firmware": [
         {
@@ -12742,7 +12745,7 @@
     },
     {
       "maker": "raspberry",
-      "name": "Raspberry Pi Pico W",
+      "name": "RPI Pico 2040 + WaveShare SX1262",
       "type": "noflash",
       "firmware": [
         {
@@ -12858,8 +12861,8 @@
       ]
     },
     {
-      "maker": "raspberry",
-      "name": "RPI Pico 2040 + WaveShare SX1262",
+      "maker": "waveshare",
+      "name": "Waveshare RP2040-LoRa-HF/LF",
       "type": "noflash",
       "firmware": [
         {
diff --git a/mesh-america/keymind-cascade-v1.16.0-provider.json b/mesh-america/keymind-cascade-v1.16.0-provider.json
index cf99bd11..588fc92f 100644
--- a/mesh-america/keymind-cascade-v1.16.0-provider.json
+++ b/mesh-america/keymind-cascade-v1.16.0-provider.json
@@ -67,6 +67,9 @@
     "uniteng": {
       "name": "UnitEng"
     },
+    "waveshare": {
+      "name": "Waveshare"
+    },
     "wehooper4": {
       "name": "SolarXiao / wehooper4"
     },
@@ -2242,7 +2245,7 @@
     },
     {
       "maker": "heltec",
-      "name": "Heltec LoRa 32 V2",
+      "name": "Heltec v2",
       "type": "esp32",
       "firmware": [
         {
@@ -2437,7 +2440,7 @@
     },
     {
       "maker": "heltec",
-      "name": "Heltec LoRa 32 V3",
+      "name": "Heltec v3",
       "type": "esp32",
       "firmware": [
         {
@@ -5543,7 +5546,7 @@
     },
     {
       "maker": "heltec",
-      "name": "Heltec Wireless Stick Lite V3",
+      "name": "Heltec WSL3",
       "type": "esp32",
       "firmware": [
         {
@@ -11822,7 +11825,7 @@
     },
     {
       "maker": "raspberry",
-      "name": "Raspberry Pi Pico W",
+      "name": "RPI Pico 2040 + WaveShare SX1262",
       "type": "noflash",
       "firmware": [
         {
@@ -11897,8 +11900,8 @@
       ]
     },
     {
-      "maker": "raspberry",
-      "name": "RPI Pico 2040 + WaveShare SX1262",
+      "maker": "waveshare",
+      "name": "Waveshare RP2040-LoRa-HF/LF",
       "type": "noflash",
       "firmware": [
         {