diff --git a/files/DTL-010_SC-IOC-110.archive b/files/DTL-010_SC-IOC-110.archive
index 4b0053f96f7a654f83f235621ed8aaf71418e8c4..586626e352d089aba03a4e19009e315f9be2e5da 100644
--- a/files/DTL-010_SC-IOC-110.archive
+++ b/files/DTL-010_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+DTL-010:RFS-PIND-110:IOExp-DirPin0
+DTL-010:RFS-PIND-110:IOExp-DirPin1
+DTL-010:RFS-PIND-110:IOExp-LevelPin0_RBV
+DTL-010:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-DTL-010:RFS-PIND-110:VMon-FactorV5
-DTL-010:RFS-PIND-110:VMon-OffsetV6
-DTL-010:RFS-PIND-110:VMon-FactorV6
+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 c340517840111ab42b8acbabdb29ba0d49d5a70b..d74678d06716629ecd734400556abd28f3a9de6d 100644
--- a/files/DTL-020_SC-IOC-110.archive
+++ b/files/DTL-020_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+DTL-020:RFS-PIND-110:IOExp-DirPin0
+DTL-020:RFS-PIND-110:IOExp-DirPin1
+DTL-020:RFS-PIND-110:IOExp-LevelPin0_RBV
+DTL-020:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-DTL-020:RFS-PIND-110:VMon-FactorV5
-DTL-020:RFS-PIND-110:VMon-OffsetV6
-DTL-020:RFS-PIND-110:VMon-FactorV6
+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 4e4ee23c0efb10d445a7f02c31715dd971af3218..7dd64db263fa264d6a870da146efdc78236e7b79 100644
--- a/files/DTL-030_SC-IOC-110.archive
+++ b/files/DTL-030_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+DTL-030:RFS-PIND-110:IOExp-DirPin0
+DTL-030:RFS-PIND-110:IOExp-DirPin1
+DTL-030:RFS-PIND-110:IOExp-LevelPin0_RBV
+DTL-030:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-DTL-030:RFS-PIND-110:VMon-FactorV5
-DTL-030:RFS-PIND-110:VMon-OffsetV6
-DTL-030:RFS-PIND-110:VMon-FactorV6
+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 715a429a5f96f5dafd9753fb082d21b19b07716d..905462f868b2b4d84d4389cd68f24f45e63df5e2 100644
--- a/files/DTL-040_SC-IOC-110.archive
+++ b/files/DTL-040_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+DTL-040:RFS-PIND-110:IOExp-DirPin0
+DTL-040:RFS-PIND-110:IOExp-DirPin1
+DTL-040:RFS-PIND-110:IOExp-LevelPin0_RBV
+DTL-040:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-DTL-040:RFS-PIND-110:VMon-FactorV5
-DTL-040:RFS-PIND-110:VMon-OffsetV6
-DTL-040:RFS-PIND-110:VMon-FactorV6
+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 736cfcb82488821d9435de588296aba43e683687..075a28d76025ee754f0ecc98b375e0743671625b 100644
--- a/files/DTL-050_SC-IOC-110.archive
+++ b/files/DTL-050_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+DTL-050:RFS-PIND-110:IOExp-DirPin0
+DTL-050:RFS-PIND-110:IOExp-DirPin1
+DTL-050:RFS-PIND-110:IOExp-LevelPin0_RBV
+DTL-050:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-DTL-050:RFS-PIND-110:VMon-FactorV5
-DTL-050:RFS-PIND-110:VMon-OffsetV6
-DTL-050:RFS-PIND-110:VMon-FactorV6
+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 09d45d4f3794d6a541857f13ce8fb62de7768892..ff999916d1a283e9296eb048c0cd87999728f28e 100644
--- a/files/MBL-010RFC_SC-IOC-110.archive
+++ b/files/MBL-010RFC_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+MBL-010RFC:RFS-PIND-110:IOExp-DirPin0
+MBL-010RFC:RFS-PIND-110:IOExp-DirPin1
+MBL-010RFC:RFS-PIND-110:IOExp-LevelPin0_RBV
+MBL-010RFC:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-010RFC:RFS-PIND-110:VMon-FactorV5
-MBL-010RFC:RFS-PIND-110:VMon-OffsetV6
-MBL-010RFC:RFS-PIND-110:VMon-FactorV6
+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 f7b74d47f75b73a2c90e85e744d162af1b076523..e3ccf57451b14df72f623f245f5e3e4ab47cbbaf 100644
--- a/files/MBL-010RFC_SC-IOC-210.archive
+++ b/files/MBL-010RFC_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+MBL-010RFC:RFS-PIND-210:IOExp-DirPin0
+MBL-010RFC:RFS-PIND-210:IOExp-DirPin1
+MBL-010RFC:RFS-PIND-210:IOExp-LevelPin0_RBV
+MBL-010RFC:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-010RFC:RFS-PIND-210:VMon-FactorV5
-MBL-010RFC:RFS-PIND-210:VMon-OffsetV6
-MBL-010RFC:RFS-PIND-210:VMon-FactorV6
+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 ad039ddaf3b7ff1d7da8ad24dc12e77881ff3b88..0b09ad0340f8e2738c91d63949487fa73b059344 100644
--- a/files/MBL-010RFC_SC-IOC-310.archive
+++ b/files/MBL-010RFC_SC-IOC-310.archive
@@ -1,9 +1,9 @@
+MBL-010RFC:RFS-PIND-310:IOExp-DirPin0
+MBL-010RFC:RFS-PIND-310:IOExp-DirPin1
+MBL-010RFC:RFS-PIND-310:IOExp-LevelPin0_RBV
+MBL-010RFC:RFS-PIND-310:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-010RFC:RFS-PIND-310:VMon-FactorV5
-MBL-010RFC:RFS-PIND-310:VMon-OffsetV6
-MBL-010RFC:RFS-PIND-310:VMon-FactorV6
+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 8ae4ce3d4658c6aa1e3267d2d043e5f0e422fb98..0995095f50f6126af78b7de72dfa35c62b05a355 100644
--- a/files/MBL-010RFC_SC-IOC-410.archive
+++ b/files/MBL-010RFC_SC-IOC-410.archive
@@ -1,9 +1,9 @@
+MBL-010RFC:RFS-PIND-410:IOExp-DirPin0
+MBL-010RFC:RFS-PIND-410:IOExp-DirPin1
+MBL-010RFC:RFS-PIND-410:IOExp-LevelPin0_RBV
+MBL-010RFC:RFS-PIND-410:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-010RFC:RFS-PIND-410:VMon-FactorV5
-MBL-010RFC:RFS-PIND-410:VMon-OffsetV6
-MBL-010RFC:RFS-PIND-410:VMon-FactorV6
+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 d787d5b5564231edf948d600c802661e74938db8..a88d80f6122377c08b6768e6b9ca9eb4bace0cf0 100644
--- a/files/MBL-020RFC_SC-IOC-110.archive
+++ b/files/MBL-020RFC_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+MBL-020RFC:RFS-PIND-110:IOExp-DirPin0
+MBL-020RFC:RFS-PIND-110:IOExp-DirPin1
+MBL-020RFC:RFS-PIND-110:IOExp-LevelPin0_RBV
+MBL-020RFC:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-020RFC:RFS-PIND-110:VMon-FactorV5
-MBL-020RFC:RFS-PIND-110:VMon-OffsetV6
-MBL-020RFC:RFS-PIND-110:VMon-FactorV6
+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 046e3b70f1c9780c0071c05587be51aceace5973..58f1b00e05bd1aaa23663cac0e1161ed941bd4c0 100644
--- a/files/MBL-020RFC_SC-IOC-210.archive
+++ b/files/MBL-020RFC_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+MBL-020RFC:RFS-PIND-210:IOExp-DirPin0
+MBL-020RFC:RFS-PIND-210:IOExp-DirPin1
+MBL-020RFC:RFS-PIND-210:IOExp-LevelPin0_RBV
+MBL-020RFC:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-020RFC:RFS-PIND-210:VMon-FactorV5
-MBL-020RFC:RFS-PIND-210:VMon-OffsetV6
-MBL-020RFC:RFS-PIND-210:VMon-FactorV6
+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 67f185cd4a80843bb09580970b5aa9cbe9f062fc..32f96668427eb14fe080853deb2c38070842011a 100644
--- a/files/MBL-020RFC_SC-IOC-310.archive
+++ b/files/MBL-020RFC_SC-IOC-310.archive
@@ -1,9 +1,9 @@
+MBL-020RFC:RFS-PIND-310:IOExp-DirPin0
+MBL-020RFC:RFS-PIND-310:IOExp-DirPin1
+MBL-020RFC:RFS-PIND-310:IOExp-LevelPin0_RBV
+MBL-020RFC:RFS-PIND-310:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-020RFC:RFS-PIND-310:VMon-FactorV5
-MBL-020RFC:RFS-PIND-310:VMon-OffsetV6
-MBL-020RFC:RFS-PIND-310:VMon-FactorV6
+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 a71129b2d96358f8bd0a1faf4f46da07ab8abc4c..3f8e56766c8f3a9e8e6457840eb1a7be4f21563e 100644
--- a/files/MBL-020RFC_SC-IOC-410.archive
+++ b/files/MBL-020RFC_SC-IOC-410.archive
@@ -1,9 +1,9 @@
+MBL-020RFC:RFS-PIND-410:IOExp-DirPin0
+MBL-020RFC:RFS-PIND-410:IOExp-DirPin1
+MBL-020RFC:RFS-PIND-410:IOExp-LevelPin0_RBV
+MBL-020RFC:RFS-PIND-410:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-020RFC:RFS-PIND-410:VMon-FactorV5
-MBL-020RFC:RFS-PIND-410:VMon-OffsetV6
-MBL-020RFC:RFS-PIND-410:VMon-FactorV6
+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 503db073068eea2c54290537773865c6452fff86..ff52e5ad119cc62e4070f71f89d9fe36b9e9224d 100644
--- a/files/MBL-030RFC_SC-IOC-110.archive
+++ b/files/MBL-030RFC_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+MBL-030RFC:RFS-PIND-110:IOExp-DirPin0
+MBL-030RFC:RFS-PIND-110:IOExp-DirPin1
+MBL-030RFC:RFS-PIND-110:IOExp-LevelPin0_RBV
+MBL-030RFC:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-030RFC:RFS-PIND-110:VMon-FactorV5
-MBL-030RFC:RFS-PIND-110:VMon-OffsetV6
-MBL-030RFC:RFS-PIND-110:VMon-FactorV6
+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 bec154a6f53c691f2539211fdee210c2f92b9e75..1ed710c9ee228482b79c776c6753fd623bfc19c6 100644
--- a/files/MBL-030RFC_SC-IOC-210.archive
+++ b/files/MBL-030RFC_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+MBL-030RFC:RFS-PIND-210:IOExp-DirPin0
+MBL-030RFC:RFS-PIND-210:IOExp-DirPin1
+MBL-030RFC:RFS-PIND-210:IOExp-LevelPin0_RBV
+MBL-030RFC:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-030RFC:RFS-PIND-210:VMon-FactorV5
-MBL-030RFC:RFS-PIND-210:VMon-OffsetV6
-MBL-030RFC:RFS-PIND-210:VMon-FactorV6
+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 2d552801233d998f22d86e6b8c2a78d21fbf52c9..6b4f4fd23cf4d0738e465972f4416fafe74b14e6 100644
--- a/files/MBL-030RFC_SC-IOC-310.archive
+++ b/files/MBL-030RFC_SC-IOC-310.archive
@@ -1,9 +1,9 @@
+MBL-030RFC:RFS-PIND-310:IOExp-DirPin0
+MBL-030RFC:RFS-PIND-310:IOExp-DirPin1
+MBL-030RFC:RFS-PIND-310:IOExp-LevelPin0_RBV
+MBL-030RFC:RFS-PIND-310:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-030RFC:RFS-PIND-310:VMon-FactorV5
-MBL-030RFC:RFS-PIND-310:VMon-OffsetV6
-MBL-030RFC:RFS-PIND-310:VMon-FactorV6
+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 1faf41f843ca5905d14d0881882a6417e3622222..a19e19f33f3886e763f24970e1e7f4b232eccdbd 100644
--- a/files/MBL-030RFC_SC-IOC-410.archive
+++ b/files/MBL-030RFC_SC-IOC-410.archive
@@ -1,9 +1,9 @@
+MBL-030RFC:RFS-PIND-410:IOExp-DirPin0
+MBL-030RFC:RFS-PIND-410:IOExp-DirPin1
+MBL-030RFC:RFS-PIND-410:IOExp-LevelPin0_RBV
+MBL-030RFC:RFS-PIND-410:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-030RFC:RFS-PIND-410:VMon-FactorV5
-MBL-030RFC:RFS-PIND-410:VMon-OffsetV6
-MBL-030RFC:RFS-PIND-410:VMon-FactorV6
+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 06128d6b996ce4e8f5b79ddc3400136b379881f8..e4f8aaf90762f03118233a71431a4156742ada94 100644
--- a/files/MBL-040RFC_SC-IOC-110.archive
+++ b/files/MBL-040RFC_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+MBL-040RFC:RFS-PIND-110:IOExp-DirPin0
+MBL-040RFC:RFS-PIND-110:IOExp-DirPin1
+MBL-040RFC:RFS-PIND-110:IOExp-LevelPin0_RBV
+MBL-040RFC:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-040RFC:RFS-PIND-110:VMon-FactorV5
-MBL-040RFC:RFS-PIND-110:VMon-OffsetV6
-MBL-040RFC:RFS-PIND-110:VMon-FactorV6
+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 516d8335d564a40537b1d6e5b6a64f92fbbf1326..14b965d83769b805476124b1a0e493f26ccd50a1 100644
--- a/files/MBL-040RFC_SC-IOC-210.archive
+++ b/files/MBL-040RFC_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+MBL-040RFC:RFS-PIND-210:IOExp-DirPin0
+MBL-040RFC:RFS-PIND-210:IOExp-DirPin1
+MBL-040RFC:RFS-PIND-210:IOExp-LevelPin0_RBV
+MBL-040RFC:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-040RFC:RFS-PIND-210:VMon-FactorV5
-MBL-040RFC:RFS-PIND-210:VMon-OffsetV6
-MBL-040RFC:RFS-PIND-210:VMon-FactorV6
+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 1a2ff03a9966dccf73c336c4f71497e574e2c4f5..7f696c94af702c28d08391c9b8e2c374bd20767b 100644
--- a/files/MBL-040RFC_SC-IOC-310.archive
+++ b/files/MBL-040RFC_SC-IOC-310.archive
@@ -1,9 +1,9 @@
+MBL-040RFC:RFS-PIND-310:IOExp-DirPin0
+MBL-040RFC:RFS-PIND-310:IOExp-DirPin1
+MBL-040RFC:RFS-PIND-310:IOExp-LevelPin0_RBV
+MBL-040RFC:RFS-PIND-310:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-040RFC:RFS-PIND-310:VMon-FactorV5
-MBL-040RFC:RFS-PIND-310:VMon-OffsetV6
-MBL-040RFC:RFS-PIND-310:VMon-FactorV6
+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 98e7081edd629f6201c988d02d843129d5aa31d0..bb5c6c45f22233ce663d3fb6b0a93a0d24d0b985 100644
--- a/files/MBL-040RFC_SC-IOC-410.archive
+++ b/files/MBL-040RFC_SC-IOC-410.archive
@@ -1,9 +1,9 @@
+MBL-040RFC:RFS-PIND-410:IOExp-DirPin0
+MBL-040RFC:RFS-PIND-410:IOExp-DirPin1
+MBL-040RFC:RFS-PIND-410:IOExp-LevelPin0_RBV
+MBL-040RFC:RFS-PIND-410:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-040RFC:RFS-PIND-410:VMon-FactorV5
-MBL-040RFC:RFS-PIND-410:VMon-OffsetV6
-MBL-040RFC:RFS-PIND-410:VMon-FactorV6
+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 7329d8764e45cb871b8677795531e996c216e354..839c6845dd14f7a840f76924dd96702514fbcdb7 100644
--- a/files/MBL-050RFC_SC-IOC-110.archive
+++ b/files/MBL-050RFC_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+MBL-050RFC:RFS-PIND-110:IOExp-DirPin0
+MBL-050RFC:RFS-PIND-110:IOExp-DirPin1
+MBL-050RFC:RFS-PIND-110:IOExp-LevelPin0_RBV
+MBL-050RFC:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-050RFC:RFS-PIND-110:VMon-FactorV5
-MBL-050RFC:RFS-PIND-110:VMon-OffsetV6
-MBL-050RFC:RFS-PIND-110:VMon-FactorV6
+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 84f5d60b8b8ad9dbc4eacd7cd7d4c3f6b37be087..734ffa1e2247f77eff63ee22bb539ce41ed38ade 100644
--- a/files/MBL-050RFC_SC-IOC-210.archive
+++ b/files/MBL-050RFC_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+MBL-050RFC:RFS-PIND-210:IOExp-DirPin0
+MBL-050RFC:RFS-PIND-210:IOExp-DirPin1
+MBL-050RFC:RFS-PIND-210:IOExp-LevelPin0_RBV
+MBL-050RFC:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-050RFC:RFS-PIND-210:VMon-FactorV5
-MBL-050RFC:RFS-PIND-210:VMon-OffsetV6
-MBL-050RFC:RFS-PIND-210:VMon-FactorV6
+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 127e5037a8e98917109ea52d3e8ddd0e359a5dc8..6121119f8cb5b9f6c3078c4ce15946c71947f5a2 100644
--- a/files/MBL-050RFC_SC-IOC-310.archive
+++ b/files/MBL-050RFC_SC-IOC-310.archive
@@ -1,9 +1,9 @@
+MBL-050RFC:RFS-PIND-310:IOExp-DirPin0
+MBL-050RFC:RFS-PIND-310:IOExp-DirPin1
+MBL-050RFC:RFS-PIND-310:IOExp-LevelPin0_RBV
+MBL-050RFC:RFS-PIND-310:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-050RFC:RFS-PIND-310:VMon-FactorV5
-MBL-050RFC:RFS-PIND-310:VMon-OffsetV6
-MBL-050RFC:RFS-PIND-310:VMon-FactorV6
+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 9b09b5ab169a4ff6bb0090c753b0a37449fd782c..24c23e86315ac60a198e60223667c5c08be36a1a 100644
--- a/files/MBL-050RFC_SC-IOC-410.archive
+++ b/files/MBL-050RFC_SC-IOC-410.archive
@@ -1,9 +1,9 @@
+MBL-050RFC:RFS-PIND-410:IOExp-DirPin0
+MBL-050RFC:RFS-PIND-410:IOExp-DirPin1
+MBL-050RFC:RFS-PIND-410:IOExp-LevelPin0_RBV
+MBL-050RFC:RFS-PIND-410:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-050RFC:RFS-PIND-410:VMon-FactorV5
-MBL-050RFC:RFS-PIND-410:VMon-OffsetV6
-MBL-050RFC:RFS-PIND-410:VMon-FactorV6
+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 b5a31a540bd94d575fd686e6c85dbc4923a09cf9..cb00fd895bd12b090e32d0313b4391a70abd03d1 100644
--- a/files/MBL-060RFC_SC-IOC-110.archive
+++ b/files/MBL-060RFC_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+MBL-060RFC:RFS-PIND-110:IOExp-DirPin0
+MBL-060RFC:RFS-PIND-110:IOExp-DirPin1
+MBL-060RFC:RFS-PIND-110:IOExp-LevelPin0_RBV
+MBL-060RFC:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-060RFC:RFS-PIND-110:VMon-FactorV5
-MBL-060RFC:RFS-PIND-110:VMon-OffsetV6
-MBL-060RFC:RFS-PIND-110:VMon-FactorV6
+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 4796712511d7cd525622216ceaccf8cc043ec8e2..31bef6709d4a5de29e138e57d01ec1932ec0362f 100644
--- a/files/MBL-060RFC_SC-IOC-210.archive
+++ b/files/MBL-060RFC_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+MBL-060RFC:RFS-PIND-210:IOExp-DirPin0
+MBL-060RFC:RFS-PIND-210:IOExp-DirPin1
+MBL-060RFC:RFS-PIND-210:IOExp-LevelPin0_RBV
+MBL-060RFC:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-060RFC:RFS-PIND-210:VMon-FactorV5
-MBL-060RFC:RFS-PIND-210:VMon-OffsetV6
-MBL-060RFC:RFS-PIND-210:VMon-FactorV6
+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 1a8836474a4e65cb74326344a25c8b40533cd322..d4ec69f08b6754596df6ddfdea735ef3ab14c004 100644
--- a/files/MBL-060RFC_SC-IOC-310.archive
+++ b/files/MBL-060RFC_SC-IOC-310.archive
@@ -1,9 +1,9 @@
+MBL-060RFC:RFS-PIND-310:IOExp-DirPin0
+MBL-060RFC:RFS-PIND-310:IOExp-DirPin1
+MBL-060RFC:RFS-PIND-310:IOExp-LevelPin0_RBV
+MBL-060RFC:RFS-PIND-310:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-060RFC:RFS-PIND-310:VMon-FactorV5
-MBL-060RFC:RFS-PIND-310:VMon-OffsetV6
-MBL-060RFC:RFS-PIND-310:VMon-FactorV6
+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 e93038f105238b807b7b9669d395dbccfddd04e3..bc134ba2e242569919029a90b4d39644f65be375 100644
--- a/files/MBL-060RFC_SC-IOC-410.archive
+++ b/files/MBL-060RFC_SC-IOC-410.archive
@@ -1,9 +1,9 @@
+MBL-060RFC:RFS-PIND-410:IOExp-DirPin0
+MBL-060RFC:RFS-PIND-410:IOExp-DirPin1
+MBL-060RFC:RFS-PIND-410:IOExp-LevelPin0_RBV
+MBL-060RFC:RFS-PIND-410:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-060RFC:RFS-PIND-410:VMon-FactorV5
-MBL-060RFC:RFS-PIND-410:VMon-OffsetV6
-MBL-060RFC:RFS-PIND-410:VMon-FactorV6
+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 6e142658a4a2d909c9c4a644874bc237253fb761..c88c66110859f71651da6c528cf0a3e91b78a796 100644
--- a/files/MBL-070RFC_SC-IOC-110.archive
+++ b/files/MBL-070RFC_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+MBL-070RFC:RFS-PIND-110:IOExp-DirPin0
+MBL-070RFC:RFS-PIND-110:IOExp-DirPin1
+MBL-070RFC:RFS-PIND-110:IOExp-LevelPin0_RBV
+MBL-070RFC:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-070RFC:RFS-PIND-110:VMon-FactorV5
-MBL-070RFC:RFS-PIND-110:VMon-OffsetV6
-MBL-070RFC:RFS-PIND-110:VMon-FactorV6
+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 32b86ac647b36c0412bd854e6a5a5a42e3b92f15..4954f424c3c4d85f52913a8db93e3a47273aba44 100644
--- a/files/MBL-070RFC_SC-IOC-210.archive
+++ b/files/MBL-070RFC_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+MBL-070RFC:RFS-PIND-210:IOExp-DirPin0
+MBL-070RFC:RFS-PIND-210:IOExp-DirPin1
+MBL-070RFC:RFS-PIND-210:IOExp-LevelPin0_RBV
+MBL-070RFC:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-070RFC:RFS-PIND-210:VMon-FactorV5
-MBL-070RFC:RFS-PIND-210:VMon-OffsetV6
-MBL-070RFC:RFS-PIND-210:VMon-FactorV6
+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 71f629141fc30caa37b4f9e617b3c06586f221ff..50a5c23061ba3e2d5d0e501a75736521fdbd6d24 100644
--- a/files/MBL-070RFC_SC-IOC-310.archive
+++ b/files/MBL-070RFC_SC-IOC-310.archive
@@ -1,9 +1,9 @@
+MBL-070RFC:RFS-PIND-310:IOExp-DirPin0
+MBL-070RFC:RFS-PIND-310:IOExp-DirPin1
+MBL-070RFC:RFS-PIND-310:IOExp-LevelPin0_RBV
+MBL-070RFC:RFS-PIND-310:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-070RFC:RFS-PIND-310:VMon-FactorV5
-MBL-070RFC:RFS-PIND-310:VMon-OffsetV6
-MBL-070RFC:RFS-PIND-310:VMon-FactorV6
+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 a137158898247a935cb926ac3b11d0a7dba4c5be..bfeede88a53e4edd565493940d350da7c57c495d 100644
--- a/files/MBL-070RFC_SC-IOC-410.archive
+++ b/files/MBL-070RFC_SC-IOC-410.archive
@@ -1,9 +1,9 @@
+MBL-070RFC:RFS-PIND-410:IOExp-DirPin0
+MBL-070RFC:RFS-PIND-410:IOExp-DirPin1
+MBL-070RFC:RFS-PIND-410:IOExp-LevelPin0_RBV
+MBL-070RFC:RFS-PIND-410:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-070RFC:RFS-PIND-410:VMon-FactorV5
-MBL-070RFC:RFS-PIND-410:VMon-OffsetV6
-MBL-070RFC:RFS-PIND-410:VMon-FactorV6
+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 3a15f70ebb288a8a25fb772acc4d68758e61e23f..a9278f093a1928388aef1b59767c1dc271778900 100644
--- a/files/MBL-080RFC_SC-IOC-110.archive
+++ b/files/MBL-080RFC_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+MBL-080RFC:RFS-PIND-110:IOExp-DirPin0
+MBL-080RFC:RFS-PIND-110:IOExp-DirPin1
+MBL-080RFC:RFS-PIND-110:IOExp-LevelPin0_RBV
+MBL-080RFC:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-080RFC:RFS-PIND-110:VMon-FactorV5
-MBL-080RFC:RFS-PIND-110:VMon-OffsetV6
-MBL-080RFC:RFS-PIND-110:VMon-FactorV6
+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 e84f06d550aec78a03f9555d8a36205182e80f64..67359abf7b01780db5db8bc4f04e6f8e93edd707 100644
--- a/files/MBL-080RFC_SC-IOC-210.archive
+++ b/files/MBL-080RFC_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+MBL-080RFC:RFS-PIND-210:IOExp-DirPin0
+MBL-080RFC:RFS-PIND-210:IOExp-DirPin1
+MBL-080RFC:RFS-PIND-210:IOExp-LevelPin0_RBV
+MBL-080RFC:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-080RFC:RFS-PIND-210:VMon-FactorV5
-MBL-080RFC:RFS-PIND-210:VMon-OffsetV6
-MBL-080RFC:RFS-PIND-210:VMon-FactorV6
+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 0bb9af02fa9b0969f7a4233f4b9b5e99651f47e5..5e95e3570a4459887d78c15c4d934a6b17e0a4c2 100644
--- a/files/MBL-080RFC_SC-IOC-310.archive
+++ b/files/MBL-080RFC_SC-IOC-310.archive
@@ -1,9 +1,9 @@
+MBL-080RFC:RFS-PIND-310:IOExp-DirPin0
+MBL-080RFC:RFS-PIND-310:IOExp-DirPin1
+MBL-080RFC:RFS-PIND-310:IOExp-LevelPin0_RBV
+MBL-080RFC:RFS-PIND-310:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-080RFC:RFS-PIND-310:VMon-FactorV5
-MBL-080RFC:RFS-PIND-310:VMon-OffsetV6
-MBL-080RFC:RFS-PIND-310:VMon-FactorV6
+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 b496f8fe996432d6910ac022e274e34dc8f34213..01470dd67a538e301aa4ee5b439053366d59bc60 100644
--- a/files/MBL-080RFC_SC-IOC-410.archive
+++ b/files/MBL-080RFC_SC-IOC-410.archive
@@ -1,9 +1,9 @@
+MBL-080RFC:RFS-PIND-410:IOExp-DirPin0
+MBL-080RFC:RFS-PIND-410:IOExp-DirPin1
+MBL-080RFC:RFS-PIND-410:IOExp-LevelPin0_RBV
+MBL-080RFC:RFS-PIND-410:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-080RFC:RFS-PIND-410:VMon-FactorV5
-MBL-080RFC:RFS-PIND-410:VMon-OffsetV6
-MBL-080RFC:RFS-PIND-410:VMon-FactorV6
+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 53e463ecc9d65e778d1295016c9d4be8f28af3a7..c9b2e1be9f6a206d8a4d0b4b3413db8e68c77e38 100644
--- a/files/MBL-090RFC_SC-IOC-110.archive
+++ b/files/MBL-090RFC_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+MBL-090RFC:RFS-PIND-110:IOExp-DirPin0
+MBL-090RFC:RFS-PIND-110:IOExp-DirPin1
+MBL-090RFC:RFS-PIND-110:IOExp-LevelPin0_RBV
+MBL-090RFC:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-090RFC:RFS-PIND-110:VMon-FactorV5
-MBL-090RFC:RFS-PIND-110:VMon-OffsetV6
-MBL-090RFC:RFS-PIND-110:VMon-FactorV6
+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 37d18be6199eb8857953d9a8bda4a792e211d845..4a7c8a0feb9269f72cec0edddb62c97179185cef 100644
--- a/files/MBL-090RFC_SC-IOC-210.archive
+++ b/files/MBL-090RFC_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+MBL-090RFC:RFS-PIND-210:IOExp-DirPin0
+MBL-090RFC:RFS-PIND-210:IOExp-DirPin1
+MBL-090RFC:RFS-PIND-210:IOExp-LevelPin0_RBV
+MBL-090RFC:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-090RFC:RFS-PIND-210:VMon-FactorV5
-MBL-090RFC:RFS-PIND-210:VMon-OffsetV6
-MBL-090RFC:RFS-PIND-210:VMon-FactorV6
+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 4e7e5be27befa369ca36d9fc5ff11f36e63bef60..aaec441c1d7d6dc05a690fefc78998d68165cb24 100644
--- a/files/MBL-090RFC_SC-IOC-310.archive
+++ b/files/MBL-090RFC_SC-IOC-310.archive
@@ -1,9 +1,9 @@
+MBL-090RFC:RFS-PIND-310:IOExp-DirPin0
+MBL-090RFC:RFS-PIND-310:IOExp-DirPin1
+MBL-090RFC:RFS-PIND-310:IOExp-LevelPin0_RBV
+MBL-090RFC:RFS-PIND-310:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-090RFC:RFS-PIND-310:VMon-FactorV5
-MBL-090RFC:RFS-PIND-310:VMon-OffsetV6
-MBL-090RFC:RFS-PIND-310:VMon-FactorV6
+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 1b5b88a3e408c11b7493d9e8791849925b6333b7..5feda2aa7e944e29d0905e95a52dd45678ec4916 100644
--- a/files/MBL-090RFC_SC-IOC-410.archive
+++ b/files/MBL-090RFC_SC-IOC-410.archive
@@ -1,9 +1,9 @@
+MBL-090RFC:RFS-PIND-410:IOExp-DirPin0
+MBL-090RFC:RFS-PIND-410:IOExp-DirPin1
+MBL-090RFC:RFS-PIND-410:IOExp-LevelPin0_RBV
+MBL-090RFC:RFS-PIND-410:IOExp-LevelPin1_RBV
 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-OffsetV5
