diff --git a/sys-kernel/lqx-sources/Manifest b/sys-kernel/liquorix-sources/Manifest
similarity index 71%
rename from sys-kernel/lqx-sources/Manifest
rename to sys-kernel/liquorix-sources/Manifest
index 67b7308..5593af9 100644
--- a/sys-kernel/lqx-sources/Manifest
+++ b/sys-kernel/liquorix-sources/Manifest
@@ -1,7 +1,7 @@
 DIST genpatches-5.5-1.base.tar.xz 3984 BLAKE2B aed3662231f2863f234ebdc3c615c8c7fa32c3b1301659388facef4354b148bd31a9978917dcced2081f157afa176df5cda2e11fa085e3599f68af65f8edfaec SHA512 bdbe3d72620418ad0245f7e7f4fec7960d302be4842c6a090440f8ffccc5f6a67fdf11e51da5a14b659ec7a003410f1374b70ece128455ffd8eaf13177a427ff
 DIST genpatches-5.5-1.extras.tar.xz 1744 BLAKE2B 78353a253969918f5c054768df01bf7d0a0887f5686f6b84a78f28a0c1ef49101f278c5140367a4547cce9932ec9e7dcff4b4fd8519bb9e9dd9b7d4764461877 SHA512 84815483c7c30e2258c1d246080c460177b8e3b6c49592a78c2a5d83798b703da845ee3f1f939da1e947dddced42fc83434ca162f8e5135c838877304e3a80cf
 DIST linux-5.5.tar.xz 110713660 BLAKE2B 36b990d3650c409652206c319c93c0cf68885334050bc286b479c8b844bc47354547e19eebb58caafb026b96d134f39f0c7ce38b4eebe9da7ea6d1610a1e2af2 SHA512 fa74fdabb5e63384a39e54da05b86a9ae9ea16179524b041fbbdffc7177e80b53600ae98d76be127ba216148f9dc55fe07ab20637e22c6d6030cb4aa09eb2f86
-DIST v5.5.11-lqx1.patch.xz 715336 BLAKE2B 96d9a5c016d5fc15ce6728f4d704ed7c51b346a6a23395d19fbec319059a4046dffc2d5175b69054f18d32c12cee944c06a0ed9038691fabe125063993313558 SHA512 3eab894b77f31ebc8981a0d5b13ccf3bb93ffe2ebdcb17f36a413b962d5f9d0bbee0f689750adc3496d4a0e034b8aacf45d2ea3f038b7317d16a199d7554b4cb
-DIST v5.5.13-lqx1.patch.xz 744304 BLAKE2B 7e3f73f9deec8157d21621b0963d9fecc3741e722b32e59235467b0ea07d9813dffb78dc4bfed6d37496c7a725d27fbdef4f2b51c4f8a444dd55bf3d37009a72 SHA512 8c20eeffd98e7ba8e4412c5741c780380b2040d8db503f4ec471c8f144023143e89fc215ae79d93e6ba998cb98bc5605afff1f69db22f461cbd2939612f9fa8f
+DIST v5.5.14-lqx1.patch.xz 898200 BLAKE2B 50bce9abcd6a41af38e67811769c48ee4b4246475a51e4e2b5c5ae8935c266a65a9bff97d3bf53615a87e322cd3267a254e73b45711557d8b89e1ade808e931f SHA512 8b98f4c1f663ce5a6133bd895de1864f2db87c86ece041aca8379b3296eb091a51fb984700674510491ff53127c354ea8b4f2000a756d389fc179b7cf6d20d83
 DIST v5.5.15-lqx1.patch.xz 893932 BLAKE2B 526cada51b9a707be3090a4401cedee536ed668bdadb5f9d0ed03b62ebf63eb271609bc2b5c57135e8a2f71b57a095a165a342d19c96b8bf4b0f7464830e6193 SHA512 9442ab11cc9e588623cf1ad1b3d65e019d972b7f7ffc6fd4a9db21e45021fbb4ccacd10bd5e23f2d38daa67fd0d9cca5dc14741836841d66e5778f94c718bc4a
 DIST v5.5.16-lqx1.patch.xz 905976 BLAKE2B a15e8fb0ecf572741479b6689f2689d527b3c9a0808df2509e4ab64f58b92b2ffdb036e1e93346f2c9d8b75fae08b67b9822ebbeb14b00c84e2f79fad6b43160 SHA512 69c6034e0bf79a355945b6c177e1b09633a1ea1b788f27fe09ecfb54f9cbd63500bdeb132b5f6c67f4639fb63a3df8296d0d6380178a4360398e5e751e3a70db
+DIST v5.5.18-lqx1.patch.xz 989228 BLAKE2B 3fb1d9c58940fabfc432604fc559ebb38d941dcdd1f7f642ab03f79c2cf7d12b1d379aab0dede4a84157ecbbf131fa7e1e4b91604cedf08295343913466dbeaa SHA512 5da1cb3cb4eaec718bf96cd409afd496e3a45b5d82d1a081efbb0b7bbefadd7213cd911a1338cf7b08f816484166036351a06ec62e82752c63ad289227345635
diff --git a/sys-kernel/lqx-sources/lqx-sources-5.5.16.ebuild b/sys-kernel/liquorix-sources/liquorix-sources-5.5.14.ebuild
similarity index 67%
rename from sys-kernel/lqx-sources/lqx-sources-5.5.16.ebuild
rename to sys-kernel/liquorix-sources/liquorix-sources-5.5.14.ebuild
index 1545b37..06ada17 100644
--- a/sys-kernel/lqx-sources/lqx-sources-5.5.16.ebuild
+++ b/sys-kernel/liquorix-sources/liquorix-sources-5.5.14.ebuild
@@ -16,15 +16,14 @@ KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://github.com/zen-kernel"
 IUSE=""
 
