diff --git a/motorApp/Db/motorStatus.db b/motorApp/Db/motorStatus.db
index d1bb4e45..d05fe53d 100644
--- a/motorApp/Db/motorStatus.db
+++ b/motorApp/Db/motorStatus.db
@@ -93,3 +93,21 @@ record(calc, "$(P)$(M):USING_ENCODER") {
     # Bitwise AND on MSTA to select the "encoder present" flag.
     field(CALC, "((A&256)=256)&&B")
 }
+
+record(bo, "$(P)$(M):SAFE_STUP") {
+  field(FLNK, "$(P)$(M):_SAFE_STUP.PROC")
+}
+
+record(calcout, "$(P)$(M):_SAFE_STUP") {
+  field(DTYP, "Soft Channel")
+  field(DESC, "Force Poll of motor position")
+  field(INPA, "$(P)$(M).MOVN")
+  field(INPB, "$(P)$(M).DMOV")
+  field(INPC, "$(P)$(M).HOMF")
+  field(INPD, "$(P)$(M).HOMR")
+  field(INPE, "$(P)$(M).JOGF")
+  field(INPF, "$(P)$(M).JOGR")
+  field(CALC, "(A=0)&&(B=1)&&(C=0)&&(D=0)&&(E=0)&&(F=0)")
+  field(OOPT, "When Non-zero")
+  field(OUT, "$(P)$(M).STUP PP")
+}
diff --git a/motorApp/Db/periodic_polling.db b/motorApp/Db/periodic_polling.db
index 87f538eb..d7019426 100644
--- a/motorApp/Db/periodic_polling.db
+++ b/motorApp/Db/periodic_polling.db
@@ -1,25 +1,6 @@
-record(bo, "$(P)$(M):SAFE_STUP") {
-  field(FLNK, "$(P)$(M):_SAFE_STUP.PROC")
-}
-
-record(calcout, "$(P)$(M):_SAFE_STUP") {
-  field(DTYP, "Soft Channel")
-  field(DESC, "Force Poll of motor position")
-  field(INPA, "$(P)$(M).MOVN")
-  field(INPB, "$(P)$(M).DMOV")
-  field(INPC, "$(P)$(M).HOMF")
-  field(INPD, "$(P)$(M).HOMR")
-  field(INPE, "$(P)$(M).JOGF")
-  field(INPF, "$(P)$(M).JOGR")
-  field(CALC, "(A=0)&&(B=1)&&(C=0)&&(D=0)&&(E=0)&&(F=0)")
-  field(OOPT, "When Non-zero")
-  field(OUT, "$(P)$(M).STUP PP")
-}
-
 record(ao, "$(P)$(M):SCAN") {
   field(DTYP, "Soft Channel")
   field(DESC, "Every POLL_RATE calls SAFE_STUP")
   field(SCAN, "$(POLL_RATE=10) second")
   field(FLNK, "$(P)$(M):SAFE_STUP.PROC")
 }
-