From 65c7e899f0e41509ff2eebd32c3971a9347cd494 Mon Sep 17 00:00:00 2001
From: Per Nilsson <per.nilsson2@esss.se>
Date: Fri, 22 Apr 2022 16:17:46 +0200
Subject: [PATCH] Fixes

---
 .../Cryo/TMCP_NEW/Coldbox/Adsorber/Sta20K.bob | 28 +++----
 .../Coldbox/Adsorber/adsorption20KFP.bob      |  2 +-
 .../Coldbox/Adsorber/cooldown20KFP.bob        |  2 +-
 .../Coldbox/Adsorber/depress20KFP.bob         |  2 +-
 .../TMCP_NEW/Coldbox/Adsorber/press20KFP.bob  |  2 +-
 .../TMCP_NEW/Coldbox/Adsorber/pump20KFP.bob   |  6 +-
 .../TMCP_NEW/Coldbox/Adsorber/purge20KFP.bob  |  4 +-
 .../Coldbox/Adsorber/setupTemplate.bob        |  4 +-
 .../TMCP_NEW/Coldbox/Adsorber/warmup20KFP.bob |  8 +-
 .../Coldbox/Modes/modesColdboxTemplate.bob    |  2 +-
 .../Cryo/TMCP_NEW/Coldbox/TIswitches.bob      | 60 +++++++-------
 .../TMCP_NEW/Common/Faceplate/CoalescerFP.bob |  4 +-
 .../Faceplate/Controller/ControllerT0.bob     |  2 +-
 .../Faceplate/Controller/ControllerT0cbx.bob  |  2 +-
 .../Faceplate/Controller/ControllerT0turb.bob |  2 +-
 .../Faceplate/Controller/ControllerT1LL.bob   |  2 +-
 .../Controller/ControllerT1LLcbx.bob          |  2 +-
 .../Controller/ControllerT1SVcbx.bob          |  2 +-
 .../Faceplate/Controller/ControllerTDC.bob    |  2 +-
 .../Faceplate/Controller/ControllerTDC2.bob   |  2 +-
 .../Controller/Extended/ControllerT0.bob      | 16 ++--
 .../Controller/Extended/ControllerT0cbx.bob   | 16 ++--
 .../Controller/Extended/ControllerT0turb.bob  | 14 ++--
 .../Controller/Extended/ControllerT1LL.bob    | 16 ++--
 .../Controller/Extended/ControllerT1LLcbx.bob | 16 ++--
 .../Controller/Extended/ControllerT1SVcbx.bob | 16 ++--
 .../Controller/Extended/ControllerTDC.bob     | 16 ++--
 .../Controller/Extended/ControllerTDC2.bob    | 16 ++--
 .../Controller/Extended/PC217002FP.bob        |  8 +-
 .../Controller/Extended/PC31850FP.bob         | 18 ++---
 .../Controller/Extended/PDC51850FP.bob        | 18 ++---
 .../Faceplate/Controller/Extended/SCFP.bob    | 14 ++--
 .../Controller/Extended/TC311551FP.bob        | 18 ++---
 .../Controller/Extended/TC316101FP.bob        | 20 ++---
 .../Controller/Extended/TC316102FP.bob        | 18 ++---
 .../Controller/Extended/TC31750FP.bob         | 16 ++--
 .../Controller/Extended/TC51200FP.bob         | 16 ++--
 .../Faceplate/Controller/PC217001CtlLim.bob   |  8 +-
 .../Faceplate/Controller/PC217001CtlParm.bob  | 80 +++++++++----------
 .../Faceplate/Controller/PC217001FP.bob       |  4 +-
 .../Controller/PC217001HPctlSPcalc.bob        | 20 ++---
 .../Faceplate/Controller/PC217002FP.bob       |  2 +-
 .../Faceplate/Controller/TC316102FP.bob       |  2 +-
 .../Common/Faceplate/Controller/TC31750FP.bob |  2 +-
 .../Common/Faceplate/Controller/TC51200FP.bob |  2 +-
 .../Cryo/TMCP_NEW/Common/Faceplate/PumpFP.bob |  8 +-
 .../Common/Faceplate/TJScontrolValveFP.bob    | 20 ++---
 .../Common/Faceplate/controlValveFP.bob       |  8 +-
 .../TMCP_NEW/Common/Faceplate/genericUSFP.bob |  8 +-
 .../TMCP_NEW/Common/Faceplate/heaterFP.bob    | 16 ++--
 .../Common/Faceplate/onOffValveFP.bob         |  8 +-
 .../Cryo/TMCP_NEW/Common/MainOPI/header.bob   | 14 ++--
 .../TMCP_NEW/Common/MainOPI/header_backup.bob |  6 +-
 .../TMCP_NEW/Common/MainOPI/header_cr.bob     |  4 +-
 .../TMCP_NEW/Common/MainOPI/header_fp.bob     |  4 +-
 .../Common/MainOPI/rightSideLED_Btns.bob      |  8 +-
 .../Modes/modesCompressorTemplate.bob         |  2 +-
 .../Compressor/stepChain/setupTemplate.bob    |  4 +-
 .../Cryo/TMCP_NEW/Test_Jumper_Spool/CMS.bob   | 18 ++---
 59 files changed, 330 insertions(+), 330 deletions(-)

diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/Sta20K.bob b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/Sta20K.bob
index 1955b73b..e8eb9627 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/Sta20K.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/Sta20K.bob
@@ -1840,7 +1840,7 @@ $(pv_value)</tooltip>
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
   </widget>
@@ -1873,7 +1873,7 @@ $(pv_value)</tooltip>
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
   </widget>
@@ -1906,7 +1906,7 @@ $(pv_value)</tooltip>
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
   </widget>
@@ -1939,7 +1939,7 @@ $(pv_value)</tooltip>
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
   </widget>
@@ -1972,7 +1972,7 @@ $(pv_value)</tooltip>
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
   </widget>
@@ -2005,7 +2005,7 @@ $(pv_value)</tooltip>
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
   </widget>
@@ -2048,7 +2048,7 @@ $(pv_value)</tooltip>
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -2091,7 +2091,7 @@ $(pv_value)</tooltip>
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
   </widget>
@@ -2125,7 +2125,7 @@ $(pv_value)</tooltip>
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
   </widget>
@@ -2168,7 +2168,7 @@ $(pv_value)</tooltip>
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -2220,7 +2220,7 @@ $(pv_value)</tooltip>
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -2272,7 +2272,7 @@ $(pv_value)</tooltip>
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -2324,7 +2324,7 @@ $(pv_value)</tooltip>
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -2376,7 +2376,7 @@ $(pv_value)</tooltip>
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/adsorption20KFP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/adsorption20KFP.bob
index f0dcd6ba..6ef32608 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/adsorption20KFP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/adsorption20KFP.bob
@@ -136,7 +136,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/cooldown20KFP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/cooldown20KFP.bob
index 0f0c68fb..f6508515 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/cooldown20KFP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/cooldown20KFP.bob
@@ -111,7 +111,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/depress20KFP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/depress20KFP.bob
index 063ef124..cf807f1c 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/depress20KFP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/depress20KFP.bob
@@ -111,7 +111,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/press20KFP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/press20KFP.bob
index 432a985b..cb5a44b0 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/press20KFP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/press20KFP.bob
@@ -140,7 +140,7 @@
             <value>false</value>
           </exp>
           <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-          <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+          <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         </rule>
       </rules>
       <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/pump20KFP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/pump20KFP.bob
