diff --git a/mysql-check-socket.sh b/mariadb-check-socket.sh
similarity index 80%
rename from mysql-check-socket.sh
rename to mariadb-check-socket.sh
index 407523f..51a7e43 100644
--- a/mysql-check-socket.sh
+++ b/mariadb-check-socket.sh
@@ -5,7 +5,7 @@
 # positive result when starting and mysqld_safe could remove
 # a socket file, which is actually being used by a different daemon.
 
-source "`dirname ${BASH_SOURCE[0]}`/mysql-scripts-common"
+source "`dirname ${BASH_SOURCE[0]}`/mariadb-scripts-common"
 
 if test -e "$socketfile" ; then
     echo "Socket file $socketfile exists." >&2
@@ -25,9 +25,9 @@ if test -e "$socketfile" ; then
     fi
 
     # some process uses the socket file
-    response=`@bindir@/mysqladmin --no-defaults --socket="$socketfile" --user=UNKNOWN_MYSQL_USER --connect-timeout="${CHECKSOCKETTIMEOUT:-10}" ping 2>&1`
+    response=`@bindir@/mariadb-admin --no-defaults --socket="$socketfile" --user=UNKNOWN_MYSQL_USER --connect-timeout="${CHECKSOCKETTIMEOUT:-10}" ping 2>&1`
     if [ $? -eq 0 ] || echo "$response" | grep -q "Access denied for user" ; then
-        echo "Is another MySQL daemon already running with the same unix socket?" >&2
+        echo "Is another MariaDB daemon already running with the same unix socket?" >&2
         echo "Please, stop the process using the socket $socketfile or remove the file manually to start the service." >&2
         exit 1
     fi
diff --git a/mysql-check-upgrade.sh b/mariadb-check-upgrade.sh
similarity index 68%
rename from mysql-check-upgrade.sh
rename to mariadb-check-upgrade.sh
index 1bfd3bc..fe95544 100644
--- a/mysql-check-upgrade.sh
+++ b/mariadb-check-upgrade.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-source "`dirname ${BASH_SOURCE[0]}`/mysql-scripts-common"
+source "`dirname ${BASH_SOURCE[0]}`/mariadb-scripts-common"
 
 upgrade_info_file="$datadir/mysql_upgrade_info"
 version=0
@@ -25,14 +25,14 @@ if [ $version -ne $thisversion ] ; then
     fi
 
     cat <<EOF >&2
-The datadir located at $datadir needs to be upgraded using 'mysql_upgrade' tool. This can be done using the following steps:
+The datadir located at $datadir needs to be upgraded using 'mariadb-upgrade' tool. This can be done using the following steps:
 
-  1. Back-up your data before with 'mysql_upgrade'
-  2. Start the database daemon using 'service @DAEMON_NAME@ start'
-  3. Run 'mysql_upgrade' with a database user that has sufficient privileges
+  1. Back-up your data before with 'mariadb-upgrade'
+  2. Start the database daemon using 'systemctl start @DAEMON_NAME@.service'
+  3. Run 'mariadb-upgrade' with a database user that has sufficient privileges
 
-Read more about 'mysql_upgrade' usage at:
-https://mariadb.com/kb/en/mariadb/documentation/sql-commands/table-commands/mysql_upgrade/
+Read more about 'mariadb-upgrade' usage at:
+https://mariadb.com/kb/en/mysql_upgrade/
 EOF
 fi
 
diff --git a/mysql-prepare-db-dir.sh b/mariadb-prepare-db-dir.sh
similarity index 95%
rename from mysql-prepare-db-dir.sh
rename to mariadb-prepare-db-dir.sh
index a82479f..cccfe96 100644
--- a/mysql-prepare-db-dir.sh
+++ b/mariadb-prepare-db-dir.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-# This script creates the mysql data directory during first service start.
+# This script creates the MariaDB data directory during first service start.
 # In subsequent starts, it does nothing much.
 
-source "`dirname ${BASH_SOURCE[0]}`/mysql-scripts-common"
+source "`dirname ${BASH_SOURCE[0]}`/mariadb-scripts-common"
 
 export LC_ALL=C
 
@@ -97,7 +97,7 @@ if should_initialize "$datadir" ; then
     # https://bugzilla.redhat.com/show_bug.cgi?id=1335849#c19
     INITDB_TIMESTAMP=`LANG=C date -u`
     sleep 1
