From c8e576897a0ace91a967f12695e1987b70169c56 Mon Sep 17 00:00:00 2001
From: Henrique Silva <henrique.silva@ess.eu>
Date: Mon, 11 Mar 2024 16:51:48 +0100
Subject: [PATCH] ICSHWI-17910: Replace aliased PVs with original

---
 files/DTL-010_SC-IOC-110.archive    | 4 ++--
 files/DTL-020_SC-IOC-110.archive    | 4 ++--
 files/DTL-030_SC-IOC-110.archive    | 4 ++--
 files/DTL-040_SC-IOC-110.archive    | 4 ++--
 files/DTL-050_SC-IOC-110.archive    | 4 ++--
 files/MBL-010RFC_SC-IOC-110.archive | 4 ++--
 files/MBL-010RFC_SC-IOC-210.archive | 4 ++--
 files/MBL-010RFC_SC-IOC-310.archive | 4 ++--
 files/MBL-010RFC_SC-IOC-410.archive | 4 ++--
 files/MBL-020RFC_SC-IOC-110.archive | 4 ++--
 files/MBL-020RFC_SC-IOC-210.archive | 4 ++--
 files/MBL-020RFC_SC-IOC-310.archive | 4 ++--
 files/MBL-020RFC_SC-IOC-410.archive | 4 ++--
 files/MBL-030RFC_SC-IOC-110.archive | 4 ++--
 files/MBL-030RFC_SC-IOC-210.archive | 4 ++--
 files/MBL-030RFC_SC-IOC-310.archive | 4 ++--
 files/MBL-030RFC_SC-IOC-410.archive | 4 ++--
 files/MBL-040RFC_SC-IOC-110.archive | 4 ++--
 files/MBL-040RFC_SC-IOC-210.archive | 4 ++--
 files/MBL-040RFC_SC-IOC-310.archive | 4 ++--
 files/MBL-040RFC_SC-IOC-410.archive | 4 ++--
 files/MBL-050RFC_SC-IOC-110.archive | 4 ++--
 files/MBL-050RFC_SC-IOC-210.archive | 4 ++--
 files/MBL-050RFC_SC-IOC-310.archive | 4 ++--
 files/MBL-050RFC_SC-IOC-410.archive | 4 ++--
 files/MBL-060RFC_SC-IOC-110.archive | 4 ++--
 files/MBL-060RFC_SC-IOC-210.archive | 4 ++--
 files/MBL-060RFC_SC-IOC-310.archive | 4 ++--
 files/MBL-060RFC_SC-IOC-410.archive | 4 ++--
 files/MBL-070RFC_SC-IOC-110.archive | 4 ++--
 files/MBL-070RFC_SC-IOC-210.archive | 4 ++--
 files/MBL-070RFC_SC-IOC-310.archive | 4 ++--
 files/MBL-070RFC_SC-IOC-410.archive | 4 ++--
 files/MBL-080RFC_SC-IOC-110.archive | 4 ++--
 files/MBL-080RFC_SC-IOC-210.archive | 4 ++--
 files/MBL-080RFC_SC-IOC-310.archive | 4 ++--
 files/MBL-080RFC_SC-IOC-410.archive | 4 ++--
 files/MBL-090RFC_SC-IOC-110.archive | 4 ++--
 files/MBL-090RFC_SC-IOC-210.archive | 4 ++--
 files/MBL-090RFC_SC-IOC-310.archive | 4 ++--
 files/MBL-090RFC_SC-IOC-410.archive | 4 ++--
 files/MEBT-010_SC-IOC-110.archive   | 4 ++--
 files/MEBT-010_SC-IOC-210.archive   | 4 ++--
 files/MEBT-010_SC-IOC-310.archive   | 4 ++--
 files/RFQ-010_SC-IOC-110.archive    | 4 ++--
 files/Spk-010RFC_SC-IOC-110.archive | 4 ++--
 files/Spk-010RFC_SC-IOC-210.archive | 4 ++--
 files/Spk-020RFC_SC-IOC-110.archive | 4 ++--
 files/Spk-020RFC_SC-IOC-210.archive | 4 ++--
 files/Spk-030RFC_SC-IOC-110.archive | 4 ++--
 files/Spk-030RFC_SC-IOC-210.archive | 4 ++--
 files/Spk-040RFC_SC-IOC-110.archive | 4 ++--
 files/Spk-040RFC_SC-IOC-210.archive | 4 ++--
 files/Spk-050RFC_SC-IOC-110.archive | 4 ++--
 files/Spk-050RFC_SC-IOC-210.archive | 4 ++--
 files/Spk-060RFC_SC-IOC-110.archive | 4 ++--
 files/Spk-060RFC_SC-IOC-210.archive | 4 ++--
 files/Spk-070RFC_SC-IOC-110.archive | 4 ++--
 files/Spk-070RFC_SC-IOC-210.archive | 4 ++--
 files/Spk-080RFC_SC-IOC-110.archive | 4 ++--
 files/Spk-080RFC_SC-IOC-210.archive | 4 ++--
 files/Spk-090RFC_SC-IOC-110.archive | 4 ++--
 files/Spk-090RFC_SC-IOC-210.archive | 4 ++--
 files/Spk-100RFC_SC-IOC-110.archive | 4 ++--
 files/Spk-100RFC_SC-IOC-210.archive | 4 ++--
 files/Spk-110RFC_SC-IOC-110.archive | 4 ++--
 files/Spk-110RFC_SC-IOC-210.archive | 4 ++--
 files/Spk-120RFC_SC-IOC-110.archive | 4 ++--
 files/Spk-120RFC_SC-IOC-210.archive | 4 ++--
 files/Spk-130RFC_SC-IOC-110.archive | 4 ++--
 files/Spk-130RFC_SC-IOC-210.archive | 4 ++--
 71 files changed, 142 insertions(+), 142 deletions(-)

diff --git a/files/DTL-010_SC-IOC-110.archive b/files/DTL-010_SC-IOC-110.archive
index e4001b8..d1286fb 100644
--- a/files/DTL-010_SC-IOC-110.archive
+++ b/files/DTL-010_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 DTL-010:RFS-PIND-110:SwitchStatus
 DTL-010:RFS-PIND-110:Temp-Value_RBV
 DTL-010:RFS-PIND-110:VMon-CurrMonitor
-DTL-010:RFS-PIND-110:VMon-AnaVol
-DTL-010:RFS-PIND-110:VMon-5vDigVol
+DTL-010:RFS-PIND-110:VMon-ValueV5_RBV
+DTL-010:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/DTL-020_SC-IOC-110.archive b/files/DTL-020_SC-IOC-110.archive
index b80552a..4c1f745 100644
--- a/files/DTL-020_SC-IOC-110.archive
+++ b/files/DTL-020_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 DTL-020:RFS-PIND-110:SwitchStatus
 DTL-020:RFS-PIND-110:Temp-Value_RBV
 DTL-020:RFS-PIND-110:VMon-CurrMonitor
-DTL-020:RFS-PIND-110:VMon-AnaVol
-DTL-020:RFS-PIND-110:VMon-5vDigVol
+DTL-020:RFS-PIND-110:VMon-ValueV5_RBV
+DTL-020:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/DTL-030_SC-IOC-110.archive b/files/DTL-030_SC-IOC-110.archive
index c3afea4..8105715 100644
--- a/files/DTL-030_SC-IOC-110.archive
+++ b/files/DTL-030_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 DTL-030:RFS-PIND-110:SwitchStatus
 DTL-030:RFS-PIND-110:Temp-Value_RBV
 DTL-030:RFS-PIND-110:VMon-CurrMonitor
