diff --git a/install_mariadb.sh b/install_mariadb.sh
index 557c6fb..11c4ba2 100755
--- a/install_mariadb.sh
+++ b/install_mariadb.sh
@@ -264,8 +264,8 @@ MY_CNF_FILE="${MARIADB_INSTALL_DIR}/etc/my.cnf"
 if $UPDATE_MARIADB ; then
    echo ""
    echononl "Ermittle Installations Verz. der existierenden MARIADB Installation."
-   if [[ -d "$(dirname "$MARIADB_INSTALL_DIR")/maria-$CURRENT_VERSION" ]]; then
-      MARIADB_CUR_INSTALL_DIR="$(dirname "$MARIADB_INSTALL_DIR")/maria-$CURRENT_VERSION"
+   if [[ -d "$(dirname "$MARIADB_INSTALL_DIR")/mariadb-$CURRENT_VERSION" ]]; then
+      MARIADB_CUR_INSTALL_DIR="$(dirname "$MARIADB_INSTALL_DIR")/mariadb-$CURRENT_VERSION"
       echo_ok
    else
       echo_failed
@@ -292,8 +292,8 @@ done
 if $UPDATE_MARIADB ; then
    echo ""
    echononl "Ermittle MARIADB-Datenbank Verz. der existierenden MARIADB Installation."
-   if [[ -d "$(dirname "$MARIADB_DATA_DIR")/maria-$CURRENT_VERSION" ]]; then
-      MARIADB_CUR_DATA_DIR="$(dirname "$MARIADB_DATA_DIR")/maria-$CURRENT_VERSION"
+   if [[ -d "$(dirname "$MARIADB_DATA_DIR")/mariadb-$CURRENT_VERSION" ]]; then
+      MARIADB_CUR_DATA_DIR="$(dirname "$MARIADB_DATA_DIR")/mariadb-$CURRENT_VERSION"
       echo_ok
    else
       echo_failed
@@ -4186,7 +4186,7 @@ else
    echo "" >> ${logdir}/main.log
    echo "## - Run 'mysql_upgrade -uroot' - this may take some (long) time" >> ${logdir}/main.log
    echo "## -" >> ${logdir}/main.log
-   echo "${MARIADB_INSTALL_DIR}/bin/MARIADB_upgrade -uroot -p$MARIADB_ROOT_PW" >> ${logdir}/main.log
+   echo "${MARIADB_INSTALL_DIR}/bin/mysql_upgrade -uroot -p$MARIADB_ROOT_PW" >> ${logdir}/main.log
    ${MARIADB_INSTALL_DIR}/bin/mysql_upgrade -uroot -p$MARIADB_ROOT_PW >> ${logdir}/main.log 2>&1
    ret_val=$?
    if [[ $ret_val -eq 0 ]] ; then
@@ -4214,9 +4214,9 @@ fi
 
 _sys_maint_cnf_needed=false
 if $UPDATE_MARIADB ; then
-   echononl "Copy 'sys-maint.cnf from old installation to the new one.."
+   echononl "Copy 'sys-maint.cnf' from old installation to the new one.."
    echo "" >> ${logdir}/main.log
-   echo "## - Copy 'sys-maint.cnf from old installation to the new one" >> ${logdir}/main.log
+   echo "## - Copy 'sys-maint.cnf' from old installation to the new one" >> ${logdir}/main.log
    echo "## -" >> ${logdir}/main.log
    if [[ "$CURRENT_VERSION" = "$MARIADB_VERSION" ]] ; then
       echo "cp -a \"$MARIADB_INSTALL_DIR.$_backup_date/sys-maint.cnf\" \"${MARIADB_INSTALL_DIR}/sys-maint.cnf\"" \
@@ -4240,9 +4240,9 @@ if $UPDATE_MARIADB ; then
          [[ $OK = "yes" ]] || fatal "Abbruch durch User"
       fi
    else
-      echo "cp -a \"$(realpath ${MARIADB_CUR_INSTALL_DIR}/sys-maint.cnf)\" \"${MARIADB_INSTALL_DIR}/sys-maint.cnf\"" \
+      echo "cp -a \"$(realpath "${MARIADB_CUR_INSTALL_DIR}/sys-maint.cnf")\" \"${MARIADB_INSTALL_DIR}/sys-maint.cnf\"" \
          >> ${logdir}/main.log
-      cp -a "$(realpath ${MARIADB_CUR_INSTALL_DIR}/sys-maint.cnf)" "${MARIADB_INSTALL_DIR}/sys-maint.cnf" \
+      cp -a "$(realpath "${MARIADB_CUR_INSTALL_DIR}/sys-maint.cnf")" "${MARIADB_INSTALL_DIR}/sys-maint.cnf" \
          >> ${logdir}/main.log 2>&1
       if [ "$?" = "0" ]; then
          echo_ok