-    @bindir@/mysql_install_db --rpm --datadir="$datadir" --user="$myuser" --skip-test-db >&2
+    @bindir@/mariadb-install-db --rpm --datadir="$datadir" --user="$myuser" --skip-test-db >&2
     ret=$?
     if [ $ret -ne 0 ] ; then
         echo "Initialization of @NICE_PROJECT_NAME@ database failed." >&2
diff --git a/mysql-scripts-common.sh b/mariadb-scripts-common.sh
similarity index 84%
rename from mysql-scripts-common.sh
rename to mariadb-scripts-common.sh
index e270433..8af7c58 100644
--- a/mysql-scripts-common.sh
+++ b/mariadb-scripts-common.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# Some useful functions used in other MySQL helper scripts
+# Some useful functions used in other MariaDB helper scripts
 # This scripts defines variables datadir, errlogfile, socketfile
 
 export LC_ALL=C
 
-# extract value of a MySQL option from config files
+# extract value of a MariaDB option from config files
 # Usage: get_mysql_option VARNAME DEFAULT SECTION [ SECTION, ... ]
 # result is returned in $result
 # We use my_print_defaults which prints all options from multiple files,
@@ -25,7 +25,7 @@ get_mysql_option(){
 	fi
 }
 
-# For the case of running more instances via systemd, scrits that source
+# For the case of running more instances via systemd, scripts that source
 # this file can get --default-group-suffix or similar option as the first
 # argument. The utility my_print_defaults needs to use it as well, so the
 # scripts sourcing this file work with the same options as the daemon.
@@ -35,17 +35,17 @@ while echo "$1" | grep -q '^--defaults' ; do
 	shift
 done
 
-# Defaults here had better match what mysqld_safe will default to
+# Defaults here had better match what mariadbd-safe will default to
 # The option values are generally defined on three important places
 # on the default installation:
-#  1) default values are hardcoded in the code of mysqld daemon or
-#     mysqld_safe script
+#  1) default values are hardcoded in the code of mariadbd daemon or
+#     mariadbd-safe script
 #  2) configurable values are defined in @sysconfdir@/my.cnf
 #  3) default values for helper scripts are specified bellow
 # So, in case values are defined in my.cnf, we need to get that value.
 # In case they are not defined in my.cnf, we need to get the same value
 # in the daemon, as in the helper scripts. Thus, default values here
-# must correspond with values defined in mysqld_safe script and source
+# must correspond with values defined in mariadbd-safe script and source
 # code itself.
 
 server_sections="mysqld_safe mysqld server mysqld-@MAJOR_VERSION@.@MINOR_VERSION@ mariadb mariadb-@MAJOR_VERSION@.@MINOR_VERSION@ client-server"
