diff --git a/kernel.spec b/kernel.spec
index 42d7a40..bd43320 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1417,10 +1417,10 @@ EOF
 
 ### Create -devel Preun script on the fly
 cat > $kernel_devel_files-preun <<EOF
-for ii in \$(/usr/sbin/dkms status -k $KernelVer | awk '{ print \$1 \$2; }'); do
+for ii in \$(/usr/sbin/dkms status -k ${KernelVer} | awk '{ print \$1 \$2; }'); do
 	mod=\$(echo \$ii | awk -v FS=',' '{ print \$1; }')
 	ver=\$(echo \$ii | awk -v FS=',' '{ print \$2; }')
-	/usr/sbin/dkms --rpm_safe_upgrade uninstall -m \$mod -v \$ver -k $KernelVer || true
+	/usr/sbin/dkms --rpm_safe_upgrade uninstall -m \$mod -v \$ver -k ${KernelVer} || true
 done
 
 # If any DKMS modules with REMAKE_INITRD=yes in their configs have been
@@ -1429,9 +1429,9 @@ done
 # initrd image files would be left behind. Remove them if the kernel itself
 # is no longer installed. Should work if they are ininstalled in parallel
 # too.
-if ! test -f /boot/vmlinuz-$KernelVer; then
-	rm -f /boot/initrd-$KernelVer.img
-	rm -f /boot/initrd-$KernelVer_old.img
+if ! test -f /boot/vmlinuz-${KernelVer}; then
+	rm -f /boot/initrd-${KernelVer}.img
+	rm -f /boot/initrd-${KernelVer}_old.img
 fi
 EOF
 
@@ -1555,13 +1555,13 @@ EOF
 
 ### Create kernel Postun script on the fly
 cat > $kernel_files-postun <<EOF
-rm -f /boot/initrd-$KernelVer.img
-rm -f /boot/initrd-$KernelVer_old.img
+rm -f /boot/initrd-${KernelVer}.img
+rm -f /boot/initrd-${KernelVer}_old.img
 # Third-party modules might have left something in /lib/modules/.../kernel/.
-rm -rf /lib/modules/$KernelVer/kernel/
-rm -rf /lib/modules/$KernelVer/modules*
+rm -rf /lib/modules/${KernelVer}/kernel/
+rm -rf /lib/modules/${KernelVer}/modules*
 # Remove /lib/modules/<...>/ if it is empty (-devel uses it too).
-find /lib/modules/$KernelVer -maxdepth 0 -empty -exec rm -rf {} \; || true
+find /lib/modules/${KernelVer} -maxdepth 0 -empty -exec rm -rf {} \; || true
 EOF
 }