diff --git a/scripts/change_url b/scripts/change_url
index 6851308..fe9ea64 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -50,23 +50,23 @@ fi
 #=================================================
 # MODIFY URL IN NGINX CONF
 #=================================================
-ynh_script_progression --message="Updating nginx web server configuration..." --weight=2
+ynh_script_progression --message="Updating NGINX web server configuration..." --weight=2
 
 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
 
-# Change the path in the nginx config file
+# Change the path in the NGINX config file
 if [ $change_path -eq 1 ]
 then
-	# Make a backup of the original nginx config file if modified
+	# Make a backup of the original NGINX config file if modified
 	ynh_backup_if_checksum_is_different --file="$nginx_conf_path"
-	# Set global variables for nginx helper
+	# Set global variables for NGINX helper
 	domain="$old_domain"
 	path_url="$new_path"
-	# Create a dedicated nginx config
+	# Create a dedicated NGINX config
 	ynh_add_nginx_config
 fi
 
-# Change the domain for nginx
+# Change the domain for NGINX
 if [ $change_domain -eq 1 ]
 then
 	# Delete file checksum for the old conf file location
@@ -81,7 +81,7 @@ fi
 #=================================================
 # UPGRADE FAIL2BAN
 #=================================================
-ynh_script_progression --message="Reconfiguring fail2ban..." --weight=6
+ynh_script_progression --message="Reconfiguring Fail2Ban..." --weight=6
 
 ynh_add_fail2ban_config --logpath="/var/log/nginx/$new_domain-error.log" --failregex="^.*authentication failure. while reading response header from upstream, client: <HOST>,.*POST $new_path.*$" --max_retry=5
 
@@ -90,7 +90,7 @@ ynh_add_fail2ban_config --logpath="/var/log/nginx/$new_domain-error.log" --failr
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..."
+ynh_script_progression --message="Reloading NGINX web server..."
 
 ynh_systemd_action --service_name=nginx --action=reload
 
diff --git a/scripts/install b/scripts/install
index 4ceb331..820c3ef 100755
--- a/scripts/install
+++ b/scripts/install
@@ -64,9 +64,9 @@ ynh_setup_source --dest_dir="$final_path"
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring nginx web server..." --weight=2
+ynh_script_progression --message="Configuring NGINX web server..." --weight=2
 
-# Create a dedicated nginx config
+# Create a dedicated NGINX config
 ynh_add_nginx_config
 
 #=================================================
@@ -80,9 +80,9 @@ ynh_system_user_create --username=$app
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring php-fpm..." --weight=2
+ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
 
-# Create a dedicated php-fpm config
+# Create a dedicated PHP-FPM config
 ynh_add_fpm_config
 
 #=================================================
@@ -90,7 +90,7 @@ ynh_add_fpm_config
 #=================================================
 # CUSTOMIZE DOKUWIKI
 #=================================================
-ynh_script_progression --message="Configuring dokuwiki..." --weight=2
+ynh_script_progression --message="Configuring DokuWiki..." --weight=2
 
 # Loading order of configuration files
 #
@@ -103,8 +103,8 @@ ynh_script_progression --message="Configuring dokuwiki..." --weight=2
 # See https://www.dokuwiki.org/plugin:config#protecting_settings
 
 
-### Copy Yunohost specific configuration
-# This File cannot be modified directly by Dokuwiki, only by hand or by Yunohost
+### Copy YunoHost specific configuration
+# This File cannot be modified directly by DokuWiki, only by hand or by YunoHost
 # It will only be updated by Yunohost package or directly by adventurous users
 cp ../conf/local.protected.php $final_path/conf
 
@@ -112,7 +112,7 @@ cp ../conf/local.protected.php $final_path/conf
 ynh_replace_string --match_string="__YNH_ADMIN_USER__" --replace_string="$admin"    --target_file="$final_path/conf/local.protected.php"
 
 
-# This file might be modified by dokuwiki admin panel or by plugins
+# This file might be modified by DokuWiki admin panel or by plugins
 # It will not be modified by Yunohost in order to keep user settings
 cp ../conf/local.php           $final_path/conf
 
@@ -159,7 +159,7 @@ ynh_store_file_checksum --file="$final_path/conf/local.protected.php"
 #=================================================
 # INSTALL LOGAUTHERROR PLUGIN FOR FAIL2BAN
 #=================================================
-ynh_script_progression --message="Installing logautherror plugin for fail2ban..." --weight=2
+ynh_script_progression --message="Installing logautherror plugin for Fail2Ban..." --weight=2
 
 ynh_setup_source --dest_dir="$final_path/lib/plugins/logautherror" --source_id=logautherror
 
@@ -209,7 +209,7 @@ find $final_path/lib -type d -print0 | xargs -0 chmod 0755
 #=================================================
 # SETUP FAIL2BAN
 #=================================================
-ynh_script_progression --message="Configuring fail2ban..." --weight=7
+ynh_script_progression --message="Configuring Fail2Ban..." --weight=7
 
 ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-error.log" --failregex="^.*authentication failure. while reading response header from upstream, client: <HOST>,.*POST $path_url.*$" --max_retry=5
 
