diff --git a/helpers/helpers.v2.1.d/mysql b/helpers/helpers.v2.1.d/mysql
index 1196e5e07..e8cf9a69d 100644
--- a/helpers/helpers.v2.1.d/mysql
+++ b/helpers/helpers.v2.1.d/mysql
@@ -2,17 +2,17 @@
 
 # Open a connection as a user
 #
-# usage: ynh_mysql_connect_as --user=user --password=password [--database=database]
+# usage: ynh_mysql_execute --user=user --password=password [--database=database]
 # | arg: -u, --user=        - the user name to connect as (by default, $db_user)
 # | arg: -p, --password=    - the user password (by default, $db_pwd)
 # | arg: -d, --database=    - the database to connect to (by default, $db_name)
 #
 # examples:
-#    ynh_mysql_connect_as --user="user" --password="pass" <<< "UPDATE ...;"
-#    ynh_mysql_connect_as --user="user" --password="pass" < /path/to/file.sql
+#    ynh_mysql_execute <<< "UPDATE ...;"
+#    ynh_mysql_execute < /path/to/file.sql
 #
 # Requires YunoHost version 2.2.4 or higher.
-ynh_mysql_connect_as() {
+ynh_mysql_execute() {
     # ============ Argument parsing =============
     local -A args_array=([u]=user= [p]=password= [d]=database=)
     local user
diff --git a/helpers/helpers.v2.1.d/postgresql b/helpers/helpers.v2.1.d/postgresql
index 9b27697c4..4e2a3bb24 100644
--- a/helpers/helpers.v2.1.d/postgresql
+++ b/helpers/helpers.v2.1.d/postgresql
@@ -5,17 +5,17 @@ PSQL_VERSION=13
 
 # Open a connection as a user
 #
-# usage: ynh_psql_connect_as --user=user --password=password [--database=database]
+# usage: ynh_psql_execute --user=user --password=password [--database=database]
 # | arg: -u, --user=        - the user name to connect as (by default, $db_user)
 # | arg: -p, --password=    - the user password (by default, $db_pw)
 # | arg: -d, --database=    - the database to connect to (by default, $db_name)
 #
 # examples:
-#    ynh_psql_connect_as 'user' 'pass' <<< "UPDATE ...;"
-#    ynh_psql_connect_as 'user' 'pass' < /path/to/file.sql
+#    ynh_psql_execute <<< "UPDATE ...;"
+#    ynh_psql_execute < /path/to/file.sql
 #
 # Requires YunoHost version 3.5.0 or higher.
-ynh_psql_connect_as() {
+ynh_psql_execute() {
     # ============ Argument parsing =============
     local -A args_array=([u]=user= [p]=password= [d]=database=)
     local user
@@ -50,8 +50,8 @@ ynh_psql_execute_as_root() {
         database="--database=$database"
     fi
 
-    ynh_psql_connect_as --user="postgres" --password="$(cat $PSQL_ROOT_PWD_FILE)" \
-        $database <<<"$sql"
+    ynh_psql_execute --user="postgres" --password="$(cat $PSQL_ROOT_PWD_FILE)" \
+        --database="$database" <<<"$sql"
 }
 
 # Execute a command from a file as root user
@@ -74,8 +74,8 @@ ynh_psql_execute_file_as_root() {
         database="--database=$database"
     fi
 
-    ynh_psql_connect_as --user="postgres" --password="$(cat $PSQL_ROOT_PWD_FILE)" \
-        $database <"$file"
+    ynh_psql_execute --user="postgres" --password="$(cat $PSQL_ROOT_PWD_FILE)" \
+        --database="$database" <"$file"
 }
 
 # Create a database and grant optionnaly privilegies to a user