diff --git a/dist/templates/kernel.template.spec b/dist/templates/kernel.template.spec
index cb56ea2614ee..a72613fd081c 100644
--- a/dist/templates/kernel.template.spec
+++ b/dist/templates/kernel.template.spec
@@ -266,10 +266,9 @@ This is the meta package of %{?rpm_vendor:%{rpm_vendor} }Linux kernel, the core
 Summary: %{rpm_vendor} Linux Kernel
 Provides: installonlypkg(kernel)
 Provides: kernel = %{version}-%{release}
-Provides: kernel-core = %{version}-%{release}
-# TK4-UNAME-R: Due to historical reason we don't want to touch TK4's uname style yet,
-# so the uname-r providing below looks different from TKS.
-Provides: kernel-uname-r = %{version}-%{release}
+Provides: %{rpm_name}-core = %{version}-%{release}
+Provides: %{rpm_name}-core-uname-r = %{kernel_unamer}
+Provides: kernel-uname-r = %{kernel_unamer}
 Requires(pre): coreutils
 Requires(post): coreutils kmod dracut
 Requires(preun): coreutils kmod
@@ -294,7 +293,9 @@ input and output, etc.
 %package modules
 Summary: %{rpm_vendor} Kernel modules to match the %{rpm_name}-core kernel
 Provides: installonlypkg(kernel-module)
-Provides: kernel-modules = %{version}-%{release}
+Provides: %{rpm_name}-modules = %{version}-%{release}
+Provides: %{rpm_name}-modules-uname-r = %{kernel_unamer}
+Provides: kernel-modules = %{kernel_unamer}
 Provides: kernel-modules-extra = %{version}-%{release}
 Requires: %{rpm_name}-core = %{version}-%{release}
 AutoReq: no
@@ -335,11 +336,9 @@ for %{name} of version %{version}-%{release}.
 Summary: Development package for building kernel modules to match the %{version}-%{release} kernel
 Release: %{release}
 Provides: installonlypkg(kernel)
-Provides: kernel-devel = %{version}-%{release}
-Provides: kernel-devel-%{_target_cpu} = %{version}-%{release}
-# TK4-UNAME-R: Due to historical reason we don't want to touch TK4's uname style yet,
-# so the uname-r providing below looks different from TKS.
-Provides: kernel-devel-uname-r = %{version}-%{release}
+Provides: %{rpm_name}-devel = %{version}-%{release}
+Provides: %{rpm_name}-devel-%{_target_cpu} = %{version}-%{release}
+Provides: kernel-devel-uname-r = %{kernel_unamer}
 AutoReqprov: no
 %description devel
 This package provides kernel headers and makefiles sufficient to build modules
@@ -367,7 +366,7 @@ Summary: Debug information for package %{rpm_name}
 # repo, and causes trouble for uses)
 # Requires: %%{rpm_name}-debuginfo-common = %%{version}-%%{release}
 Provides: installonlypkg(kernel)
-Provides: kernel-debuginfo = %{version}-%{release}
+Provides: %{rpm_name}-debuginfo = %{version}-%{release}
 AutoReqProv: no
 %description debuginfo
 This package provides debug information including
@@ -392,7 +391,7 @@ This is required to use SystemTap with %{rpm_name}.
 %package debuginfo-common
 Summary: Kernel source files used by %{rpm_name}-debuginfo packages
 Provides: installonlypkg(kernel)
-Provides: kernel-debuginfo-common = %{version}-%{release}
+Provides: %{rpm_name}-debuginfo-common = %{version}-%{release}
 %description debuginfo-common
 This package is required by %{rpm_name}-debuginfo subpackages.
 It provides the kernel source files common to all builds.