diff --git a/alarm-01.tn.esss.lu.se/BIS.xml b/alarm-01.tn.esss.lu.se/BIS.xml
index 39ac928ce2ad19de08261d816e40bf2ab63fac9a..6d69539f985427229fad693a07bbd2a1b06586a3 100644
--- a/alarm-01.tn.esss.lu.se/BIS.xml
+++ b/alarm-01.tn.esss.lu.se/BIS.xml
@@ -5586,7 +5586,7 @@
   </component>
   <component name="MPSoS-PwrSup">
     <component name="U02">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U02:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-02:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -5615,7 +5615,7 @@
       </pv>
     </component>
     <component name="U03">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U03:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-03:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -5635,7 +5635,7 @@
       </pv>
     </component>
     <component name="U04">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U04:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-04:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -5655,7 +5655,7 @@
       </pv>
     </component>
     <component name="U07">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U07:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-07:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -5675,7 +5675,7 @@
       </pv>
     </component>
     <component name="U09">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U09:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-09:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -5704,7 +5704,7 @@
       </pv>
     </component>
     <component name="U11">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U11:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-11:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -5733,7 +5733,7 @@
       </pv>
     </component>
     <component name="U13">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U13:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-13:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -5762,7 +5762,7 @@
       </pv>
     </component>
     <component name="U15">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U15:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-15:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -5791,7 +5791,7 @@
       </pv>
     </component>
     <component name="U17">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U17:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-17:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -5820,7 +5820,7 @@
       </pv>
     </component>
     <component name="U19">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U19:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-19:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -5849,7 +5849,7 @@
       </pv>
     </component>
     <component name="U21">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U21:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-21:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -5878,7 +5878,7 @@
       </pv>
     </component>
     <component name="U23">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U23:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-23:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -5907,7 +5907,7 @@
       </pv>
     </component>
     <component name="U25">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U25:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-25:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -5936,7 +5936,7 @@
       </pv>
     </component>
     <component name="U27">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U27:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-27:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -5965,7 +5965,7 @@
       </pv>
     </component>
     <component name="U28">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U28:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-28:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -5994,7 +5994,7 @@
       </pv>
     </component>
     <component name="U31">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U31:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-31:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -6023,7 +6023,7 @@
       </pv>
     </component>
     <component name="U33">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U33:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-33:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -6052,7 +6052,7 @@
       </pv>
     </component>
     <component name="U35">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U35:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-35:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -6081,7 +6081,7 @@
       </pv>
     </component>
     <component name="U37">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U37:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-37:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -6110,7 +6110,7 @@
       </pv>
     </component>
     <component name="U39">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U39:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-39:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -6139,7 +6139,7 @@
       </pv>
     </component>
     <component name="U41">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U41:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-41:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -6168,7 +6168,7 @@
       </pv>
     </component>
     <component name="U43">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U43:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-43:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -6197,7 +6197,7 @@
       </pv>
     </component>
     <component name="U45">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U45:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-45:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -6226,7 +6226,7 @@
       </pv>
     </component>
     <component name="U47">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U47:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-47:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -6255,7 +6255,7 @@
       </pv>
     </component>
     <component name="U48">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U48:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-48:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -6275,7 +6275,7 @@
       </pv>
     </component>
     <component name="U49">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U49:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-49:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -6304,7 +6304,7 @@
       </pv>
     </component>
     <component name="U51">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U51:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-51:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -6342,7 +6342,7 @@
       </pv>
     </component>
     <component name="U52">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U52:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-52:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -6380,7 +6380,7 @@
       </pv>
     </component>
     <component name="U53">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U53:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-53:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>
@@ -6418,7 +6418,7 @@
       </pv>
     </component>
     <component name="U54">
-      <pv name="MPSoS-PwrSup:Ctrl-PLC-U54:Heartbeat_Stat">
+      <pv name="MPSoS-PwrSup:Ctrl-PLC-54:Heartbeat_Stat">
         <description>Watchdog for Siemens LOGO! PLC Status</description>
         <latching>false</latching>
         <annunciating>true</annunciating>