-MBL-090RFC:RFS-PIND-410:VMon-FactorV5
-MBL-090RFC:RFS-PIND-410:VMon-OffsetV6
-MBL-090RFC:RFS-PIND-410:VMon-FactorV6
+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 358a591454898caa4b95d45b3b7d9310eddd1cdf..29bf5c87e08515489ff19379c603ad9fc0d4f822 100644
--- a/files/MEBT-010_SC-IOC-110.archive
+++ b/files/MEBT-010_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+MEBT-010:RFS-PIND-110:IOExp-DirPin0
+MEBT-010:RFS-PIND-110:IOExp-DirPin1
+MEBT-010:RFS-PIND-110:IOExp-LevelPin0_RBV
+MEBT-010:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-MEBT-010:RFS-PIND-110:VMon-FactorV5
-MEBT-010:RFS-PIND-110:VMon-OffsetV6
-MEBT-010:RFS-PIND-110:VMon-FactorV6
+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 a21d48aa55e5b69592e84114be52ca2ba4e937a2..89afbe523b104934af4b5052997c666cd1b4b88f 100644
--- a/files/MEBT-010_SC-IOC-210.archive
+++ b/files/MEBT-010_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+MEBT-010:RFS-PIND-210:IOExp-DirPin0
+MEBT-010:RFS-PIND-210:IOExp-DirPin1
+MEBT-010:RFS-PIND-210:IOExp-LevelPin0_RBV
+MEBT-010:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-MEBT-010:RFS-PIND-210:VMon-FactorV5
-MEBT-010:RFS-PIND-210:VMon-OffsetV6
-MEBT-010:RFS-PIND-210:VMon-FactorV6
+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 86c9b5f63a28360fe52b7163c6f6b92481b64ccb..f49095c89cc9684b82e7cb76b347978fae1a37f4 100644
--- a/files/MEBT-010_SC-IOC-310.archive
+++ b/files/MEBT-010_SC-IOC-310.archive
@@ -1,9 +1,9 @@
+MEBT-010:RFS-PIND-310:IOExp-DirPin0
+MEBT-010:RFS-PIND-310:IOExp-DirPin1
+MEBT-010:RFS-PIND-310:IOExp-LevelPin0_RBV
+MEBT-010:RFS-PIND-310:IOExp-LevelPin1_RBV
 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-OffsetV5