-DTL-030:RFS-PIND-110:VMon-AnaVol
-DTL-030:RFS-PIND-110:VMon-5vDigVol
+DTL-030:RFS-PIND-110:VMon-ValueV5_RBV
+DTL-030:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/DTL-040_SC-IOC-110.archive b/files/DTL-040_SC-IOC-110.archive
index 2ea5868..d8ff8c0 100644
--- a/files/DTL-040_SC-IOC-110.archive
+++ b/files/DTL-040_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 DTL-040:RFS-PIND-110:SwitchStatus
 DTL-040:RFS-PIND-110:Temp-Value_RBV
 DTL-040:RFS-PIND-110:VMon-CurrMonitor
-DTL-040:RFS-PIND-110:VMon-AnaVol
-DTL-040:RFS-PIND-110:VMon-5vDigVol
+DTL-040:RFS-PIND-110:VMon-ValueV5_RBV
+DTL-040:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/DTL-050_SC-IOC-110.archive b/files/DTL-050_SC-IOC-110.archive
index e50ea99..b199743 100644
--- a/files/DTL-050_SC-IOC-110.archive
+++ b/files/DTL-050_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 DTL-050:RFS-PIND-110:SwitchStatus
 DTL-050:RFS-PIND-110:Temp-Value_RBV
 DTL-050:RFS-PIND-110:VMon-CurrMonitor
-DTL-050:RFS-PIND-110:VMon-AnaVol
-DTL-050:RFS-PIND-110:VMon-5vDigVol
+DTL-050:RFS-PIND-110:VMon-ValueV5_RBV
+DTL-050:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/MBL-010RFC_SC-IOC-110.archive b/files/MBL-010RFC_SC-IOC-110.archive
index a0a2d53..8608752 100644
--- a/files/MBL-010RFC_SC-IOC-110.archive
+++ b/files/MBL-010RFC_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 MBL-010RFC:RFS-PIND-110:SwitchStatus
 MBL-010RFC:RFS-PIND-110:Temp-Value_RBV
 MBL-010RFC:RFS-PIND-110:VMon-CurrMonitor
-MBL-010RFC:RFS-PIND-110:VMon-AnaVol
-MBL-010RFC:RFS-PIND-110:VMon-5vDigVol
+MBL-010RFC:RFS-PIND-110:VMon-ValueV5_RBV
+MBL-010RFC:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/MBL-010RFC_SC-IOC-210.archive b/files/MBL-010RFC_SC-IOC-210.archive
index f372a95..8f57929 100644
--- a/files/MBL-010RFC_SC-IOC-210.archive
+++ b/files/MBL-010RFC_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 MBL-010RFC:RFS-PIND-210:SwitchStatus
 MBL-010RFC:RFS-PIND-210:Temp-Value_RBV
 MBL-010RFC:RFS-PIND-210:VMon-CurrMonitor
-MBL-010RFC:RFS-PIND-210:VMon-AnaVol
-MBL-010RFC:RFS-PIND-210:VMon-5vDigVol
+MBL-010RFC:RFS-PIND-210:VMon-ValueV5_RBV
+MBL-010RFC:RFS-PIND-210:VMon-ValueV6_RBV
diff --git a/files/MBL-010RFC_SC-IOC-310.archive b/files/MBL-010RFC_SC-IOC-310.archive
index 64ecd03..b42240b 100644
--- a/files/MBL-010RFC_SC-IOC-310.archive
+++ b/files/MBL-010RFC_SC-IOC-310.archive
@@ -1,5 +1,5 @@
 MBL-010RFC:RFS-PIND-310:SwitchStatus
 MBL-010RFC:RFS-PIND-310:Temp-Value_RBV
 MBL-010RFC:RFS-PIND-310:VMon-CurrMonitor
-MBL-010RFC:RFS-PIND-310:VMon-AnaVol
-MBL-010RFC:RFS-PIND-310:VMon-5vDigVol
+MBL-010RFC:RFS-PIND-310:VMon-ValueV5_RBV
+MBL-010RFC:RFS-PIND-310:VMon-ValueV6_RBV
diff --git a/files/MBL-010RFC_SC-IOC-410.archive b/files/MBL-010RFC_SC-IOC-410.archive
index 70fa149..02efeb1 100644
--- a/files/MBL-010RFC_SC-IOC-410.archive
+++ b/files/MBL-010RFC_SC-IOC-410.archive
@@ -1,5 +1,5 @@
 MBL-010RFC:RFS-PIND-410:SwitchStatus
 MBL-010RFC:RFS-PIND-410:Temp-Value_RBV
 MBL-010RFC:RFS-PIND-410:VMon-CurrMonitor
-MBL-010RFC:RFS-PIND-410:VMon-AnaVol
-MBL-010RFC:RFS-PIND-410:VMon-5vDigVol
+MBL-010RFC:RFS-PIND-410:VMon-ValueV5_RBV
+MBL-010RFC:RFS-PIND-410:VMon-ValueV6_RBV
diff --git a/files/MBL-020RFC_SC-IOC-110.archive b/files/MBL-020RFC_SC-IOC-110.archive
index 0ce3122..c281b55 100644
--- a/files/MBL-020RFC_SC-IOC-110.archive
+++ b/files/MBL-020RFC_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 MBL-020RFC:RFS-PIND-110:SwitchStatus
 MBL-020RFC:RFS-PIND-110:Temp-Value_RBV
 MBL-020RFC:RFS-PIND-110:VMon-CurrMonitor
-MBL-020RFC:RFS-PIND-110:VMon-AnaVol
-MBL-020RFC:RFS-PIND-110:VMon-5vDigVol
+MBL-020RFC:RFS-PIND-110:VMon-ValueV5_RBV
+MBL-020RFC:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/MBL-020RFC_SC-IOC-210.archive b/files/MBL-020RFC_SC-IOC-210.archive
index daa1b53..7427a97 100644
--- a/files/MBL-020RFC_SC-IOC-210.archive
+++ b/files/MBL-020RFC_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 MBL-020RFC:RFS-PIND-210:SwitchStatus
 MBL-020RFC:RFS-PIND-210:Temp-Value_RBV
 MBL-020RFC:RFS-PIND-210:VMon-CurrMonitor
-MBL-020RFC:RFS-PIND-210:VMon-AnaVol
-MBL-020RFC:RFS-PIND-210:VMon-5vDigVol
+MBL-020RFC:RFS-PIND-210:VMon-ValueV5_RBV
+MBL-020RFC:RFS-PIND-210:VMon-ValueV6_RBV
diff --git a/files/MBL-020RFC_SC-IOC-310.archive b/files/MBL-020RFC_SC-IOC-310.archive
index ff5a00d..1bee65a 100644
--- a/files/MBL-020RFC_SC-IOC-310.archive
+++ b/files/MBL-020RFC_SC-IOC-310.archive
@@ -1,5 +1,5 @@
 MBL-020RFC:RFS-PIND-310:SwitchStatus
 MBL-020RFC:RFS-PIND-310:Temp-Value_RBV
 MBL-020RFC:RFS-PIND-310:VMon-CurrMonitor
-MBL-020RFC:RFS-PIND-310:VMon-AnaVol
-MBL-020RFC:RFS-PIND-310:VMon-5vDigVol
+MBL-020RFC:RFS-PIND-310:VMon-ValueV5_RBV
+MBL-020RFC:RFS-PIND-310:VMon-ValueV6_RBV
diff --git a/files/MBL-020RFC_SC-IOC-410.archive b/files/MBL-020RFC_SC-IOC-410.archive
index 66f45c4..c1109c2 100644
--- a/files/MBL-020RFC_SC-IOC-410.archive
+++ b/files/MBL-020RFC_SC-IOC-410.archive
@@ -1,5 +1,5 @@
 MBL-020RFC:RFS-PIND-410:SwitchStatus
 MBL-020RFC:RFS-PIND-410:Temp-Value_RBV
 MBL-020RFC:RFS-PIND-410:VMon-CurrMonitor
-MBL-020RFC:RFS-PIND-410:VMon-AnaVol
-MBL-020RFC:RFS-PIND-410:VMon-5vDigVol
+MBL-020RFC:RFS-PIND-410:VMon-ValueV5_RBV
+MBL-020RFC:RFS-PIND-410:VMon-ValueV6_RBV
diff --git a/files/MBL-030RFC_SC-IOC-110.archive b/files/MBL-030RFC_SC-IOC-110.archive
index fdb3c17..3480b3b 100644
--- a/files/MBL-030RFC_SC-IOC-110.archive
+++ b/files/MBL-030RFC_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 MBL-030RFC:RFS-PIND-110:SwitchStatus
 MBL-030RFC:RFS-PIND-110:Temp-Value_RBV
 MBL-030RFC:RFS-PIND-110:VMon-CurrMonitor
-MBL-030RFC:RFS-PIND-110:VMon-AnaVol
-MBL-030RFC:RFS-PIND-110:VMon-5vDigVol
+MBL-030RFC:RFS-PIND-110:VMon-ValueV5_RBV
+MBL-030RFC:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/MBL-030RFC_SC-IOC-210.archive b/files/MBL-030RFC_SC-IOC-210.archive
index 78dc505..5154295 100644
--- a/files/MBL-030RFC_SC-IOC-210.archive
+++ b/files/MBL-030RFC_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 MBL-030RFC:RFS-PIND-210:SwitchStatus
 MBL-030RFC:RFS-PIND-210:Temp-Value_RBV
 MBL-030RFC:RFS-PIND-210:VMon-CurrMonitor
-MBL-030RFC:RFS-PIND-210:VMon-AnaVol
-MBL-030RFC:RFS-PIND-210:VMon-5vDigVol
+MBL-030RFC:RFS-PIND-210:VMon-ValueV5_RBV
+MBL-030RFC:RFS-PIND-210:VMon-ValueV6_RBV
diff --git a/files/MBL-030RFC_SC-IOC-310.archive b/files/MBL-030RFC_SC-IOC-310.archive
index b32b670..00f1fac 100644
--- a/files/MBL-030RFC_SC-IOC-310.archive
+++ b/files/MBL-030RFC_SC-IOC-310.archive
@@ -1,5 +1,5 @@
 MBL-030RFC:RFS-PIND-310:SwitchStatus
 MBL-030RFC:RFS-PIND-310:Temp-Value_RBV
 MBL-030RFC:RFS-PIND-310:VMon-CurrMonitor
-MBL-030RFC:RFS-PIND-310:VMon-AnaVol
-MBL-030RFC:RFS-PIND-310:VMon-5vDigVol
+MBL-030RFC:RFS-PIND-310:VMon-ValueV5_RBV
+MBL-030RFC:RFS-PIND-310:VMon-ValueV6_RBV
diff --git a/files/MBL-030RFC_SC-IOC-410.archive b/files/MBL-030RFC_SC-IOC-410.archive
index cb4c3e6..b0207bc 100644
--- a/files/MBL-030RFC_SC-IOC-410.archive
+++ b/files/MBL-030RFC_SC-IOC-410.archive
@@ -1,5 +1,5 @@
 MBL-030RFC:RFS-PIND-410:SwitchStatus
 MBL-030RFC:RFS-PIND-410:Temp-Value_RBV
 MBL-030RFC:RFS-PIND-410:VMon-CurrMonitor
-MBL-030RFC:RFS-PIND-410:VMon-AnaVol
-MBL-030RFC:RFS-PIND-410:VMon-5vDigVol
+MBL-030RFC:RFS-PIND-410:VMon-ValueV5_RBV
+MBL-030RFC:RFS-PIND-410:VMon-ValueV6_RBV
diff --git a/files/MBL-040RFC_SC-IOC-110.archive b/files/MBL-040RFC_SC-IOC-110.archive
index 94ca57c..35987fa 100644
--- a/files/MBL-040RFC_SC-IOC-110.archive
+++ b/files/MBL-040RFC_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 MBL-040RFC:RFS-PIND-110:SwitchStatus
 MBL-040RFC:RFS-PIND-110:Temp-Value_RBV
 MBL-040RFC:RFS-PIND-110:VMon-CurrMonitor
-MBL-040RFC:RFS-PIND-110:VMon-AnaVol
-MBL-040RFC:RFS-PIND-110:VMon-5vDigVol
+MBL-040RFC:RFS-PIND-110:VMon-ValueV5_RBV
+MBL-040RFC:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/MBL-040RFC_SC-IOC-210.archive b/files/MBL-040RFC_SC-IOC-210.archive
index d0acb53..2e17458 100644
--- a/files/MBL-040RFC_SC-IOC-210.archive
+++ b/files/MBL-040RFC_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 MBL-040RFC:RFS-PIND-210:SwitchStatus
 MBL-040RFC:RFS-PIND-210:Temp-Value_RBV
 MBL-040RFC:RFS-PIND-210:VMon-CurrMonitor
-MBL-040RFC:RFS-PIND-210:VMon-AnaVol
-MBL-040RFC:RFS-PIND-210:VMon-5vDigVol
+MBL-040RFC:RFS-PIND-210:VMon-ValueV5_RBV
+MBL-040RFC:RFS-PIND-210:VMon-ValueV6_RBV
diff --git a/files/MBL-040RFC_SC-IOC-310.archive b/files/MBL-040RFC_SC-IOC-310.archive
index f2501bf..4e82013 100644
--- a/files/MBL-040RFC_SC-IOC-310.archive
+++ b/files/MBL-040RFC_SC-IOC-310.archive
@@ -1,5 +1,5 @@
 MBL-040RFC:RFS-PIND-310:SwitchStatus
 MBL-040RFC:RFS-PIND-310:Temp-Value_RBV
 MBL-040RFC:RFS-PIND-310:VMon-CurrMonitor
-MBL-040RFC:RFS-PIND-310:VMon-AnaVol
-MBL-040RFC:RFS-PIND-310:VMon-5vDigVol
+MBL-040RFC:RFS-PIND-310:VMon-ValueV5_RBV
+MBL-040RFC:RFS-PIND-310:VMon-ValueV6_RBV
diff --git a/files/MBL-040RFC_SC-IOC-410.archive b/files/MBL-040RFC_SC-IOC-410.archive
index 6f788d7..fafa8a6 100644
--- a/files/MBL-040RFC_SC-IOC-410.archive
+++ b/files/MBL-040RFC_SC-IOC-410.archive
@@ -1,5 +1,5 @@
 MBL-040RFC:RFS-PIND-410:SwitchStatus
 MBL-040RFC:RFS-PIND-410:Temp-Value_RBV
 MBL-040RFC:RFS-PIND-410:VMon-CurrMonitor
-MBL-040RFC:RFS-PIND-410:VMon-AnaVol
-MBL-040RFC:RFS-PIND-410:VMon-5vDigVol
+MBL-040RFC:RFS-PIND-410:VMon-ValueV5_RBV
+MBL-040RFC:RFS-PIND-410:VMon-ValueV6_RBV
diff --git a/files/MBL-050RFC_SC-IOC-110.archive b/files/MBL-050RFC_SC-IOC-110.archive
index 18bfb93..816c61c 100644
--- a/files/MBL-050RFC_SC-IOC-110.archive
+++ b/files/MBL-050RFC_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 MBL-050RFC:RFS-PIND-110:SwitchStatus
 MBL-050RFC:RFS-PIND-110:Temp-Value_RBV
 MBL-050RFC:RFS-PIND-110:VMon-CurrMonitor
-MBL-050RFC:RFS-PIND-110:VMon-AnaVol
-MBL-050RFC:RFS-PIND-110:VMon-5vDigVol
+MBL-050RFC:RFS-PIND-110:VMon-ValueV5_RBV
+MBL-050RFC:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/MBL-050RFC_SC-IOC-210.archive b/files/MBL-050RFC_SC-IOC-210.archive
index 3d8d1cf..643d74b 100644
--- a/files/MBL-050RFC_SC-IOC-210.archive
+++ b/files/MBL-050RFC_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 MBL-050RFC:RFS-PIND-210:SwitchStatus
 MBL-050RFC:RFS-PIND-210:Temp-Value_RBV
 MBL-050RFC:RFS-PIND-210:VMon-CurrMonitor
