diff --git a/SPECS/kernel-6.1.spec b/SPECS/kernel-6.1.spec
index 717c18e..e943689 100755
--- a/SPECS/kernel-6.1.spec
+++ b/SPECS/kernel-6.1.spec
@@ -116,6 +116,7 @@
 #
 # Three sets of minimum package version requirements in the form of Conflicts.
 #
+%define KVRFA %{version}-%{release}${Flavour}.%{_target_cpu}
 
 #
 # Packages that need to be installed before the kernel because the %%post scripts make use of them.
@@ -375,8 +376,6 @@ BuildKernel() {
         %{__cp} config-%{cpuarch}-${Flavour} .config
     fi
 
-    %define KVRFA %{version}-%{release}${Flavour}.%{_target_cpu}
-
     %{__mkdir_p} $RPM_BUILD_ROOT/lib/modules/%{KVRFA}
     %{__mkdir_p} $RPM_BUILD_ROOT/lib/modules/%{KVRFA}/kernel
 
@@ -389,9 +388,9 @@ BuildKernel() {
     # Install the results into the RPM_BUILD_ROOT directory.
     %{__mkdir_p} $RPM_BUILD_ROOT/boot
     %{__install} -m 644 .config $RPM_BUILD_ROOT/boot/config-%{KVRFA}
-    %{__install} -m 644 .config $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/config
+    %{__install} -m 644 .config $RPM_BUILD_ROOT/lib/modules/%{KVRFA}/config
     %{__install} -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-%{KVRFA}
-    %{__install} -m 644 System.map $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/System.map
+    %{__install} -m 644 System.map $RPM_BUILD_ROOT/lib/modules/%{KVRFA}/System.map
 
     # We estimate the size of the initramfs because rpm needs to take this size
     # into consideration when performing disk space calculations. (See bz #530778)
@@ -401,7 +400,7 @@ BuildKernel() {
     #%{__cp} %make_target $RPM_BUILD_ROOT/boot/vmlinuz-%{KVRFA}
     if [ %make_target == 'bzImage' ]; then
        %{__cp} arch/%{buildarch}/boot/%make_target $RPM_BUILD_ROOT/boot/vmlinuz-%{KVRFA}
-       %{__cp} $RPM_BUILD_ROOT/boot/vmlinuz-%{KVRFA} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/vmlinuz
+       %{__cp} $RPM_BUILD_ROOT/boot/vmlinuz-%{KVRFA} $RPM_BUILD_ROOT/lib/modules/%{KVRFA}/vmlinuz
     else
        eu-strip --remove-comment -o $RPM_BUILD_ROOT/boot/vmlinuz-%{KVRFA} %make_target
     fi
@@ -761,29 +760,29 @@ popd > /dev/null
 %posttrans
 %if %{with_default}
 #%{_sbindir}/new-kernel-pkg --package %{name} --mkinitrd --dracut --depmod --update %{version}-%{release}.%{_target_cpu} || exit $?
-%{_sbindir}/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?
+%{_sbindir}/kernel-install add %{KVRFA}%{?1:+%{1}} /lib/modules/%{KVRFA}%{?1:+%{1}}/vmlinuz || exit $?
 if [ -x %{_sbindir}/weak-modules ]
 then
-    %{_sbindir}/weak-modules --add-kernel %{KVERREL}%{?1:+%{1}} || exit $?
+    %{_sbindir}/weak-modules --add-kernel %{KVRFA}%{?1:+%{1}} || exit $?
 fi\
 
 
 %post
 #%{_sbindir}/new-kernel-pkg --package %{name} --mkinitrd --dracut --depmod --install %{version}-%{release}.%{_target_cpu} || exit $?
-%{_sbindir}/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz /lib/modules/%{KVERREL}%{?1:+%{1}}/System.map || exit $?
+%{_sbindir}/kernel-install add %{KVRFA}%{?1:+%{1}} /lib/modules/%{KVRFA}%{?1:+%{1}}/vmlinuz /lib/modules/%{KVRFA}%{?1:+%{1}}/System.map || exit $?
 if [ -x %{_sbindir}/weak-modules ]
 then
-    %{_sbindir}/weak-modules --add-kernel %{KVERREL}%{?1:+%{1}} || exit $?
+    %{_sbindir}/weak-modules --add-kernel %{KVRFA}%{?1:+%{1}} || exit $?
 fi
-/sbin/depmod -a %{KVERREL}%{?1:+%{1}}
+/sbin/depmod -a %{KVRFA}%{?1:+%{1}}
 
 
 %preun
 #%{_sbindir}/new-kernel-pkg --rminitrd --rmmoddep --remove %{version}-%{release}.%{_target_cpu} || exit $?
-%{_bindir}/kernel-install remove %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?
+%{_bindir}/kernel-install remove %{KVRFA}%{?1:+%{1}} /lib/modules/%{KVRFA}%{?1:+%{1}}/vmlinuz || exit $?
 if [ -x %{_sbindir}/weak-modules ]
 then
-    %{_sbindir}/weak-modules --remove-kernel %{KVERREL}%{?1:+%{1}} || exit $?
+    %{_sbindir}/weak-modules --remove-kernel %{KVRFA}%{?1:+%{1}} || exit $?
 fi
 
 %post devel