index e790bf89..dca2592e 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/pump20KFP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/pump20KFP.bob
@@ -82,7 +82,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -162,7 +162,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -271,7 +271,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/purge20KFP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/purge20KFP.bob
index da190688..a9aeb563 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/purge20KFP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/purge20KFP.bob
@@ -111,7 +111,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -216,7 +216,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/setupTemplate.bob b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/setupTemplate.bob
index 87af0f52..91b3ddc3 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/setupTemplate.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/setupTemplate.bob
@@ -113,7 +113,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -168,7 +168,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/warmup20KFP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/warmup20KFP.bob
index 7fd3deeb..8551e885 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/warmup20KFP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/warmup20KFP.bob
@@ -111,7 +111,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -216,7 +216,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -296,7 +296,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -535,7 +535,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Modes/modesColdboxTemplate.bob b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Modes/modesColdboxTemplate.bob
index 27d7b6b7..40e7af10 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Modes/modesColdboxTemplate.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Modes/modesColdboxTemplate.bob
@@ -147,7 +147,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
   </widget>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/TIswitches.bob b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/TIswitches.bob
index 123dfb79..9c509e93 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/TIswitches.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/TIswitches.bob
@@ -57,7 +57,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==0">
@@ -125,7 +125,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -168,7 +168,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==0">
@@ -236,7 +236,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -279,7 +279,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==0">
@@ -347,7 +347,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -390,7 +390,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==0">
@@ -458,7 +458,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -501,7 +501,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==0">
@@ -569,7 +569,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -612,7 +612,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==0">
@@ -680,7 +680,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -723,7 +723,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==0">
@@ -791,7 +791,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -834,7 +834,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==0">
@@ -902,7 +902,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -945,7 +945,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==0">
@@ -1013,7 +1013,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -1056,7 +1056,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==0">
@@ -1124,7 +1124,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -1167,7 +1167,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==0">
@@ -1235,7 +1235,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -1278,7 +1278,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==0">
@@ -1346,7 +1346,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -1389,7 +1389,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==0">
@@ -1457,7 +1457,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -1500,7 +1500,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==0">
@@ -1568,7 +1568,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -1611,7 +1611,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==0">
@@ -1679,7 +1679,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="ColorRule" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/CoalescerFP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/CoalescerFP.bob
index c24db4bd..f742106d 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/CoalescerFP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/CoalescerFP.bob
@@ -405,7 +405,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -444,7 +444,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
   </widget>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT0.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT0.bob
index 0f0b25b5..a41a8c40 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT0.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT0.bob
@@ -117,7 +117,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT0cbx.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT0cbx.bob
index e0a3ef28..477bf256 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT0cbx.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT0cbx.bob
@@ -117,7 +117,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT0turb.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT0turb.bob
index e0a3ef28..477bf256 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT0turb.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT0turb.bob
@@ -117,7 +117,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT1LL.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT1LL.bob
index adb716bf..3b5d6265 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT1LL.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT1LL.bob
@@ -233,7 +233,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT1LLcbx.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT1LLcbx.bob
index 868b37d3..80e6ac6e 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT1LLcbx.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT1LLcbx.bob
@@ -233,7 +233,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT1SVcbx.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT1SVcbx.bob
index 55dbb696..005be1a6 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT1SVcbx.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerT1SVcbx.bob
@@ -233,7 +233,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerTDC.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerTDC.bob
index 8f104369..75ea1ab3 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerTDC.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerTDC.bob
@@ -135,7 +135,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerTDC2.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerTDC2.bob
index e1d167e4..4e0f3852 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerTDC2.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/ControllerTDC2.bob
@@ -117,7 +117,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT0.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT0.bob
index 283a2007..baca1458 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT0.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT0.bob
@@ -317,7 +317,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -351,7 +351,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -385,7 +385,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -419,7 +419,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -453,7 +453,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -487,7 +487,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -521,7 +521,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -555,7 +555,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT0cbx.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT0cbx.bob
index 400f771c..c1e3a9f7 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT0cbx.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT0cbx.bob
@@ -342,7 +342,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -376,7 +376,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -410,7 +410,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -444,7 +444,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -478,7 +478,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -512,7 +512,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -546,7 +546,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -580,7 +580,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT0turb.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT0turb.bob
index 4dfee7b0..9c39cc00 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT0turb.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT0turb.bob
@@ -342,7 +342,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -376,7 +376,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -410,7 +410,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -444,7 +444,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -478,7 +478,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -512,7 +512,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -546,7 +546,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT1LL.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT1LL.bob
index ec4f2334..2603b7cc 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT1LL.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT1LL.bob
@@ -233,7 +233,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -442,7 +442,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -476,7 +476,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -510,7 +510,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -691,7 +691,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -725,7 +725,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -759,7 +759,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -818,7 +818,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT1LLcbx.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT1LLcbx.bob
index 18993c81..fc550575 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT1LLcbx.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT1LLcbx.bob
@@ -233,7 +233,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -442,7 +442,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -476,7 +476,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -510,7 +510,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -691,7 +691,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -725,7 +725,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -759,7 +759,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -818,7 +818,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT1SVcbx.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT1SVcbx.bob
index faad6483..bf9fcfc4 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT1SVcbx.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerT1SVcbx.bob
@@ -233,7 +233,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -442,7 +442,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -476,7 +476,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -510,7 +510,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -691,7 +691,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -725,7 +725,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -759,7 +759,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -818,7 +818,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerTDC.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerTDC.bob
index bb16bc00..d0b98111 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerTDC.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerTDC.bob
@@ -387,7 +387,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -421,7 +421,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -455,7 +455,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -489,7 +489,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -523,7 +523,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -557,7 +557,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -591,7 +591,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -625,7 +625,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerTDC2.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerTDC2.bob
index 3b9dc46d..2781d1b4 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerTDC2.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/ControllerTDC2.bob
@@ -317,7 +317,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -351,7 +351,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -385,7 +385,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -419,7 +419,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -453,7 +453,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -487,7 +487,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -521,7 +521,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -555,7 +555,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/PC217002FP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/PC217002FP.bob
index 9e9f9599..c041f9e3 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/PC217002FP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/PC217002FP.bob
@@ -117,7 +117,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -342,7 +342,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -376,7 +376,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -410,7 +410,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/PC31850FP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/PC31850FP.bob
index 43e18c26..70d0bc6d 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/PC31850FP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/PC31850FP.bob
@@ -188,7 +188,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -222,7 +222,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -256,7 +256,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -416,7 +416,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -450,7 +450,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -484,7 +484,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -543,7 +543,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -939,7 +939,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1019,7 +1019,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/PDC51850FP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/PDC51850FP.bob
index 5f79a903..a4e2a8d7 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/PDC51850FP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/PDC51850FP.bob
@@ -362,7 +362,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -396,7 +396,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -430,7 +430,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -611,7 +611,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -645,7 +645,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -679,7 +679,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -738,7 +738,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1031,7 +1031,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1157,7 +1157,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/SCFP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/SCFP.bob
index 97c73701..1c2638da 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/SCFP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/SCFP.bob
@@ -267,7 +267,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -301,7 +301,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -335,7 +335,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -369,7 +369,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -403,7 +403,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -437,7 +437,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -788,7 +788,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/TC311551FP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/TC311551FP.bob
index 139f3cc7..b363dfe0 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/TC311551FP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/TC311551FP.bob
@@ -337,7 +337,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -371,7 +371,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -531,7 +531,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -565,7 +565,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -599,7 +599,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -750,7 +750,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -830,7 +830,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -939,7 +939,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1019,7 +1019,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/TC316101FP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/TC316101FP.bob
index 1bb0334a..fbcfc447 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/TC316101FP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/TC316101FP.bob
@@ -312,7 +312,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -451,7 +451,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -485,7 +485,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -519,7 +519,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -620,7 +620,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -817,7 +817,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -851,7 +851,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1056,7 +1056,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1090,7 +1090,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1191,7 +1191,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/TC316102FP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/TC316102FP.bob
index c61de4bb..6ff08fd4 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/TC316102FP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/TC316102FP.bob
@@ -287,7 +287,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -405,7 +405,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -439,7 +439,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -473,7 +473,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -603,7 +603,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -637,7 +637,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -738,7 +738,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -893,7 +893,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -973,7 +973,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/TC31750FP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/TC31750FP.bob
index a402ad21..f7a535a0 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/TC31750FP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/TC31750FP.bob
@@ -233,7 +233,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -417,7 +417,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -451,7 +451,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -485,7 +485,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -645,7 +645,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -679,7 +679,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -713,7 +713,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -772,7 +772,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/TC51200FP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/TC51200FP.bob
index 4cbc577c..548efa4b 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/TC51200FP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/Extended/TC51200FP.bob
@@ -233,7 +233,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -417,7 +417,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -451,7 +451,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -485,7 +485,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -645,7 +645,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -679,7 +679,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -713,7 +713,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -772,7 +772,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/PC217001CtlLim.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/PC217001CtlLim.bob
index 77758a43..26421cb6 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/PC217001CtlLim.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/PC217001CtlLim.bob
@@ -213,7 +213,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -247,7 +247,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -448,7 +448,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -482,7 +482,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/PC217001CtlParm.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/PC217001CtlParm.bob
index 685fd44e..d927157e 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/PC217001CtlParm.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/PC217001CtlParm.bob
@@ -38,7 +38,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -114,7 +114,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -148,7 +148,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -224,7 +224,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -258,7 +258,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -292,7 +292,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -368,7 +368,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -402,7 +402,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -478,7 +478,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -533,7 +533,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -567,7 +567,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -643,7 +643,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -677,7 +677,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -753,7 +753,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -808,7 +808,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -842,7 +842,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -918,7 +918,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -952,7 +952,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1028,7 +1028,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1083,7 +1083,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1117,7 +1117,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1193,7 +1193,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1227,7 +1227,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1303,7 +1303,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1533,7 +1533,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1567,7 +1567,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1843,7 +1843,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1877,7 +1877,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1976,7 +1976,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -2031,7 +2031,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -2065,7 +2065,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -2141,7 +2141,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -2175,7 +2175,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -2251,7 +2251,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -2306,7 +2306,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -2340,7 +2340,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -2416,7 +2416,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -2450,7 +2450,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -2526,7 +2526,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -2581,7 +2581,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/PC217001FP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/PC217001FP.bob
index 744f1876..00a4a551 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/PC217001FP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/PC217001FP.bob
@@ -418,7 +418,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -936,7 +936,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/PC217001HPctlSPcalc.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/PC217001HPctlSPcalc.bob
index f5857fd5..852e5821 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/PC217001HPctlSPcalc.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/PC217001HPctlSPcalc.bob
@@ -287,7 +287,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -363,7 +363,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -489,7 +489,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -565,7 +565,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -599,7 +599,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -675,7 +675,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -709,7 +709,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -769,7 +769,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="BckgColor" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv1==1">
@@ -849,7 +849,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="BckgColor" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv1==0">
@@ -1037,7 +1037,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         <pv_name>$(CTRLPRE):ManModeSpOn-RB</pv_name>
       </rule>
     </rules>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/PC217002FP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/PC217002FP.bob
