diff --git a/bacula-7.0.4-autoconf.patch b/bacula-autoconf.patch
similarity index 100%
rename from bacula-7.0.4-autoconf.patch
rename to bacula-autoconf.patch
diff --git a/bacula-9.0.6-bat-build.patch b/bacula-bat-build.patch
similarity index 100%
rename from bacula-9.0.6-bat-build.patch
rename to bacula-bat-build.patch
diff --git a/bacula-9.0.2-desktop.patch b/bacula-desktop.patch
similarity index 100%
rename from bacula-9.0.2-desktop.patch
rename to bacula-desktop.patch
diff --git a/bacula-9.4.2-g++-options.patch b/bacula-g++-options.patch
similarity index 100%
rename from bacula-9.4.2-g++-options.patch
rename to bacula-g++-options.patch
diff --git a/bacula-5.2.13-logwatch.patch b/bacula-logwatch.patch
similarity index 100%
rename from bacula-5.2.13-logwatch.patch
rename to bacula-logwatch.patch
diff --git a/bacula-9.4.0-non-free-code.patch b/bacula-non-free-code.patch
similarity index 100%
rename from bacula-9.4.0-non-free-code.patch
rename to bacula-non-free-code.patch
diff --git a/bacula-9.4.0-openssl.patch b/bacula-openssl.patch
similarity index 100%
rename from bacula-9.4.0-openssl.patch
rename to bacula-openssl.patch
diff --git a/bacula-9.0.0-queryfile.patch b/bacula-queryfile.patch
similarity index 100%
rename from bacula-9.0.0-queryfile.patch
rename to bacula-queryfile.patch
diff --git a/bacula-9.4.2-s3-configure.patch b/bacula-s3-configure.patch
similarity index 100%
rename from bacula-9.4.2-s3-configure.patch
rename to bacula-s3-configure.patch
diff --git a/bacula-9.4.0-seg-fault.patch b/bacula-seg-fault.patch
similarity index 100%
rename from bacula-9.4.0-seg-fault.patch
rename to bacula-seg-fault.patch
diff --git a/bacula-9.0.4-sqlite-priv.patch b/bacula-sqlite-priv.patch
similarity index 100%
rename from bacula-9.0.4-sqlite-priv.patch
rename to bacula-sqlite-priv.patch
diff --git a/bacula.spec b/bacula.spec
index fdd317a..0eb60f8 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -28,25 +28,25 @@ Source17:           %{name}-sd.sysconfig
 # Image taken from http://www.bacula.org/git/cgit.cgi/bacula/plain/bacula/src/tray-monitor/generic.xpm
 Source19:           generic.xpm
 
-Patch1:             %{name}-9.4.0-openssl.patch
-Patch2:             %{name}-9.0.0-queryfile.patch
-Patch3:             %{name}-9.0.4-sqlite-priv.patch
-Patch4:             %{name}-9.0.6-bat-build.patch
-Patch5:             %{name}-9.4.0-seg-fault.patch
-Patch6:             %{name}-5.2.13-logwatch.patch
-Patch7:             %{name}-9.4.0-non-free-code.patch
+Patch1:             %{name}-openssl.patch
+Patch2:             %{name}-queryfile.patch
+Patch3:             %{name}-sqlite-priv.patch
+Patch4:             %{name}-bat-build.patch
+Patch5:             %{name}-seg-fault.patch
+Patch6:             %{name}-logwatch.patch
+Patch7:             %{name}-non-free-code.patch
 # desktop-file-install not supported on RHEL 6
-Patch8:             %{name}-9.0.2-desktop.patch
-Patch9:             %{name}-9.4.2-g++-options.patch
+Patch8:             %{name}-desktop.patch
+Patch9:             %{name}-g++-options.patch
 # https://sources.debian.org/patches/bacula/9.4.1-1/upstream/add-libs3-checks/
-Patch10:            %{name}-9.4.2-s3-configure.patch
+Patch10:            %{name}-s3-configure.patch
 
 # Original patch removed by mistake, upstream is not willing to add it again:
 # http://www.bacula.org/git/cgit.cgi/bacula/commit/?h=Branch-7.0&id=51b3b98fb77ab3c0decee455cc6c4d2eb3c5303a
 # Without this, there is no library providing the correct shared object name
 # required by the daemons.
 # http://bugs.bacula.org/view.php?id=2084
-Patch12:            %{name}-7.0.4-autoconf.patch
+Patch12:            %{name}-autoconf.patch
 
 BuildRequires:      desktop-file-utils
 BuildRequires:      perl-generators