diff --git a/roles/prometheus-snmp-exporter/templates/prometheus/snmp.yml.j2 b/roles/prometheus-snmp-exporter/templates/prometheus/snmp.yml.j2
index a0616048..b721b775 100644
--- a/roles/prometheus-snmp-exporter/templates/prometheus/snmp.yml.j2
+++ b/roles/prometheus-snmp-exporter/templates/prometheus/snmp.yml.j2
@@ -131,211 +131,211 @@ ubiquiti_unifi:
 #    type: DisplayString
 #    help: The physical location of this node (e.g., 'telephone closet, 3rd floor')
 #      - 1.3.6.1.2.1.1.6
-  - name: unifiVapChannel
+  - name: unifi_vap_channel
     oid: 1.3.6.1.4.1.41112.1.6.1.2.1.4
     type: gauge
     help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.4'
     indexes:
-    - labelname: unifiVapEssId
+    - labelname: unifi_vap_essid
       type: gauge
-  - name: unifiVapEssId
+  - name: unifi_vap_essid
     oid: 1.3.6.1.4.1.41112.1.6.1.2.1.6
     type: DisplayString
     help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.6'
-  - name: unifiVapNumStations
+  - name: unifi_vap_num_stations
     oid: 1.3.6.1.4.1.41112.1.6.1.2.1.8
     type: gauge
     help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.8'
     indexes:
-    - labelname: unifiVapEssId
+    - labelname: unifi_vap_essid
       type: gauge
-  - name: unifiVapRadio
+  - name: unifi_vap_radio
     oid: 1.3.6.1.4.1.41112.1.6.1.2.1.9
     type: DisplayString
     help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.9'
     indexes:
-    - labelname: unifiVapEssId
+    - labelname: unifi_vap_essid
       type: gauge
-  - name: unifiVapRxBytes
+  - name: unifi_vap_rx_bytes
     oid: 1.3.6.1.4.1.41112.1.6.1.2.1.10
     type: counter
     help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.10'
     indexes:
-    - labelname: unifiVapEssId
+    - labelname: unifi_vap_essid
       type: gauge
-  - name: unifiVapRxCrypts
+  - name: unifi_vap_rx_crypts
     oid: 1.3.6.1.4.1.41112.1.6.1.2.1.11
     type: counter
     help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.11'
     indexes:
-    - labelname: unifiVapEssId
+    - labelname: unifi_vap_essid
       type: gauge
-  - name: unifiVapRxDropped
+  - name: unifi_vap_rx_dropped
     oid: 1.3.6.1.4.1.41112.1.6.1.2.1.12
     type: counter
     help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.12'
     indexes:
-    - labelname: unifiVapEssId
+    - labelname: unifi_vap_essid
       type: gauge
-  - name: unifiVapRxErrors
+  - name: unifi_vap_rx_errors
     oid: 1.3.6.1.4.1.41112.1.6.1.2.1.13
     type: counter
     help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.13'
     indexes:
-    - labelname: unifiVapEssId
+    - labelname: unifi_vap_essid
       type: gauge
-  - name: unifiVapRxFrags
+  - name: unifi_vap_rx_frags
     oid: 1.3.6.1.4.1.41112.1.6.1.2.1.14
     type: counter
     help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.14'
     indexes:
-    - labelname: unifiVapEssId
+    - labelname: unifi_vap_essid
       type: gauge
-  - name: unifiVapRxPackets
+  - name: unifi_vap_rx_packets
     oid: 1.3.6.1.4.1.41112.1.6.1.2.1.15
     type: counter
     help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.15'
     indexes:
-    - labelname: unifiVapEssId
+    - labelname: unifi_vap_essid
       type: gauge
-  - name: unifiVapTxBytes
+  - name: unifi_vap_tx_bytes
     oid: 1.3.6.1.4.1.41112.1.6.1.2.1.16
     type: counter
     help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.16'
     indexes:
-    - labelname: unifiVapEssId
+    - labelname: unifi_vap_essid
       type: gauge
-  - name: unifiVapTxDropped
+  - name: unifi_vap_tx_dropped
     oid: 1.3.6.1.4.1.41112.1.6.1.2.1.17
     type: counter
     help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.17'
     indexes:
-    - labelname: unifiVapEssId
+    - labelname: unifi_vap_essid
       type: gauge
-  - name: unifiVapTxErrors
+  - name: unifi_vap_tx_errors
     oid: 1.3.6.1.4.1.41112.1.6.1.2.1.18
     type: counter
     help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.18'
     indexes:
-    - labelname: unifiVapEssId
+    - labelname: unifi_vap_essid
       type: gauge
-  - name: unifiVapTxPackets
+  - name: unifi_vap_tx_packets
     oid: 1.3.6.1.4.1.41112.1.6.1.2.1.19
     type: counter
     help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.19'
     indexes:
-    - labelname: unifiVapEssId
+    - labelname: unifi_vap_essid
       type: gauge
-  - name: unifiVapTxRetries
+  - name: unifi_vap_tx_retries
     oid: 1.3.6.1.4.1.41112.1.6.1.2.1.20
     type: counter
     help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.20'
     indexes:
-    - labelname: unifiVapEssId
+    - labelname: unifi_vap_essid
       type: gauge
-  - name: unifiVapTxPower
+  - name: unifi_vap_tx_power
     oid: 1.3.6.1.4.1.41112.1.6.1.2.1.21
     type: gauge
     help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.21'
     indexes:
