diff --git a/check_process b/check_process
index 5c96dba..7dcddeb 100644
--- a/check_process
+++ b/check_process
@@ -7,7 +7,7 @@
 	; Manifest
         domain="domain.tld"    (DOMAIN)
         path="/rainloop"    (PATH)
-        language="fr"
+        lang="fr"
         is_public=1 (PUBLIC|public=1|private=0)
 		password="pass"
         ldap=1
diff --git a/manifest.json b/manifest.json
index 84701ce..fd53967 100644
--- a/manifest.json
+++ b/manifest.json
@@ -52,7 +52,7 @@
 				"default": false
 			},
 			{
-                "name": "language",
+                "name": "lang",
                 "type": "string",
 				"ask": {
                     "en": "Choose the application language",
diff --git a/scripts/install b/scripts/install
index 84419af..21146dd 100644
--- a/scripts/install
+++ b/scripts/install
@@ -28,7 +28,7 @@ ynh_print_info "Retrieve arguments from the manifest ..."
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 is_public=$YNH_APP_ARG_IS_PUBLIC
-language=$YNH_APP_ARG_LANGUAGE
+lang=$YNH_APP_ARG_LANG
 password=$YNH_APP_ARG_PASSWORD
 ldap=$YNH_APP_ARG_LDAP
 
@@ -68,7 +68,7 @@ ynh_print_info "Store settings from manifest ..."
 ynh_app_setting_set $app domain $domain
 ynh_app_setting_set $app path $path_url
 ynh_app_setting_set $app is_public $is_public
-ynh_app_setting_set $app language $language
+ynh_app_setting_set $app lang $lang
 ynh_app_setting_set $app password $password #9999 Check if it's need to save password
 ynh_app_setting_set $app ldap $ldap
 
@@ -166,7 +166,7 @@ sudo cp ../conf/data/configs/application.ini "$application_file"
 ynh_replace_string "domain.tld" "$domain" "$application_file"
 ynh_replace_string "MYSQLUSER" "$db_name" "$application_file"
 ynh_replace_string "MYSQLPASSWORD" "$db_pwd" "$application_file"
-ynh_replace_string "LANGTOCHANGE" "$language" "$application_file"
+ynh_replace_string "LANGTOCHANGE" "$lang" "$application_file"
 ynh_replace_string "PLUGINSTOENABLE" "$plugins" "$application_file"
 
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 88bd8c8..a0284c4 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -20,17 +20,8 @@ domain=$(ynh_app_setting_get $app domain)
 path_url=$(ynh_app_setting_get $app path)
 is_public=$(ynh_app_setting_get $app is_public)
 final_path=$(ynh_app_setting_get $app final_path)
-language=$(ynh_app_setting_get $app language)
-db_name=$(ynh_app_setting_get $app db_name)
-
 lang=$(ynh_app_setting_get $app lang)
-
-if [ -n "$lang" ]
-then
-    language="$lang"
-    ynh_app_setting_set "$app" language "$language"
-	ynh_app_setting_delete "$app" lang
-fi
+db_name=$(ynh_app_setting_get $app db_name)
 
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY