diff --git a/services/injectionguard/current/ioc/INJECTIONGUARD_automated.template b/services/injectionguard/current/ioc/INJECTIONGUARD_automated.template
index ebb7172..3661b8b 100644
--- a/services/injectionguard/current/ioc/INJECTIONGUARD_automated.template
+++ b/services/injectionguard/current/ioc/INJECTIONGUARD_automated.template
@@ -1,17 +1,17 @@
-record(bo, "AGEBD-INJECTIONGUARD:CONTROL-BRIDGE-CHECK-$(NR)") {
+record(bo, "$(DEVICE):CONTROL-BRIDGE-CHECK-$(NR)") {
     field(DESC, "Only in MD mode: bridge check $(NR)")
     field(ASG,  "PROTECTED")
-    field(FLNK, "AGEBD-INJECTIONGUARD:CHECK-$(NR)-MD")
+    field(FLNK, "$(DEVICE):CHECK-$(NR)-MD")
     field(VAL,  "0")
     field(ZSV,  "NO_ALARM")
     field(OSV,  "MINOR")
     field(PINI, "YES")
 }
 
-record(bo, "AGEBD-INJECTIONGUARD:CHECK-$(NR)") {
+record(bo, "$(DEVICE):CHECK-$(NR)") {
     field(DESC, "$(Description)")
     field(ASG,  "PROTECTED")
-    field(FLNK, "AGEBD-INJECTIONGUARD:CHECK-$(NR)-MD")
+    field(FLNK, "$(DEVICE):CHECK-$(NR)-MD")
     field(ZSV,  "MAJOR")
     field(OSV,  "NO_ALARM")
     field(VAL,  "1")
@@ -19,53 +19,53 @@ record(bo, "AGEBD-INJECTIONGUARD:CHECK-$(NR)") {
     field(HIGH, "1") # Seconds until automatic switch to Alarm
 }
 
-record(calc, "AGEBD-INJECTIONGUARD:CHECK-$(NR)-MD") {
+record(calc, "$(DEVICE):CHECK-$(NR)-MD") {
     field(DESC, "Check $(NR) MD, written by IOC")
     field(ASG,  "READONLY")
-    field(FLNK, "AGEBD-INJECTIONGUARD:CHECK-$(NR)-LATCHFWD")
+    field(FLNK, "$(DEVICE):CHECK-$(NR)-LATCHFWD")
     field(LOLO, "0.1")
     field(LLSV, "MAJOR")
     field(CALC, "A ? 1 : B") 
-    field(INPA, "AGEBD-INJECTIONGUARD:CONTROL-BRIDGE-CHECK-$(NR)")
-    field(INPB, "AGEBD-INJECTIONGUARD:CHECK-$(NR)")
+    field(INPA, "$(DEVICE):CONTROL-BRIDGE-CHECK-$(NR)")
+    field(INPB, "$(DEVICE):CHECK-$(NR)")
 }
 
 # forward only alarm states to latch bo
-record(calcout, "AGEBD-INJECTIONGUARD:CHECK-$(NR)-LATCHFWD") {
+record(calcout, "$(DEVICE):CHECK-$(NR)-LATCHFWD") {
     field(DESC, "Latchfwd for check $(NR)")
     field(ASG,  "READONLY")
-    field(FLNK, "AGEBD-INJECTIONGUARD:CHECK-$(NR)-LATCH")
+    field(FLNK, "$(DEVICE):CHECK-$(NR)-LATCH")
     field(CALC, "$(Latch)? ( A? C : B ) : 1")
     field(PINI, "YES")
-    field(INPA, "AGEBD-INJECTIONGUARD:CONTROL-MODE CP")
-    field(INPB, "AGEBD-INJECTIONGUARD:CHECK-$(NR) CP")
-    field(INPC, "AGEBD-INJECTIONGUARD:CHECK-$(NR)-MD CP")
+    field(INPA, "$(DEVICE):CONTROL-MODE CP")
+    field(INPB, "$(DEVICE):CHECK-$(NR) CP")
+    field(INPC, "$(DEVICE):CHECK-$(NR)-MD CP")
     field(OOPT, "When Zero")
     field(DOPT, "Use CALC")
-    field(OUT,  "AGEBD-INJECTIONGUARD:CHECK-$(NR)-LATCH.VAL")
+    field(OUT,  "$(DEVICE):CHECK-$(NR)-LATCH.VAL")
 }
 
 # forward current state to latch bo on reset event
-record(calcout, "AGEBD-INJECTIONGUARD:CHECK-$(NR)-LATCHRST") {
+record(calcout, "$(DEVICE):CHECK-$(NR)-LATCHRST") {
     field(DESC, "Latchfwd for check $(NR)")
     field(ASG,  "READONLY")
-    field(FLNK, "AGEBD-INJECTIONGUARD:CHECK-$(NR)-LATCH")
+    field(FLNK, "$(DEVICE):CHECK-$(NR)-LATCH")
     field(SCAN, "Event")
     field(EVNT, "5")
     field(CALC, "$(Latch)? ( A? C : B ) : 1")
     field(PINI, "YES")
-    field(INPA, "AGEBD-INJECTIONGUARD:CONTROL-MODE")
-    field(INPB, "AGEBD-INJECTIONGUARD:CHECK-$(NR)")
-    field(INPC, "AGEBD-INJECTIONGUARD:CHECK-$(NR)-MD")
+    field(INPA, "$(DEVICE):CONTROL-MODE")
+    field(INPB, "$(DEVICE):CHECK-$(NR)")
+    field(INPC, "$(DEVICE):CHECK-$(NR)-MD")
     field(OOPT, "Every Time")
     field(DOPT, "Use CALC")
-    field(OUT,  "AGEBD-INJECTIONGUARD:CHECK-$(NR)-LATCH.VAL")
+    field(OUT,  "$(DEVICE):CHECK-$(NR)-LATCH.VAL")
 }
 
-record(bo, "AGEBD-INJECTIONGUARD:CHECK-$(NR)-LATCH") {
+record(bo, "$(DEVICE):CHECK-$(NR)-LATCH") {
     field(DESC, "$(Description)")
     field(ASG,  "READONLY")
-    field(FLNK, "AGEBD-INJECTIONGUARD:CHECK-SUM-OP-A")
+    field(FLNK, "$(DEVICE):CHECK-SUM-OP-A")
     field(ZSV,  "MINOR")
     field(OSV,  "NO_ALARM")
     field(VAL,  "1")
@@ -73,17 +73,15 @@ record(bo, "AGEBD-INJECTIONGUARD:CHECK-$(NR)-LATCH") {
 }
 
 # emit event for master rearm when alarm state is left and non latched
-record(calcout, "AGEBD-INJECTIONGUARD:CHECK-$(NR)-REARM-MASTER") {
+record(calcout, "$(DEVICE):CHECK-$(NR)-REARM-MASTER") {
     field(DESC, "Rearm Master for non latched checks")
     field(ASG,  "NOACCESS")
     field(CALC, "!$(Latch)? ( A? C : B ) : 1")
     field(PINI, "YES")
-    field(INPA, "AGEBD-INJECTIONGUARD:CONTROL-MODE CP")
-    field(INPB, "AGEBD-INJECTIONGUARD:CHECK-$(NR) CP")
-    field(INPC, "AGEBD-INJECTIONGUARD:CHECK-$(NR)-MD CP")
+    field(INPA, "$(DEVICE):CONTROL-MODE CP")
+    field(INPB, "$(DEVICE):CHECK-$(NR) CP")
+    field(INPC, "$(DEVICE):CHECK-$(NR)-MD CP")
     field(OOPT, "Transition To Non-zero")
     field(OEVT, "4")
     field(ODLY, "0.1")
 }
-
-    
\ No newline at end of file