diff --git a/templates/definition/meter/janitza-b23.yaml b/templates/definition/meter/janitza.yaml
similarity index 87%
rename from templates/definition/meter/janitza-b23.yaml
rename to templates/definition/meter/janitza.yaml
index fd52f669e..b163d9cfe 100644
--- a/templates/definition/meter/janitza-b23.yaml
+++ b/templates/definition/meter/janitza.yaml
@@ -1,8 +1,8 @@
-template: janitza-b23
+template: janitza
 products:
   - brand: Janitza
     description:
-      generic: B23
+      generic: B series, UMG series
 params:
   - name: usage
     choice: ["grid", "charge"]
@@ -11,6 +11,7 @@ params:
 render: |
   type: modbus
   {{- include "modbus" . }}
+  model: janitza
   power: Power
   energy: Import
   currents:
diff --git a/templates/docs/meter/janitza-b23_0.yaml b/templates/docs/meter/janitza_0.yaml
similarity index 93%
rename from templates/docs/meter/janitza-b23_0.yaml
rename to templates/docs/meter/janitza_0.yaml
index 4f1d11c12..aea8f910b 100644
--- a/templates/docs/meter/janitza-b23_0.yaml
+++ b/templates/docs/meter/janitza_0.yaml
@@ -1,11 +1,11 @@
 product:
   brand: Janitza
-  description: B23
+  description: B series, UMG series
 render:
   - usage: grid
     default: |
       type: template
-      template: janitza-b23
+      template: janitza
       usage: grid      
 
       # RS485 via adapter (Modbus RTU)
@@ -29,7 +29,7 @@ render:
   - usage: charge
     default: |
       type: template
-      template: janitza-b23
+      template: janitza
       usage: charge      
 
       # RS485 via adapter (Modbus RTU)