diff --git a/configuration/sample-development.engine.ini b/configuration/sample-development.engine.ini
index eceff4e885582fb778bfa463b0e01fce12604d4c..e70d1f5d855bd959ebc5e12d4b1270823da69bf5 100644
--- a/configuration/sample-development.engine.ini
+++ b/configuration/sample-development.engine.ini
@@ -140,7 +140,7 @@ daemonuser="engineuser"
 socketdir="/home/username/code/aura/engine/modules/liquidsoap"
 
 [audiosources]
-audiofolder="var/audio/source"
+audio_source_folder="var/audio/source"
 audio_source_extension=".flac"
 
 [fallback]
diff --git a/configuration/sample-docker.engine.ini b/configuration/sample-docker.engine.ini
index 3e937187fc5b9aef20124bc8c9bfa9fa194f2a76..9d60291e4686665b11791946e0df16fd473f5cda 100644
--- a/configuration/sample-docker.engine.ini
+++ b/configuration/sample-docker.engine.ini
@@ -138,7 +138,7 @@ daemonuser="engineuser"
 socketdir="/srv/modules/liquidsoap"
 
 [audiosources]
-audiofolder="var/audio/source"
+audio_source_folder="var/audio/source"
 audio_source_extension=".flac"
 
 [fallback]
diff --git a/configuration/sample-production.engine.ini b/configuration/sample-production.engine.ini
index b13a2c926c952c417a86e39ba8107e303f2fa0bf..21639b06e56b152277dc78c8bbf7ce7c7ebf2bff 100644
--- a/configuration/sample-production.engine.ini
+++ b/configuration/sample-production.engine.ini
@@ -138,7 +138,7 @@ daemonuser="engineuser"
 socketdir="/opt/aura/engine/modules/liquidsoap"
 
 [audiosources]
-audiofolder="var/audio/source"
+audio_source_folder="var/audio/source"
 audio_source_extension=".flac"
 
 [fallback]
diff --git a/docs/installation-development.md b/docs/installation-development.md
index aa38215e9263659d0c5fbdf3ebc4fc8830ab6551..2f866efb8dc0a080c96f73258f7edfabe890d324 100644
--- a/docs/installation-development.md
+++ b/docs/installation-development.md
@@ -162,8 +162,8 @@ Finally Engine needs to be able to access the audio folder, where all the tracks
 are stored via *Tank*:
 
 ```ini
-[audiofolder]
-audiofolder="/var/audio"
+[audiosource]
+audio_source_folder="/var/audio"
 ```
 
 If the audio device desired for playback is set as `default`, the Engine now should be ready to play
diff --git a/docs/installation-production.md b/docs/installation-production.md
index 2c4c3ee9639ffe5005a1214412804fe12f5adcfb..71a002d564ef84cb4297ae82170cc453161d086f 100644
--- a/docs/installation-production.md
+++ b/docs/installation-production.md
@@ -201,8 +201,8 @@ Finally Engine needs to be able to access the audio folder, where all the tracks
 are stored via *Tank*:
 
 ```ini
-[audiofolder]
-audiofolder="/var/audio"
+[audiosource]
+audio_source_folder="/var/audio/source"
 ```
 
 There is some document on how to [Setup the Audio Store](docs/setup-audio-store.md).
diff --git a/docs/setup-audio-store.md b/docs/setup-audio-store.md
index dffbceacb538f2bddd1c9ae1eef18e5d7a375a61..a86d4d0b5519ab1e9c431e278bf146d1a96b844e 100644
--- a/docs/setup-audio-store.md
+++ b/docs/setup-audio-store.md
@@ -3,7 +3,7 @@
 
 The *Audio Store* is a folder which is utilized by AURA Tank and Engine to exchange audio files.
 
-Assuming AURA Engine and Tank are hosted on different machines, the `audiofolder` must by shared 
+Assuming AURA Engine and Tank are hosted on different machines, the `audio_source_folder` must by shared 
 using some network share. 
 
 In case you are hosting Engine and Tank on the same machine (e.g. in development), you can skip 
@@ -21,13 +21,13 @@ this documentation. Just think about pointing them to the same directory.
 
 <!-- /TOC -->
 
-By default Engine expects audio files shared by Tank in `/var/audio`.
+By default Engine expects audio files shared by Tank in `/var/audio/source`.
 
 This can be configurated in `engine.ini`:
 
 ```ini
-[audiofolder]
-audiofolder="/var/audio"
+[audiosource]
+audio_source_folder="/var/audio/source"
 ```
 
 Now, this folder must be somehow writable by Tank.
@@ -70,21 +70,21 @@ this documentation.
 
 SSHFS allows you to access the filesystem on a remote computer via SSH. Interaction with files and folders behaves similar to any local data.
 
-This example is setting up the `audiofolder` on the Engine instance.
+This example is setting up the `audio_source_folder` on the Engine instance.
 
 ### Configuring Engine
 
-First, you'll need to create an user which enables Tank to access the `audiofolder` on Engine:
+First, you'll need to create an user which enables Tank to access the `audio_source_folder` on Engine:
 
 ```shell
 adduser tankuser
-chown tankuser:engineuser /var/audio
+chown tankuser:engineuser /var/audio/source
 ```
 
 Ensure that `engineuser` has no permissions to write the directory:
 
 ```shell
-chmod u=+rwx,go=+rx-w /var/audio
+chmod u=+rwx,go=+rx-w /var/audio/source
 ```
 
 ### Configuring Tank
diff --git a/modules/plugins/monitor.py b/modules/plugins/monitor.py
index 4fd631dd70cb279cbcee3c8938ec384e6712480e..080a7338207314bb0396394b8287667f43bd2610 100644
--- a/modules/plugins/monitor.py
+++ b/modules/plugins/monitor.py
@@ -248,7 +248,7 @@ class AuraMonitor:
         self.soundsystem.disable_transaction(self.soundsystem.client)
 
         self.status["redis"]["active"] = self.validate_redis_connection()
-        self.status["audio_store"] = self.validate_directory(self.config.get("audiofolder"))
+        self.status["audio_source"] = self.validate_directory(self.config.get("audio_source_folder"))
 
         # After first update start the Heartbeat Monitor
         if not self.heartbeat_running: