diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a0322a..7f90ffe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,10 +37,10 @@ This release includes a lot of changes and improvements, so check the changelog
 
 - [NEW] Add configuration system
   - Now you can configure the system (including server port) editing the  `bundle/config/config.json` file
-  - You can also use enviroment `ARUNA_<PROPERTY>` variables to override the configuration file
+  - You can also use enviroment `ARUNACORE_<PROPERTY>` variables to override the configuration file
 
 - [NEW] Add `masterkey` to allow access to restricted endpoints and commands
-  - You can set the masterkey in the configuration file or in the enviroment variable `ARUNA_MASTERKEY`
+  - You can set the masterkey in the configuration file or in the enviroment variable `ARUNACORE_MASTERKEY`
   - If a masterkey is not provided, all restricted endpoints and commands will be disabled and will return a `503` error
 
 - [NEW] Create a connection structure
diff --git a/src/main/start.ts b/src/main/start.ts
index 3b6fbad..76439f1 100644
--- a/src/main/start.ts
+++ b/src/main/start.ts
@@ -42,8 +42,8 @@ webs.on('message', (message) => {
   logger.info('Message received:', message);
 });
 
-if (process.env.FINISH_IN_SECONDS) {
-  const seconds = parseInt(process.env.FINISH_IN_SECONDS);
+if (process.env.ARUNACORE_FINISH_IN_SECONDS) {
+  const seconds = parseInt(process.env.ARUNACORE_FINISH_IN_SECONDS);
   logger.warn(`Finishing in ${seconds} seconds...`);
   setTimeout(() => {
     webs.finishWebSocket();