index 4c26cae2..4c8eb71b 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/PC217002FP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/PC217002FP.bob
@@ -117,7 +117,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/TC316102FP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/TC316102FP.bob
index c7568c44..1a60eaea 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/TC316102FP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/TC316102FP.bob
@@ -230,7 +230,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/TC31750FP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/TC31750FP.bob
index 7e8963fb..ef33bc48 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/TC31750FP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/TC31750FP.bob
@@ -233,7 +233,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/TC51200FP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/TC51200FP.bob
index 1e6973aa..e4c7f4e2 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/TC51200FP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/Controller/TC51200FP.bob
@@ -233,7 +233,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/PumpFP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/PumpFP.bob
index 51423468..8064ac40 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/PumpFP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/PumpFP.bob
@@ -90,7 +90,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="BackgroundMan" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -140,7 +140,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="BkgndAuto" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==0">
@@ -190,7 +190,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         <pv_name>$(PRE):MM-RB</pv_name>
       </rule>
       <rule name="Background" prop_id="background_color" out_exp="false">
@@ -241,7 +241,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         <pv_name>$(PRE):MM-RB</pv_name>
       </rule>
       <rule name="Background" prop_id="background_color" out_exp="false">
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/TJScontrolValveFP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/TJScontrolValveFP.bob
index 9787f9db..cab5674b 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/TJScontrolValveFP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/TJScontrolValveFP.bob
@@ -118,7 +118,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="BackgroundMan" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -168,7 +168,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="BkgndAuto" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==0">
@@ -280,7 +280,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         <pv_name>$(PRE):Man-RB</pv_name>
       </rule>
     </rules>
