diff --git a/MOVED b/MOVED
index 41a2754761e2..e978c849dd03 100644
--- a/MOVED
+++ b/MOVED
@@ -9387,3 +9387,4 @@ graphics/libGL|graphics/mesa-libs|2017-05-12|Mesa libraries were merged into one
 multimedia/rubygem-av-rails5||2017-05-15|Has expired: Use multimedia/rubygem-av instead
 devel/rubygem-cocaine-rails5||2017-05-15|Has expired: Use devel/rubygem-cocaine instead
 devel/rubygem-climate_control-rails5||2017-05-15|Has expired: Use devel/rubygem-climate_control instead
+net/py-twitter|net/py-python-twitter|2017-05-15|Renamed to reflect official name at PyPI/Github
diff --git a/net/Makefile b/net/Makefile
index 077e04e8857b..04ec877886b6 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1033,6 +1033,7 @@
     SUBDIR += py-python-novaclient
     SUBDIR += py-python-ntlm
     SUBDIR += py-python-openstackclient
+    SUBDIR += py-python-twitter
     SUBDIR += py-pyvmomi
     SUBDIR += py-pyzmq
     SUBDIR += py-qt4-network
@@ -1059,7 +1060,6 @@
     SUBDIR += py-tofu
     SUBDIR += py-tweepy
     SUBDIR += py-twistedPair
-    SUBDIR += py-twitter
     SUBDIR += py-twitter-tools
     SUBDIR += py-txamqp
     SUBDIR += py-txrestapi
diff --git a/net/py-twitter/Makefile b/net/py-python-twitter/Makefile
similarity index 88%
rename from net/py-twitter/Makefile
rename to net/py-python-twitter/Makefile
index 35ba31d9f7ff..a8b9ea9dc546 100644
--- a/net/py-twitter/Makefile
+++ b/net/py-python-twitter/Makefile
@@ -1,12 +1,11 @@
 # Created by: ijliao
 # $FreeBSD$
 
-PORTNAME=	twitter
+PORTNAME=	python-twitter
 PORTVERSION=	3.2.1
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Python wrapper around the Twitter API
diff --git a/net/py-twitter/distinfo b/net/py-python-twitter/distinfo
similarity index 100%
rename from net/py-twitter/distinfo
rename to net/py-python-twitter/distinfo
diff --git a/net/py-twitter/files/patch-setup.py b/net/py-python-twitter/files/patch-setup.py
similarity index 100%
rename from net/py-twitter/files/patch-setup.py
rename to net/py-python-twitter/files/patch-setup.py
diff --git a/net/py-twitter/pkg-descr b/net/py-python-twitter/pkg-descr
similarity index 100%
rename from net/py-twitter/pkg-descr
rename to net/py-python-twitter/pkg-descr