diff --git a/packages/dev-python/python-eventlib/python-eventlib-0.2.4.exheres-0 b/packages/dev-python/python-eventlib/python-eventlib-0.2.4-r1.exheres-0
similarity index 90%
rename from packages/dev-python/python-eventlib/python-eventlib-0.2.4.exheres-0
rename to packages/dev-python/python-eventlib/python-eventlib-0.2.4-r1.exheres-0
index 6c375e53..bcf8ffa4 100644
--- a/packages/dev-python/python-eventlib/python-eventlib-0.2.4.exheres-0
+++ b/packages/dev-python/python-eventlib/python-eventlib-0.2.4-r1.exheres-0
@@ -16,6 +16,6 @@ MYOPTIONS=""
 DEPENDENCIES="
     run:
         dev-python/greenlet[python_abis:*(-)?]
-        net-twisted/TwistedCore[python_abis:*(-)?]
+        net-twisted/Twisted[python_abis:*(-)?]
 "
 
diff --git a/packages/dev-python/python-msrplib/python-msrplib-0.19.2.exheres-0 b/packages/dev-python/python-msrplib/python-msrplib-0.19.2-r1.exheres-0
similarity index 85%
rename from packages/dev-python/python-msrplib/python-msrplib-0.19.2.exheres-0
rename to packages/dev-python/python-msrplib/python-msrplib-0.19.2-r1.exheres-0
index 5d75f5c6..5a92b63b 100644
--- a/packages/dev-python/python-msrplib/python-msrplib-0.19.2.exheres-0
+++ b/packages/dev-python/python-msrplib/python-msrplib-0.19.2-r1.exheres-0
@@ -17,7 +17,6 @@ DEPENDENCIES="
         dev-python/python-application[python_abis:*(-)?]
         dev-python/python-eventlib[python_abis:*(-)?]
         dev-python/python-gnutls[>=3.0.0][python_abis:*(-)?]
-        net-twisted/TwistedCore[python_abis:*(-)?]
-        net-twisted/TwistedNames[python_abis:*(-)?]
+        net-twisted/Twisted[python_abis:*(-)?]
 "
 
diff --git a/packages/dev-python/python-sipsimple/python-sipsimple-3.4.2.exheres-0 b/packages/dev-python/python-sipsimple/python-sipsimple-3.4.2-r1.exheres-0
similarity index 97%
rename from packages/dev-python/python-sipsimple/python-sipsimple-3.4.2.exheres-0
rename to packages/dev-python/python-sipsimple/python-sipsimple-3.4.2-r1.exheres-0
index 04d2c1da..43f15c85 100644
--- a/packages/dev-python/python-sipsimple/python-sipsimple-3.4.2.exheres-0
+++ b/packages/dev-python/python-sipsimple/python-sipsimple-3.4.2-r1.exheres-0
@@ -44,7 +44,7 @@ DEPENDENCIES="
         dev-python/python-xcaplib[python_abis:*(-)?]
         dev-python/zopeinterface[python_abis:*(-)?]
         media-libs/x264[-10bit]
-        net-twisted/TwistedCore[python_abis:*(-)?]
+        net-twisted/Twisted[python_abis:*(-)?]
 "
 
 DEFAULT_SRC_PREPARE_PATCHES=(
diff --git a/packages/voip/blink/blink-3.2.0.exheres-0 b/packages/voip/blink/blink-3.2.0-r1.exheres-0
similarity index 96%
rename from packages/voip/blink/blink-3.2.0.exheres-0
rename to packages/voip/blink/blink-3.2.0-r1.exheres-0
index c7daf050..f3a9c4f0 100644
--- a/packages/voip/blink/blink-3.2.0.exheres-0
+++ b/packages/voip/blink/blink-3.2.0-r1.exheres-0
@@ -28,7 +28,7 @@ DEPENDENCIES="
         dev-python/python-eventlib[python_abis:*(-)?]
         dev-python/python-sipsimple[>=3.0.0][python_abis:*(-)?]
         dev-python/zopeinterface[python_abis:*(-)?]
-        net-twisted/TwistedCore[python_abis:*(-)?]
+        net-twisted/Twisted[python_abis:*(-)?]
 "
 
 DEFAULT_SRC_PREPARE_PATCHES=(