diff --git a/db/template4.substitutions b/db/template4.substitutions
index 943ef5f..a756269 100644
--- a/db/template4.substitutions
+++ b/db/template4.substitutions
@@ -1,4 +1,4 @@
-file socket_record.db
+file db/socket_record.db
 {
     pattern
     { DEVICE, PARAMETER_NAME, PARAMETER_ID, SCALCOUT_FIELD_INPUT, FORWARDED_ID}
@@ -8,7 +8,7 @@ file socket_record.db
     { "$(DEVICE_NAME)", "outlet", 3, "DD", 3}
 }
 
-file feedback_records.db
+file db/feedback_records.db
 {
     pattern
     { DEVICE, CONFIG_PARAMETER_NAME, OUTLET_NUMBER, GETTER_OUTPUT_PARAMETER_NAME}
diff --git a/db/template8.substitutions b/db/template8.substitutions
index 298ccb0..13c4b32 100644
--- a/db/template8.substitutions
+++ b/db/template8.substitutions
@@ -1,4 +1,4 @@
-file socket_record.db
+file db/socket_record.db
 {
     pattern
     { DEVICE, PARAMETER_NAME, PARAMETER_ID, SCALCOUT_FIELD_INPUT, FORWARDED_ID}
@@ -12,7 +12,7 @@ file socket_record.db
     { "$(DEVICE_NAME)", "outlet", 7, "HH", 7}
 }
 
-file feedback_records.db
+file db/feedback_records.db
 {
     pattern
     {DEVICE, CONFIG_PARAMETER_NAME, OUTLET_NUMBER, GETTER_OUTPUT_PARAMETER_NAME}
diff --git a/st.cmd b/st.cmd
index eca81d9..35c6255 100644
--- a/st.cmd
+++ b/st.cmd
@@ -2,13 +2,11 @@ require stream
 
 epicsEnvSet("ASYN_PORT","myDriverPort")
 
-
-epicsEnvSet("PROTO", "$(ePowerSwitch_DB)command.proto")
-
 # I use HTTP to use TCP and disconnect after, but no disconnection is done, so I disconnect manually.
 drvAsynIPPortConfigure("$(ASYN_PORT)","127.0.0.1:55555 http", 0, 0, 0)
 
-dbLoadTemplate("db/template$(EPOWERSWITCH_SOCKET_NUMBER).substitutions", "PORT=$(ASYN_PORT)")
+dbLoadTemplate("db/template$(EPOWERSWITCH_SOCKET_NUMBER).substitutions", "PORT=$(ASYN_PORT), DEVICE_NAME=ePowerSwitch, PROTO=db/command.proto")
+
 
 iocInit()