@@ -316,7 +316,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         <pv_name>$(PRE):Man-RB</pv_name>
       </rule>
     </rules>
@@ -428,7 +428,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="BackgroundMan" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -472,7 +472,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="BkgndAuto" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==0">
@@ -556,7 +556,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -591,7 +591,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -720,7 +720,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -755,7 +755,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/controlValveFP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/controlValveFP.bob
index 1ed65749..a44fdb7c 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/controlValveFP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/controlValveFP.bob
@@ -118,7 +118,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="BackgroundMan" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -168,7 +168,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="BkgndAuto" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==0">
@@ -280,7 +280,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         <pv_name>$(PRE):Man-RB</pv_name>
       </rule>
     </rules>
@@ -316,7 +316,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         <pv_name>$(PRE):Man-RB</pv_name>
       </rule>
     </rules>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/genericUSFP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/genericUSFP.bob
index a91541a7..c60a96ae 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/genericUSFP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/genericUSFP.bob
@@ -89,7 +89,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="BackgroundMan" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -138,7 +138,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="BkgndAuto" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==0">
@@ -188,7 +188,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         <pv_name>$(PRE):MM-RB</pv_name>
       </rule>
       <rule name="Background" prop_id="background_color" out_exp="false">
@@ -239,7 +239,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         <pv_name>$(PRE):MM-RB</pv_name>
       </rule>
       <rule name="Background" prop_id="background_color" out_exp="false">
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/heaterFP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/heaterFP.bob
index bebbf7ec..65a6d15b 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/heaterFP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/heaterFP.bob
@@ -97,7 +97,7 @@
             <value>false</value>
           </exp>
           <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-          <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+          <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         </rule>
         <rule name="BackgroundMan" prop_id="background_color" out_exp="false">
           <exp bool_exp="pv0==1">
@@ -147,7 +147,7 @@
             <value>false</value>
           </exp>
           <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-          <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+          <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         </rule>
         <rule name="BkgndAuto" prop_id="background_color" out_exp="false">
           <exp bool_exp="pv0==0">
@@ -196,7 +196,7 @@
             <value>false</value>
           </exp>
           <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-          <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+          <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
           <pv_name>$(PRE)MM-RB</pv_name>
         </rule>
         <rule name="Background" prop_id="background_color" out_exp="false">
@@ -247,7 +247,7 @@
             <value>false</value>
           </exp>
           <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-          <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+          <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
           <pv_name>$(PRE)MM-RB</pv_name>
         </rule>
         <rule name="Background" prop_id="background_color" out_exp="false">
@@ -418,7 +418,7 @@
             <value>false</value>
           </exp>
           <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-          <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+          <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
           <pv_name>$(PREH)Man-RB</pv_name>
         </rule>
       </rules>
@@ -483,7 +483,7 @@
             <value>false</value>
           </exp>
           <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-          <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+          <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         </rule>
         <rule name="BackgroundMan" prop_id="background_color" out_exp="false">
           <exp bool_exp="pv0==1">
