diff -Nur smeserver-mysql57-2.0.0.old/createlinks smeserver-mysql57-2.0.0/createlinks
--- smeserver-mysql57-2.0.0.old/createlinks	2017-02-19 09:44:53.000000000 -0500
+++ smeserver-mysql57-2.0.0/createlinks	2017-03-12 17:58:15.441000000 -0400
@@ -31,8 +31,8 @@
 $event = "bootstrap-console-save";
 
 foreach (qw(
-	/opt/rh/mysql57/root/etc/my.cnf
-	/opt/rh/mysql57/root/etc/sysconfig/mysqld
+	/opt/rh/rh-mysql57/root/etc/my.cnf
+	/opt/rh/rh-mysql57/root/etc/sysconfig/mysqld
 	/var/service/mysql57-mysqld/set.password
 	))
 #	/root/.my.cnf
@@ -53,4 +53,4 @@
 templates2events("/etc/e-smith/sql/init57/10fix_privilege_tables", 
 	"bootstrap-console-save");
 
-safe_symlink("/opt/rh/mysql57/root/var/run/mysqld", "root/var/run/mysql57-mysqld");
+safe_symlink("/opt/rh/rh-mysql57/root/var/run/mysqld", "root/var/run/mysql57-mysqld");
diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-delete-db-files smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-delete-db-files
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-delete-db-files	2017-02-19 09:44:53.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-delete-db-files	2017-03-12 17:58:15.440000000 -0400
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-cd /opt/rh/mysql57/root/var/lib/mysql && find . -type f | xargs rm -f
+cd /opt/rh/rh-mysql57/root/var/lib/mysql && find . -type f | xargs rm -f
diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-dump-tables smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-dump-tables
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-dump-tables	2017-02-19 09:44:53.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-dump-tables	2017-03-12 17:58:15.440000000 -0400
@@ -6,7 +6,7 @@
     echo "mysql57-mysqld is disabled - no tables dumped" >&2
     exit 0
 fi
-for db in $(/opt/rh/mysql57/root/usr/bin/mysql --socket=/var/lib/mysql/mysql57.sock -BNre "show databases;")
+for db in $(/opt/rh/rh-mysql57/root/usr/bin/mysql --socket=/var/lib/mysql/mysql57.sock -BNre "show databases;")
 do
-    /opt/rh/mysql57/root/usr/bin/mysqldump --single-transaction --socket=/var/lib/mysql/mysql57.sock --add-drop-table -QB "$db" -r /home/e-smith/db/mysql57/"$db".dump || exit 1
+    /opt/rh/rh-mysql57/root/usr/bin/mysqldump --single-transaction --socket=/var/lib/mysql/mysql57.sock --add-drop-table -QB "$db" -r /home/e-smith/db/mysql57/"$db".dump || exit 1
 done
diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-load-tables smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-load-tables
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-load-tables	2017-02-19 09:44:53.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-load-tables	2017-03-12 17:58:15.440000000 -0400
@@ -6,7 +6,7 @@
     echo "mysqld is disabled - no tables restored" >&2
     exit 0
 fi