-MBL-050RFC:RFS-PIND-210:VMon-AnaVol
-MBL-050RFC:RFS-PIND-210:VMon-5vDigVol
+MBL-050RFC:RFS-PIND-210:VMon-ValueV5_RBV
+MBL-050RFC:RFS-PIND-210:VMon-ValueV6_RBV
diff --git a/files/MBL-050RFC_SC-IOC-310.archive b/files/MBL-050RFC_SC-IOC-310.archive
index 781c789..4eba657 100644
--- a/files/MBL-050RFC_SC-IOC-310.archive
+++ b/files/MBL-050RFC_SC-IOC-310.archive
@@ -1,5 +1,5 @@
 MBL-050RFC:RFS-PIND-310:SwitchStatus
 MBL-050RFC:RFS-PIND-310:Temp-Value_RBV
 MBL-050RFC:RFS-PIND-310:VMon-CurrMonitor
-MBL-050RFC:RFS-PIND-310:VMon-AnaVol
-MBL-050RFC:RFS-PIND-310:VMon-5vDigVol
+MBL-050RFC:RFS-PIND-310:VMon-ValueV5_RBV
+MBL-050RFC:RFS-PIND-310:VMon-ValueV6_RBV
diff --git a/files/MBL-050RFC_SC-IOC-410.archive b/files/MBL-050RFC_SC-IOC-410.archive
index 98b52ed..c5eb5b6 100644
--- a/files/MBL-050RFC_SC-IOC-410.archive
+++ b/files/MBL-050RFC_SC-IOC-410.archive
@@ -1,5 +1,5 @@
 MBL-050RFC:RFS-PIND-410:SwitchStatus
 MBL-050RFC:RFS-PIND-410:Temp-Value_RBV
 MBL-050RFC:RFS-PIND-410:VMon-CurrMonitor
-MBL-050RFC:RFS-PIND-410:VMon-AnaVol
-MBL-050RFC:RFS-PIND-410:VMon-5vDigVol
+MBL-050RFC:RFS-PIND-410:VMon-ValueV5_RBV
+MBL-050RFC:RFS-PIND-410:VMon-ValueV6_RBV
diff --git a/files/MBL-060RFC_SC-IOC-110.archive b/files/MBL-060RFC_SC-IOC-110.archive
index f451e73..889d6cc 100644
--- a/files/MBL-060RFC_SC-IOC-110.archive
+++ b/files/MBL-060RFC_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 MBL-060RFC:RFS-PIND-110:SwitchStatus
 MBL-060RFC:RFS-PIND-110:Temp-Value_RBV
 MBL-060RFC:RFS-PIND-110:VMon-CurrMonitor
-MBL-060RFC:RFS-PIND-110:VMon-AnaVol
-MBL-060RFC:RFS-PIND-110:VMon-5vDigVol
+MBL-060RFC:RFS-PIND-110:VMon-ValueV5_RBV
+MBL-060RFC:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/MBL-060RFC_SC-IOC-210.archive b/files/MBL-060RFC_SC-IOC-210.archive
index a6fd8d0..eb2c63c 100644
--- a/files/MBL-060RFC_SC-IOC-210.archive
+++ b/files/MBL-060RFC_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 MBL-060RFC:RFS-PIND-210:SwitchStatus
 MBL-060RFC:RFS-PIND-210:Temp-Value_RBV
 MBL-060RFC:RFS-PIND-210:VMon-CurrMonitor
-MBL-060RFC:RFS-PIND-210:VMon-AnaVol
-MBL-060RFC:RFS-PIND-210:VMon-5vDigVol
+MBL-060RFC:RFS-PIND-210:VMon-ValueV5_RBV
+MBL-060RFC:RFS-PIND-210:VMon-ValueV6_RBV
diff --git a/files/MBL-060RFC_SC-IOC-310.archive b/files/MBL-060RFC_SC-IOC-310.archive
index 56154c5..484afe8 100644
--- a/files/MBL-060RFC_SC-IOC-310.archive
+++ b/files/MBL-060RFC_SC-IOC-310.archive
@@ -1,5 +1,5 @@
 MBL-060RFC:RFS-PIND-310:SwitchStatus
 MBL-060RFC:RFS-PIND-310:Temp-Value_RBV
 MBL-060RFC:RFS-PIND-310:VMon-CurrMonitor
-MBL-060RFC:RFS-PIND-310:VMon-AnaVol
-MBL-060RFC:RFS-PIND-310:VMon-5vDigVol
+MBL-060RFC:RFS-PIND-310:VMon-ValueV5_RBV
+MBL-060RFC:RFS-PIND-310:VMon-ValueV6_RBV
diff --git a/files/MBL-060RFC_SC-IOC-410.archive b/files/MBL-060RFC_SC-IOC-410.archive
index a432657..9d4cc7d 100644
--- a/files/MBL-060RFC_SC-IOC-410.archive
+++ b/files/MBL-060RFC_SC-IOC-410.archive
@@ -1,5 +1,5 @@
 MBL-060RFC:RFS-PIND-410:SwitchStatus
 MBL-060RFC:RFS-PIND-410:Temp-Value_RBV
 MBL-060RFC:RFS-PIND-410:VMon-CurrMonitor
-MBL-060RFC:RFS-PIND-410:VMon-AnaVol
-MBL-060RFC:RFS-PIND-410:VMon-5vDigVol
+MBL-060RFC:RFS-PIND-410:VMon-ValueV5_RBV
+MBL-060RFC:RFS-PIND-410:VMon-ValueV6_RBV
diff --git a/files/MBL-070RFC_SC-IOC-110.archive b/files/MBL-070RFC_SC-IOC-110.archive
index 313c3be..ada3c5a 100644
--- a/files/MBL-070RFC_SC-IOC-110.archive
+++ b/files/MBL-070RFC_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 MBL-070RFC:RFS-PIND-110:SwitchStatus
 MBL-070RFC:RFS-PIND-110:Temp-Value_RBV
 MBL-070RFC:RFS-PIND-110:VMon-CurrMonitor
-MBL-070RFC:RFS-PIND-110:VMon-AnaVol
-MBL-070RFC:RFS-PIND-110:VMon-5vDigVol
+MBL-070RFC:RFS-PIND-110:VMon-ValueV5_RBV
+MBL-070RFC:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/MBL-070RFC_SC-IOC-210.archive b/files/MBL-070RFC_SC-IOC-210.archive
index 1de33dc..33a1abd 100644
--- a/files/MBL-070RFC_SC-IOC-210.archive
+++ b/files/MBL-070RFC_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 MBL-070RFC:RFS-PIND-210:SwitchStatus
 MBL-070RFC:RFS-PIND-210:Temp-Value_RBV
 MBL-070RFC:RFS-PIND-210:VMon-CurrMonitor
-MBL-070RFC:RFS-PIND-210:VMon-AnaVol
-MBL-070RFC:RFS-PIND-210:VMon-5vDigVol
+MBL-070RFC:RFS-PIND-210:VMon-ValueV5_RBV
+MBL-070RFC:RFS-PIND-210:VMon-ValueV6_RBV
diff --git a/files/MBL-070RFC_SC-IOC-310.archive b/files/MBL-070RFC_SC-IOC-310.archive
index 0f76a7f..3b3cc28 100644
--- a/files/MBL-070RFC_SC-IOC-310.archive
+++ b/files/MBL-070RFC_SC-IOC-310.archive
@@ -1,5 +1,5 @@
 MBL-070RFC:RFS-PIND-310:SwitchStatus
 MBL-070RFC:RFS-PIND-310:Temp-Value_RBV
 MBL-070RFC:RFS-PIND-310:VMon-CurrMonitor
