diff --git a/services/injectionguard/current/ioc/AGEBD-CPCL-INJECTIONGUARD_main.subs b/services/injectionguard/current/ioc/AGEBD-CPCL-INJECTIONGUARD_main.subs
index 9fe790b..10eab88 100644
--- a/services/injectionguard/current/ioc/AGEBD-CPCL-INJECTIONGUARD_main.subs
+++ b/services/injectionguard/current/ioc/AGEBD-CPCL-INJECTIONGUARD_main.subs
@@ -1,31 +1,31 @@
 file INJECTIONGUARD_individual.template {
   pattern { DEVICE }
-  { AGEBD-INJECTIONGUARD }
+  { AGEBD-INJECTIONGUARD{{ agebd_env }} }
 }
 
 file INJECTIONGUARD_automated.template {
-  pattern { NR  Latch Description }
-          { 01  1     "Beam Dump Kicker"}
-          { 02  1     "Dump Valve"}
-          { 03  1     "MIS"}
-          { 04  1     "VCS"}
-          { 05  1     "Linac KV/BB/BY"}
-          { 06  1     "RF Linac"}
-          { 07  1     "RF Booster"}
-          { 08  1     "RF Ring"}
-          { 09  1     "Magnets Pulsed"}
-          { 10  1     "Magnets Booster"}
-          { 11  1     "Magnets Corrector"}
-          { 12  1     "Magnets Ring"}
-          { 13  1     "Current Limit"}
-          { 14  1     "IDs Ready"}
-          { 15  1     "Single Bunch Charge"}
-          { 16  1     "Injection Quality"}
-          { 17  1     "Dump Quality"}
-          { 18  1     "Lifetime"}
-          { 19  1     "Tune"}
-          { 20  0     "Pingers"}
-          { 21  1     "Vacuum Pressure"}
-          { 22  1     "Orbit Deviation"}
-          { 23  1     "Beam Dump Controller"}
-}
\ No newline at end of file
+  pattern { DEVICE                               NR  Latch Description }
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  01  1     "Beam Dump Kicker"}
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  02  1     "Dump Valve"}
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  03  1     "MIS"}
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  04  1     "VCS"}
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  05  1     "Linac KV/BB/BY"}
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  06  1     "RF Linac"}
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  07  1     "RF Booster"}
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  08  1     "RF Ring"}
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  09  1     "Magnets Pulsed"}
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  10  1     "Magnets Booster"}
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  11  1     "Magnets Corrector"}
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  12  1     "Magnets Ring"}
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  13  1     "Current Limit"}
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  14  1     "IDs Ready"}
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  15  1     "Single Bunch Charge"}
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  16  1     "Injection Quality"}
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  17  1     "Dump Quality"}
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  18  1     "Lifetime"}
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  19  1     "Tune"}
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  20  0     "Pingers"}
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  21  1     "Vacuum Pressure"}
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  22  1     "Orbit Deviation"}
+          { AGEBD-INJECTIONGUARD{{ agebd_env }}  23  1     "Beam Dump Controller"}
+}
diff --git a/services/injectionguard/current/ioc/INJECTIONGUARD_individual.template b/services/injectionguard/current/ioc/INJECTIONGUARD_individual.template
index b7c421f..b6e66d2 100644
--- a/services/injectionguard/current/ioc/INJECTIONGUARD_individual.template
+++ b/services/injectionguard/current/ioc/INJECTIONGUARD_individual.template
@@ -283,22 +283,22 @@ record(calc, "$(DEVICE):CHECK-SUM-LATCH") {
     field(INPL, "$(DEVICE):CHECK-SUM-LATCH-A")
 }
 
-record(bo, "AGEBD-INJECTIONGUARD:RESET-LATCHES") {
+record(bo, "$(DEVICE):RESET-LATCHES") {
     field(DESC, "Reset all Latches")
     field(ASG,  "PROTECTED")
-    field(FLNK, "AGEBD-INJECTIONGUARD:RESET-LATCHES-CALCOUT")
+    field(FLNK, "$(DEVICE):RESET-LATCHES-CALCOUT")
     field(VAL,  "0")
     field(PINI, "YES")
     field(HIGH, "1") # Seconds until automatic switch to 0
 }
 
-record(calcout, "AGEBD-INJECTIONGUARD:RESET-LATCHES-CALCOUT") {
+record(calcout, "$(DEVICE):RESET-LATCHES-CALCOUT") {
     field(DESC, "Reset all Latches")
     field(ASG,  "PROTECTED")
     field(VAL,  "0")
     field(PINI, "YES")
     field(CALC, "A")
-    field(INPA, "AGEBD-INJECTIONGUARD:RESET-LATCHES")
+    field(INPA, "$(DEVICE):RESET-LATCHES")
     field(OOPT, "Transition To Non-zero")
     field(OEVT, "5")
 }