diff --git a/templates/definition/charger/amtron.yaml b/templates/definition/charger/amtron.yaml
index acc20133d..939de2ecc 100644
--- a/templates/definition/charger/amtron.yaml
+++ b/templates/definition/charger/amtron.yaml
@@ -1,11 +1,8 @@
 template: amtron
 products:
-  - brand: Mennekes
+  - brand: Mennekes AMTRON
     description:
-      generic: AMTRON XTRA
-  - brand: Mennekes
-    description:
-      generic: AMTRON PREMIUM
+      generic: XTRA, PREMIUM
 requirements:
   evcc: ["sponsorship"]
 params:
diff --git a/templates/definition/charger/goe-v3.yaml b/templates/definition/charger/goe-v3.yaml
index 36c0c9d5e..a4fe781cc 100644
--- a/templates/definition/charger/goe-v3.yaml
+++ b/templates/definition/charger/goe-v3.yaml
@@ -1,11 +1,8 @@
 template: go-e-v3
 products:
-  - brand: go-e
+  - brand: go-eCharger
     description:
-      generic: Charger HOME+ (V3)
-  - brand: go-e
-    description:
-      generic: Charger HOMEfix (V3)
+      generic: HOME+, HOMEfix (V3)
 capabilities: ["1p3p"]
 requirements:
   description:
diff --git a/templates/definition/charger/goe.yaml b/templates/definition/charger/goe.yaml
index d168b5077..ad9a713d5 100644
--- a/templates/definition/charger/goe.yaml
+++ b/templates/definition/charger/goe.yaml
@@ -1,14 +1,8 @@
 template: go-e
 products:
-  - brand: go-e
+  - brand: go-eCharger
     description:
-      generic: Charger HOME+
-  - brand: go-e
-    description:
-      generic: Charger HOMEfix
-  - brand: go-e
-    description:
-      generic: Charger Pro
+      generic: HOME+, HOMEfix, Pro
 requirements:
   description:
     en: Requires firmware 040.0 or later.
diff --git a/templates/definition/charger/keba.yaml b/templates/definition/charger/keba.yaml
index 8cb6fb2b1..0a14f4b48 100644
--- a/templates/definition/charger/keba.yaml
+++ b/templates/definition/charger/keba.yaml
@@ -2,10 +2,7 @@ template: keba
 products:
   - brand: KEBA
     description:
-      generic: KeContact P20
-  - brand: KEBA
-    description:
-      generic: KeContact P30
+      generic: KeContact P20, P30
   - brand: BMW
     description:
       generic: i Wallbox
diff --git a/templates/definition/charger/wallbe-meter.yaml b/templates/definition/charger/wallbe-meter.yaml
index 694b92885..c42e0bc12 100644
--- a/templates/definition/charger/wallbe-meter.yaml
+++ b/templates/definition/charger/wallbe-meter.yaml
@@ -2,12 +2,8 @@ template: wallbe-meter
 products:
   - brand: Wallbe
     description:
-      de: Eco (mit Strommessgerät)
-      en: Eco (with meter)
-  - brand: Wallbe
-    description:
-      de: Pro (mit Strommessgerät)
-      en: Pro (with meter)
+      de: Eco, Pro (mit Strommessgerät)
+      en: Eco, Pro (with meter)
 requirements:
   description:
     en: DIP switch 10 must be set to 'ON'.
diff --git a/templates/definition/meter/kostal-piko.yaml b/templates/definition/meter/kostal-piko.yaml
index cdbc92856..925b09a5a 100644
--- a/templates/definition/meter/kostal-piko.yaml
+++ b/templates/definition/meter/kostal-piko.yaml
@@ -2,10 +2,7 @@ template: kostal-piko
 products:
   - brand: Kostal
     description:
-      generic: Piko
-  - brand: Kostal
-    description:
-      generic: Piko BA
+      generic: Piko, Piko BA
 guidedsetup:
   enable: true
 params:
diff --git a/templates/definition/vehicle/seat-cupra.yaml b/templates/definition/vehicle/seat-cupra.yaml
index 6eefb6d23..8bcd00168 100644
--- a/templates/definition/vehicle/seat-cupra.yaml
+++ b/templates/definition/vehicle/seat-cupra.yaml
@@ -2,10 +2,7 @@ template: cupra
 products:
   - brand: Seat
     description:
-      generic: My Cupra
-  - brand: Seat
-    description:
-      generic: Cupra Born
+      generic: Cupra Born, My Cupra
 params:
   - preset: vehiclebase
   - preset: vehicleidentify
diff --git a/templates/definition/vehicle/seat.yaml b/templates/definition/vehicle/seat.yaml
index fa8090f6f..14a794384 100644
--- a/templates/definition/vehicle/seat.yaml
+++ b/templates/definition/vehicle/seat.yaml
@@ -2,10 +2,7 @@ template: seat
 products:
   - brand: Seat
     description:
-      generic: Cupra
-  - brand: Seat
-    description:
-      generic: Mii
+      generic: Cupra, Mii
 params:
   - preset: vehiclebase
   - preset: vehicleidentify