@@ -228,7 +228,7 @@ fi
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..."
+ynh_script_progression --message="Reloading NGINX web server..."
 
 ynh_systemd_action --service_name=nginx --action=reload
 
diff --git a/scripts/remove b/scripts/remove
index 6bb05bb..b0d36b7 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -32,23 +32,23 @@ ynh_secure_remove --file="$final_path"
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing nginx web server configuration..."
+ynh_script_progression --message="Removing NGINX web server configuration..."
 
-# Remove the dedicated nginx config
+# Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
 #=================================================
 # REMOVE PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing php-fpm configuration..." --weight=2
+ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=2
 
-# Remove the dedicated php-fpm config
+# Remove the dedicated PHP-FPM config
 ynh_remove_fpm_config
 
 #=================================================
 # REMOVE FAIL2BAN CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing fail2ban configuration..." --weight=7
+ynh_script_progression --message="Removing Fail2Ban configuration..." --weight=7
 
 ynh_remove_fail2ban_config
 
diff --git a/scripts/restore b/scripts/restore
index 0cf8f4a..e36a534 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -94,7 +94,7 @@ ynh_restore_file --origin_path="/etc/php/7.0/fpm/pool.d/$app.conf"
 #=================================================
 # RESTORE FAIL2BAN CONFIGURATION
 #=================================================
-ynh_script_progression --message="Restoring the fail2ban configuration..." --weight=7
+ynh_script_progression --message="Restoring the Fail2Ban configuration..." --weight=7
 
 ynh_restore_file --origin_path="/etc/fail2ban/jail.d/$app.conf"
 ynh_restore_file --origin_path="/etc/fail2ban/filter.d/$app.conf"
@@ -105,7 +105,7 @@ ynh_systemd_action --action=restart --service_name=fail2ban
 #=================================================
 # RELOAD NGINX AND PHP-FPM
 #=================================================
-ynh_script_progression --message="Reloading nginx web server and php-fpm..." --weight=2
+ynh_script_progression --message="Reloading NGINX web server and PHP-FPM.." --weight=2
 
 ynh_systemd_action --service_name=php7.0-fpm --action=reload
 ynh_systemd_action --service_name=nginx --action=reload
diff --git a/scripts/upgrade b/scripts/upgrade
index 8e9eaaa..645baee 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -63,10 +63,10 @@ fi
 
 
 
-# Yunohost specific configuration, if it isn't exist already
+# YunoHost specific configuration, if it isn't exist already
 
 # Previously, these settings were store in an unique "dokuwiki.php"
-# Now, they are split in multiple files to ease upgrading process (separate Yunohost config from user config)
+# Now, they are split in multiple files to ease upgrading process (separate YunoHost config from user config)
 
 # Loading order of configuration files
 #
@@ -176,9 +176,9 @@ fi
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=2
+ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2
 
-# Create a dedicated nginx config
+# Create a dedicated NGINX config
 ynh_add_nginx_config
 
 #=================================================
@@ -192,9 +192,9 @@ ynh_system_user_create --username=$app
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Upgrading php-fpm configuration..."
+ynh_script_progression --message="Upgrading PHP-FPM configuration..."
 
-# Create a dedicated php-fpm config
+# Create a dedicated PHP-FPM config
 ynh_add_fpm_config
 
 #=================================================
@@ -203,7 +203,7 @@ ynh_add_fpm_config
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-    ynh_script_progression --message="Upgrading dokuwiki..." --weight=7
+    ynh_script_progression --message="Upgrading DokuWiki..." --weight=7
 
     # Remove upgrade notification inside Dokuwiki's admin panel
     # See https://www.dokuwiki.org/update_check
@@ -256,7 +256,7 @@ ynh_store_file_checksum --file="$final_path/conf/local.protected.php"
 #=================================================
 # INSTALL LOGAUTHERROR PLUGIN FOR FAIL2BAN
 #=================================================
-ynh_script_progression --message="Upgrading logautherror plugin for fail2ban..." --weight=2
+ynh_script_progression --message="Upgrading logautherror plugin for Fail2Ban..." --weight=2
 
 ynh_setup_source --dest_dir="$final_path/lib/plugins/logautherror" --source_id=logautherror
 
@@ -306,7 +306,7 @@ find $final_path/lib -type d -print0 | xargs -0 chmod 0755
 #=================================================
 # SETUP FAIL2BAN
 #=================================================
-ynh_script_progression --message="Reconfiguring fail2ban..." --weight=7
+ynh_script_progression --message="Reconfiguring Fail2Ban..." --weight=7
 
 ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-error.log" --failregex="^.*authentication failure. while reading response header from upstream, client: <HOST>,.*POST $path_url.*$" --max_retry=5
 
@@ -329,7 +329,7 @@ fi
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..."
+ynh_script_progression --message="Reloading NGINX web server..."
 
 ynh_systemd_action --service_name=nginx --action=reload