diff --git a/dev-python/olm/olm-3.2.14-r1.ebuild b/dev-python/olm/olm-3.2.14-r2.ebuild
similarity index 95%
rename from dev-python/olm/olm-3.2.14-r1.ebuild
rename to dev-python/olm/olm-3.2.14-r2.ebuild
index 1aca1e1d38..ce75d87517 100644
--- a/dev-python/olm/olm-3.2.14-r1.ebuild
+++ b/dev-python/olm/olm-3.2.14-r2.ebuild
@@ -37,5 +37,5 @@ distutils_enable_tests pytest
 src_install() {
 	distutils-r1_src_install
 	# To avoid merge collision with dev-libs/olm
-	rm "${ED}/usr/share/doc/${P}/README.md" || die
+	rm "${ED}/usr/share/doc/${PF}/README.md" || die
 }
diff --git a/net-nntp/pan/pan-0.154.ebuild b/net-nntp/pan/pan-0.154-r1.ebuild
similarity index 100%
rename from net-nntp/pan/pan-0.154.ebuild
rename to net-nntp/pan/pan-0.154-r1.ebuild