-MEBT-010:RFS-PIND-310:VMon-FactorV5
-MEBT-010:RFS-PIND-310:VMon-OffsetV6
-MEBT-010:RFS-PIND-310:VMon-FactorV6
+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 938b02087acd50198d39d9eb64652001d883d41f..73abf5d288c028a8bd02b0ad41e739d1312e8d8c 100644
--- a/files/RFQ-010_SC-IOC-110.archive
+++ b/files/RFQ-010_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+RFQ-010:RFS-PIND-110:IOExp-DirPin0
+RFQ-010:RFS-PIND-110:IOExp-DirPin1
+RFQ-010:RFS-PIND-110:IOExp-LevelPin0_RBV
+RFQ-010:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-RFQ-010:RFS-PIND-110:VMon-FactorV5
-RFQ-010:RFS-PIND-110:VMon-OffsetV6
-RFQ-010:RFS-PIND-110:VMon-FactorV6
+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 490568c8101c3b964dc234faad15913c42ca2ef9..cf6daa37a90163bd7d2b31606a33c2ccafdb67d8 100644
--- a/files/Spk-010RFC_SC-IOC-110.archive
+++ b/files/Spk-010RFC_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+Spk-010RFC:RFS-PIND-110:IOExp-DirPin0
+Spk-010RFC:RFS-PIND-110:IOExp-DirPin1
+Spk-010RFC:RFS-PIND-110:IOExp-LevelPin0_RBV
+Spk-010RFC:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-010RFC:RFS-PIND-110:VMon-FactorV5
-Spk-010RFC:RFS-PIND-110:VMon-OffsetV6
-Spk-010RFC:RFS-PIND-110:VMon-FactorV6
+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 09ef5cfb05c58f6422821c3c30df63f122678b25..827e769550ff9ef1b52029edbf86a3e8db9905a1 100644
--- a/files/Spk-010RFC_SC-IOC-210.archive
+++ b/files/Spk-010RFC_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+Spk-010RFC:RFS-PIND-210:IOExp-DirPin0
+Spk-010RFC:RFS-PIND-210:IOExp-DirPin1
+Spk-010RFC:RFS-PIND-210:IOExp-LevelPin0_RBV
+Spk-010RFC:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-010RFC:RFS-PIND-210:VMon-FactorV5
-Spk-010RFC:RFS-PIND-210:VMon-OffsetV6
-Spk-010RFC:RFS-PIND-210:VMon-FactorV6
+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 2484a1ef37fe6838ff65e4f24f44aa22436f7cfa..8e8de63d845e5f2cdbba6a16562d57d32674647f 100644
--- a/files/Spk-020RFC_SC-IOC-110.archive
+++ b/files/Spk-020RFC_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+Spk-020RFC:RFS-PIND-110:IOExp-DirPin0
+Spk-020RFC:RFS-PIND-110:IOExp-DirPin1
+Spk-020RFC:RFS-PIND-110:IOExp-LevelPin0_RBV
+Spk-020RFC:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-020RFC:RFS-PIND-110:VMon-FactorV5
-Spk-020RFC:RFS-PIND-110:VMon-OffsetV6
-Spk-020RFC:RFS-PIND-110:VMon-FactorV6
+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 ac1066ce0709dbb080b4efb41b20f27e97c5f768..6694a8cb4531b8cd3ba686a3a9c8d609ecd8d365 100644
--- a/files/Spk-020RFC_SC-IOC-210.archive
+++ b/files/Spk-020RFC_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+Spk-020RFC:RFS-PIND-210:IOExp-DirPin0
+Spk-020RFC:RFS-PIND-210:IOExp-DirPin1
+Spk-020RFC:RFS-PIND-210:IOExp-LevelPin0_RBV
+Spk-020RFC:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-020RFC:RFS-PIND-210:VMon-FactorV5
-Spk-020RFC:RFS-PIND-210:VMon-OffsetV6
-Spk-020RFC:RFS-PIND-210:VMon-FactorV6
+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 6c0a4dee221badd6e46e2192714ac5a3be3ec229..6353109b2404630138a632bf3f666e147763d2ba 100644
--- a/files/Spk-030RFC_SC-IOC-110.archive
+++ b/files/Spk-030RFC_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+Spk-030RFC:RFS-PIND-110:IOExp-DirPin0
+Spk-030RFC:RFS-PIND-110:IOExp-DirPin1
+Spk-030RFC:RFS-PIND-110:IOExp-LevelPin0_RBV
+Spk-030RFC:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-030RFC:RFS-PIND-110:VMon-FactorV5
-Spk-030RFC:RFS-PIND-110:VMon-OffsetV6
-Spk-030RFC:RFS-PIND-110:VMon-FactorV6
+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 23e85cc6e9664ce130389f208a4c2b8f8ee7931f..bda82bb98c52132b1f4daaa5e6b585a041df70c0 100644
--- a/files/Spk-030RFC_SC-IOC-210.archive
+++ b/files/Spk-030RFC_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+Spk-030RFC:RFS-PIND-210:IOExp-DirPin0
+Spk-030RFC:RFS-PIND-210:IOExp-DirPin1
+Spk-030RFC:RFS-PIND-210:IOExp-LevelPin0_RBV
+Spk-030RFC:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-030RFC:RFS-PIND-210:VMon-FactorV5
-Spk-030RFC:RFS-PIND-210:VMon-OffsetV6
-Spk-030RFC:RFS-PIND-210:VMon-FactorV6
+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 e5f312c755df0fd6b4cb32579b31cca07e9802b4..b1ad1ea3b7daf8aaccb3089fc8d17a490f91a4fc 100644
--- a/files/Spk-040RFC_SC-IOC-110.archive
+++ b/files/Spk-040RFC_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+Spk-040RFC:RFS-PIND-110:IOExp-DirPin0
+Spk-040RFC:RFS-PIND-110:IOExp-DirPin1
+Spk-040RFC:RFS-PIND-110:IOExp-LevelPin0_RBV
+Spk-040RFC:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-040RFC:RFS-PIND-110:VMon-FactorV5
-Spk-040RFC:RFS-PIND-110:VMon-OffsetV6
-Spk-040RFC:RFS-PIND-110:VMon-FactorV6
+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 1ab17eca3c4a7bcf8d8fa29016f408f518dabe79..1a6807423a39385a0708903dbaad7f76202b7768 100644
--- a/files/Spk-040RFC_SC-IOC-210.archive
+++ b/files/Spk-040RFC_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+Spk-040RFC:RFS-PIND-210:IOExp-DirPin0
+Spk-040RFC:RFS-PIND-210:IOExp-DirPin1
+Spk-040RFC:RFS-PIND-210:IOExp-LevelPin0_RBV
+Spk-040RFC:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-040RFC:RFS-PIND-210:VMon-FactorV5
-Spk-040RFC:RFS-PIND-210:VMon-OffsetV6
-Spk-040RFC:RFS-PIND-210:VMon-FactorV6
+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 dca906fb0ce9d8653868b37d35a9dacbf15b33b2..3828271d3e85158622e116c3c585f4bc0b4b0e7e 100644
--- a/files/Spk-050RFC_SC-IOC-110.archive
+++ b/files/Spk-050RFC_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+Spk-050RFC:RFS-PIND-110:IOExp-DirPin0
+Spk-050RFC:RFS-PIND-110:IOExp-DirPin1
+Spk-050RFC:RFS-PIND-110:IOExp-LevelPin0_RBV
+Spk-050RFC:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-050RFC:RFS-PIND-110:VMon-FactorV5
-Spk-050RFC:RFS-PIND-110:VMon-OffsetV6
-Spk-050RFC:RFS-PIND-110:VMon-FactorV6
+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 63e8796b4a5f7ff4d3df79332c243db8d5eb93fa..4efeee0194720c955dac293fe9cb8ad407663b97 100644
--- a/files/Spk-050RFC_SC-IOC-210.archive
+++ b/files/Spk-050RFC_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+Spk-050RFC:RFS-PIND-210:IOExp-DirPin0
+Spk-050RFC:RFS-PIND-210:IOExp-DirPin1
+Spk-050RFC:RFS-PIND-210:IOExp-LevelPin0_RBV
+Spk-050RFC:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-050RFC:RFS-PIND-210:VMon-FactorV5
-Spk-050RFC:RFS-PIND-210:VMon-OffsetV6
-Spk-050RFC:RFS-PIND-210:VMon-FactorV6
+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 638d459959663a4f58f1e3dd940f00cd5356fb8a..365eb181dd6393b3072fd56bbe972ffcda3f243c 100644
--- a/files/Spk-060RFC_SC-IOC-110.archive
+++ b/files/Spk-060RFC_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+Spk-060RFC:RFS-PIND-110:IOExp-DirPin0
+Spk-060RFC:RFS-PIND-110:IOExp-DirPin1
+Spk-060RFC:RFS-PIND-110:IOExp-LevelPin0_RBV
+Spk-060RFC:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-060RFC:RFS-PIND-110:VMon-FactorV5
-Spk-060RFC:RFS-PIND-110:VMon-OffsetV6
-Spk-060RFC:RFS-PIND-110:VMon-FactorV6
+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 4606f568c5d11493e6a04d2839af9d0b99570ec0..eb8aac20244d7f85c9356ad02257a766c5c4dc8e 100644
--- a/files/Spk-060RFC_SC-IOC-210.archive
+++ b/files/Spk-060RFC_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+Spk-060RFC:RFS-PIND-210:IOExp-DirPin0
+Spk-060RFC:RFS-PIND-210:IOExp-DirPin1
+Spk-060RFC:RFS-PIND-210:IOExp-LevelPin0_RBV
+Spk-060RFC:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-060RFC:RFS-PIND-210:VMon-FactorV5
-Spk-060RFC:RFS-PIND-210:VMon-OffsetV6
-Spk-060RFC:RFS-PIND-210:VMon-FactorV6
+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 549fee7743c59525cc86ee2f5d27faafc9af64df..9b94414e3b06d86c4b08ba54eda3589b1968a9e1 100644
--- a/files/Spk-070RFC_SC-IOC-110.archive
+++ b/files/Spk-070RFC_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+Spk-070RFC:RFS-PIND-110:IOExp-DirPin0
+Spk-070RFC:RFS-PIND-110:IOExp-DirPin1
+Spk-070RFC:RFS-PIND-110:IOExp-LevelPin0_RBV
+Spk-070RFC:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-070RFC:RFS-PIND-110:VMon-FactorV5
-Spk-070RFC:RFS-PIND-110:VMon-OffsetV6
-Spk-070RFC:RFS-PIND-110:VMon-FactorV6
+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 6b89ceff42010bb05bcf03746c29e96915cb2d1c..fc586e6b296c32d7286a0f34e0d133b3994b7361 100644
--- a/files/Spk-070RFC_SC-IOC-210.archive
+++ b/files/Spk-070RFC_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+Spk-070RFC:RFS-PIND-210:IOExp-DirPin0
+Spk-070RFC:RFS-PIND-210:IOExp-DirPin1
+Spk-070RFC:RFS-PIND-210:IOExp-LevelPin0_RBV
+Spk-070RFC:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-070RFC:RFS-PIND-210:VMon-FactorV5
-Spk-070RFC:RFS-PIND-210:VMon-OffsetV6
-Spk-070RFC:RFS-PIND-210:VMon-FactorV6
+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 23a28f067f6628aa7bf7a4b1730788b959c0f305..29de7bcb43df449ec13e3de881724770e574ea7e 100644
--- a/files/Spk-080RFC_SC-IOC-110.archive
+++ b/files/Spk-080RFC_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+Spk-080RFC:RFS-PIND-110:IOExp-DirPin0
+Spk-080RFC:RFS-PIND-110:IOExp-DirPin1
+Spk-080RFC:RFS-PIND-110:IOExp-LevelPin0_RBV
+Spk-080RFC:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-080RFC:RFS-PIND-110:VMon-FactorV5
-Spk-080RFC:RFS-PIND-110:VMon-OffsetV6
-Spk-080RFC:RFS-PIND-110:VMon-FactorV6
+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 3ed37ef9bb038a172e6db3392e8cf86b62b0b51e..38596a044bf33649e696b67200907b3811bdd737 100644
--- a/files/Spk-080RFC_SC-IOC-210.archive
+++ b/files/Spk-080RFC_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+Spk-080RFC:RFS-PIND-210:IOExp-DirPin0
+Spk-080RFC:RFS-PIND-210:IOExp-DirPin1
+Spk-080RFC:RFS-PIND-210:IOExp-LevelPin0_RBV
+Spk-080RFC:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-080RFC:RFS-PIND-210:VMon-FactorV5
-Spk-080RFC:RFS-PIND-210:VMon-OffsetV6
-Spk-080RFC:RFS-PIND-210:VMon-FactorV6
+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 2ba3b53ea151b227179fe7ab3c3ee72c0ef7e39a..210b7d34056f3bf81328bfeb7f54c4b458c47887 100644
--- a/files/Spk-090RFC_SC-IOC-110.archive
+++ b/files/Spk-090RFC_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+Spk-090RFC:RFS-PIND-110:IOExp-DirPin0
+Spk-090RFC:RFS-PIND-110:IOExp-DirPin1
+Spk-090RFC:RFS-PIND-110:IOExp-LevelPin0_RBV
+Spk-090RFC:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-090RFC:RFS-PIND-110:VMon-FactorV5
-Spk-090RFC:RFS-PIND-110:VMon-OffsetV6
-Spk-090RFC:RFS-PIND-110:VMon-FactorV6
+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 e35f2deb4ebc92a1a85886dae626d7327a434cd0..7bb9ea2e09d986f1eb398345523564eb91d55fa6 100644
--- a/files/Spk-090RFC_SC-IOC-210.archive
+++ b/files/Spk-090RFC_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+Spk-090RFC:RFS-PIND-210:IOExp-DirPin0
+Spk-090RFC:RFS-PIND-210:IOExp-DirPin1
+Spk-090RFC:RFS-PIND-210:IOExp-LevelPin0_RBV
+Spk-090RFC:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-090RFC:RFS-PIND-210:VMon-FactorV5
-Spk-090RFC:RFS-PIND-210:VMon-OffsetV6
-Spk-090RFC:RFS-PIND-210:VMon-FactorV6
+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 7e508e1cfa6738585ee0104410d0b03193313d07..8dfc78c91ffd2a86973f51151078a167c21a0b1f 100644
--- a/files/Spk-100RFC_SC-IOC-110.archive
+++ b/files/Spk-100RFC_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+Spk-100RFC:RFS-PIND-110:IOExp-DirPin0
+Spk-100RFC:RFS-PIND-110:IOExp-DirPin1
+Spk-100RFC:RFS-PIND-110:IOExp-LevelPin0_RBV
+Spk-100RFC:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-100RFC:RFS-PIND-110:VMon-FactorV5
-Spk-100RFC:RFS-PIND-110:VMon-OffsetV6
-Spk-100RFC:RFS-PIND-110:VMon-FactorV6
+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 fd04bf59114c8a34cf7f199db0fb12b46cde779b..550f413b3c00e9fe7fa5bf973cc602cf84a5a442 100644
--- a/files/Spk-100RFC_SC-IOC-210.archive
+++ b/files/Spk-100RFC_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+Spk-100RFC:RFS-PIND-210:IOExp-DirPin0
+Spk-100RFC:RFS-PIND-210:IOExp-DirPin1
+Spk-100RFC:RFS-PIND-210:IOExp-LevelPin0_RBV
+Spk-100RFC:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-100RFC:RFS-PIND-210:VMon-FactorV5
-Spk-100RFC:RFS-PIND-210:VMon-OffsetV6
-Spk-100RFC:RFS-PIND-210:VMon-FactorV6
+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 61f719017736065cdb0773b2f3ab2664bfcba1bb..9a7bb5810c76b911eeec8ab94335f1a5cfcba7bc 100644
--- a/files/Spk-110RFC_SC-IOC-110.archive
+++ b/files/Spk-110RFC_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+Spk-110RFC:RFS-PIND-110:IOExp-DirPin0
+Spk-110RFC:RFS-PIND-110:IOExp-DirPin1
+Spk-110RFC:RFS-PIND-110:IOExp-LevelPin0_RBV
+Spk-110RFC:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-110RFC:RFS-PIND-110:VMon-FactorV5
-Spk-110RFC:RFS-PIND-110:VMon-OffsetV6
-Spk-110RFC:RFS-PIND-110:VMon-FactorV6
+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 da08fd788a6cf62154139642c5acc56a82bd9cf7..91017fdec2ad08b22054843a9fef47414303326e 100644
--- a/files/Spk-110RFC_SC-IOC-210.archive
+++ b/files/Spk-110RFC_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+Spk-110RFC:RFS-PIND-210:IOExp-DirPin0
+Spk-110RFC:RFS-PIND-210:IOExp-DirPin1
+Spk-110RFC:RFS-PIND-210:IOExp-LevelPin0_RBV
+Spk-110RFC:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-110RFC:RFS-PIND-210:VMon-FactorV5
-Spk-110RFC:RFS-PIND-210:VMon-OffsetV6
-Spk-110RFC:RFS-PIND-210:VMon-FactorV6
+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 d2d0fab0851ae6c7faa858698af459147a2fb0c0..9b3b4b6d6edff3cad59186b57e6a6d9f5cde221d 100644
--- a/files/Spk-120RFC_SC-IOC-110.archive
+++ b/files/Spk-120RFC_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+Spk-120RFC:RFS-PIND-110:IOExp-DirPin0
+Spk-120RFC:RFS-PIND-110:IOExp-DirPin1
+Spk-120RFC:RFS-PIND-110:IOExp-LevelPin0_RBV
+Spk-120RFC:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-120RFC:RFS-PIND-110:VMon-FactorV5
-Spk-120RFC:RFS-PIND-110:VMon-OffsetV6
-Spk-120RFC:RFS-PIND-110:VMon-FactorV6
+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 e83468c8482d8858a308a116a78c5e962b503f5c..a04fbdb953853abb850082960c6a849b53052bac 100644
--- a/files/Spk-120RFC_SC-IOC-210.archive
+++ b/files/Spk-120RFC_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+Spk-120RFC:RFS-PIND-210:IOExp-DirPin0
+Spk-120RFC:RFS-PIND-210:IOExp-DirPin1
+Spk-120RFC:RFS-PIND-210:IOExp-LevelPin0_RBV
+Spk-120RFC:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-120RFC:RFS-PIND-210:VMon-FactorV5
-Spk-120RFC:RFS-PIND-210:VMon-OffsetV6
-Spk-120RFC:RFS-PIND-210:VMon-FactorV6
+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 da54bc986efe54e560681e2aba857eb4656200e3..17380cbfef27ce577418690cb2e0133ab483e162 100644
--- a/files/Spk-130RFC_SC-IOC-110.archive
+++ b/files/Spk-130RFC_SC-IOC-110.archive
@@ -1,9 +1,9 @@
+Spk-130RFC:RFS-PIND-110:IOExp-DirPin0
+Spk-130RFC:RFS-PIND-110:IOExp-DirPin1
+Spk-130RFC:RFS-PIND-110:IOExp-LevelPin0_RBV
+Spk-130RFC:RFS-PIND-110:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-130RFC:RFS-PIND-110:VMon-FactorV5
-Spk-130RFC:RFS-PIND-110:VMon-OffsetV6
-Spk-130RFC:RFS-PIND-110:VMon-FactorV6
+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 ef1894c20cc643bf4cdd8e0fd8110070be082b62..0e1e83750e8b097d072dd98315b0dae5d6e113ab 100644
--- a/files/Spk-130RFC_SC-IOC-210.archive
+++ b/files/Spk-130RFC_SC-IOC-210.archive
@@ -1,9 +1,9 @@
+Spk-130RFC:RFS-PIND-210:IOExp-DirPin0
+Spk-130RFC:RFS-PIND-210:IOExp-DirPin1
+Spk-130RFC:RFS-PIND-210:IOExp-LevelPin0_RBV
+Spk-130RFC:RFS-PIND-210:IOExp-LevelPin1_RBV
 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-OffsetV5
-Spk-130RFC:RFS-PIND-210:VMon-FactorV5
-Spk-130RFC:RFS-PIND-210:VMon-OffsetV6
-Spk-130RFC:RFS-PIND-210:VMon-FactorV6
+Spk-130RFC:RFS-PIND-210:VMon-ValueV5_RBV
+Spk-130RFC:RFS-PIND-210:VMon-ValueV6_RBV