-DESCRIPTION="The Liquorix Kernel Live Sources"
-LQX_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-lqx1/v${PV}-lqx1.patch.xz"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${LQX_URI}"
+DESCRIPTION="Liquorix sources including the Gentoo patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+LIQUORIX_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-lqx1/v${PV}-lqx1.patch.xz"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${LIQUORIX_URI}"
 
 UNIPATCH_LIST="${DISTDIR}/v${PV}-lqx1.patch.xz"
 UNIPATCH_STRICTORDER="yes"
 
-K_EXTRAEINFO="For more info on lqx-sources, and for how to report problems, see: \
-${HOMEPAGE}"
+K_EXTRAEINFO="For more info on ${PN}, and for how to report problems, see: ${HOMEPAGE}"
 
 pkg_setup() {
 	ewarn
diff --git a/sys-kernel/lqx-sources/lqx-sources-5.5.11.ebuild b/sys-kernel/liquorix-sources/liquorix-sources-5.5.15.ebuild
similarity index 67%
rename from sys-kernel/lqx-sources/lqx-sources-5.5.11.ebuild
rename to sys-kernel/liquorix-sources/liquorix-sources-5.5.15.ebuild
index 1545b37..06ada17 100644
--- a/sys-kernel/lqx-sources/lqx-sources-5.5.11.ebuild
+++ b/sys-kernel/liquorix-sources/liquorix-sources-5.5.15.ebuild
@@ -16,15 +16,14 @@ KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://github.com/zen-kernel"
 IUSE=""
 
-DESCRIPTION="The Liquorix Kernel Live Sources"
-LQX_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-lqx1/v${PV}-lqx1.patch.xz"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${LQX_URI}"
+DESCRIPTION="Liquorix sources including the Gentoo patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+LIQUORIX_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-lqx1/v${PV}-lqx1.patch.xz"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${LIQUORIX_URI}"
 
 UNIPATCH_LIST="${DISTDIR}/v${PV}-lqx1.patch.xz"
 UNIPATCH_STRICTORDER="yes"
 
-K_EXTRAEINFO="For more info on lqx-sources, and for how to report problems, see: \
-${HOMEPAGE}"
+K_EXTRAEINFO="For more info on ${PN}, and for how to report problems, see: ${HOMEPAGE}"
 
 pkg_setup() {
 	ewarn
diff --git a/sys-kernel/lqx-sources/lqx-sources-5.5.13.ebuild b/sys-kernel/liquorix-sources/liquorix-sources-5.5.16.ebuild
similarity index 67%
rename from sys-kernel/lqx-sources/lqx-sources-5.5.13.ebuild
rename to sys-kernel/liquorix-sources/liquorix-sources-5.5.16.ebuild
index 1545b37..06ada17 100644
--- a/sys-kernel/lqx-sources/lqx-sources-5.5.13.ebuild
+++ b/sys-kernel/liquorix-sources/liquorix-sources-5.5.16.ebuild
@@ -16,15 +16,14 @@ KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://github.com/zen-kernel"
 IUSE=""
 
-DESCRIPTION="The Liquorix Kernel Live Sources"
-LQX_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-lqx1/v${PV}-lqx1.patch.xz"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${LQX_URI}"
+DESCRIPTION="Liquorix sources including the Gentoo patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+LIQUORIX_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-lqx1/v${PV}-lqx1.patch.xz"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${LIQUORIX_URI}"
 
 UNIPATCH_LIST="${DISTDIR}/v${PV}-lqx1.patch.xz"
 UNIPATCH_STRICTORDER="yes"
 
-K_EXTRAEINFO="For more info on lqx-sources, and for how to report problems, see: \
-${HOMEPAGE}"
+K_EXTRAEINFO="For more info on ${PN}, and for how to report problems, see: ${HOMEPAGE}"
 
 pkg_setup() {
 	ewarn
diff --git a/sys-kernel/lqx-sources/lqx-sources-5.5.15.ebuild b/sys-kernel/liquorix-sources/liquorix-sources-5.5.18.ebuild
similarity index 67%
rename from sys-kernel/lqx-sources/lqx-sources-5.5.15.ebuild
rename to sys-kernel/liquorix-sources/liquorix-sources-5.5.18.ebuild
index 1545b37..06ada17 100644
--- a/sys-kernel/lqx-sources/lqx-sources-5.5.15.ebuild
+++ b/sys-kernel/liquorix-sources/liquorix-sources-5.5.18.ebuild
@@ -16,15 +16,14 @@ KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://github.com/zen-kernel"
 IUSE=""
 
-DESCRIPTION="The Liquorix Kernel Live Sources"
-LQX_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-lqx1/v${PV}-lqx1.patch.xz"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${LQX_URI}"
+DESCRIPTION="Liquorix sources including the Gentoo patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+LIQUORIX_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-lqx1/v${PV}-lqx1.patch.xz"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${LIQUORIX_URI}"
 
 UNIPATCH_LIST="${DISTDIR}/v${PV}-lqx1.patch.xz"
 UNIPATCH_STRICTORDER="yes"
 
-K_EXTRAEINFO="For more info on lqx-sources, and for how to report problems, see: \
-${HOMEPAGE}"
+K_EXTRAEINFO="For more info on ${PN}, and for how to report problems, see: ${HOMEPAGE}"
 
 pkg_setup() {
 	ewarn
diff --git a/sys-kernel/lqx-sources/metadata.xml b/sys-kernel/liquorix-sources/metadata.xml
similarity index 100%
rename from sys-kernel/lqx-sources/metadata.xml
rename to sys-kernel/liquorix-sources/metadata.xml