diff --git a/GNUmakefile b/GNUmakefile
index bdc50db..2c81fc9 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -30,7 +30,7 @@ SOURCES += $(SRC_DIR)/ecmcPluginDAQ.c
 DBDS += $(SRC_DIR)/ecmcDAQPlg.dbd
 TEMPLATES += $(wildcard $(DB_DIR)/*.template)
 SCRIPTS += ./startup.cmd
-SCRIPTS += $(SCRIPTS_DIR)/ecmcAddDaqArray.cmd
-SCRIPTS += $(SCRIPTS_DIR)/ecmcAddDaqChannel.cmd
-SCRIPTS += $(SCRIPTS_DIR)/ecmcAddDaqDataItem.cmd
-SCRIPTS += $(SCRIPTS_DIR)/ecmcLoadDaqArrayRecords.cmd
+SCRIPTS += $(SCRIPTS_DIR)/ecmcDAQAddArray.cmd
+SCRIPTS += $(SCRIPTS_DIR)/ecmcDAQAddChannel.cmd
+SCRIPTS += $(SCRIPTS_DIR)/ecmcDAQAddDataItem.cmd
+SCRIPTS += $(SCRIPTS_DIR)/ecmcDAQFinalizeArray.cmd
diff --git a/iocsh/test.script b/iocsh/test.script
index 703e673..d8354d7 100644
--- a/iocsh/test.script
+++ b/iocsh/test.script
@@ -45,52 +45,37 @@ ${SCRIPTEXEC} ${ECMC_CONFIG_ROOT}loadYamlAxis.cmd, "FILE=./cfg/axis.yaml,LIMIT=1
 #
 require ecmc_plugin_daq sandst_a "PLUGIN_ID=0"
 
-#ecmcAddDAQArray("test",PLUGIN.DAQ.test)
-#ecmcAddDAQChannel(123)
-#ecmcAddDAQItem(ec0.s13.ONE,0)
-#ecmcAddDAQItem(ax1.actpos,0)
-#ecmcAddDAQItem(ec0.s13.positionActual01,0)
-#ecmcAddDAQItem(ec0.s13.ONE,0)
-#ecmcAddDAQItem(ax1.setpos,0)
-#ecmcAddDAQChannel(12)
-#ecmcAddDAQItem(ec0.s13.positionActual01,0)
-#ecmcAddDAQItem(ec0.s13.positionActual01,0)
-#ecmcAddDAQItem(ec0.s13.positionActual01,0)
-#ecmcAddDAQItem(ec0.s13.ONE,0)
-#ecmcAddDAQItem(ec0.s13.ONE,0)
-#ecmcAddDAQItem(ax1.setpos,0)
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddArray.cmd,        "NAME=Testing1"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddChannel.cmd,      "TYPE=1234"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s13.ONE,FORMAT=2"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s13.positionActual01"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ax1.setpos"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ax1.setpos"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ax1.setpos"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s13.positionActual01"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddChannel.cmd,      "TYPE=4321"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s13.ONE,FORMAT=2"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s13.positionActual01"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ax1.setpos"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ax1.setpos"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ax1.setpos"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQFinalizeArray.cmd    "NAME=Testing1"
 
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqArray.cmd,        "NAME=Testing1"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqChannel.cmd,      "TYPE=1234"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqDataItem.cmd,     "PARAM=ec0.s13.ONE,FORMAT=2"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqDataItem.cmd,     "PARAM=ec0.s13.positionActual01"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqDataItem.cmd,     "PARAM=ax1.setpos"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqDataItem.cmd,     "PARAM=ax1.setpos"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqDataItem.cmd,     "PARAM=ax1.setpos"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqDataItem.cmd,     "PARAM=ec0.s13.positionActual01"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqChannel.cmd,      "TYPE=4321"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqDataItem.cmd,     "PARAM=ec0.s13.ONE,FORMAT=2"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqDataItem.cmd,     "PARAM=ec0.s13.positionActual01"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqDataItem.cmd,     "PARAM=ax1.setpos"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqDataItem.cmd,     "PARAM=ax1.setpos"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqDataItem.cmd,     "PARAM=ax1.setpos"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcFinalizeDaqArray.cmd    "NAME=Testing1"
-
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqArray.cmd,        "NAME=Testing2"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqChannel.cmd,      "TYPE=1234"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqDataItem.cmd,     "PARAM=ec0.s13.ONE,FORMAT=2"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqDataItem.cmd,     "PARAM=ec0.s13.positionActual01"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqDataItem.cmd,     "PARAM=ax1.setpos"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqDataItem.cmd,     "PARAM=ax1.setpos"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqDataItem.cmd,     "PARAM=ax1.setpos"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqDataItem.cmd,     "PARAM=ec0.s13.positionActual01"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqChannel.cmd,      "TYPE=4321"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqDataItem.cmd,     "PARAM=ec0.s13.ONE,FORMAT=2"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqDataItem.cmd,     "PARAM=ec0.s13.positionActual01"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqDataItem.cmd,     "PARAM=ax1.setpos"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqDataItem.cmd,     "PARAM=ax1.setpos"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcAddDaqDataItem.cmd,     "PARAM=ax1.setpos"
-${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcFinalizeDaqArray.cmd    "NAME=Testing2"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddArray.cmd,        "NAME=Testing2"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddChannel.cmd,      "TYPE=1234"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s13.ONE,FORMAT=2"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s13.positionActual01"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ax1.setpos"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ax1.setpos"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ax1.setpos"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s13.positionActual01"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddChannel.cmd,      "TYPE=4321"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s13.ONE,FORMAT=2"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ec0.s13.positionActual01"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ax1.setpos"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ax1.setpos"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQAddDataItem.cmd,     "PARAM=ax1.setpos"
+${SCRIPTEXEC} ${ecmc_plugin_daq_DIR}ecmcDAQFinalizeArray.cmd    "NAME=Testing1"
 
 ##############################################################################
 ## Configure diagnostics:
diff --git a/scripts/ecmcAddDaqArray.cmd b/scripts/ecmcDAQAddArray.cmd
similarity index 80%
rename from scripts/ecmcAddDaqArray.cmd
rename to scripts/ecmcDAQAddArray.cmd
index 011d337..b44d86c 100644
--- a/scripts/ecmcAddDaqArray.cmd
+++ b/scripts/ecmcDAQAddArray.cmd
@@ -1,8 +1,8 @@
 
 #==============================================================================
-# ecmcAddDaqArray.cmd
+# ecmcDAQAddArray.cmd
 #-------------- Information:
-#- Description: ecmc_plugin_daq ecmcAddDaqArray.cmd
+#- Description: ecmc_plugin_daq ecmcDAQAddArray.cmd
 #-              Add a DAQ-Array object
 #-
 #- by Anders Sandström, Paul Scherrer Institute, 2024
@@ -16,5 +16,4 @@
 #################################################################################
 
 #-               Name  , Asyn port name
-ecmcAddDAQArray(${NAME},ECMC.PLUGIN.DAQ.${NAME})
-
+ecmcDAQAddArray(${NAME},ECMC.PLUGIN.DAQ.${NAME})
diff --git a/scripts/ecmcAddDaqChannel.cmd b/scripts/ecmcDAQAddChannel.cmd
similarity index 82%
rename from scripts/ecmcAddDaqChannel.cmd
rename to scripts/ecmcDAQAddChannel.cmd
index 6725796..7c6c6de 100644
--- a/scripts/ecmcAddDaqChannel.cmd
+++ b/scripts/ecmcDAQAddChannel.cmd
@@ -1,8 +1,8 @@
 
 #==============================================================================
-# ecmcAddDaqChannel.cmd
+# ecmcDAQAddChannel.cmd
 #-------------- Information:
-#- Description: ecmc_plugin_daq ecmcAddDaqChannel.cmd
+#- Description: ecmc_plugin_daq ecmcDAQAddChannel.cmd
 #-              Add a DAQ-channel to the last added DAQ-array object
 #-
 #- by Anders Sandström, Paul Scherrer Institute, 2024
@@ -15,5 +15,4 @@
 #-
 #################################################################################
 
-ecmcAddDAQChannel(${TYPE})
-
+ecmcDAQAddChannel(${TYPE})
diff --git a/scripts/ecmcAddDaqDataItem.cmd b/scripts/ecmcDAQAddDataItem.cmd
similarity index 91%
rename from scripts/ecmcAddDaqDataItem.cmd
rename to scripts/ecmcDAQAddDataItem.cmd
index 5ae3d85..4ab9d7b 100644
--- a/scripts/ecmcAddDaqDataItem.cmd
+++ b/scripts/ecmcDAQAddDataItem.cmd
@@ -1,8 +1,8 @@
 
 #==============================================================================
-# ecmcAddDaqDataItem.cmd
+# ecmcDAQAddDataItem.cmd
 #-------------- Information:
-#- Description: ecmc_plugin_daq ecmcAddDaqDataItem.cmd
+#- Description: ecmc_plugin_daq ecmcDAQAddDataItem.cmd
 #-              Add a DAQ-dataitem to the last added DAQ-channel object
 #-
 #- by Anders Sandström, Paul Scherrer Institute, 2024
@@ -22,5 +22,4 @@
 #-
 #################################################################################
 
-ecmcAddDAQItem(${PARAM},${FORMAT=0})
-
+ecmcDAQAddItem(${PARAM},${FORMAT=0})
diff --git a/scripts/ecmcFinalizeDaqArray.cmd b/scripts/ecmcDAQFinalizeArray.cmd
similarity index 90%
rename from scripts/ecmcFinalizeDaqArray.cmd
rename to scripts/ecmcDAQFinalizeArray.cmd
index a84074f..3c23279 100644
--- a/scripts/ecmcFinalizeDaqArray.cmd
+++ b/scripts/ecmcDAQFinalizeArray.cmd
@@ -1,8 +1,8 @@
 
 #==============================================================================
-# ecmcFinalizeDaqArray.cmd
+# ecmcDAQFinalizeArray.cmd
 #-------------- Information:
-#- Description: ecmc_plugin_daq ecmcFinalizeDaqArray.cmd
+#- Description: ecmc_plugin_daq ecmcDAQFinalizeArray.cmd
 #-              Load database for a DAQ-Array
 #-
 #- by Anders Sandström, Paul Scherrer Institute, 2024
@@ -16,6 +16,8 @@
 #################################################################################
 
 #- Connect to sources in order to know NELM.. Data sources must be known before added with the scripts..
+help
+
 ecmcDAQConnectToDataSource()
 
 #- Read NELM
@@ -26,4 +28,3 @@ ecmcEndIf()
 
 dbLoadTemplate(ecmcPluginDAQ.template,"P=${ECMC_PREFIX},Name=${NAME},NELM=${DAQ_NELM},PORT=ECMC.PLUGIN.DAQ.${NAME}")
 epicsEnvUnset(DAQ_NELM)
-
diff --git a/src/ecmcDAQWrap.cpp b/src/ecmcDAQWrap.cpp
index 5b8cad1..9c2eea2 100644
--- a/src/ecmcDAQWrap.cpp
+++ b/src/ecmcDAQWrap.cpp
@@ -213,8 +213,7 @@ static const iocshArg initArg1_0 =
 static const iocshArg *const initArgs_0[]  = { &initArg0_0,
                                                &initArg1_0};
 
-
-static const iocshFuncDef    initFuncDef_0 = { "ecmcAddDAQArray", 2, initArgs_0};
+static const iocshFuncDef    initFuncDef_0 = { "ecmcDAQAddArray", 2, initArgs_0};
 static void initCallFunc_0(const iocshArgBuf *args) {
   ecmcAddDAQArray(args[0].sval, args[1].sval);
 }
@@ -249,7 +248,7 @@ static const iocshArg initArg0_1 =
 
 static const iocshArg *const initArgs_1[]  = { &initArg0_1};
 
-static const iocshFuncDef    initFuncDef_1 = { "ecmcAddDAQChannel", 1, initArgs_1};
+static const iocshFuncDef    initFuncDef_1 = { "ecmcDAQAddChannel", 1, initArgs_1};
 static void initCallFunc_1(const iocshArgBuf *args) {
   ecmcAddDAQChannel(args[0].ival);
 }
@@ -297,7 +296,7 @@ static const iocshArg initArg1_2 =
 static const iocshArg *const initArgs_2[]  = { &initArg0_2,
                                                &initArg1_2};
 
-static const iocshFuncDef    initFuncDef_2 = { "ecmcAddDAQItem", 2, initArgs_2};
+static const iocshFuncDef    initFuncDef_2 = { "ecmcDAQAddItem", 2, initArgs_2};
 static void initCallFunc_2(const iocshArgBuf *args) {
   ecmcAddDAQItem(args[0].sval,args[1].ival);
 }
@@ -394,7 +393,7 @@ void ecmcDAQPlgRegister(void) {
   iocshRegister(&initFuncDef_1,  initCallFunc_1);
   iocshRegister(&initFuncDef_2,  initCallFunc_2);
   iocshRegister(&initFuncDef_3,  initCallFunc_3);
-  iocshRegister(&initFuncDef_3,  initCallFunc_4);
+  iocshRegister(&initFuncDef_4,  initCallFunc_4);
 }
 
 epicsExportRegistrar(ecmcDAQPlgRegister);
diff --git a/startup.cmd b/startup.cmd
index affd55e..9c21194 100644
--- a/startup.cmd
+++ b/startup.cmd
@@ -15,6 +15,5 @@
 #################################################################################
 
 #- Load plugin:
-epicsEnvSet(ECMC_PLUGIN_FILNAME,"$(ecmc_plugin_daq_DIR)/lib/${EPICS_HOST_ARCH=linux-x86_64}/libecmc_plugin_daq.so")
-${SCRIPTEXEC} ${ecmccfg_DIR}loadPlugin.cmd, "PLUGIN_ID=${PLUGIN_ID},FILE=${ECMC_PLUGIN_FILNAME},CONFIG=''"
-
+epicsEnvSet(ECMC_PLUGIN_FILNAME,"$(ecmc_plugin_daq_DIR)lib/${EPICS_HOST_ARCH=linux-x86_64}/libecmc_plugin_daq.so")
+${SCRIPTEXEC} ${ecmccfg_DIR}loadPlugin.cmd, "PLUGIN_ID=${PLUGIN_ID}, FILE='${ECMC_PLUGIN_FILNAME}' , CONFIG='NOT USED',REPORT=1"