@@ -533,7 +533,7 @@
             <value>false</value>
           </exp>
           <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-          <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+          <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         </rule>
         <rule name="BkgndAuto" prop_id="background_color" out_exp="false">
           <exp bool_exp="pv0==0">
@@ -626,7 +626,7 @@
             <value>false</value>
           </exp>
           <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-          <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+          <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
           <pv_name>$(PREH)Man-RB</pv_name>
         </rule>
       </rules>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/onOffValveFP.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/onOffValveFP.bob
index e6a729ed..3c9c7c50 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/onOffValveFP.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/Faceplate/onOffValveFP.bob
@@ -68,7 +68,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="BackgroundMan" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -118,7 +118,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="BkgndAuto" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==0">
@@ -190,7 +190,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         <pv_name>$(PRE):MM-RB</pv_name>
       </rule>
       <rule name="Background" prop_id="background_color" out_exp="false">
@@ -241,7 +241,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         <pv_name>$(PRE):MM-RB</pv_name>
       </rule>
       <rule name="Background" prop_id="background_color" out_exp="false">
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/MainOPI/header.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/MainOPI/header.bob
index 01405171..e47fec10 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/MainOPI/header.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/MainOPI/header.bob
@@ -259,7 +259,7 @@ $(pv_value)</tooltip>
         <description>Write 1 to PV</description>
       </action>
     </actions>
-    <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+    <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
     <text>Enable access</text>
     <x>120</x>
     <y>55</y>
@@ -294,7 +294,7 @@ $(pv_value)</tooltip>
         <description>Write 0 to PV</description>
       </action>
     </actions>
-    <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+    <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
     <text>Disable access</text>
     <x>270</x>
     <y>55</y>
@@ -312,7 +312,7 @@ $(pv_value)</tooltip>
         <exp bool_exp="pv0==1">
           <value>true</value>
         </exp>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <tooltip>$(actions)</tooltip>
@@ -779,7 +779,7 @@ $(pv_value)</tooltip>
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -814,7 +814,7 @@ $(pv_value)</tooltip>
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1000,7 +1000,7 @@ $(pv_value)</tooltip>
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1041,7 +1041,7 @@ $(pv_value)</tooltip>
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="Bkgd" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv1==1">
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/MainOPI/header_backup.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/MainOPI/header_backup.bob
index bb5cf162..00329a7b 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/MainOPI/header_backup.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/MainOPI/header_backup.bob
@@ -259,7 +259,7 @@ $(pv_value)</tooltip>
         <description>Write 1 to PV</description>
       </action>
     </actions>
-    <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+    <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
     <text>Enable</text>
     <x>250</x>
     <y>53</y>
@@ -290,7 +290,7 @@ $(pv_value)</tooltip>
         <description>Write 0 to PV</description>
       </action>
     </actions>
-    <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+    <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
     <text>Disable</text>
     <x>362</x>
     <y>53</y>
@@ -304,7 +304,7 @@ $(pv_value)</tooltip>
         <exp bool_exp="pv0==1">
           <value>true</value>
         </exp>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <tooltip>$(actions)</tooltip>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/MainOPI/header_cr.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/MainOPI/header_cr.bob
index 5355175a..4b56f0d1 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/MainOPI/header_cr.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/MainOPI/header_cr.bob
@@ -261,7 +261,7 @@ $(pv_value)</tooltip>
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::LOCALSCREENLOCKONE</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
   </widget>
@@ -374,7 +374,7 @@ $(pv_value)</tooltip>
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::LOCALSCREENLOCKTWO</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
   </widget>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/MainOPI/header_fp.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/MainOPI/header_fp.bob
index 10c3beda..f0528083 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/MainOPI/header_fp.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/MainOPI/header_fp.bob
@@ -141,7 +141,7 @@ $(pv_value)</tooltip>
         <description>Write 0 to PV</description>
       </action>
     </actions>
-    <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+    <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
     <text>Unlock</text>
     <x>342</x>
     <y>53</y>
