diff --git a/Agent/AgentSettings.py b/Agent/config.py
similarity index 100%
rename from Agent/AgentSettings.py
rename to Agent/config.py
diff --git a/Agent/kill.cmd b/Agent/kill.cmd
index 22b20308..af2c90e5 100644
--- a/Agent/kill.cmd
+++ b/Agent/kill.cmd
@@ -1,3 +1,3 @@
 cd %~dp0
-taskkill /F /FI "USERNAME eq %username%" /IM pyOpenRPA_Agent.exe
+taskkill /F /FI "USERNAME eq %username%" /IM orpa-agent.exe
 pause >nul
\ No newline at end of file
diff --git a/Agent/start-daemon.cmd b/Agent/start-daemon.cmd
index 3695b6fa..d308709d 100644
--- a/Agent/start-daemon.cmd
+++ b/Agent/start-daemon.cmd
@@ -1,5 +1,5 @@
 cd %~dp0
-taskkill /im "pyOpenRPA_Agent.exe" /F /fi "username eq %username%"
-copy /Y ..\Resources\WPy64-3720\python-3.7.2.amd64\pythonw.exe ..\Resources\WPy64-3720\python-3.7.2.amd64\pyOpenRPA_Agent.exe
-.\..\Resources\WPy64-3720\python-3.7.2.amd64\pyOpenRPA_Agent.exe "AgentSettings.py"
+taskkill /im "orpa-agent.exe" /F /fi "username eq %username%"
+copy /Y ..\Resources\WPy64-3720\python-3.7.2.amd64\pythonw.exe ..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-agent.exe
+.\..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-agent.exe "config.py"
 pause >nul
\ No newline at end of file
diff --git a/Agent/start.cmd b/Agent/start.cmd
index fdccc7d5..f3afdf35 100644
--- a/Agent/start.cmd
+++ b/Agent/start.cmd
@@ -1,5 +1,5 @@
 cd %~dp0
-taskkill /im "pyOpenRPA_Agent.exe" /F /fi "username eq %username%"
-copy /Y ..\Resources\WPy64-3720\python-3.7.2.amd64\python.exe ..\Resources\WPy64-3720\python-3.7.2.amd64\pyOpenRPA_Agent.exe
-.\..\Resources\WPy64-3720\python-3.7.2.amd64\pyOpenRPA_Agent.exe "AgentSettings.py"
+taskkill /im "orpa-agent.exe" /F /fi "username eq %username%"
+copy /Y ..\Resources\WPy64-3720\python-3.7.2.amd64\python.exe ..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-agent.exe
+.\..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-agent.exe "config.py"
 pause >nul
\ No newline at end of file
diff --git a/Agent/start.sh b/Agent/start.sh
index 220a3c7b..5776ee82 100644
--- a/Agent/start.sh
+++ b/Agent/start.sh
@@ -1,2 +1,2 @@
 export PYTHONPATH="../Sources"
-./../Resources/LPy64-3105/bin/python3.10 "AgentSettings.py"
+./../Resources/LPy64-3105/bin/python3.10 "config.py"
diff --git a/Orchestrator/OrchestratorSettings.py b/Orchestrator/config.py
similarity index 100%
rename from Orchestrator/OrchestratorSettings.py
rename to Orchestrator/config.py
diff --git a/Orchestrator/start.cmd b/Orchestrator/start.cmd
index 73270e4f..2fba96d6 100644
--- a/Orchestrator/start.cmd
+++ b/Orchestrator/start.cmd
@@ -1,5 +1,5 @@
 cd %~dp0
-taskkill /im "pyOpenRPA_Orchestrator.exe" /F /fi "username eq %username%"
-copy /Y ..\Resources\WPy64-3720\python-3.7.2.amd64\python.exe ..\Resources\WPy64-3720\python-3.7.2.amd64\pyOpenRPA_Orchestrator.exe
-.\..\Resources\WPy64-3720\python-3.7.2.amd64\pyOpenRPA_Orchestrator.exe "OrchestratorSettings.py"
+taskkill /im "orpa-orc.exe" /F /fi "username eq %username%"
+copy /Y ..\Resources\WPy64-3720\python-3.7.2.amd64\python.exe ..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-orc.exe
+.\..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-orc.exe "config.py"
 pause>nul
\ No newline at end of file
diff --git a/Orchestrator/start.sh b/Orchestrator/start.sh
index 421767c5..5776ee82 100644
--- a/Orchestrator/start.sh
+++ b/Orchestrator/start.sh
@@ -1,2 +1,2 @@
 export PYTHONPATH="../Sources"
-./../Resources/LPy64-3105/bin/python3.10 "OrchestratorSettings.py"
+./../Resources/LPy64-3105/bin/python3.10 "config.py"