diff --git a/conf/librephotos.env b/conf/librephotos.env
index 8cf2c0f..aa7273f 100644
--- a/conf/librephotos.env
+++ b/conf/librephotos.env
@@ -1,4 +1,4 @@
-BASE_DATA=__DATA_PATH__
+BASE_DATA=__DATA_DIR__
 BASE_LOGS=/var/log/__APP__/
 
 PYTHONUNBUFFERED=TRUE
@@ -25,6 +25,6 @@ HEAVYWEIGHT_PROCESS=1
 httpPort=__PORT__
 BACKEND_PORT=__BACKEND_PORT__
 IMAGE_SIMILARITY_SERVER_PORT=__SIMILARITY_PORT__
-MPLCONFIGDIR=__DATA_PATH__/matplotlib
+MPLCONFIGDIR=__DATA_DIR__/matplotlib
 NODEJS_PATH=__NODEJS_PATH__
-DJANGO_SETTINGS_MODULE=ownphotos.settings
\ No newline at end of file
+DJANGO_SETTINGS_MODULE=ownphotos.settings
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 7bbfa89..66b32f8 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -16,11 +16,11 @@ function unpack_source {
 	mkdir -p "$install_dir/data_models/"{places365,im2txt}
 	ynh_setup_source --source_id="places365" --dest_dir="$install_dir/data_models/places365/"
 	ynh_setup_source --source_id="im2txt" --dest_dir="$install_dir/data_models/im2txt/"
-	mkdir -p "$data_path"
-	ln -sf "$install_dir/data_models" "$data_path/data_models"
-	mkdir -p "$data_path/protected_media/"{thumbnails_big,square_thumbnails,square_thumbnails_small,faces}
-	mkdir -p "$data_path/data/nextcloud_media"
-	mkdir -p "$data_path/matplotlib"
+	mkdir -p "$data_dir"
+	ln -sf "$install_dir/data_models" "$data_dir/data_models"
+	mkdir -p "$data_dir/protected_media/"{thumbnails_big,square_thumbnails,square_thumbnails_small,faces}
+	mkdir -p "$data_dir/data/nextcloud_media"
+	mkdir -p "$data_dir/matplotlib"
 
 	mkdir -p ~/.cache/torch/hub/checkpoints/
 	ynh_setup_source --source_id="resnet152-b121ed2d" --dest_dir="/root/.cache/torch/hub/checkpoints/"
@@ -145,13 +145,13 @@ function upgrade_db {
 function set_permissions {
 	chown -R root:$app "$install_dir"
 	chmod -R g=u,g-w,o-rwx "$install_dir"
-	chown -R $app:$app "$data_path"
-	chmod -R g=u,g-w,o-rwx "$data_path"
+	chown -R $app:$app "$data_dir"
+	chmod -R g=u,g-w,o-rwx "$data_dir"
 	chown -R $app:$app "$install_dir/data_models"
 	chown -R $app:$app "/var/log/$app"
 	chmod -R g-w,o-rwx "/var/log/$app"
-	setfacl -n -m user:www-data:rx "$data_path"
-	setfacl -nR -m u:www-data:rx -m d:u:www-data:rx "$data_path/protected_media" "$data_path/data" "$data_path/data/nextcloud_media"
+	setfacl -n -m user:www-data:rx "$data_dir"
+	setfacl -nR -m u:www-data:rx -m d:u:www-data:rx "$data_dir/protected_media" "$data_dir/data" "$data_dir/data/nextcloud_media"
 }
 
 function set_up_logrotate {
diff --git a/scripts/backup b/scripts/backup
index 5ead846..6e90f0e 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -49,7 +49,7 @@ ynh_backup --src_path="/etc/systemd/system/$app-worker.service"
 #=================================================
 
 ynh_backup --src_path="/var/log/$app"
-ynh_backup --src_path="$data_path" --is_big
+ynh_backup --src_path="$data_dir" --is_big
 
 #=================================================
 # BACKUP THE POSTGRESQL DATABASE
diff --git a/scripts/restore b/scripts/restore
index cb5489d..565e6fe 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -30,11 +30,11 @@ ynh_restore_file --origin_path="$install_dir"
 #=================================================
 ynh_script_progression --message="Restoring the app data directory..." --weight=1
 
-ynh_restore_file --origin_path="$data_path" --not_mandatory
-mkdir -p $data_path/protected_media/{thumbnails_big,square_thumbnails,square_thumbnails_small,faces}
-mkdir -p $data_path/data/nextcloud_media
-mkdir -p $data_path/matplotlib
-ln -s $install_dir/data_models $data_path/data_models
+ynh_restore_file --origin_path="$data_dir" --not_mandatory
+mkdir -p $data_dir/protected_media/{thumbnails_big,square_thumbnails,square_thumbnails_small,faces}
+mkdir -p $data_dir/data/nextcloud_media
+mkdir -p $data_dir/matplotlib
+ln -s $install_dir/data_models $data_dir/data_models
 
 #=================================================
 # RESTORE VARIOUS FILES