diff --git a/manifest.json b/manifest.json
index 0dbbca7..610b376 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,12 +1,12 @@
 {
-    "name": "pgAdmin",
+    "name": "pgAdmin4",
     "id": "pgadmin",
     "packaging_format": 1,
     "description": {
         "en": "Manage PostgreSQL databases over the web",
         "fr": "Application web de gestion des bases de données PostgreSQL"
     },
-    "version": "4-6.12~ynh1",
+    "version": "6.12~ynh1",
     "url": "https://www.pgadmin.org",
     "upstream": {
         "license": "PostgreSQL",
diff --git a/scripts/_common.sh b/scripts/_common.sh
index fe36ad6..ef18cc0 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -61,7 +61,7 @@ install_source() {
         pip3 install --upgrade pip
         pip3 install --upgrade 'Werkzeug<1.0'
         pip3 install --upgrade 'markupsafe==2.0.1'
-        pip3 install --upgrade pgadmin$app_main_version==$app_sub_version
+        pip3 install --upgrade pgadmin4==$app_sub_version
         set +$u_arg;
         deactivate
         set -$u_arg;
diff --git a/scripts/install b/scripts/install
index 349cf68..aaad63c 100644
--- a/scripts/install
+++ b/scripts/install
@@ -32,7 +32,6 @@ admin_pwd=$YNH_APP_ARG_PASSWORD
 db_user="pgadmin"
 db_pwd=$(ynh_string_random --length 30)
 app_version=$(ynh_app_upstream_version)
-app_main_version=$(echo $app_version | cut -d'-' -f1)
 app_sub_version=$(echo $app_version | cut -d'-' -f2)
 
 app=$YNH_APP_INSTANCE_NAME
diff --git a/scripts/restore b/scripts/restore
index b68671e..7f494d0 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -36,7 +36,6 @@ db_user=$(ynh_app_setting_get --app=$app --key=db_user)
 db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
 
 app_version=$(ynh_app_upstream_version)
-app_main_version=$(echo $app_version | cut -d'-' -f1)
 app_sub_version=$(echo $app_version | cut -d'-' -f2)
 
 pgadmin_user="$app"
diff --git a/scripts/upgrade b/scripts/upgrade
index 3d7c322..7c74faa 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -23,7 +23,6 @@ admin=$(ynh_app_setting_get --app=$app --key=admin)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
 app_version=$(ynh_app_upstream_version)
-app_main_version=$(echo $app_version | cut -d'-' -f1)
 app_sub_version=$(echo $app_version | cut -d'-' -f2)
 
 pgadmin_user="$app"