diff --git a/community-mysql-arm32-timer.patch b/mysql-arm32-timer.patch
similarity index 100%
rename from community-mysql-arm32-timer.patch
rename to mysql-arm32-timer.patch
diff --git a/community-mysql-c99.patch b/mysql-c99.patch
similarity index 100%
rename from community-mysql-c99.patch
rename to mysql-c99.patch
diff --git a/community-mysql-file-contents.patch b/mysql-file-contents.patch
similarity index 100%
rename from community-mysql-file-contents.patch
rename to mysql-file-contents.patch
diff --git a/community-mysql-install-test.patch b/mysql-install-test.patch
similarity index 100%
rename from community-mysql-install-test.patch
rename to mysql-install-test.patch
diff --git a/community-mysql-mtr.patch b/mysql-mtr.patch
similarity index 100%
rename from community-mysql-mtr.patch
rename to mysql-mtr.patch
diff --git a/community-mysql-paths.patch b/mysql-paths.patch
similarity index 100%
rename from community-mysql-paths.patch
rename to mysql-paths.patch
diff --git a/community-mysql-rpath.patch b/mysql-rpath.patch
similarity index 100%
rename from community-mysql-rpath.patch
rename to mysql-rpath.patch
diff --git a/community-mysql-scripts.patch b/mysql-scripts.patch
similarity index 100%
rename from community-mysql-scripts.patch
rename to mysql-scripts.patch
diff --git a/community-mysql-sharedir.patch b/mysql-sharedir.patch
similarity index 100%
rename from community-mysql-sharedir.patch
rename to mysql-sharedir.patch
diff --git a/community-mysql.rpmlintrc b/mysql.rpmlintrc
similarity index 100%
rename from community-mysql.rpmlintrc
rename to mysql.rpmlintrc
diff --git a/community-mysql.spec b/mysql8.0.spec
similarity index 99%
rename from community-mysql.spec
rename to mysql8.0.spec
index ccd9345..a907be3 100644
--- a/community-mysql.spec
+++ b/mysql8.0.spec
@@ -1,11 +1,11 @@
 # Name of the package without any prefixes
 %global pkg_name %{name}
-%global pkgnamepatch community-mysql
+%global pkgnamepatch mysql
 
 # Regression tests may take a long time (many cores recommended), skip them by
 # passing --nocheck to rpmbuild or by setting runselftest to 0 if defining
 # --nocheck is not possible (e.g. in koji build)
-%{!?runselftest:%global runselftest 1}
+%{!?runselftest:%global runselftest 0}
 
 # Set this to 1 to see which tests fail, but 0 on production ready build
 %global ignore_testsuite_result 0
@@ -120,7 +120,7 @@ Patch51:          %{pkgnamepatch}-sharedir.patch
 Patch52:          %{pkgnamepatch}-rpath.patch
 Patch53:          %{pkgnamepatch}-mtr.patch
 Patch54:          %{pkgnamepatch}-arm32-timer.patch
-Patch55:	  community-mysql-c99.patch
+Patch55:	  %{pkgnamepatch}-c99.patch
 
 # Patches taken from boost 1.59
 Patch111:         boost-1.58.0-pool.patch