diff --git a/mariadb-scripts.patch b/mariadb-scripts.patch
index 74914b1..3b6dc16 100644
--- a/mariadb-scripts.patch
+++ b/mariadb-scripts.patch
@@ -11,13 +11,13 @@ be expanded by cmake. Cmake needs to know about them, so adding them manually.
 +
 +  # files for systemd
 +  SET(SYSTEMD_SCRIPTS
-+    mysql.tmpfiles.d
++    mariadb.tmpfiles.d
 +    mysql.service
 +    mysql@.service
-+    mysql-prepare-db-dir
-+    mysql-check-socket
-+    mysql-check-upgrade
-+    mysql-scripts-common
++    mariadb-prepare-db-dir
++    mariadb-check-socket
++    mariadb-check-upgrade
++    mariadb-scripts-common
 +    mysql_config_multilib
 +    clustercheck
 +    galera_new_cluster
diff --git a/mariadb.rpmlintrc b/mariadb.rpmlintrc
index b0c9077..09130ab 100644
--- a/mariadb.rpmlintrc
+++ b/mariadb.rpmlintrc
@@ -51,8 +51,8 @@ addFilter(r'incoherent-logrotate-file /etc/logrotate.d/mariadb')
 addFilter(r'non-executable-in-bin /usr/bin/wsrep_sst_common 644')
 addFilter(r'script-without-shebang /usr/bin/wsrep_sst_common')
 addFilter(r'non-executable-script /usr/bin/wsrep_sst_common 644 None')
-# mysql-scripts-common has a simmilar issue
-addFilter(r'non-executable-script /usr/libexec/mysql-scripts-common 644 /bin/sh')
+# mariadb-scripts-common has a similar issue
+addFilter(r'non-executable-script /usr/libexec/mariadb-scripts-common 644 /bin/sh')
 # Seems pretty standard to me ...
 addFilter(r'non-standard-dir-perm /var/log/mariadb 750')
 
diff --git a/mariadb.spec b/mariadb.spec
index fbecf88..db552e0 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -171,13 +171,13 @@ License:          GPLv2 and LGPLv2
 Source0:          https://downloads.mariadb.org/interstitial/mariadb-%{version}/source/mariadb-%{version}.tar.gz
 Source2:          mysql_config_multilib.sh
 Source3:          my.cnf.in
-Source6:          README.mysql-docs
-Source10:         mysql.tmpfiles.d.in
+Source6:          README.mariadb-docs
+Source10:         mariadb.tmpfiles.d.in
 Source11:         mysql.service.in
-Source12:         mysql-prepare-db-dir.sh
-Source14:         mysql-check-socket.sh
-Source15:         mysql-scripts-common.sh
-Source16:         mysql-check-upgrade.sh
+Source12:         mariadb-prepare-db-dir.sh
+Source14:         mariadb-check-socket.sh
+Source15:         mariadb-scripts-common.sh
+Source16:         mariadb-check-upgrade.sh
 Source18:         mysql@.service.in
 Source50:         rh-skipped-tests-base.list
 Source51:         rh-skipped-tests-arm.list
@@ -994,18 +994,18 @@ install -D -p -m 644 %{_vpath_builddir}/scripts/mysql.service %{buildroot}%{_uni
 install -D -p -m 644 %{_vpath_builddir}/scripts/mysql@.service %{buildroot}%{_unitdir}/%{daemon_name}@.service
 
 # helper scripts for service starting
-install -p -m 755 %{_vpath_builddir}/scripts/mysql-prepare-db-dir %{buildroot}%{_libexecdir}/mysql-prepare-db-dir
-install -p -m 755 %{_vpath_builddir}/scripts/mysql-check-socket %{buildroot}%{_libexecdir}/mysql-check-socket
-install -p -m 755 %{_vpath_builddir}/scripts/mysql-check-upgrade %{buildroot}%{_libexecdir}/mysql-check-upgrade
-install -p -m 644 %{_vpath_builddir}/scripts/mysql-scripts-common %{buildroot}%{_libexecdir}/mysql-scripts-common
+install -p -m 755 %{_vpath_builddir}/scripts/mariadb-prepare-db-dir %{buildroot}%{_libexecdir}/mariadb-prepare-db-dir
+install -p -m 755 %{_vpath_builddir}/scripts/mariadb-check-socket %{buildroot}%{_libexecdir}/mariadb-check-socket
+install -p -m 755 %{_vpath_builddir}/scripts/mariadb-check-upgrade %{buildroot}%{_libexecdir}/mariadb-check-upgrade
+install -p -m 644 %{_vpath_builddir}/scripts/mariadb-scripts-common %{buildroot}%{_libexecdir}/mariadb-scripts-common
 
 # Install downstream version of tmpfiles
-install -D -p -m 0644 %{_vpath_builddir}/scripts/mysql.tmpfiles.d %{buildroot}%{_tmpfilesdir}/%{name}.conf
+install -D -p -m 0644 %{_vpath_builddir}/scripts/mariadb.tmpfiles.d %{buildroot}%{_tmpfilesdir}/%{name}.conf
 %if 0%{?mysqld_pid_dir:1}
 echo "d %{pidfiledir} 0755 mysql mysql -" >>%{buildroot}%{_tmpfilesdir}/%{name}.conf
 %endif
 
-# install aditional galera selinux policy
+# install additional galera selinux policy
 %if %{with galera}
 install -p -m 644 -D selinux/%{name}-server-galera.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp
 %endif
@@ -1523,10 +1523,10 @@ fi
 %{_unitdir}/%{daemon_name}*
 %{?with_tokudb:%exclude %{_unitdir}/mariadb.service.d/tokudb.conf}
 
-%{_libexecdir}/mysql-prepare-db-dir
-%{_libexecdir}/mysql-check-socket
-%{_libexecdir}/mysql-check-upgrade
-%{_libexecdir}/mysql-scripts-common
+%{_libexecdir}/mariadb-prepare-db-dir
+%{_libexecdir}/mariadb-check-socket
+%{_libexecdir}/mariadb-check-upgrade
+%{_libexecdir}/mariadb-scripts-common
 
 %attr(0755,mysql,mysql) %dir %{pidfiledir}
 %attr(0755,mysql,mysql) %dir %{dbdatadir}
diff --git a/mysql.tmpfiles.d.in b/mariadb.tmpfiles.d.in
similarity index 100%
rename from mysql.tmpfiles.d.in
rename to mariadb.tmpfiles.d.in
diff --git a/mysql.service.in b/mysql.service.in
index 6f84dd3..24e61cc 100644
--- a/mysql.service.in
+++ b/mysql.service.in
@@ -26,7 +26,7 @@
 
 [Unit]
 Description=@NICE_PROJECT_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@ database server
-Documentation=man:mysqld(8)
+Documentation=man:mariadbd(8)
 Documentation=https://mariadb.com/kb/en/library/systemd/
 After=network.target
 
@@ -40,17 +40,17 @@ Type=notify
 User=mysql
 Group=mysql
 
-ExecStartPre=@libexecdir@/mysql-check-socket
+ExecStartPre=@libexecdir@/mariadb-check-socket
 # '%n' expands to 'Full unit name'; man systemd.unit
-ExecStartPre=@libexecdir@/mysql-prepare-db-dir %n
+ExecStartPre=@libexecdir@/mariadb-prepare-db-dir %n
 # MYSQLD_OPTS here is for users to set in /etc/systemd/system/@DAEMON_NAME@@.service.d/MY_SPECIAL.conf
 # Note: we set --basedir to prevent probes that might trigger SELinux alarms,
 # per bug #547485
-ExecStart=@libexecdir@/mysqld --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
-ExecStartPost=@libexecdir@/mysql-check-upgrade
+ExecStart=@libexecdir@/mariadbd --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
+ExecStartPost=@libexecdir@/mariadb-check-upgrade
 
 # Setting this to true can break replication and the Type=notify settings
-# See also bind-address mysqld option.
+# See also bind-address MariaDB option.
 PrivateNetwork=false
 
 KillMode=process
diff --git a/mysql@.service.in b/mysql@.service.in
index b36ce6d..f9b72fa 100644
--- a/mysql@.service.in
+++ b/mysql@.service.in
@@ -33,7 +33,7 @@
 
 [Unit]
 Description=@NICE_PROJECT_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@ database server
-Documentation=man:mysqld(8)
+Documentation=man:mariadbd(8)
 Documentation=https://mariadb.com/kb/en/library/systemd/
 After=network.target
 
@@ -47,16 +47,16 @@ Type=notify
 User=mysql
 Group=mysql
 
-ExecStartPre=@libexecdir@/mysql-check-socket --defaults-group-suffix=.%I
-ExecStartPre=@libexecdir@/mysql-prepare-db-dir --defaults-group-suffix=.%I %n
+ExecStartPre=@libexecdir@/mariadb-check-socket --defaults-group-suffix=.%I
+ExecStartPre=@libexecdir@/mariadb-prepare-db-dir --defaults-group-suffix=.%I %n
 # MYSQLD_OPTS here is for users to set in /etc/systemd/system/@DAEMON_NAME@@.service.d/MY_SPECIAL.conf
 # Note: we set --basedir to prevent probes that might trigger SELinux alarms,
 # per bug #547485
-ExecStart=@libexecdir@/mysqld --defaults-group-suffix=.%I --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
-ExecStartPost=@libexecdir@/mysql-check-upgrade --defaults-group-suffix=.%I
+ExecStart=@libexecdir@/mariadbd --defaults-group-suffix=.%I --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
+ExecStartPost=@libexecdir@/mariadb-check-upgrade --defaults-group-suffix=.%I
 
 # Setting this to true can break replication and the Type=notify settings
-# See also bind-address mysqld option.
+# See also bind-address MariaDB option.
 PrivateNetwork=false
 
 KillMode=process