-MBL-070RFC:RFS-PIND-310:VMon-AnaVol
-MBL-070RFC:RFS-PIND-310:VMon-5vDigVol
+MBL-070RFC:RFS-PIND-310:VMon-ValueV5_RBV
+MBL-070RFC:RFS-PIND-310:VMon-ValueV6_RBV
diff --git a/files/MBL-070RFC_SC-IOC-410.archive b/files/MBL-070RFC_SC-IOC-410.archive
index 57da33b..579ccfc 100644
--- a/files/MBL-070RFC_SC-IOC-410.archive
+++ b/files/MBL-070RFC_SC-IOC-410.archive
@@ -1,5 +1,5 @@
 MBL-070RFC:RFS-PIND-410:SwitchStatus
 MBL-070RFC:RFS-PIND-410:Temp-Value_RBV
 MBL-070RFC:RFS-PIND-410:VMon-CurrMonitor
-MBL-070RFC:RFS-PIND-410:VMon-AnaVol
-MBL-070RFC:RFS-PIND-410:VMon-5vDigVol
+MBL-070RFC:RFS-PIND-410:VMon-ValueV5_RBV
+MBL-070RFC:RFS-PIND-410:VMon-ValueV6_RBV
diff --git a/files/MBL-080RFC_SC-IOC-110.archive b/files/MBL-080RFC_SC-IOC-110.archive
index 8247466..73c5f5a 100644
--- a/files/MBL-080RFC_SC-IOC-110.archive
+++ b/files/MBL-080RFC_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 MBL-080RFC:RFS-PIND-110:SwitchStatus
 MBL-080RFC:RFS-PIND-110:Temp-Value_RBV
 MBL-080RFC:RFS-PIND-110:VMon-CurrMonitor
-MBL-080RFC:RFS-PIND-110:VMon-AnaVol
-MBL-080RFC:RFS-PIND-110:VMon-5vDigVol
+MBL-080RFC:RFS-PIND-110:VMon-ValueV5_RBV
+MBL-080RFC:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/MBL-080RFC_SC-IOC-210.archive b/files/MBL-080RFC_SC-IOC-210.archive
index 291061e..73d4e11 100644
--- a/files/MBL-080RFC_SC-IOC-210.archive
+++ b/files/MBL-080RFC_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 MBL-080RFC:RFS-PIND-210:SwitchStatus
 MBL-080RFC:RFS-PIND-210:Temp-Value_RBV
 MBL-080RFC:RFS-PIND-210:VMon-CurrMonitor
-MBL-080RFC:RFS-PIND-210:VMon-AnaVol
-MBL-080RFC:RFS-PIND-210:VMon-5vDigVol
+MBL-080RFC:RFS-PIND-210:VMon-ValueV5_RBV
+MBL-080RFC:RFS-PIND-210:VMon-ValueV6_RBV
diff --git a/files/MBL-080RFC_SC-IOC-310.archive b/files/MBL-080RFC_SC-IOC-310.archive
index 6742fb0..9418790 100644
--- a/files/MBL-080RFC_SC-IOC-310.archive
+++ b/files/MBL-080RFC_SC-IOC-310.archive
@@ -1,5 +1,5 @@
 MBL-080RFC:RFS-PIND-310:SwitchStatus
 MBL-080RFC:RFS-PIND-310:Temp-Value_RBV
 MBL-080RFC:RFS-PIND-310:VMon-CurrMonitor
-MBL-080RFC:RFS-PIND-310:VMon-AnaVol
-MBL-080RFC:RFS-PIND-310:VMon-5vDigVol
+MBL-080RFC:RFS-PIND-310:VMon-ValueV5_RBV
+MBL-080RFC:RFS-PIND-310:VMon-ValueV6_RBV
diff --git a/files/MBL-080RFC_SC-IOC-410.archive b/files/MBL-080RFC_SC-IOC-410.archive
index 3830ee9..e4cfdd6 100644
--- a/files/MBL-080RFC_SC-IOC-410.archive
+++ b/files/MBL-080RFC_SC-IOC-410.archive
@@ -1,5 +1,5 @@
 MBL-080RFC:RFS-PIND-410:SwitchStatus
 MBL-080RFC:RFS-PIND-410:Temp-Value_RBV
 MBL-080RFC:RFS-PIND-410:VMon-CurrMonitor
-MBL-080RFC:RFS-PIND-410:VMon-AnaVol
-MBL-080RFC:RFS-PIND-410:VMon-5vDigVol
+MBL-080RFC:RFS-PIND-410:VMon-ValueV5_RBV
+MBL-080RFC:RFS-PIND-410:VMon-ValueV6_RBV
diff --git a/files/MBL-090RFC_SC-IOC-110.archive b/files/MBL-090RFC_SC-IOC-110.archive
index 7a7f4bf..7ffcc51 100644
--- a/files/MBL-090RFC_SC-IOC-110.archive
+++ b/files/MBL-090RFC_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 MBL-090RFC:RFS-PIND-110:SwitchStatus
 MBL-090RFC:RFS-PIND-110:Temp-Value_RBV
 MBL-090RFC:RFS-PIND-110:VMon-CurrMonitor
-MBL-090RFC:RFS-PIND-110:VMon-AnaVol
-MBL-090RFC:RFS-PIND-110:VMon-5vDigVol
+MBL-090RFC:RFS-PIND-110:VMon-ValueV5_RBV
+MBL-090RFC:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/MBL-090RFC_SC-IOC-210.archive b/files/MBL-090RFC_SC-IOC-210.archive
index 868f404..e7f6f1f 100644
--- a/files/MBL-090RFC_SC-IOC-210.archive
+++ b/files/MBL-090RFC_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 MBL-090RFC:RFS-PIND-210:SwitchStatus
 MBL-090RFC:RFS-PIND-210:Temp-Value_RBV
 MBL-090RFC:RFS-PIND-210:VMon-CurrMonitor
-MBL-090RFC:RFS-PIND-210:VMon-AnaVol
-MBL-090RFC:RFS-PIND-210:VMon-5vDigVol
+MBL-090RFC:RFS-PIND-210:VMon-ValueV5_RBV
+MBL-090RFC:RFS-PIND-210:VMon-ValueV6_RBV
diff --git a/files/MBL-090RFC_SC-IOC-310.archive b/files/MBL-090RFC_SC-IOC-310.archive
index 378f97e..4595f61 100644
--- a/files/MBL-090RFC_SC-IOC-310.archive
+++ b/files/MBL-090RFC_SC-IOC-310.archive
@@ -1,5 +1,5 @@
 MBL-090RFC:RFS-PIND-310:SwitchStatus
 MBL-090RFC:RFS-PIND-310:Temp-Value_RBV
 MBL-090RFC:RFS-PIND-310:VMon-CurrMonitor
-MBL-090RFC:RFS-PIND-310:VMon-AnaVol
-MBL-090RFC:RFS-PIND-310:VMon-5vDigVol
+MBL-090RFC:RFS-PIND-310:VMon-ValueV5_RBV
+MBL-090RFC:RFS-PIND-310:VMon-ValueV6_RBV
diff --git a/files/MBL-090RFC_SC-IOC-410.archive b/files/MBL-090RFC_SC-IOC-410.archive
index 12b86b0..0d6abce 100644
--- a/files/MBL-090RFC_SC-IOC-410.archive
+++ b/files/MBL-090RFC_SC-IOC-410.archive
@@ -1,5 +1,5 @@
 MBL-090RFC:RFS-PIND-410:SwitchStatus
 MBL-090RFC:RFS-PIND-410:Temp-Value_RBV
 MBL-090RFC:RFS-PIND-410:VMon-CurrMonitor
-MBL-090RFC:RFS-PIND-410:VMon-AnaVol
-MBL-090RFC:RFS-PIND-410:VMon-5vDigVol
+MBL-090RFC:RFS-PIND-410:VMon-ValueV5_RBV
+MBL-090RFC:RFS-PIND-410:VMon-ValueV6_RBV
diff --git a/files/MEBT-010_SC-IOC-110.archive b/files/MEBT-010_SC-IOC-110.archive
index ad25000..41e2ee2 100644
--- a/files/MEBT-010_SC-IOC-110.archive
+++ b/files/MEBT-010_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 MEBT-010:RFS-PIND-110:SwitchStatus
 MEBT-010:RFS-PIND-110:Temp-Value_RBV
 MEBT-010:RFS-PIND-110:VMon-CurrMonitor
-MEBT-010:RFS-PIND-110:VMon-AnaVol
-MEBT-010:RFS-PIND-110:VMon-5vDigVol
+MEBT-010:RFS-PIND-110:VMon-ValueV5_RBV
+MEBT-010:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/MEBT-010_SC-IOC-210.archive b/files/MEBT-010_SC-IOC-210.archive
index 0c71e72..3d645ad 100644
--- a/files/MEBT-010_SC-IOC-210.archive
+++ b/files/MEBT-010_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 MEBT-010:RFS-PIND-210:SwitchStatus
 MEBT-010:RFS-PIND-210:Temp-Value_RBV
 MEBT-010:RFS-PIND-210:VMon-CurrMonitor
-MEBT-010:RFS-PIND-210:VMon-AnaVol
-MEBT-010:RFS-PIND-210:VMon-5vDigVol
+MEBT-010:RFS-PIND-210:VMon-ValueV5_RBV
+MEBT-010:RFS-PIND-210:VMon-ValueV6_RBV
diff --git a/files/MEBT-010_SC-IOC-310.archive b/files/MEBT-010_SC-IOC-310.archive
index cf05ea8..0eb19ec 100644
--- a/files/MEBT-010_SC-IOC-310.archive
+++ b/files/MEBT-010_SC-IOC-310.archive
@@ -1,5 +1,5 @@
 MEBT-010:RFS-PIND-310:SwitchStatus
 MEBT-010:RFS-PIND-310:Temp-Value_RBV
 MEBT-010:RFS-PIND-310:VMon-CurrMonitor
-MEBT-010:RFS-PIND-310:VMon-AnaVol
-MEBT-010:RFS-PIND-310:VMon-5vDigVol
+MEBT-010:RFS-PIND-310:VMon-ValueV5_RBV
+MEBT-010:RFS-PIND-310:VMon-ValueV6_RBV
diff --git a/files/RFQ-010_SC-IOC-110.archive b/files/RFQ-010_SC-IOC-110.archive
index c664f4e..30c155e 100644
--- a/files/RFQ-010_SC-IOC-110.archive
+++ b/files/RFQ-010_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 RFQ-010:RFS-PIND-110:SwitchStatus
 RFQ-010:RFS-PIND-110:Temp-Value_RBV
 RFQ-010:RFS-PIND-110:VMon-CurrMonitor
-RFQ-010:RFS-PIND-110:VMon-AnaVol
-RFQ-010:RFS-PIND-110:VMon-5vDigVol
+RFQ-010:RFS-PIND-110:VMon-ValueV5_RBV
+RFQ-010:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/Spk-010RFC_SC-IOC-110.archive b/files/Spk-010RFC_SC-IOC-110.archive
index 1bd3d62..6ad1660 100644
--- a/files/Spk-010RFC_SC-IOC-110.archive
+++ b/files/Spk-010RFC_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 Spk-010RFC:RFS-PIND-110:SwitchStatus
 Spk-010RFC:RFS-PIND-110:Temp-Value_RBV
 Spk-010RFC:RFS-PIND-110:VMon-CurrMonitor
-Spk-010RFC:RFS-PIND-110:VMon-AnaVol
-Spk-010RFC:RFS-PIND-110:VMon-5vDigVol
+Spk-010RFC:RFS-PIND-110:VMon-ValueV5_RBV
+Spk-010RFC:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/Spk-010RFC_SC-IOC-210.archive b/files/Spk-010RFC_SC-IOC-210.archive
index 132e9fa..88a70f5 100644
--- a/files/Spk-010RFC_SC-IOC-210.archive
+++ b/files/Spk-010RFC_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 Spk-010RFC:RFS-PIND-210:SwitchStatus
 Spk-010RFC:RFS-PIND-210:Temp-Value_RBV
 Spk-010RFC:RFS-PIND-210:VMon-CurrMonitor
-Spk-010RFC:RFS-PIND-210:VMon-AnaVol
-Spk-010RFC:RFS-PIND-210:VMon-5vDigVol
+Spk-010RFC:RFS-PIND-210:VMon-ValueV5_RBV
+Spk-010RFC:RFS-PIND-210:VMon-ValueV6_RBV
diff --git a/files/Spk-020RFC_SC-IOC-110.archive b/files/Spk-020RFC_SC-IOC-110.archive
index 33fb382..370be49 100644
--- a/files/Spk-020RFC_SC-IOC-110.archive
+++ b/files/Spk-020RFC_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 Spk-020RFC:RFS-PIND-110:SwitchStatus
 Spk-020RFC:RFS-PIND-110:Temp-Value_RBV
 Spk-020RFC:RFS-PIND-110:VMon-CurrMonitor
-Spk-020RFC:RFS-PIND-110:VMon-AnaVol
-Spk-020RFC:RFS-PIND-110:VMon-5vDigVol
+Spk-020RFC:RFS-PIND-110:VMon-ValueV5_RBV
+Spk-020RFC:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/Spk-020RFC_SC-IOC-210.archive b/files/Spk-020RFC_SC-IOC-210.archive
index add3a71..fb11819 100644
--- a/files/Spk-020RFC_SC-IOC-210.archive
+++ b/files/Spk-020RFC_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 Spk-020RFC:RFS-PIND-210:SwitchStatus
 Spk-020RFC:RFS-PIND-210:Temp-Value_RBV
 Spk-020RFC:RFS-PIND-210:VMon-CurrMonitor
-Spk-020RFC:RFS-PIND-210:VMon-AnaVol
-Spk-020RFC:RFS-PIND-210:VMon-5vDigVol
+Spk-020RFC:RFS-PIND-210:VMon-ValueV5_RBV
+Spk-020RFC:RFS-PIND-210:VMon-ValueV6_RBV
diff --git a/files/Spk-030RFC_SC-IOC-110.archive b/files/Spk-030RFC_SC-IOC-110.archive
index 2a8889d..f4e4a33 100644
--- a/files/Spk-030RFC_SC-IOC-110.archive
+++ b/files/Spk-030RFC_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 Spk-030RFC:RFS-PIND-110:SwitchStatus
 Spk-030RFC:RFS-PIND-110:Temp-Value_RBV
 Spk-030RFC:RFS-PIND-110:VMon-CurrMonitor
-Spk-030RFC:RFS-PIND-110:VMon-AnaVol
-Spk-030RFC:RFS-PIND-110:VMon-5vDigVol
+Spk-030RFC:RFS-PIND-110:VMon-ValueV5_RBV
+Spk-030RFC:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/Spk-030RFC_SC-IOC-210.archive b/files/Spk-030RFC_SC-IOC-210.archive
index c0afdb4..42e3220 100644
--- a/files/Spk-030RFC_SC-IOC-210.archive
+++ b/files/Spk-030RFC_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 Spk-030RFC:RFS-PIND-210:SwitchStatus
 Spk-030RFC:RFS-PIND-210:Temp-Value_RBV
 Spk-030RFC:RFS-PIND-210:VMon-CurrMonitor
-Spk-030RFC:RFS-PIND-210:VMon-AnaVol
-Spk-030RFC:RFS-PIND-210:VMon-5vDigVol
+Spk-030RFC:RFS-PIND-210:VMon-ValueV5_RBV
+Spk-030RFC:RFS-PIND-210:VMon-ValueV6_RBV
diff --git a/files/Spk-040RFC_SC-IOC-110.archive b/files/Spk-040RFC_SC-IOC-110.archive
index 8c2c74f..afe9fb5 100644
--- a/files/Spk-040RFC_SC-IOC-110.archive
+++ b/files/Spk-040RFC_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 Spk-040RFC:RFS-PIND-110:SwitchStatus
 Spk-040RFC:RFS-PIND-110:Temp-Value_RBV
 Spk-040RFC:RFS-PIND-110:VMon-CurrMonitor
-Spk-040RFC:RFS-PIND-110:VMon-AnaVol
-Spk-040RFC:RFS-PIND-110:VMon-5vDigVol
+Spk-040RFC:RFS-PIND-110:VMon-ValueV5_RBV
+Spk-040RFC:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/Spk-040RFC_SC-IOC-210.archive b/files/Spk-040RFC_SC-IOC-210.archive
index 9df788d..4d8bc91 100644
--- a/files/Spk-040RFC_SC-IOC-210.archive
+++ b/files/Spk-040RFC_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 Spk-040RFC:RFS-PIND-210:SwitchStatus
 Spk-040RFC:RFS-PIND-210:Temp-Value_RBV
 Spk-040RFC:RFS-PIND-210:VMon-CurrMonitor
-Spk-040RFC:RFS-PIND-210:VMon-AnaVol
-Spk-040RFC:RFS-PIND-210:VMon-5vDigVol
+Spk-040RFC:RFS-PIND-210:VMon-ValueV5_RBV
+Spk-040RFC:RFS-PIND-210:VMon-ValueV6_RBV
diff --git a/files/Spk-050RFC_SC-IOC-110.archive b/files/Spk-050RFC_SC-IOC-110.archive
index 18c5b69..0589fdb 100644
--- a/files/Spk-050RFC_SC-IOC-110.archive
+++ b/files/Spk-050RFC_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 Spk-050RFC:RFS-PIND-110:SwitchStatus
 Spk-050RFC:RFS-PIND-110:Temp-Value_RBV
 Spk-050RFC:RFS-PIND-110:VMon-CurrMonitor
-Spk-050RFC:RFS-PIND-110:VMon-AnaVol
-Spk-050RFC:RFS-PIND-110:VMon-5vDigVol
+Spk-050RFC:RFS-PIND-110:VMon-ValueV5_RBV
+Spk-050RFC:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/Spk-050RFC_SC-IOC-210.archive b/files/Spk-050RFC_SC-IOC-210.archive
index af19ebc..82a5b1e 100644
--- a/files/Spk-050RFC_SC-IOC-210.archive
+++ b/files/Spk-050RFC_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 Spk-050RFC:RFS-PIND-210:SwitchStatus
 Spk-050RFC:RFS-PIND-210:Temp-Value_RBV
 Spk-050RFC:RFS-PIND-210:VMon-CurrMonitor
-Spk-050RFC:RFS-PIND-210:VMon-AnaVol
-Spk-050RFC:RFS-PIND-210:VMon-5vDigVol
+Spk-050RFC:RFS-PIND-210:VMon-ValueV5_RBV
+Spk-050RFC:RFS-PIND-210:VMon-ValueV6_RBV
diff --git a/files/Spk-060RFC_SC-IOC-110.archive b/files/Spk-060RFC_SC-IOC-110.archive
index 4804fd3..93951be 100644
--- a/files/Spk-060RFC_SC-IOC-110.archive
+++ b/files/Spk-060RFC_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 Spk-060RFC:RFS-PIND-110:SwitchStatus
 Spk-060RFC:RFS-PIND-110:Temp-Value_RBV
 Spk-060RFC:RFS-PIND-110:VMon-CurrMonitor
-Spk-060RFC:RFS-PIND-110:VMon-AnaVol
-Spk-060RFC:RFS-PIND-110:VMon-5vDigVol
+Spk-060RFC:RFS-PIND-110:VMon-ValueV5_RBV
+Spk-060RFC:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/Spk-060RFC_SC-IOC-210.archive b/files/Spk-060RFC_SC-IOC-210.archive
index 663b255..500bedb 100644
--- a/files/Spk-060RFC_SC-IOC-210.archive
+++ b/files/Spk-060RFC_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 Spk-060RFC:RFS-PIND-210:SwitchStatus
 Spk-060RFC:RFS-PIND-210:Temp-Value_RBV
 Spk-060RFC:RFS-PIND-210:VMon-CurrMonitor
-Spk-060RFC:RFS-PIND-210:VMon-AnaVol
-Spk-060RFC:RFS-PIND-210:VMon-5vDigVol
+Spk-060RFC:RFS-PIND-210:VMon-ValueV5_RBV
+Spk-060RFC:RFS-PIND-210:VMon-ValueV6_RBV
diff --git a/files/Spk-070RFC_SC-IOC-110.archive b/files/Spk-070RFC_SC-IOC-110.archive
index eb9cc94..d4522bb 100644
--- a/files/Spk-070RFC_SC-IOC-110.archive
+++ b/files/Spk-070RFC_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 Spk-070RFC:RFS-PIND-110:SwitchStatus
 Spk-070RFC:RFS-PIND-110:Temp-Value_RBV
 Spk-070RFC:RFS-PIND-110:VMon-CurrMonitor
-Spk-070RFC:RFS-PIND-110:VMon-AnaVol
-Spk-070RFC:RFS-PIND-110:VMon-5vDigVol
+Spk-070RFC:RFS-PIND-110:VMon-ValueV5_RBV
+Spk-070RFC:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/Spk-070RFC_SC-IOC-210.archive b/files/Spk-070RFC_SC-IOC-210.archive
index b4b39cc..949a24b 100644
--- a/files/Spk-070RFC_SC-IOC-210.archive
+++ b/files/Spk-070RFC_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 Spk-070RFC:RFS-PIND-210:SwitchStatus
 Spk-070RFC:RFS-PIND-210:Temp-Value_RBV
 Spk-070RFC:RFS-PIND-210:VMon-CurrMonitor
-Spk-070RFC:RFS-PIND-210:VMon-AnaVol
-Spk-070RFC:RFS-PIND-210:VMon-5vDigVol
+Spk-070RFC:RFS-PIND-210:VMon-ValueV5_RBV
+Spk-070RFC:RFS-PIND-210:VMon-ValueV6_RBV
diff --git a/files/Spk-080RFC_SC-IOC-110.archive b/files/Spk-080RFC_SC-IOC-110.archive
index d3a2ebb..7b35e72 100644
--- a/files/Spk-080RFC_SC-IOC-110.archive
+++ b/files/Spk-080RFC_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 Spk-080RFC:RFS-PIND-110:SwitchStatus
 Spk-080RFC:RFS-PIND-110:Temp-Value_RBV
 Spk-080RFC:RFS-PIND-110:VMon-CurrMonitor
-Spk-080RFC:RFS-PIND-110:VMon-AnaVol
-Spk-080RFC:RFS-PIND-110:VMon-5vDigVol
+Spk-080RFC:RFS-PIND-110:VMon-ValueV5_RBV
+Spk-080RFC:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/Spk-080RFC_SC-IOC-210.archive b/files/Spk-080RFC_SC-IOC-210.archive
index c28a3c2..38ff618 100644
--- a/files/Spk-080RFC_SC-IOC-210.archive
+++ b/files/Spk-080RFC_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 Spk-080RFC:RFS-PIND-210:SwitchStatus
 Spk-080RFC:RFS-PIND-210:Temp-Value_RBV
 Spk-080RFC:RFS-PIND-210:VMon-CurrMonitor
-Spk-080RFC:RFS-PIND-210:VMon-AnaVol
-Spk-080RFC:RFS-PIND-210:VMon-5vDigVol
+Spk-080RFC:RFS-PIND-210:VMon-ValueV5_RBV
+Spk-080RFC:RFS-PIND-210:VMon-ValueV6_RBV
diff --git a/files/Spk-090RFC_SC-IOC-110.archive b/files/Spk-090RFC_SC-IOC-110.archive
index 7cf8a7a..3aac692 100644
--- a/files/Spk-090RFC_SC-IOC-110.archive
+++ b/files/Spk-090RFC_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 Spk-090RFC:RFS-PIND-110:SwitchStatus
 Spk-090RFC:RFS-PIND-110:Temp-Value_RBV
 Spk-090RFC:RFS-PIND-110:VMon-CurrMonitor
-Spk-090RFC:RFS-PIND-110:VMon-AnaVol
-Spk-090RFC:RFS-PIND-110:VMon-5vDigVol
+Spk-090RFC:RFS-PIND-110:VMon-ValueV5_RBV
+Spk-090RFC:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/Spk-090RFC_SC-IOC-210.archive b/files/Spk-090RFC_SC-IOC-210.archive
index 1e7dae2..0323624 100644
--- a/files/Spk-090RFC_SC-IOC-210.archive
+++ b/files/Spk-090RFC_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 Spk-090RFC:RFS-PIND-210:SwitchStatus
 Spk-090RFC:RFS-PIND-210:Temp-Value_RBV
 Spk-090RFC:RFS-PIND-210:VMon-CurrMonitor
-Spk-090RFC:RFS-PIND-210:VMon-AnaVol
-Spk-090RFC:RFS-PIND-210:VMon-5vDigVol
+Spk-090RFC:RFS-PIND-210:VMon-ValueV5_RBV
+Spk-090RFC:RFS-PIND-210:VMon-ValueV6_RBV
diff --git a/files/Spk-100RFC_SC-IOC-110.archive b/files/Spk-100RFC_SC-IOC-110.archive
index 7f6d98d..d2ffeb7 100644
--- a/files/Spk-100RFC_SC-IOC-110.archive
+++ b/files/Spk-100RFC_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 Spk-100RFC:RFS-PIND-110:SwitchStatus
 Spk-100RFC:RFS-PIND-110:Temp-Value_RBV
 Spk-100RFC:RFS-PIND-110:VMon-CurrMonitor
-Spk-100RFC:RFS-PIND-110:VMon-AnaVol
-Spk-100RFC:RFS-PIND-110:VMon-5vDigVol
+Spk-100RFC:RFS-PIND-110:VMon-ValueV5_RBV
+Spk-100RFC:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/Spk-100RFC_SC-IOC-210.archive b/files/Spk-100RFC_SC-IOC-210.archive
index 92117e8..ccbfca3 100644
--- a/files/Spk-100RFC_SC-IOC-210.archive
+++ b/files/Spk-100RFC_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 Spk-100RFC:RFS-PIND-210:SwitchStatus
 Spk-100RFC:RFS-PIND-210:Temp-Value_RBV
 Spk-100RFC:RFS-PIND-210:VMon-CurrMonitor
-Spk-100RFC:RFS-PIND-210:VMon-AnaVol
-Spk-100RFC:RFS-PIND-210:VMon-5vDigVol
+Spk-100RFC:RFS-PIND-210:VMon-ValueV5_RBV
+Spk-100RFC:RFS-PIND-210:VMon-ValueV6_RBV
diff --git a/files/Spk-110RFC_SC-IOC-110.archive b/files/Spk-110RFC_SC-IOC-110.archive
index d107b3e..7fa880d 100644
--- a/files/Spk-110RFC_SC-IOC-110.archive
+++ b/files/Spk-110RFC_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 Spk-110RFC:RFS-PIND-110:SwitchStatus
 Spk-110RFC:RFS-PIND-110:Temp-Value_RBV
 Spk-110RFC:RFS-PIND-110:VMon-CurrMonitor
-Spk-110RFC:RFS-PIND-110:VMon-AnaVol
-Spk-110RFC:RFS-PIND-110:VMon-5vDigVol
+Spk-110RFC:RFS-PIND-110:VMon-ValueV5_RBV
+Spk-110RFC:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/Spk-110RFC_SC-IOC-210.archive b/files/Spk-110RFC_SC-IOC-210.archive
index 84438d4..dbb8b9b 100644
--- a/files/Spk-110RFC_SC-IOC-210.archive
+++ b/files/Spk-110RFC_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 Spk-110RFC:RFS-PIND-210:SwitchStatus
 Spk-110RFC:RFS-PIND-210:Temp-Value_RBV
 Spk-110RFC:RFS-PIND-210:VMon-CurrMonitor
-Spk-110RFC:RFS-PIND-210:VMon-AnaVol
-Spk-110RFC:RFS-PIND-210:VMon-5vDigVol
+Spk-110RFC:RFS-PIND-210:VMon-ValueV5_RBV
+Spk-110RFC:RFS-PIND-210:VMon-ValueV6_RBV
diff --git a/files/Spk-120RFC_SC-IOC-110.archive b/files/Spk-120RFC_SC-IOC-110.archive
index d9de2a5..c9e32d5 100644
--- a/files/Spk-120RFC_SC-IOC-110.archive
+++ b/files/Spk-120RFC_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 Spk-120RFC:RFS-PIND-110:SwitchStatus
 Spk-120RFC:RFS-PIND-110:Temp-Value_RBV
 Spk-120RFC:RFS-PIND-110:VMon-CurrMonitor
-Spk-120RFC:RFS-PIND-110:VMon-AnaVol
-Spk-120RFC:RFS-PIND-110:VMon-5vDigVol
+Spk-120RFC:RFS-PIND-110:VMon-ValueV5_RBV
+Spk-120RFC:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/Spk-120RFC_SC-IOC-210.archive b/files/Spk-120RFC_SC-IOC-210.archive
index c6c940a..ed62a62 100644
--- a/files/Spk-120RFC_SC-IOC-210.archive
+++ b/files/Spk-120RFC_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 Spk-120RFC:RFS-PIND-210:SwitchStatus
 Spk-120RFC:RFS-PIND-210:Temp-Value_RBV
 Spk-120RFC:RFS-PIND-210:VMon-CurrMonitor
-Spk-120RFC:RFS-PIND-210:VMon-AnaVol
-Spk-120RFC:RFS-PIND-210:VMon-5vDigVol
+Spk-120RFC:RFS-PIND-210:VMon-ValueV5_RBV
+Spk-120RFC:RFS-PIND-210:VMon-ValueV6_RBV
diff --git a/files/Spk-130RFC_SC-IOC-110.archive b/files/Spk-130RFC_SC-IOC-110.archive
index e378712..d84949b 100644
--- a/files/Spk-130RFC_SC-IOC-110.archive
+++ b/files/Spk-130RFC_SC-IOC-110.archive
@@ -1,5 +1,5 @@
 Spk-130RFC:RFS-PIND-110:SwitchStatus
 Spk-130RFC:RFS-PIND-110:Temp-Value_RBV
 Spk-130RFC:RFS-PIND-110:VMon-CurrMonitor
-Spk-130RFC:RFS-PIND-110:VMon-AnaVol
-Spk-130RFC:RFS-PIND-110:VMon-5vDigVol
+Spk-130RFC:RFS-PIND-110:VMon-ValueV5_RBV
+Spk-130RFC:RFS-PIND-110:VMon-ValueV6_RBV
diff --git a/files/Spk-130RFC_SC-IOC-210.archive b/files/Spk-130RFC_SC-IOC-210.archive
index e423a53..18532d9 100644
--- a/files/Spk-130RFC_SC-IOC-210.archive
+++ b/files/Spk-130RFC_SC-IOC-210.archive
@@ -1,5 +1,5 @@
 Spk-130RFC:RFS-PIND-210:SwitchStatus
 Spk-130RFC:RFS-PIND-210:Temp-Value_RBV
 Spk-130RFC:RFS-PIND-210:VMon-CurrMonitor
-Spk-130RFC:RFS-PIND-210:VMon-AnaVol
-Spk-130RFC:RFS-PIND-210:VMon-5vDigVol
+Spk-130RFC:RFS-PIND-210:VMon-ValueV5_RBV
+Spk-130RFC:RFS-PIND-210:VMon-ValueV6_RBV
-- 
GitLab