diff --git a/app-editors/howl/Manifest b/app-editors/howl/Manifest
index e1f8785..6e44213 100644
--- a/app-editors/howl/Manifest
+++ b/app-editors/howl/Manifest
@@ -1,5 +1,3 @@
-DIST howl-0.6-LuaJIT-2.1.0-beta3.tar.gz 1025180 BLAKE2B ac3d12e25bd9946ba41aed6672c66884e7256e6be99d7ee8d1260d697453c966b24d60387f278f47233bad44cda61085c9059e6f62c0bc7cfdaaefde282346c5 SHA512 c44e967a0f671ed32b55aee810bc8b3b63737a2d7363b8984ae1949b24f98dbb3f9be7c1e10239fdeb96a3e3c836f606342cbd61838cf9bcadb077443eb5bc12
-DIST howl-0.6-lpeg-0.10.2.tar.gz 53887 BLAKE2B 78f606cbc6c45709eaf0910cc272d8f9d554b95cd48c144c94a661eee98798e338abed81751e058820504b2f6f47fa70ca375dd13d3179e9aee3d64abda676c0 SHA512 0f8cc7e1a24654fd2999fea6d3945a7469afdee41598de807334f70a1ce6f891c73ac76db1d6592f7364d132fb6c5aa05a32f0848a5a8c7a317c26d3b78ea40d
 DIST howl-0.6.tar.gz 17502537 BLAKE2B ecfa5e7a6a4f188600582ec04c7d03afc3cc80155a77bd24ff430854b0b58d668c6cc874c68cd73e8440cf21f7811d3a080e4d2cf0851765d8c7888c3d4b4ee6 SHA512 07cf3cc1d3de623bf895c3530732176f2493b04557e6d342f9b49efdfbf1609ffcd9ab429cbabdf747824b8864ac7a4f104b62e204fee37b18e5a908d3fd8d30
-DIST howl-9999-LuaJIT-2.1.0-beta3.tar.gz 1025180 BLAKE2B ac3d12e25bd9946ba41aed6672c66884e7256e6be99d7ee8d1260d697453c966b24d60387f278f47233bad44cda61085c9059e6f62c0bc7cfdaaefde282346c5 SHA512 c44e967a0f671ed32b55aee810bc8b3b63737a2d7363b8984ae1949b24f98dbb3f9be7c1e10239fdeb96a3e3c836f606342cbd61838cf9bcadb077443eb5bc12
-DIST howl-9999-lpeg-0.10.2.tar.gz 53887 BLAKE2B 78f606cbc6c45709eaf0910cc272d8f9d554b95cd48c144c94a661eee98798e338abed81751e058820504b2f6f47fa70ca375dd13d3179e9aee3d64abda676c0 SHA512 0f8cc7e1a24654fd2999fea6d3945a7469afdee41598de807334f70a1ce6f891c73ac76db1d6592f7364d132fb6c5aa05a32f0848a5a8c7a317c26d3b78ea40d
+DIST howl-LuaJIT-2.1.0-beta3.tar.gz 1025180 BLAKE2B ac3d12e25bd9946ba41aed6672c66884e7256e6be99d7ee8d1260d697453c966b24d60387f278f47233bad44cda61085c9059e6f62c0bc7cfdaaefde282346c5 SHA512 c44e967a0f671ed32b55aee810bc8b3b63737a2d7363b8984ae1949b24f98dbb3f9be7c1e10239fdeb96a3e3c836f606342cbd61838cf9bcadb077443eb5bc12
+DIST howl-lpeg-0.10.2.tar.gz 53887 BLAKE2B 78f606cbc6c45709eaf0910cc272d8f9d554b95cd48c144c94a661eee98798e338abed81751e058820504b2f6f47fa70ca375dd13d3179e9aee3d64abda676c0 SHA512 0f8cc7e1a24654fd2999fea6d3945a7469afdee41598de807334f70a1ce6f891c73ac76db1d6592f7364d132fb6c5aa05a32f0848a5a8c7a317c26d3b78ea40d
diff --git a/app-editors/howl/howl-0.6.ebuild b/app-editors/howl/howl-0.6.ebuild
index c360174..5433856 100644
--- a/app-editors/howl/howl-0.6.ebuild
+++ b/app-editors/howl/howl-0.6.ebuild
@@ -8,8 +8,8 @@ LPEG_V="lpeg-0.10.2"
 
 # What else should we do?
 BUNDLE_SRC="
-	http://luajit.org/download/${LUAJIT_V}.tar.gz -> ${P}-${LUAJIT_V}.tar.gz
-	http://nordman.org/mirror/lpeg/${LPEG_V}.tar.gz -> ${P}-${LPEG_V}.tar.gz
+	http://luajit.org/download/${LUAJIT_V}.tar.gz -> ${PN}-${LUAJIT_V}.tar.gz
+	http://nordman.org/mirror/lpeg/${LPEG_V}.tar.gz -> ${PN}-${LPEG_V}.tar.gz
 "
 
 inherit eutils desktop xdg
@@ -51,9 +51,9 @@ src_prepare() {
 	if [[ "${PV}" == *9999* ]]
 	then
 		# This is a little bit too much back-and-forth
-		unpack "${P}-${LUAJIT_V}.tar.gz"
+		unpack "${PN}-${LUAJIT_V}.tar.gz"
 		mv "${S}/${LUAJIT_V}" "${WORKDIR}"
-		unpack "${P}-${LPEG_V}.tar.gz"
+		unpack "${PN}-${LPEG_V}.tar.gz"
 		mv "${S}/${LPEG_V}" "${WORKDIR}"
 	fi
 
diff --git a/app-editors/howl/howl-9999.ebuild b/app-editors/howl/howl-9999.ebuild
index c360174..5433856 100644
--- a/app-editors/howl/howl-9999.ebuild
+++ b/app-editors/howl/howl-9999.ebuild
@@ -8,8 +8,8 @@ LPEG_V="lpeg-0.10.2"
 
 # What else should we do?
 BUNDLE_SRC="
-	http://luajit.org/download/${LUAJIT_V}.tar.gz -> ${P}-${LUAJIT_V}.tar.gz
-	http://nordman.org/mirror/lpeg/${LPEG_V}.tar.gz -> ${P}-${LPEG_V}.tar.gz
+	http://luajit.org/download/${LUAJIT_V}.tar.gz -> ${PN}-${LUAJIT_V}.tar.gz
+	http://nordman.org/mirror/lpeg/${LPEG_V}.tar.gz -> ${PN}-${LPEG_V}.tar.gz
 "
 
 inherit eutils desktop xdg
@@ -51,9 +51,9 @@ src_prepare() {
 	if [[ "${PV}" == *9999* ]]
 	then
 		# This is a little bit too much back-and-forth
-		unpack "${P}-${LUAJIT_V}.tar.gz"
+		unpack "${PN}-${LUAJIT_V}.tar.gz"
 		mv "${S}/${LUAJIT_V}" "${WORKDIR}"
-		unpack "${P}-${LPEG_V}.tar.gz"
+		unpack "${PN}-${LPEG_V}.tar.gz"
 		mv "${S}/${LPEG_V}" "${WORKDIR}"
 	fi