diff --git a/app-admin/htpasswd/htpasswd-9999.ebuild b/app-admin/htpasswd/htpasswd-9999.ebuild
index 042002cc..d45e59c0 100644
--- a/app-admin/htpasswd/htpasswd-9999.ebuild
+++ b/app-admin/htpasswd/htpasswd-9999.ebuild
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	if [[ ${PV} == "9999" ]] ; then
 		# Allow user patches to be applied without modifying the ebuild
-		epatch_user
+		eapply_user
 	fi
 }
 
diff --git a/app-admin/network-profile/network-profile-9999.ebuild b/app-admin/network-profile/network-profile-9999.ebuild
index 8e13381d..a21ce408 100644
--- a/app-admin/network-profile/network-profile-9999.ebuild
+++ b/app-admin/network-profile/network-profile-9999.ebuild
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	if [[ ${PV} == "9999" ]] ; then
 		# Allow user patches to be applied without modifying the ebuild
-		epatch_user
+		eapply_user
 	fi
 }
 
diff --git a/app-portage/findcruftfiles/findcruftfiles-9999.ebuild b/app-portage/findcruftfiles/findcruftfiles-9999.ebuild
index 9dcf6c99..c684b292 100644
--- a/app-portage/findcruftfiles/findcruftfiles-9999.ebuild
+++ b/app-portage/findcruftfiles/findcruftfiles-9999.ebuild
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	if [[ ${PV} == "9999" ]] ; then
 		# Allow user patches to be applied without modifying the ebuild
-		epatch_user
+		eapply_user
 	fi
 }
 
diff --git a/dev-util/colormake/colormake-9999.ebuild b/dev-util/colormake/colormake-9999.ebuild
index 6ac36cfd..da04616b 100644
--- a/dev-util/colormake/colormake-9999.ebuild
+++ b/dev-util/colormake/colormake-9999.ebuild
@@ -33,7 +33,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-cmake.patch
 	if [[ ${PV} == "9999" ]] ; then
 		# Allow user patches to be applied without modifying the ebuild
-		epatch_user
+		eapply_user
 	fi
 }
 
diff --git a/x11-drivers/snail/snail-1.2.6.ebuild b/x11-drivers/snail/snail-1.2.6.ebuild
index e0df6cfd..a4dc85f9 100644
--- a/x11-drivers/snail/snail-1.2.6.ebuild
+++ b/x11-drivers/snail/snail-1.2.6.ebuild
@@ -31,7 +31,7 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	if [[ 9999 == ${PV} ]] ; then
 		# Allow user patches to be applied without modifying the ebuild
-		epatch_user
+		eapply_user
 	fi
 }
 
diff --git a/x11-drivers/snail/snail-9999.ebuild b/x11-drivers/snail/snail-9999.ebuild
index b7554ed5..18e7069c 100644
--- a/x11-drivers/snail/snail-9999.ebuild
+++ b/x11-drivers/snail/snail-9999.ebuild
@@ -31,7 +31,7 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	if [[ 9999 == ${PV} ]] ; then
 		# Allow user patches to be applied without modifying the ebuild
-		epatch_user
+		eapply_user
 	fi
 }