-if [ ! -f /opt/rh/mysql57/root/var/lib/mysql/user.frm ]
+if [ ! -f /opt/rh/rh-mysql57/root/var/lib/mysql/user.frm ]
 then
     for db in $(ls /home/e-smith/db/mysql57/*.dump 2> /dev/null | grep -v '/mysql.dump')
     do
diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init57/00_restore_dumped_dbs smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/e-smith/sql/init57/00_restore_dumped_dbs
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init57/00_restore_dumped_dbs	2017-02-19 09:44:53.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/e-smith/sql/init57/00_restore_dumped_dbs	2017-03-12 17:58:15.441000000 -0400
@@ -1,13 +1,13 @@
 #! /bin/sh
 
 ( cat /home/e-smith/db/mysql57/mysql.dump ;
-  cat /service/mysql57-mysqld/set.password ) | /opt/rh/mysql57/root/usr/bin/mysql --socket=/var/lib/mysql/mysql57.sock || exit 1
-P=$(cat /opt/rh/mysql57/root/var/run/mysqld/mysqld.pid)
-/bin/rm /opt/rh/mysql57/root/var/run/mysqld/mysqld.pid
+  cat /service/mysql57-mysqld/set.password ) | /opt/rh/rh-mysql57/root/usr/bin/mysql --socket=/var/lib/mysql/mysql57.sock || exit 1
+P=$(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid)
+/bin/rm /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid
 kill -TERM $P
 for i in $(seq 1 20);
 do
-  if [ -f /opt/rh/mysql57/root/var/run/mysqld/mysqld.pid ]
+  if [ -f /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid ]
   then
       /bin/rm /home/e-smith/db/mysql57/mysql.dump
       exit 0
diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init57/10fix_privilege_tables smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/e-smith/sql/init57/10fix_privilege_tables
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init57/10fix_privilege_tables	2017-02-19 09:44:53.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/e-smith/sql/init57/10fix_privilege_tables	2017-03-12 17:58:15.440000000 -0400
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-/opt/rh/mysql57/root/usr/bin/mysql -f mysql < /usr/share/mysql/mysql_fix_privilege_tables.sql
-P=$(cat /opt/rh/mysql57/root/var/run/mysqld/mysqld.pid)
-/bin/rm /opt/rh/mysql57/root/var/run/mysqld/mysqld.pid
+/opt/rh/rh-mysql57/root/usr/bin/mysql -f mysql < /usr/share/mysql/mysql_fix_privilege_tables.sql
+P=$(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid)
+/bin/rm /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid
 kill -TERM $P
 for i in $(seq 1 20);
 do
-  if [ -f /opt/rh/mysql57/root/var/run/mysqld/mysqld.pid ]
+  if [ -f /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid ]
   then
       exit 0
   fi
diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/logrotate.d/mysql57-mysqld/50options smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/logrotate.d/mysql57-mysqld/50options
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/logrotate.d/mysql57-mysqld/50options	2017-02-19 09:44:53.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/logrotate.d/mysql57-mysqld/50options	2017-03-12 17:58:15.441000000 -0400
@@ -8,6 +8,6 @@
 	postrotate
 	# just if mysqld is really running
 	if test -n "`ps ax|grep mysql57|grep -v 'grep'`"; then
-		/opt/rh/mysql57/root/usr/bin/mysqladmin flush-logs
+		/opt/rh/rh-mysql57/root/usr/bin/mysqladmin flush-logs
 	fi
 	endscript
diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/006pid-file smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/006pid-file
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/006pid-file	2017-02-19 09:44:53.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/006pid-file	2017-03-12 17:58:15.440000000 -0400
@@ -1 +1 @@
-pid-file=/opt/rh/mysql57/root/var/run/mysqld/mysqld.pid
+pid-file=/opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid
diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/007basedir smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/007basedir
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/007basedir	2017-02-19 09:44:53.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/007basedir	2017-03-12 17:58:15.440000000 -0400
@@ -1 +1 @@
-basedir=/opt/rh/mysql57/root/usr
+basedir=/opt/rh/rh-mysql57/root/usr
diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/008datadir smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/008datadir
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/008datadir	2017-02-19 09:44:53.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/008datadir	2017-03-12 17:58:15.440000000 -0400
@@ -1 +1 @@
-datadir=/opt/rh/mysql57/root/var/lib/mysql
+datadir=/opt/rh/rh-mysql57/root/var/lib/mysql
diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/040mysqld_safe smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/040mysqld_safe
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/040mysqld_safe	2017-02-19 09:44:53.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/040mysqld_safe	2017-03-12 17:58:15.440000000 -0400
@@ -1,4 +1,4 @@
 
 {   # allow backwards-compatibility with safe_mysqld (mysql < 4.0)
-    -f "/opt/rh/mysql57/root/usr/bin/mysqld_safe" ? "[mysqld_safe]" : "[safe_mysqld]";
+    -f "/opt/rh/rh-mysql57/root/usr/bin/mysqld_safe" ? "[mysqld_safe]" : "[safe_mysqld]";
 }
diff -Nur smeserver-mysql57-2.0.0.old/root/sbin/e-smith/mysql57-preload smeserver-mysql57-2.0.0/root/sbin/e-smith/mysql57-preload
--- smeserver-mysql57-2.0.0.old/root/sbin/e-smith/mysql57-preload	2017-02-19 09:44:53.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/sbin/e-smith/mysql57-preload	2017-03-12 17:58:15.439000000 -0400
@@ -40,9 +40,9 @@
 	else
 	{
 	    # Find our mysqld binary
-	    my $mysqld = "/opt/rh/mysql57/root/usr/libexec/mysqld --socket=/var/lib/mysql/mysql57.sock";
-	    if (-f "/opt/rh/mysql57/root/usr/sbin/mysqld") {
-		$mysqld = "/opt/rh/mysql57/root/usr/sbin/mysqld --socket=/var/lib/mysql/mysql57.sock";
+	    my $mysqld = "/opt/rh/rh-mysql57/root/usr/libexec/mysqld --socket=/var/lib/mysql/mysql57.sock";
+	    if (-f "/opt/rh/rh-mysql57/root/usr/sbin/mysqld") {
+		$mysqld = "/opt/rh/rh-mysql57/root/usr/sbin/mysqld --socket=/var/lib/mysql/mysql57.sock";
 	    }
 	    # Hard-code user, since it is set in mysqld_safe currently.
 	    # See http://bugs.mysql.com/2163
diff -Nur smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/d smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/d
--- smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/d	2017-02-19 09:44:53.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/d	2017-03-12 17:58:15.439000000 -0400
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-exec kill -TERM $(cat /opt/rh/mysql57/root/var/run/mysqld/mysqld.pid)
+exec kill -TERM $(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid)
diff -Nur smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/i smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/i
--- smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/i	2017-02-19 09:44:53.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/i	2017-03-12 17:58:15.439000000 -0400
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-exec kill -INT $(cat /opt/rh/mysql57/root/var/run/mysqld/mysqld.pid)
+exec kill -INT $(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid)
diff -Nur smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/q smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/q
--- smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/q	2017-02-19 09:44:53.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/q	2017-03-12 17:58:15.440000000 -0400
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-exec kill -QUIT $(cat /opt/rh/mysql57/root/var/run/mysqld/mysqld.pid)
+exec kill -QUIT $(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid)
diff -Nur smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/t smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/t
--- smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/t	2017-02-19 09:44:53.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/t	2017-03-12 17:58:15.440000000 -0400
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-exec kill -TERM $(cat /opt/rh/mysql57/root/var/run/mysqld/mysqld.pid)
+exec kill -TERM $(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid)
diff -Nur smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/run smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/run
--- smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/run	2017-02-19 09:44:53.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/run	2017-03-12 17:58:15.439000000 -0400
@@ -4,7 +4,7 @@
 # clears almost all environment variables.
 # Since X_SCLS is cleared as well, we lose information about other
 # collections enabled.
-. /opt/rh/mysql57/service-environment
+. /opt/rh/rh-mysql57/service-environment
 for sclname in $MYSQL57_SCLS_ENABLED ; do
     . /opt/rh/$sclname/enable
         export X_SCLS="$X_SCLS $sclname"
@@ -12,25 +12,25 @@
         
         # we want start daemon only inside "scl enable" invocation
         if ! scl_enabled mysql57 ; then
-            echo "Collection mysql57 has to be listed in /opt/rh/mysql57/service-environment"
+            echo "Collection mysql57 has to be listed in /opt/rh/rh-mysql57/service-environment"
                 exit 1
                 fi
                 
 exec 2>&1
-if [ ! -f /opt/rh/mysql57/root/var/lib/mysql/mysql/user.frm ]
+if [ ! -f /opt/rh/rh-mysql57/root/var/lib/mysql/mysql/user.frm ]
 then
-    setuidgid mysql sh /opt/rh/mysql57/root/usr/bin/mysql_install_db
-    /opt/rh/mysql57/root/usr/libexec/mysqld --bootstrap --user=mysql --skip-grant-tables --socket=/var/lib/mysql/mysql57.sock < ./set.password
+    setuidgid mysql sh /opt/rh/rh-mysql57/root/usr/bin/mysql_install_db
+    /opt/rh/rh-mysql57/root/usr/libexec/mysqld --bootstrap --user=mysql --skip-grant-tables --socket=/var/lib/mysql/mysql57.sock < ./set.password
     if [ -f /home/e-smith/db/mysql57/mysql.dump ]
     then
 	/sbin/e-smith/expand-template /etc/e-smith/sql/init57/00_restore_dumped_dbs
     fi
 fi
 
-exec /opt/rh/mysql57/root/usr/libexec/mysqld \
- --defaults-file=/opt/rh/mysql57/root/etc/my.cnf \
-  --basedir=/opt/rh/mysql57/root/usr \
-   --datadir=/opt/rh/mysql57/root/var/lib/mysql \
+exec /opt/rh/rh-mysql57/root/usr/libexec/mysqld \
+ --defaults-file=/opt/rh/rh-mysql57/root/etc/my.cnf \
+  --basedir=/opt/rh/rh-mysql57/root/usr \
+   --datadir=/opt/rh/rh-mysql57/root/var/lib/mysql \
     --user=mysql \
-     --pid-file=/opt/rh/mysql57/root/var/run/mysqld/mysqld.pid \
+     --pid-file=/opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid \
       --socket=/var/lib/mysql/mysql57.sock