diff --git a/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/Sta20K.bob b/NON-APPROVED/Cryo/TMCP_NEW/Coldbox/Adsorber/Sta20K.bob
index 1955b73bf344cd649eab49af96459e9b45d3cc45..e8eb9627998a6e4a8814868af48f64b8d483849e 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 f0dcd6ba1a01bc6877f7831bd5ff8ba4b0605ba5..6ef32608655662e84b7c004d279f160d723dd2de 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 0f0c68fbdce1a4b66ec03655dd44b47f042a9e57..f65085151801a92787035412f404d7a75fdb794e 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 063ef124c4eff7596d7c7d56e46ed77370eeea71..cf807f1c75a614de1c06dd8ba6b8ae1832256fe3 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 432a985b1777e1cd743e0b724e6f337da999a5d3..cb5a44b008bf115a297d5d9d4b3e13a8b87a9ec5 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 e790bf892e68731a7d6cc0343372b93c4aaf92b8..dca2592e3ded181b232d0c363cc02ab69476e03d 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 da190688951f0581996c09ca0a91244afdcacfba..a9aeb563dabf755a69110ebfc18833685984efbd 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 87af0f52a76b4c5becf5479673103a5c0b753b56..91b3ddc33858f7a0e22a2e53976c5e31c983d4c7 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 7fd3deeb510a29b08d4d593c3f695a43c1cfbf0d..8551e885b066849ae9b6420a3a2ee77d7f6ee12c 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 27d7b6b74c2fe49784f51e7a06cab20aff00c40c..40e7af106159702f81909360a9c6aa1a3b9e7c36 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 123dfb796f72f52214da2d93147ffe6ecc2226b2..9c509e937e6d096511cb7653ac4926a052bc3e61 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 c24db4bd4d5f415c13dc038e996d6d7712d39986..f742106da0c616cbcd1ef20fc93e52906559aebe 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 0f0b25b522379c07b92280403243538084339d48..a41a8c40fab9af561b15b44e3365323d62efafa6 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 e0a3ef287a6e375a03ff60c38399e5fdbf991f03..477bf25608668216ebc336413bafefc3c4cc1818 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 e0a3ef287a6e375a03ff60c38399e5fdbf991f03..477bf25608668216ebc336413bafefc3c4cc1818 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 adb716bfd670ad40c0c42785f8cbef6734732904..3b5d62659eac3b7044238c7d1d82755280cd3f18 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 868b37d3a11a9847b90417d2100748ae12b8aae5..80e6ac6eea81af814aeb0963ffae6a06b160a9bd 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 55dbb6961700620ea41c555d508449d649c661ce..005be1a6ae5ba6242c7b66501caf0fb5367c4849 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 8f104369095a94a7d9a58dabc7bbad01485bbc1e..75ea1ab3397784800bad529ab171362fdc46671b 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 e1d167e40ae370b0998d42bf2788112fe38770bf..4e0f3852cb0ca2ad6e5b0567b8b540538053384b 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 283a20076db964fbb15a99e467e8f9e4a402e5bc..baca14588a79a023236f8a95f8b9c3ee890b7da6 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 400f771c9471356cbd14d32ed15895c63c5ca8d5..c1e3a9f7af465ef272f12127fd2cecb3237c77af 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 4dfee7b0a4ac80386505d5944ff44a346f97d415..9c39cc00fdc83800789a35622ea1e0a6ea457c70 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 ec4f23344252c0235d8b49e6e7e42d369f3fdcc0..2603b7cc8be4493e305c21e1f21868ac8f5f85b0 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 18993c812374e00926db9ea8518a8b8d2f098771..fc550575f38dc2f16ecab5deef14d97a9941edd0 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 faad6483ffcbf81a97e7304c7ec2809b9e73e7d1..bf9fcfc4bc71329640d8d998e1a8db7f0ee93911 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 bb16bc00c279abeb4714a6d42ebcd5ad34c9a2c3..d0b98111c9ff90dcb4879b680cac1f02f2623c48 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 3b9dc46d03464aa9b93478c5dc3b1e789624860b..2781d1b4f4239dece1ed59253da2905ea8ef1485 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 9e9f9599c2d4e234d6438a198d2f2c1a307c45bf..c041f9e3deac3da2c24d58215942584ec6702649 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 43e18c2674f7989ccb77ee9e1b6602a18f036354..70d0bc6d16f726ad8e492246570747d9a38cdc6f 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 5f79a9034af335586ec4c4741e9a35a227525168..a4e2a8d750060eb46a73f6d9c62dac3a9f9f6374 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 97c73701699b3cdd5a4fe73b3c4dc67df94e4483..1c2638dae92f1713ecb2737e4011a0c76147d54e 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 139f3cc75ae0d6c95325bdb552f1b4638473ac63..b363dfe0fd91452c114d360993682baf8c2ceb3f 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 1bb0334abf2f6b87c1136ea7622f1dc79d67a15c..fbcfc447f02827e7c51a90025da1e68e86c3050f 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 c61de4bb986a6475501017e3ba7b4c3bed6d7c11..6ff08fd412f27d826436002d18bfa9f76cac6303 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 a402ad21dc42179545edb0572628fb80b0710048..f7a535a04f848a46847ed888c5425b1d5778c101 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 4cbc577ca6a45077e943fd49af3d1af087603ac6..548efa4b4ff3fce4f6588e56f4825eeeda0d4cd0 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 77758a4395cea5cec71134f7402f6d94b7c738a7..26421cb6d60e597a39c5592c76bd06f3a4ff5bc2 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 685fd44ef0c0315514b244b6d53d428a34f0742b..d927157e7118cd10c3f6b9d66a261c8593e92afb 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 744f1876e3879d4c405a983d7be1f9d0459e399a..00a4a551ec06894934a829308238571db7d9bc43 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 f5857fd59df3bae588d63dbc0a9a4a0dbf9510db..852e58216121f0e2e8237cf23f896a2780da6a60 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 4c26cae24fbcc7aad85316e678027ed533f9e793..4c8eb71b53698b2716eb94300f9bde73ce052941 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 c7568c445d417e44c97cec00729853256f963720..1a60eaea9984b97d2c30c0cb073582bd82ad5593 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 7e8963fbdd944866024d6b3a0d1ab028ed9e012b..ef33bc48b94aa01743d04458faa5447e21bac9fd 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 1e6973aa6f57e1691c5767ce9787f0594e9a3a47..e4c7f4e26380c01a9e26ce3669e55111661464e7 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 5142346886970367ae0988667857166618b5c7f1..8064ac40cc983d99bd88b364a8e5c97ed45bf919 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 9787f9dbda0e75ccae86720aff0713bf405a15fe..cab5674ba32a85896d7b4ea76c6a390698383cfd 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 1ed657499c84e9763afb122081b50d1f363d578c..a44fdb7cb38152c7dbc9c7cfe017a0147c920c8e 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 a91541a750e0daff15092180bea3b54cd4095770..c60a96aeac16ccf8a970a4fc44f8900ac29d39fe 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 bebbf7eca9f9495b3e2bee064b58f4f2efd12c16..65a6d15b7094c34383d1d2564313a7c160dcd31f 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 e6a729ed4de97526694c35831bb6fc76d06daa40..3c9c7c5019a381d481ecc03285b4f31df5f09b10 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 0140517177319f3574bb35d7ebb11b6e19ab9326..e47fec100fd6f24788c70c5821736fc9105020e0 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 bb5cf1623ec8e9a6b291e2e7af3bd7f3c61fa465..00329a7b5bd5e1c07528583de82d7adf34eccf20 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 5355175a10661c8c1a7724c162cfa5226c0e3c5e..4b56f0d13725ece650a5569bca8b003035ffc5f1 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 10c3beda1d66ed6d4b68e6a446eba6cf63f39340..f05280833292a4f058b94cf5124b4f8f0c4fad28 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 fecaf36f3e83501e5107ae77f27993c0adaf78c4..ab790d27f15c009975447fbb1e4872c01417b071 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 eb887949c2ff4ba79360e3fdb948c1ce389e7923..aa20f2564e753faf2e97bb60e1065e112ed74a53 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 75f7a733ae753b15024f4482806e55415045aeae..5665b45066daee83916cb183cf439ecbd16e325a 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 25edad1316c0754643e2ffeb8514bd8faa8001c2..c3a8a7e9be8f3830a18244dc33640eac4b47b123 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">