diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md
index c6e5fe0..f4092b7 100644
--- a/doc/DESCRIPTION.md
+++ b/doc/DESCRIPTION.md
@@ -1,6 +1,6 @@
 A versatile web based messenger using IRC
 
-###Features:
+### Features:
 
 - For single networks, bouncer hosts, or a personal generic IRC client that remembers your networks
 - Works out of the box with a default IRC network - or use your own
diff --git a/manifest.json b/manifest.json
index 836a938..7f3f7c8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,8 +3,8 @@
     "id": "kiwiirc",
     "packaging_format": 1,
     "description": {
-        "en": "A versatile web based messenger using IRC",
-        "fr": "Une messagerie Web polyvalente utilisant IRC"
+        "en": "Versatile web based messenger using IRC",
+        "fr": "Messagerie Web polyvalente utilisant IRC"
     },
     "version": "1.5.0~ynh1",
     "url": "https://github.com/kiwiirc/kiwiirc",
@@ -31,8 +31,7 @@
         "install" : [
             {
                 "name": "domain",
-                "type": "domain",
-                "example": "domain.org"
+                "type": "domain"
             },
             {
                 "name": "path",
diff --git a/scripts/backup b/scripts/backup
index 248181b..11f1bbb 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -56,4 +56,4 @@ ynh_backup --src_path="/etc/systemd/system/$app.service"
 # END OF SCRIPT
 #=================================================
 
-ynh_print_info --message="Backup script completed for KiwiIRC. (YunoHost will then actually copy those files to the archive)."
+ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."
diff --git a/scripts/change_url b/scripts/change_url
index f1f2183..554a6f8 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -33,7 +33,7 @@ port=$(ynh_app_setting_get --app=$app --key=port)
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
-ynh_script_progression --message="Backing up KiwiIRC before changing its URL (may take a while)..." --weight=1
+ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1
 
 # Backup the current version of the app
 ynh_backup_before_upgrade
@@ -103,4 +103,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Change of URL completed for KiwiIRC" --last
+ynh_script_progression --message="Change of URL completed for $app" --last
diff --git a/scripts/install b/scripts/install
index b454e28..85bae3d 100644
--- a/scripts/install
+++ b/scripts/install
@@ -133,7 +133,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_script_progression --message="Configuring SSOwat..." --weight=1
+ynh_script_progression --message="Configuring permissions..." --weight=1
 
 # Make app public if necessary or protect it
 if [ $is_public -eq 1 ]
@@ -152,4 +152,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Installation of KiwiIRC completed" --last
+ynh_script_progression --message="Installation of $app completed" --last
diff --git a/scripts/remove b/scripts/remove
index 65fc0d6..eb5b1aa 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -43,7 +43,7 @@ ynh_remove_systemd_config
 #=================================================
 # REMOVE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Removing KiwiIRC main directory..." --weight=6
+ynh_script_progression --message="Removing the app main directory..." --weight=6
 
 # Remove the app directory securely
 ynh_secure_remove --file="$final_path"
@@ -72,4 +72,4 @@ ynh_system_user_delete --username=$app
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Removal of KiwiIRC completed" --last
+ynh_script_progression --message="Removal of $app completed" --last
diff --git a/scripts/restore b/scripts/restore
index 14fa6db..65dbec6 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -56,7 +56,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Restoring KiwiIRC main directory..." --weight=60
+ynh_script_progression --message="Restoring $app main directory..." --weight=60
 
 ynh_restore_file --origin_path="$final_path"
 
@@ -97,4 +97,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Restoration completed for KiwiIRC" --last
+ynh_script_progression --message="Restoration completed for $app" --last
diff --git a/scripts/upgrade b/scripts/upgrade
index cf1817a..0357364 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -127,4 +127,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Upgrade of KiwiIRC completed" --last
+ynh_script_progression --message="Upgrade of $app completed" --last