@@ -155,7 +155,7 @@ $(pv_value)</tooltip>
         <exp bool_exp="pv0==1">
           <value>true</value>
         </exp>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <tooltip>$(actions)</tooltip>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Common/MainOPI/rightSideLED_Btns.bob b/NON-APPROVED/Cryo/TMCP_NEW/Common/MainOPI/rightSideLED_Btns.bob
index fecaf36f..ab790d27 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Common/MainOPI/rightSideLED_Btns.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Common/MainOPI/rightSideLED_Btns.bob
@@ -42,7 +42,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
   </widget>
@@ -76,7 +76,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
   </widget>
@@ -252,7 +252,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <show_confirm_dialog>2</show_confirm_dialog>
@@ -288,7 +288,7 @@ direct load</text>
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="Bkgd" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv1==1">
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Compressor/Modes/modesCompressorTemplate.bob b/NON-APPROVED/Cryo/TMCP_NEW/Compressor/Modes/modesCompressorTemplate.bob
index eb887949..aa20f256 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Compressor/Modes/modesCompressorTemplate.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Compressor/Modes/modesCompressorTemplate.bob
@@ -150,7 +150,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
   </widget>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Compressor/stepChain/setupTemplate.bob b/NON-APPROVED/Cryo/TMCP_NEW/Compressor/stepChain/setupTemplate.bob
index 75f7a733..5665b450 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Compressor/stepChain/setupTemplate.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Compressor/stepChain/setupTemplate.bob
@@ -113,7 +113,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -168,7 +168,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
     </rules>
     <border_alarm_sensitive>false</border_alarm_sensitive>
diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Test_Jumper_Spool/CMS.bob b/NON-APPROVED/Cryo/TMCP_NEW/Test_Jumper_Spool/CMS.bob
index 25edad13..c3a8a7e9 100644
--- a/NON-APPROVED/Cryo/TMCP_NEW/Test_Jumper_Spool/CMS.bob
+++ b/NON-APPROVED/Cryo/TMCP_NEW/Test_Jumper_Spool/CMS.bob
@@ -247,7 +247,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         <pv_name>$(PRE):CMSLocalRemote-RB</pv_name>
       </rule>
     </rules>
@@ -303,7 +303,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         <pv_name>$(PRE):CMSLocalRemote-RB</pv_name>
       </rule>
     </rules>
@@ -359,7 +359,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         <pv_name>$(PRE):CMSLocalRemote-RB</pv_name>
       </rule>
     </rules>
@@ -483,7 +483,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="BackgroundMan" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==1">
@@ -533,7 +533,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
       </rule>
       <rule name="BkgndAuto" prop_id="background_color" out_exp="false">
         <exp bool_exp="pv0==0">
@@ -582,7 +582,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         <pv_name>$(PRE):CMSLocalRemote-RB</pv_name>
       </rule>
       <rule name="BackgroundMan" prop_id="background_color" out_exp="false">
@@ -632,7 +632,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         <pv_name>$(PRE):CMSLocalRemote-RB</pv_name>
       </rule>
       <rule name="BackgroundMan" prop_id="background_color" out_exp="false">
@@ -724,7 +724,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         <pv_name>$(PRE):CMSLocalRemote-RB</pv_name>
       </rule>
       <rule name="BackgroundMan" prop_id="background_color" out_exp="false">
@@ -774,7 +774,7 @@
           <value>false</value>
         </exp>
         <pv_name>CrS-TMCP::SCREENLOCK</pv_name>
-        <pv_name>$(P)-LOCALSCREENLOCK$(LOCKID)</pv_name>
+        <pv_name>CrS-TMCP::LOCALSCREENLOCK$(LOCKID)</pv_name>
         <pv_name>$(PRE):CMSLocalRemote-RB</pv_name>
       </rule>
       <rule name="BackgroundMan" prop_id="background_color" out_exp="false">
-- 
GitLab