diff --git a/media-fonts/firge/firge-0.3.0.ebuild b/media-fonts/firge/firge-0.3.0.ebuild
index a53883a02c..a465f9d78f 100644
--- a/media-fonts/firge/firge-0.3.0.ebuild
+++ b/media-fonts/firge/firge-0.3.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit font
 
-MY_PN="Firge"
+MY_PN="${PN^}"
 MY_PV="v${PV}"
 MY_P="${MY_PN}_${MY_PV}"
 MY_P_NF="${MY_PN}Nerd_${MY_PV}"
@@ -16,6 +16,9 @@ SRC_URI="https://github.com/yuru7/Firge/releases/download/${MY_PV}/${MY_P}.zip
 	nerdfonts? ( https://github.com/yuru7/Firge/releases/download/${MY_PV}/${MY_P_NF}.zip )
 "
 
+S="${WORKDIR}"
+FONT_SUFFIX="ttf"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
@@ -23,9 +26,6 @@ IUSE="nerdfonts"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
-FONT_SUFFIX="ttf"
-
 src_unpack() {
 	default
 	mv ${MY_P}/*.${FONT_SUFFIX} . || die
diff --git a/media-fonts/hackgen/hackgen-2.9.0.ebuild b/media-fonts/hackgen/hackgen-2.9.0.ebuild
index b3186fd2b8..8da9731135 100644
--- a/media-fonts/hackgen/hackgen-2.9.0.ebuild
+++ b/media-fonts/hackgen/hackgen-2.9.0.ebuild
@@ -16,6 +16,9 @@ SRC_URI="https://github.com/yuru7/HackGen/releases/download/${MY_PV}/${MY_P}.zip
 	nerdfonts? ( https://github.com/yuru7/HackGen/releases/download/${MY_PV}/${MY_P_NF}.zip )
 "
 
+S="${WORKDIR}"
+FONT_SUFFIX="ttf"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
@@ -23,9 +26,6 @@ IUSE="nerdfonts"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
-FONT_SUFFIX="ttf"
-
 src_unpack() {
 	default
 	mv ${MY_P}/*.${FONT_SUFFIX} . || die
diff --git a/media-fonts/moralerspace/moralerspace-1.0.0.ebuild b/media-fonts/moralerspace/moralerspace-1.0.0.ebuild
index bbc78fb777..64fe1710ec 100644
--- a/media-fonts/moralerspace/moralerspace-1.0.0.ebuild
+++ b/media-fonts/moralerspace/moralerspace-1.0.0.ebuild
@@ -5,9 +5,10 @@ EAPI=8
 
 inherit font
 
+MY_PN="${PN^}"
 MY_PV="v${PV}"
-MY_P="${PN^}_${MY_PV}"
-MY_P_NF="${PN^}NF_${MY_PV}"
+MY_P="${MY_PN}_${MY_PV}"
+MY_P_NF="${MY_PN}NF_${MY_PV}"
 
 DESCRIPTION="moralerspace is a composite font of Monaspace and IBM Plex Sans JP."
 HOMEPAGE="https://github.com/yuru7/moralerspace"
@@ -15,6 +16,9 @@ SRC_URI="https://github.com/yuru7/moralerspace/releases/download/${MY_PV}/${MY_P
 	nerdfonts? ( https://github.com/yuru7/moralerspace/releases/download/${MY_PV}/${MY_P_NF}.zip )
 "
 
+S="${WORKDIR}"
+FONT_SUFFIX="ttf"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
@@ -22,9 +26,6 @@ IUSE="nerdfonts"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
-FONT_SUFFIX="ttf"
-
 src_unpack() {
 	default
 	mv ${MY_P}/*.${FONT_SUFFIX} . || die
diff --git a/media-fonts/plemoljp/plemoljp-1.7.1.ebuild b/media-fonts/plemoljp/plemoljp-1.7.1.ebuild
index 39a38b0f29..fc7e55e2e8 100644
--- a/media-fonts/plemoljp/plemoljp-1.7.1.ebuild
+++ b/media-fonts/plemoljp/plemoljp-1.7.1.ebuild
@@ -18,6 +18,9 @@ SRC_URI="https://github.com/yuru7/PlemolJP/releases/download/${MY_PV}/${MY_P}.zi
 	nerdfonts? ( https://github.com/yuru7/PlemolJP/releases/download/${MY_PV}/${MY_P_NF}.zip )
 "
 
+S="${WORKDIR}"
+FONT_SUFFIX="ttf"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
@@ -25,9 +28,6 @@ IUSE="hiddenspace nerdfonts"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
-FONT_SUFFIX="ttf"
-
 src_unpack() {
 	default
 	mv ${MY_P}/*/*.${FONT_SUFFIX} . || die
diff --git a/media-fonts/udev-gothic/udev-gothic-1.3.1-r1.ebuild b/media-fonts/udev-gothic/udev-gothic-1.3.1-r1.ebuild
index 01ae3821da..d14c0275e9 100644
--- a/media-fonts/udev-gothic/udev-gothic-1.3.1-r1.ebuild
+++ b/media-fonts/udev-gothic/udev-gothic-1.3.1-r1.ebuild
@@ -16,6 +16,9 @@ SRC_URI="https://github.com/yuru7/udev-gothic/releases/download/${MY_PV}/${MY_P}
 	nerdfonts? ( https://github.com/yuru7/udev-gothic/releases/download/${MY_PV}/${MY_P_NF}.zip )
 "
 
+S="${WORKDIR}"
+FONT_SUFFIX="ttf"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
@@ -23,9 +26,6 @@ IUSE="nerdfonts"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
-FONT_SUFFIX="ttf"
-
 src_unpack() {
 	default
 	mv ${MY_P}/*.${FONT_SUFFIX} . || die