diff --git a/PKGBUILD b/PKGBUILD
index a56d965..1709f55 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -91,13 +91,14 @@
 
 ### BUILD OPTIONS END
 
-_major=6.7
-_minor=9
-_srcname=linux-${_major}
-_clr=${_major}.8-1413
+_kerneloptimized_version=ko1
+_kernel_major=6.7
+_kernel_minor=9
 _gcc_more_v='20240221.2'
+_srcname_linux=linux-${_kernel_major}
+_srcname_clpatches=${_kernel_major}.8-1413
 pkgbase=linux-server-kernel
-pkgver=${_major}.${_minor}
+pkgver=linux${_kernel_major}.${_kernel_minor}+clear${_srcname_clpatches//-/_}+${_kerneloptimized_version}
 pkgrel=1
 pkgdesc="Optimized Linux kernel. Includes Clear Linux's kernel config and some tweaks made by StarOpenSource and upstream (JeremyStarTM)."
 arch=('x86_64')
@@ -109,10 +110,10 @@ if [ -n "$_use_llvm_lto" ]; then
 fi
 options=('!strip')
 source=(
-  "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_major}.tar.xz"
-  "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_major}.tar.sign"
-  "https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-${pkgver}.xz"
-  "cl-linux::git+https://github.com/clearlinux-pkgs/linux.git#tag=${_clr}"
+  "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_kernel_major}.tar.xz"
+  "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_kernel_major}.tar.sign"
+  "https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-${_kernel_major}.${_kernel_minor}.xz"
+  "cl-linux::git+https://github.com/clearlinux-pkgs/linux.git#tag=${_srcname_clpatches}"
   "more-uarches-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/$_gcc_more_v.tar.gz"
 )
 
@@ -129,12 +130,12 @@ export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EP
 
 prepare() {
     echo ":: prepare: prepare() called"
-    echo ":: prepare: cding into \"${_srcname}\""
-    cd "${_srcname}" || exit 1
+    echo ":: prepare: cding into \"${_srcname_linux}\""
+    cd "${_srcname_linux}" || exit 1
     
     ### Add upstream patches
     echo ":: prepare: adding upstream patches"
-    patch -Np1 -i ../patch-${pkgver} || true
+    patch -Np1 -i ../patch-${_kernel_major}.${_kernel_minor} || true
 
     ### Setting version
     echo ":: prepare: updating version"
@@ -231,15 +232,15 @@ prepare() {
     ### Save configuration for later reuse
     [[ -z "$_copyfinalconfig" ]] || (
         echo ":: prepare: copying configuration file into kernel-optimized repository"
-        cp -Tf ./.config "${startdir}/finalconfig-${pkgver}-${pkgrel}${pkgbase#linux}"
+        cp -Tf ./.config "${startdir}/kconfig-final"
     )
     echo ":: prepare: prepare() finished"
 }
 
 build() {
     echo ":: build: build() called"
-    echo ":: build: cding into \"${_srcname}\""
-    cd "${_srcname}" || exit 1
+    echo ":: build: cding into \"${_srcname_linux}\""
+    cd "${_srcname_linux}" || exit 1
     echo ":: build: starting compilation (make ${BUILD_FLAGS[*]} all)"
     make ${BUILD_FLAGS[*]} all
     echo ":: build: build() finished"
@@ -256,8 +257,8 @@ _package() {
     provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE)
     install=linux.install
 
-    echo ":: _package: cding into \"${_srcname}\""
-    cd "$_srcname" || exit 1
+    echo ":: _package: cding into \"${_srcname_linux}\""
+    cd "$_srcname_linux" || exit 1
 
     local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
 
@@ -285,8 +286,8 @@ _package-headers() {
     pkgdesc="${pkgdesc} This package includes various headers and scripts for building modules."
     depends=(pahole)
 
-    echo ":: _package-headers: cding into \"${_srcname}\""
-    cd "${_srcname}" || exit 1
+    echo ":: _package-headers: cding into \"${_srcname_linux}\""
+    cd "${_srcname_linux}" || exit 1
     local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
 
     echo ":: _package-headers: installing build files"
diff --git a/PKGBUILD.buildtool b/PKGBUILD.buildtool
index 66f03f7..4553c82 100644
--- a/PKGBUILD.buildtool
+++ b/PKGBUILD.buildtool
@@ -7,13 +7,14 @@
 # All build options have been removed as this PKGBUILD is exclusively used for buildtool.sh.
 # If you want to build linux-jstm-optimized without using buildtool.sh use the other PKGBUILD file instead.
 
-_major=6.7
-_minor=9
-_srcname=linux-${_major}
-_clr=${_major}.8-1413
+_kerneloptimized_version=ko1
+_kernel_major=6.7
+_kernel_minor=9
 _gcc_more_v='20240221.2'
+_srcname_linux=linux-${_kernel_major}
+_srcname_clpatches=${_kernel_major}.8-1413
 pkgbase=linux-server-kernel
-pkgver=${_major}.${_minor}
+pkgver=linux${_kernel_major}.${_kernel_minor}+clear${_srcname_clpatches//-/_}+${_kerneloptimized_version}
 pkgrel=1
 pkgdesc="Optimized Linux kernel. Includes Clear Linux's kernel config and some tweaks made by StarOpenSource and upstream (JeremyStarTM)."
 arch=('x86_64')
@@ -25,10 +26,10 @@ if [ -n "$_use_llvm_lto" ]; then
 fi
 options=('!strip')
 source=(
-  "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_major}.tar.xz"
-  "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_major}.tar.sign"
-  "https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-${pkgver}.xz"
-  "cl-linux::git+https://github.com/clearlinux-pkgs/linux.git#tag=${_clr}"
+  "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_kernel_major}.tar.xz"
+  "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_kernel_major}.tar.sign"
+  "https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-${_kernel_major}.${_kernel_minor}.xz"
+  "cl-linux::git+https://github.com/clearlinux-pkgs/linux.git#tag=${_srcname_clpatches}"
   "more-uarches-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/$_gcc_more_v.tar.gz"
 )
 
@@ -45,12 +46,12 @@ export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EP
 
 prepare() {
     echo ":: prepare: prepare() called"
-    echo ":: prepare: cding into \"${_srcname}\""
-    cd "${_srcname}" || exit 1
+    echo ":: prepare: cding into \"${_srcname_linux}\""
+    cd "${_srcname_linux}" || exit 1
     
     ### Add upstream patches
     echo ":: prepare: adding upstream patches"
-    patch -Np1 -i ../patch-${pkgver} || true
+    patch -Np1 -i ../patch-${_kernel_major}.${_kernel_minor} || true
 
     ### Setting version
     echo ":: prepare: updating version"
@@ -147,15 +148,15 @@ prepare() {
     ### Save configuration for later reuse
     [[ -z "$_copyfinalconfig" ]] || (
         echo ":: prepare: copying configuration file into kernel-optimized repository"
-        cp -Tf ./.config "${startdir}/finalconfig-${pkgver}-${pkgrel}${pkgbase#linux}"
+        cp -Tf ./.config "${startdir}/kconfig-final"
     )
     echo ":: prepare: prepare() finished"
 }
 
 build() {
     echo ":: build: build() called"
-    echo ":: build: cding into \"${_srcname}\""
-    cd "${_srcname}" || exit 1
+    echo ":: build: cding into \"${_srcname_linux}\""
+    cd "${_srcname_linux}" || exit 1
     echo ":: build: starting compilation (make ${BUILD_FLAGS[*]} all)"
     make ${BUILD_FLAGS[*]} all
     echo ":: build: build() finished"
@@ -172,8 +173,8 @@ _package() {
     provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE)
     install=linux.install
 
-    echo ":: _package: cding into \"${_srcname}\""
-    cd "$_srcname" || exit 1
+    echo ":: _package: cding into \"${_srcname_linux}\""
+    cd "$_srcname_linux" || exit 1
 
     local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
 
@@ -201,8 +202,8 @@ _package-headers() {
     pkgdesc="${pkgdesc} This package includes various headers and scripts for building modules."
     depends=(pahole)
 
-    echo ":: _package-headers: cding into \"${_srcname}\""
-    cd "${_srcname}" || exit 1
+    echo ":: _package-headers: cding into \"${_srcname_linux}\""
+    cd "${_srcname_linux}" || exit 1
     local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
 
     echo ":: _package-headers: installing build files"
diff --git a/buildtool.sh b/buildtool.sh
index 5650300..1488df4 100755
--- a/buildtool.sh
+++ b/buildtool.sh
@@ -74,8 +74,12 @@ special "|___/\___|_|    \_/ \___|_|       |_|\_\___|_|  |_| |_|\___|_|"
 empty
 
 # Print environment configuration
-diagh "\$BUILDTOOL_DEBUG is set, debug mode is enabled"
-diagh "\$BUILDTOOL_LOCALDIR is set, will build kernel package from current working directory"
+if [ -n "${BUILDTOOL_DEBUG}" ]; then
+	warnh "\$BUILDTOOL_DEBUG is set, debug mode is enabled"
+fi
+if [ -n "${BUILDTOOL_LOCALDIR}" ]; then
+	warnh "\$BUILDTOOL_LOCALDIR is set, will build kernel package from current working directory"
+fi
 
 # Checks
 ## Check for Arch Linux