diff --git a/support-files/MacOSX/ReadMe.txt b/support-files/MacOSX/ReadMe.txt
index 31fb0d97e14..efa10075834 100644
--- a/support-files/MacOSX/ReadMe.txt
+++ b/support-files/MacOSX/ReadMe.txt
@@ -80,7 +80,7 @@ Note
    lib             Libraries
    man             Unix manual pages
    mysql-test      MySQL test suite
-   scripts         Contains the mysql_install_db script
+   scripts         Contains the mariadb-install-db script
    share/mysql     Error message files
    sql-bench       Benchmarks
    support-files   Scripts and sample configuration files
@@ -288,7 +288,7 @@ Note
    /usr/libexec                The mariadbd server
    /usr/share/man              Unix manual pages
    /usr/share/mysql/mysql-test MySQL test suite
-   /usr/share/mysql            Contains the mysql_install_db script
+   /usr/share/mysql            Contains the mariadb-install-db script
    /var/mysql/mysql.sock       The location of the MySQL Unix socket
 
 Note
diff --git a/support-files/MacOSX/postflight.sh b/support-files/MacOSX/postflight.sh
index 752eddc4241..223ff0d657d 100644
--- a/support-files/MacOSX/postflight.sh
+++ b/support-files/MacOSX/postflight.sh
@@ -23,13 +23,13 @@
 # installation has been performed.
 #
 # This script will install the MySQL privilege tables using the
-# "mysql_install_db" script and will correct the ownerships of these files
+# "mariadb-install-db" script and will correct the ownerships of these files
 # afterwards.
 #
 
 if cd @prefix@ ; then
 	if [ ! -f data/mysql/db.frm ] ; then
-		./scripts/mysql_install_db --rpm
+		./scripts/mariadb-install-db --rpm
 	fi
 
 	if [ -d data ] ; then
diff --git a/support-files/binary-configure.sh b/support-files/binary-configure.sh
index 47123668683..98b26c161d3 100644
--- a/support-files/binary-configure.sh
+++ b/support-files/binary-configure.sh
@@ -23,9 +23,9 @@ for arg do
   esac
 done
 
-if test ! -x  ./scripts/mysql_install_db
+if test ! -x  ./scripts/mariadb-install-db
 then
-  echo "I didn't find the script './scripts/mysql_install_db'."
+  echo "I didn't find the script './scripts/mariadb-install-db'."
   echo "Please execute this script in the mysql distribution directory!"
   exit 1;
 fi
@@ -38,7 +38,7 @@ echo "and start the MySQL server for you.  If you run into any trouble, please"
 echo "consult the MySQL manual, that you can find in the Docs directory."
 echo ""
 
-./scripts/mysql_install_db --no-defaults
+./scripts/mariadb-install-db --no-defaults
 if [ $? = 0 ]
 then
   echo "Starting the mariadbd server.  You can test that it is up and running"
diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in
index 547fc1732fa..c19e84a898d 100644
--- a/support-files/mariadb.service.in
+++ b/support-files/mariadb.service.in
@@ -82,7 +82,7 @@ ExecStartPre=/bin/sh -c "[ ! -e @bindir@/galera_recovery ] && VAR= || \
  && systemctl set-environment _WSREP_START_POSITION=$VAR || exit 1"
 
 # Needed to create system tables etc.
-# ExecStartPre=@scriptdir@/mysql_install_db -u mysql
+# ExecStartPre=@scriptdir@/mariadb-install-db -u mysql
 
 # Start main service
 # MYSQLD_OPTS here is for users to set in /etc/systemd/system/mariadb.service.d/MY_SPECIAL.conf
diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in
index 40d87817c10..01859763eb0 100644
--- a/support-files/mariadb@.service.in
+++ b/support-files/mariadb@.service.in
@@ -88,7 +88,7 @@
 #   User=%I
 #   ProtectHome=false
 #   ExecStartPre=
-#   ExecStartPre=@scriptdir@/mysql_install_db $MYSQLD_MULTI_INSTANCE \
+#   ExecStartPre=@scriptdir@/mariadb-install-db $MYSQLD_MULTI_INSTANCE \
 #       --auth-root-authentication-method=socket --auth-root-socket-user=%I
 #   Environment=MYSQLD_MULTI_INSTANCE="--defaults-file=/home/%I/my%I.cnf \
 #       --datadir=/home/%I/mysqldatadir --skip-networking --socket=@mysql-%I"
@@ -197,8 +197,8 @@ ProtectSystem=full
 # Prevent accessing /home, /root and /run/user
 ProtectHome=true
 
-# Needed to create system tables etc.
-ExecStartPre=@scriptdir@/mysql_install_db $MYSQLD_MULTI_INSTANCE
+# Needed to create system tables etc. --rpm to not do pam permission changes.
+ExecStartPre=@scriptdir@/mariadb-install-db $MYSQLD_MULTI_INSTANCE --rpm
 
 # Start main service
 # A few variables are here: