diff --git a/dev-java/oracle-jdk-bin/files/fontconfig.Gentoo.properties b/dev-java/oracle-jdk-bin/files/fontconfig.properties
similarity index 100%
rename from dev-java/oracle-jdk-bin/files/fontconfig.Gentoo.properties
rename to dev-java/oracle-jdk-bin/files/fontconfig.properties
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162-r1.ebuild
similarity index 99%
rename from dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild
rename to dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162-r1.ebuild
index a57793e032f0a..8da2c3466faf5 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162-r1.ebuild
@@ -239,7 +239,7 @@ src_install() {
 	# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
 	if ! use fontconfig ; then
 		insinto "${dest}"/jre/lib/
-		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.Gentoo.properties)"
+		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
 	fi
 
 	# Needs to be done before CDS, bug #215225.
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r1.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r2.ebuild
similarity index 98%
rename from dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r1.ebuild
rename to dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r2.ebuild
index 216d6da221787..272910669d9bb 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r1.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r2.ebuild
@@ -185,7 +185,7 @@ src_install() {
 	# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
 	if ! use fontconfig ; then
 		insinto "${dest}"/lib/
-		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.Gentoo.properties)"
+		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
 	fi
 
 	# Needs to be done before CDS, bug #215225.