diff --git a/99-Shared/bpmmanager/bpmmanager-bpm-instance.bob b/99-Shared/bpmmanager/bpmmanager-bpm-instance.bob
index 2e3e4d7e26c75c30d107503b76bfb9b6b8d72551..5ef1878e2dff5f227699d8e85d3189ff4d551168 100644
--- a/99-Shared/bpmmanager/bpmmanager-bpm-instance.bob
+++ b/99-Shared/bpmmanager/bpmmanager-bpm-instance.bob
@@ -124,7 +124,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_76</name>
- <pv_name>$(P)$(R)ThrXPosLow</pv_name>
+ <pv_name>$(P)$(R)ThrXPosLowR</pv_name>
<x>730</x>
<y>205</y>
<width>130</width>
@@ -176,7 +176,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_1</name>
- <pv_name>$(P)$(R)ThrXPosHigh</pv_name>
+ <pv_name>$(P)$(R)ThrXPosHighR</pv_name>
<x>730</x>
<y>245</y>
<width>130</width>
@@ -228,7 +228,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_2</name>
- <pv_name>$(P)$(R)ThrYPosLow</pv_name>
+ <pv_name>$(P)$(R)ThrYPosLowR</pv_name>
<x>730</x>
<y>285</y>
<width>130</width>
@@ -280,7 +280,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_3</name>
- <pv_name>$(P)$(R)ThrYPosHigh</pv_name>
+ <pv_name>$(P)$(R)ThrYPosHighR</pv_name>
<x>730</x>
<y>325</y>
<width>130</width>
@@ -331,7 +331,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_4</name>
- <pv_name>$(P)$(R)ThrMagnitude</pv_name>
+ <pv_name>$(P)$(R)ThrMagnitudeR</pv_name>
<x>730</x>
<y>495</y>
<width>130</width>
@@ -366,7 +366,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_4</name>
- <pv_name>$(P)$(R)IlkPositionControl</pv_name>
+ <pv_name>$(P)$(R)IlkPositionControlR</pv_name>
<x>740</x>
<y>130</y>
<off_color>
@@ -445,7 +445,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_3</name>
- <pv_name>$(P)$(R)IlkPositionClear</pv_name>
+ <pv_name>$(P)$(R)IlkPositionClearR</pv_name>
<x>740</x>
<y>170</y>
<off_color>
@@ -479,7 +479,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_5</name>
- <pv_name>$(P)$(R)IlkMagnitudeControl</pv_name>
+ <pv_name>$(P)$(R)IlkMagnitudeControlR</pv_name>
<x>740</x>
<y>421</y>
<off_color>
@@ -572,7 +572,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_6</name>
- <pv_name>$(P)$(R)IlkPositionClear</pv_name>
+ <pv_name>$(P)$(R)IlkPositionClearR</pv_name>
<x>740</x>
<y>461</y>
<off_color>
@@ -660,7 +660,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_112</name>
- <pv_name>$(P)$(R)SelfTrigThreshold</pv_name>
+ <pv_name>$(P)$(R)SelfTrigThresholdR</pv_name>
<x>730</x>
<y>625</y>
<width>130</width>
@@ -757,7 +757,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_4</name>
- <pv_name>$(P)$(R)SelfTrigControl</pv_name>
+ <pv_name>$(P)$(R)SelfTrigControlR</pv_name>
<x>740</x>
<y>590</y>
<off_color>
@@ -881,7 +881,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_7</name>
- <pv_name>$(P)$(R)Control</pv_name>
+ <pv_name>$(P)$(R)ControlR</pv_name>
<x>290</x>
<y>526</y>
<off_color>
@@ -944,7 +944,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_77</name>
- <pv_name>$(P)$(R)PositionScalingFactor</pv_name>
+ <pv_name>$(P)$(R)PositionScalingFactorR</pv_name>
<x>240</x>
<y>560</y>
<width>130</width>
@@ -993,7 +993,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_78</name>
- <pv_name>$(P)$(R)PhaseScalingFactor</pv_name>
+ <pv_name>$(P)$(R)PhaseScalingFactorR</pv_name>
<x>240</x>
<y>676</y>
<width>130</width>
@@ -1044,7 +1044,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_79</name>
- <pv_name>$(P)$(R)RTMAttn</pv_name>
+ <pv_name>$(P)$(R)RTMAttnR</pv_name>
<x>240</x>
<y>831</y>
<width>130</width>
@@ -1232,7 +1232,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_84</name>
- <pv_name>$(P)$(BPM_PAIR)-EnergyInterlockLowerThreshold</pv_name>
+ <pv_name>$(P)$(BPM_PAIR)-EnergyInterlockLowerThresholdR</pv_name>
<x>730</x>
<y>795</y>
<width>130</width>
@@ -1282,7 +1282,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_85</name>
- <pv_name>$(P)$(BPM_PAIR)-EnergyInterlockUpperThreshold</pv_name>
+ <pv_name>$(P)$(BPM_PAIR)-EnergyInterlockUpperThresholdR</pv_name>
<x>730</x>
<y>835</y>
<width>130</width>
@@ -1317,7 +1317,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_8</name>
- <pv_name>$(P)$(BPM_PAIR)-EnergyInterlockControl</pv_name>
+ <pv_name>$(P)$(BPM_PAIR)-EnergyInterlockControlR</pv_name>
<x>740</x>
<y>720</y>
<off_color>
@@ -1410,7 +1410,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_9</name>
- <pv_name>$(P)$(BPM_PAIR)-EnergyInterlockClear</pv_name>
+ <pv_name>$(P)$(BPM_PAIR)-EnergyInterlockClearR</pv_name>
<x>740</x>
<y>760</y>
<off_color>
@@ -1610,7 +1610,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_88</name>
- <pv_name>$(P)$(BPM_PAIR)-RL1Attn3</pv_name>
+ <pv_name>$(P)$(BPM_PAIR)-RL1Attn3R</pv_name>
<x>240</x>
<y>1075</y>
<width>130</width>
@@ -1659,7 +1659,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_89</name>
- <pv_name>$(P)$(BPM_PAIR)-RL2Attn3</pv_name>
+ <pv_name>$(P)$(BPM_PAIR)-RL2Attn3R</pv_name>
<x>240</x>
<y>1115</y>
<width>130</width>
@@ -1847,7 +1847,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_105</name>
- <pv_name>$(P)$(BPM_PAIR)-TriggerRepeat</pv_name>
+ <pv_name>$(P)$(BPM_PAIR)-TriggerRepeatR</pv_name>
<x>240</x>
<y>125</y>
<width>130</width>
@@ -1943,7 +1943,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_10</name>
- <pv_name>$(P)$(BPM_PAIR)-Acquire</pv_name>
+ <pv_name>$(P)$(BPM_PAIR)-AcquireR</pv_name>
<x>500</x>
<y>250</y>
<off_color>
@@ -2030,7 +2030,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_11</name>
- <pv_name>$(P)$(BPM_PAIR)-TransferArrays</pv_name>
+ <pv_name>$(P)$(BPM_PAIR)-TransferArraysR</pv_name>
<x>500</x>
<y>285</y>
<off_color>
@@ -2059,7 +2059,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_12</name>
- <pv_name>$(P)$(R)PhaseUnwrapControl</pv_name>
+ <pv_name>$(P)$(R)PhaseUnwrapControlR</pv_name>
<x>290</x>
<y>606</y>
<off_color>
@@ -2122,7 +2122,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_80</name>
- <pv_name>$(P)$(R)PhaseUnwrap</pv_name>
+ <pv_name>$(P)$(R)PhaseUnwrapR</pv_name>
<x>240</x>
<y>638</y>
<width>130</width>
@@ -2173,7 +2173,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_106</name>
- <pv_name>$(P)$(BPM_PAIR)-TriggerTimeoutValue</pv_name>
+ <pv_name>$(P)$(BPM_PAIR)-TriggerTimeoutValueR</pv_name>
<x>240</x>
<y>205</y>
<width>130</width>
@@ -2221,7 +2221,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_13</name>
- <pv_name>$(P)$(BPM_PAIR)-HealthClockIntrClear</pv_name>
+ <pv_name>$(P)$(BPM_PAIR)-HealthClockIntrClearR</pv_name>
<x>290</x>
<y>320</y>
<off_color>
@@ -2282,7 +2282,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_14</name>
- <pv_name>$(P)$(BPM_PAIR)-AngleDiffPhaseUnwrapControl</pv_name>
+ <pv_name>$(P)$(BPM_PAIR)-AngleDiffPhaseUnwrapControlR</pv_name>
<x>500</x>
<y>355</y>
<off_color>
@@ -2325,7 +2325,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_107</name>
- <pv_name>$(P)$(BPM_PAIR)-AngleDiffPhaseUnwrap</pv_name>
+ <pv_name>$(P)$(BPM_PAIR)-AngleDiffPhaseUnwrapR</pv_name>
<x>240</x>
<y>390</y>
<width>130</width>
@@ -2375,7 +2375,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_108</name>
- <pv_name>$(P)$(BPM_PAIR)-Ready</pv_name>
+ <pv_name>$(P)$(BPM_PAIR)-ReadyR</pv_name>
<x>240</x>
<y>425</y>
<width>130</width>