-    - labelname: unifiVapEssId
+    - labelname: unifi_vap_essid
       type: gauge
-  - name: unifiVapUp
+  - name: unifi_vap_up
     oid: 1.3.6.1.4.1.41112.1.6.1.2.1.22
     type: gauge
     help: ' - 1.3.6.1.4.1.41112.1.6.1.2.1.22'
     indexes:
-    - labelname: unifiVapEssId
+    - labelname: unifi_vap_essid
       type: gauge
-  - name: unifiVapUsage
+  - name: unifi_vap_usage
     oid: 1.3.6.1.4.1.41112.1.6.1.2.1.23
     type: DisplayString
     help: guest or regular user - 1.3.6.1.4.1.41112.1.6.1.2.1.23
     indexes:
-    - labelname: unifiVapEssId
+    - labelname: unifi_vap_essid
       type: gauge
-  - name: unifiIfIndex
+  - name: unifi_if_index
     oid: 1.3.6.1.4.1.41112.1.6.2.1.1.1
     type: gauge
     help: ' - 1.3.6.1.4.1.41112.1.6.2.1.1.1'
     indexes:
-    - labelname: unifiIfIndex
+    - labelname: unifi_if_index
       type: gauge
-  - name: unifiIfName
+  - name: unifi_if_name
     oid: 1.3.6.1.4.1.41112.1.6.2.1.1.5
     type: DisplayString
     help: ' - 1.3.6.1.4.1.41112.1.6.2.1.1.5'
     indexes:
-    - labelname: unifiIfIndex
+    - labelname: unifi_if_index
       type: gauge
-  - name: unifiIfRxBytes
+  - name: unifi_if_rx_bytes
     oid: 1.3.6.1.4.1.41112.1.6.2.1.1.6
     type: counter
     help: ' - 1.3.6.1.4.1.41112.1.6.2.1.1.6'
     indexes:
-    - labelname: unifiIfIndex
+    - labelname: unifi_if_index
       type: gauge
-  - name: unifiIfRxDropped
+  - name: unifi_if_rx_dropped
     oid: 1.3.6.1.4.1.41112.1.6.2.1.1.7
     type: counter
     help: ' - 1.3.6.1.4.1.41112.1.6.2.1.1.7'
     indexes:
-    - labelname: unifiIfIndex
+    - labelname: unifi_if_index
       type: gauge
-  - name: unifiIfRxError
+  - name: unifi_if_rx_error
     oid: 1.3.6.1.4.1.41112.1.6.2.1.1.8
     type: counter
     help: ' - 1.3.6.1.4.1.41112.1.6.2.1.1.8'
     indexes:
-    - labelname: unifiIfIndex
+    - labelname: unifi_if_index
       type: gauge
-  - name: unifiIfRxMulticast
+  - name: unifi_if_rx_multicast
     oid: 1.3.6.1.4.1.41112.1.6.2.1.1.9
     type: counter
     help: ' - 1.3.6.1.4.1.41112.1.6.2.1.1.9'
     indexes:
-    - labelname: unifiIfIndex
+    - labelname: unifi_if_index
       type: gauge
-  - name: unifiIfRxPackets
+  - name: unifi_if_rx_packets
     oid: 1.3.6.1.4.1.41112.1.6.2.1.1.10
     type: counter
     help: ' - 1.3.6.1.4.1.41112.1.6.2.1.1.10'
     indexes:
-    - labelname: unifiIfIndex
+    - labelname: unifi_if_index
       type: gauge
-  - name: unifiIfTxBytes
+  - name: unifi_if_tx_bytes
     oid: 1.3.6.1.4.1.41112.1.6.2.1.1.12
     type: counter
     help: ' - 1.3.6.1.4.1.41112.1.6.2.1.1.12'
     indexes:
-    - labelname: unifiIfIndex
+    - labelname: unifi_if_index
       type: gauge
-  - name: unifiIfTxDropped
+  - name: unifi_if_tx_dropped
     oid: 1.3.6.1.4.1.41112.1.6.2.1.1.13
     type: counter
     help: ' - 1.3.6.1.4.1.41112.1.6.2.1.1.13'
     indexes:
-    - labelname: unifiIfIndex
+    - labelname: unifi_if_index
       type: gauge
-  - name: unifiIfTxError
+  - name: unifi_if_tx_error
     oid: 1.3.6.1.4.1.41112.1.6.2.1.1.14
     type: counter
     help: ' - 1.3.6.1.4.1.41112.1.6.2.1.1.14'
     indexes:
-    - labelname: unifiIfIndex
+    - labelname: unifi_if_index
       type: gauge
-  - name: unifiIfTxPackets
+  - name: unifi_if_tx_packets
     oid: 1.3.6.1.4.1.41112.1.6.2.1.1.15
     type: counter
     help: ' - 1.3.6.1.4.1.41112.1.6.2.1.1.15'
     indexes:
-    - labelname: unifiIfIndex
+    - labelname: unifi_if_index
       type: gauge
-  - name: unifiApSystemModel
+  - name: unifi_ap_system_model
     oid: 1.3.6.1.4.1.41112.1.6.3.3
     type: DisplayString
     help: ' - 1.3.6.1.4.1.41112.1.6.3.3'
-  - name: unifiApSystemUptime
+  - name: unifi_ap_system_uptime
     oid: 1.3.6.1.4.1.41112.1.6.3.5
     type: counter
     help: ' - 1.3.6.1.4.1.41112.1.6.3.5'