diff --git a/check_process b/check_process
index 364ff6c..cd1be94 100644
--- a/check_process
+++ b/check_process
@@ -2,7 +2,7 @@
 	; Manifest
 		domain="domain.tld"	(DOMAIN)
 		path="/path"	(PATH)
-		phpversion="7.3"
+		php_version="7.3"
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1
@@ -20,7 +20,7 @@
 	; Manifest
 		domain="domain.tld"	(DOMAIN)
 		path="/path"	(PATH)
-		phpversion="7.2"
+		php_version="7.2"
 	; Checks
 		setup_sub_dir=1
 		backup_restore=1
@@ -28,7 +28,7 @@
 	; Manifest
 		domain="domain.tld"	(DOMAIN)
 		path="/path"	(PATH)
-		phpversion="7.1"
+		php_version="7.1"
 	; Checks
 		setup_sub_dir=1
 		backup_restore=1
@@ -36,7 +36,7 @@
 	; Manifest
 		domain="domain.tld"	(DOMAIN)
 		path="/path"	(PATH)
-		phpversion="7.0"
+		php_version="7.0"
 	; Checks
 		setup_sub_dir=1
 		backup_restore=1
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 556b622..86a38a9 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -17,7 +17,7 @@ location __PATH__/ {
   try_files $uri $uri/ index.php;
   location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-    fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
+    fastcgi_pass unix:/var/run/php/php__PHP_VERSION__-fpm-__NAME__.sock;
 
     fastcgi_index index.php;
     include fastcgi_params;
diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index ab1a471..4fefc91 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -33,7 +33,7 @@ group = __USER__
 ;                            (IPv6 and IPv4-mapped) on a specific port;
 ;   '/path/to/unix/socket' - to listen on a unix socket.
 ; Note: This value is mandatory.
-listen = /var/run/php/php__PHPVERSION__-fpm-__NAMETOCHANGE__.sock
+listen = /var/run/php/php__PHP_VERSION__-fpm-__NAMETOCHANGE__.sock
 
 ; Set listen(2) backlog.
 ; Default Value: 511 (-1 on FreeBSD and OpenBSD)
diff --git a/manifest.json b/manifest.json
index 5f00f52..2e59640 100644
--- a/manifest.json
+++ b/manifest.json
@@ -42,7 +42,7 @@
                 "default": "/phpinfo"
             },
             {
-                "name": "phpversion",
+                "name": "php_version",
                 "type": "string",
                 "ask": {
                     "en": "Choose the version of PHP to use."
diff --git a/scripts/backup b/scripts/backup
index 17439b2..2067a45 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -27,7 +27,7 @@ app=$YNH_APP_INSTANCE_NAME
 
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 domain=$(ynh_app_setting_get --app=$app --key=domain)
-phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
+php_version=$(ynh_app_setting_get --app=$app --key=php_version)
 ynh_use_php
 
 #=================================================
diff --git a/scripts/install b/scripts/install
index 9530ba3..d15e833 100755
--- a/scripts/install
+++ b/scripts/install
@@ -23,7 +23,7 @@ ynh_abort_if_errors
 
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
-php_version=$YNH_APP_ARG_PHPVERSION
+php_version=$YNH_APP_ARG_PHP_VERSION
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -73,7 +73,7 @@ cp ../sources/index.php $final_path/.
 ynh_script_progression --message="Configuring NGINX web server..."
 
 # Create a dedicated NGINX config
-ynh_add_nginx_config
+ynh_add_nginx_config "php_version"
 
 #=================================================
 # CREATE DEDICATED USER
diff --git a/scripts/restore b/scripts/restore
index 68bc886..dc48701 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -28,7 +28,7 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
+php_version=$(ynh_app_setting_get --app=$app --key=php_version)
 
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
diff --git a/scripts/upgrade b/scripts/upgrade
index b8d2066..736290d 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -75,7 +75,7 @@ YNH_PHP_VERSION=$(ynh_app_setting_get --app=$app --key=php_version)
 ynh_script_progression --message="Upgrading NGINX web server configuration..."
 
 # Create a dedicated NGINX config
-ynh_add_nginx_config
+ynh_add_nginx_config "php_version"
 
 #=================================================
 # CREATE DEDICATED USER