diff --git a/sys-apps/systemd/files/218-Dont-enable-audit-by-default.patch b/sys-apps/systemd/files/gentoo-Dont-enable-audit-by-default.patch
similarity index 100%
rename from sys-apps/systemd/files/218-Dont-enable-audit-by-default.patch
rename to sys-apps/systemd/files/gentoo-Dont-enable-audit-by-default.patch
diff --git a/sys-apps/systemd/files/generator-path.patch b/sys-apps/systemd/files/gentoo-generator-path.patch
similarity index 100%
rename from sys-apps/systemd/files/generator-path.patch
rename to sys-apps/systemd/files/gentoo-generator-path.patch
diff --git a/sys-apps/systemd/files/228-noclean-tmp.patch b/sys-apps/systemd/files/gentoo-noclean-tmp.patch
similarity index 100%
rename from sys-apps/systemd/files/228-noclean-tmp.patch
rename to sys-apps/systemd/files/gentoo-noclean-tmp.patch
diff --git a/sys-apps/systemd/files/233-systemd-user-pam.patch b/sys-apps/systemd/files/gentoo-systemd-user-pam.patch
similarity index 100%
rename from sys-apps/systemd/files/233-systemd-user-pam.patch
rename to sys-apps/systemd/files/gentoo-systemd-user-pam.patch
diff --git a/sys-apps/systemd/files/234-uucp-group.patch b/sys-apps/systemd/files/gentoo-uucp-group-r0.patch
similarity index 100%
rename from sys-apps/systemd/files/234-uucp-group.patch
rename to sys-apps/systemd/files/gentoo-uucp-group-r0.patch
diff --git a/sys-apps/systemd/files/236-uucp-group.patch b/sys-apps/systemd/files/gentoo-uucp-group-r1.patch
similarity index 100%
rename from sys-apps/systemd/files/236-uucp-group.patch
rename to sys-apps/systemd/files/gentoo-uucp-group-r1.patch
diff --git a/sys-apps/systemd/systemd-233-r6.ebuild b/sys-apps/systemd/systemd-233-r6.ebuild
index d735dd02ab98d..fded2f5f4a08b 100644
--- a/sys-apps/systemd/systemd-233-r6.ebuild
+++ b/sys-apps/systemd/systemd-233-r6.ebuild
@@ -158,9 +158,9 @@ src_prepare() {
 
 	if ! use vanilla; then
 		PATCHES+=(
-			"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/228-noclean-tmp.patch"
-			"${FILESDIR}/233-systemd-user-pam.patch"
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-noclean-tmp.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.patch"
 		)
 	fi
 
diff --git a/sys-apps/systemd/systemd-235-r1.ebuild b/sys-apps/systemd/systemd-235-r1.ebuild
index 1175508fe8db1..a0800a27a1d61 100644
--- a/sys-apps/systemd/systemd-235-r1.ebuild
+++ b/sys-apps/systemd/systemd-235-r1.ebuild
@@ -156,11 +156,11 @@ src_prepare() {
 
 	if ! use vanilla; then
 		PATCHES+=(
-			"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/228-noclean-tmp.patch"
-			"${FILESDIR}/233-systemd-user-pam.patch"
-			"${FILESDIR}/234-uucp-group.patch"
-			"${FILESDIR}/generator-path.patch"
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-noclean-tmp.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.patch"
+			"${FILESDIR}/gentoo-uucp-group-r0.patch"
+			"${FILESDIR}/gentoo-generator-path.patch"
 		)
 	fi
 
diff --git a/sys-apps/systemd/systemd-236-r3.ebuild b/sys-apps/systemd/systemd-236-r3.ebuild
index b97c3c364c4fb..8d68e3a31ba63 100644
--- a/sys-apps/systemd/systemd-236-r3.ebuild
+++ b/sys-apps/systemd/systemd-236-r3.ebuild
@@ -154,10 +154,10 @@ src_prepare() {
 
 	if ! use vanilla; then
 		PATCHES+=(
-			"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/233-systemd-user-pam.patch"
-			"${FILESDIR}/236-uucp-group.patch"
-			"${FILESDIR}/generator-path.patch"
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.patch"
+			"${FILESDIR}/gentoo-uucp-group-r1.patch"
+			"${FILESDIR}/gentoo-generator-path.patch"
 		)
 	fi
 
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index b1e105a5bb64a..1838bd792b161 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -151,10 +151,10 @@ src_prepare() {
 
 	if ! use vanilla; then
 		PATCHES+=(
-			"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/233-systemd-user-pam.patch"
-			"${FILESDIR}/236-uucp-group.patch"
-			"${FILESDIR}/generator-path.patch"
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.patch"
+			"${FILESDIR}/gentoo-uucp-group-r1.patch"
+			"${FILESDIR}/gentoo-generator-path.patch"
 		)
 	fi