diff --git a/ADOrcaApp/Db/orca.template b/ADOrcaApp/Db/orca.template
index 9323580..fd0dc07 100644
--- a/ADOrcaApp/Db/orca.template
+++ b/ADOrcaApp/Db/orca.template
@@ -114,7 +114,7 @@ record(calcout, "$(P)$(R)#EVRAcquireTime-S") {
     field(CALC, "A=0?B:A*B")
     field(INPA, "$(P)$(R)AcquirePeriod_RBV")
     field(INPB, "88052500")
-    field(OUT,  "$(EVR):PS-1-Div-SP PP")
+    field(OUT,  "$(EVR):PS1Div-SP PP")
 }
 
 record(stringin, "$(P)$(R)#EVRTimeProc") {
@@ -148,18 +148,18 @@ record(seq, "$(P)$(R)#SoftSeqDisable") {
     field(SELM, "All")
     # Disable sequencer 0
     field(DOL1, "1")
-    field(LNK1, "$(EVR):SoftSeq-0-Disable-Cmd CP")
+    field(LNK1, "$(EVR):SoftSeq0Disable-Cmd CP")
 }
 
 record(seq, "$(P)$(R)#SoftSeqEnable") {
     field(SELM, "All")
     # reset prescaler
     field(DOL1, "123")
-    field(LNK1, "$(EVR):Evt-ResetPS-SP PP")
+    field(LNK1, "$(EVR):EvtResetPS-SP PP")
     field(DOL2, "123")
     field(LNK2, "$(EVR):EvtCode-SP PP")
     # Enable sequencer 0
-    field(LNK3, "$(EVR):SoftSeq-0-Enable-Cmd.PROC PP")
+    field(LNK3, "$(EVR):SoftSeq0Enable-Cmd.PROC PP")
 }
 
 record(longin, "$(P)$(R)#AcquireCtrl") {
@@ -224,7 +224,7 @@ record(calcout, "$(P)$(R)#StopAfterAcq0") {
 record(longin, "$(P)$(R)#Cycle-Cnt") {
     field(DESC, "Cycle Counter")
     field(SCAN, "Passive")
-    field(INP,  "$(EVR):SoftSeq-0-NumOfStarts-I CPP")
+    field(INP,  "$(EVR):SoftSeq0NumOfStarts-I CPP")
     field(FLNK, "$(P)$(R)#CountSeq")
 }