diff --git a/dev-python/pypy3/pypy3-7.3.1-r2.ebuild b/dev-python/pypy3/pypy3-7.3.1-r3.ebuild
similarity index 96%
rename from dev-python/pypy3/pypy3-7.3.1-r2.ebuild
rename to dev-python/pypy3/pypy3-7.3.1-r3.ebuild
index 3388f868455fe..4f4f4bded682c 100644
--- a/dev-python/pypy3/pypy3-7.3.1-r2.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.1-r3.ebuild
@@ -204,7 +204,9 @@ src_install() {
 	fi
 
 	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}${dest}/pypy3-c
+	local -x PYTHON=${ED}${dest}/pypy3-c-${PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy3-c-${PV}" "${PYTHON}" || die
 
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_moduleinto /usr/lib/pypy3.6/site-packages
@@ -212,4 +214,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/pypy3/pypy3-7.3.2_rc2.ebuild b/dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild
similarity index 96%
rename from dev-python/pypy3/pypy3-7.3.2_rc2.ebuild
rename to dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild
index 45d2ebfd2176a..acb328c4e725b 100644
--- a/dev-python/pypy3/pypy3-7.3.2_rc2.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild
@@ -191,7 +191,9 @@ src_install() {
 	fi
 
 	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}${dest}/pypy3-c
+	local -x PYTHON=${ED}${dest}/pypy3-c-${PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy3-c-${PV}" "${PYTHON}" || die
 
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_moduleinto /usr/lib/pypy3.6/site-packages
@@ -199,4 +201,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/pypy3/pypy3-7.3.2_rc2_p37.ebuild b/dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild
similarity index 95%
rename from dev-python/pypy3/pypy3-7.3.2_rc2_p37.ebuild
rename to dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild
index 530c3ef5cebcb..d750cf9c4b2bb 100644
--- a/dev-python/pypy3/pypy3-7.3.2_rc2_p37.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild
@@ -162,7 +162,9 @@ src_install() {
 	fi
 
 	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}${dest}/pypy3-c
+	local -x PYTHON=${ED}${dest}/pypy3-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy3-c-${PYPY_PV}" "${PYTHON}" || die
 
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_moduleinto /usr/lib/pypy3.7/site-packages
@@ -170,4 +172,7 @@ src_install() {
 
 	einfo "Byte-compiling Python standard library..."
 	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
 }