diff --git a/includes/definitions/discovery/valere.yaml b/includes/definitions/discovery/valere.yaml
index 561ca97315..e5e06af92f 100644
--- a/includes/definitions/discovery/valere.yaml
+++ b/includes/definitions/discovery/valere.yaml
@@ -22,8 +22,8 @@ modules:
                     num_oid: '.1.3.6.1.4.1.13858.2.1.6.1.4.{{ $index }}'
                     high_limit: vpwrModuleCapacity
                     divisor: 100
-                    descr: 'Module {{ $vpwrBayIndex }}.{{ $vpwrModuleIndex }} Current'
-                    group: Modules
+                    group: 'Shelf {{ $vpwrBayIndex }}'
+                    descr: 'Module {{ $vpwrModuleIndex }} Current'
                     skip_values:
                         -   oid: vpwrModuleOID
                             op: '='
@@ -71,8 +71,8 @@ modules:
                     oid: vpwrSystemIdentTable
                     value: vpwrModuleOperStatus
                     num_oid: '.1.3.6.1.4.1.13858.2.1.6.1.5.{{ $index }}'
-                    descr: "Module {{ $vpwrBayIndex }}.{{ $vpwrModuleIndex }} Status"
-                    group: Modules
+                    group: 'Shelf {{ $vpwrBayIndex }}'
+                    descr: 'Module {{ $vpwrModuleIndex }} Status'
                     state_name: vpwrModuleOperStatus
                     states:
                         - { descr: Ok, graph: 0, value: 0, generic: 0 }
diff --git a/tests/data/valere.json b/tests/data/valere.json
index 36064be746..5456235ed8 100644
--- a/tests/data/valere.json
+++ b/tests/data/valere.json
@@ -291,8 +291,8 @@
                     "sensor_oid": ".1.3.6.1.4.1.13858.2.1.6.1.4.1.1",
                     "sensor_index": "1.1",
                     "sensor_type": "valere",
-                    "sensor_descr": "Module 1.1 Current",
-                    "group": "Modules",
+                    "sensor_descr": "Module 1 Current",
+                    "group": "Shelf 1",
                     "sensor_divisor": 100,
                     "sensor_multiplier": 1,
                     "sensor_current": 9.11,
@@ -315,8 +315,8 @@
                     "sensor_oid": ".1.3.6.1.4.1.13858.2.1.6.1.4.1.2",
                     "sensor_index": "1.2",
                     "sensor_type": "valere",
-                    "sensor_descr": "Module 1.2 Current",
-                    "group": "Modules",
+                    "sensor_descr": "Module 2 Current",
+                    "group": "Shelf 1",
                     "sensor_divisor": 100,
                     "sensor_multiplier": 1,
                     "sensor_current": 9.07,
@@ -339,8 +339,8 @@
                     "sensor_oid": ".1.3.6.1.4.1.13858.2.1.6.1.5.1.1",
                     "sensor_index": "1.1",
                     "sensor_type": "vpwrModuleOperStatus",
-                    "sensor_descr": "Module 1.1 Status",
-                    "group": "Modules",
+                    "sensor_descr": "Module 1 Status",
+                    "group": "Shelf 1",
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
                     "sensor_current": 0,
@@ -363,8 +363,8 @@
                     "sensor_oid": ".1.3.6.1.4.1.13858.2.1.6.1.5.1.2",
                     "sensor_index": "1.2",
                     "sensor_type": "vpwrModuleOperStatus",
-                    "sensor_descr": "Module 1.2 Status",
-                    "group": "Modules",
+                    "sensor_descr": "Module 2 Status",
+                    "group": "Shelf 1",
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
                     "sensor_current": 0,