diff --git a/dev-python/pypy/pypy-7.3.1-r2.ebuild b/dev-python/pypy/pypy-7.3.1-r3.ebuild
similarity index 96%
rename from dev-python/pypy/pypy-7.3.1-r2.ebuild
rename to dev-python/pypy/pypy-7.3.1-r3.ebuild
index 59902f3b0a51d..8508153c294f1 100644
--- a/dev-python/pypy/pypy-7.3.1-r2.ebuild
+++ b/dev-python/pypy/pypy-7.3.1-r3.ebuild
@@ -166,7 +166,9 @@ src_install() {
 	fi
 
 	local -x EPYTHON=pypy
-	local -x PYTHON=${ED}${dest}/pypy-c
+	local -x PYTHON=${ED}${dest}/pypy-c-${PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy-c-${PV}" "${PYTHON}" || die
 
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_moduleinto /usr/lib/pypy2.7/site-packages
@@ -174,4 +176,7 @@ src_install() {
 
 	einfo "Byte-compiling Python standard library..."
 	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
 }
diff --git a/dev-python/pypy/pypy-7.3.2_rc2.ebuild b/dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild
similarity index 96%
rename from dev-python/pypy/pypy-7.3.2_rc2.ebuild
rename to dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild
index d6556f35ca7b3..a5a678ffa9d0b 100644
--- a/dev-python/pypy/pypy-7.3.2_rc2.ebuild
+++ b/dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild
@@ -159,7 +159,9 @@ src_install() {
 	fi
 
 	local -x EPYTHON=pypy
-	local -x PYTHON=${ED}${dest}/pypy-c
+	local -x PYTHON=${ED}${dest}/pypy-c-${PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy-c-${PV}" "${PYTHON}" || die
 
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_moduleinto /usr/lib/pypy2.7/site-packages
@@ -167,4 +169,7 @@ src_install() {
 
 	einfo "Byte-compiling Python standard library..."
 	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
 }