diff --git a/autospec/failed_commands b/autospec/failed_commands
index 5f22c12..a17fff9 100644
--- a/autospec/failed_commands
+++ b/autospec/failed_commands
@@ -562,7 +562,7 @@ SharedMimeInfo, shared-mime-info
 Snappy, snappy-dev
 Soprano, soprano-dev
 SpatialIndex, libspatialindex-dev
-Sphinx, Sphinx
+Sphinx, pypi-sphinx
 Sqlite, sqlite-autoconf-dev
 Startup notification library, libnotify-dev
 TBB, tbb-dev
@@ -1276,8 +1276,8 @@ sm, libSM-dev
 sndfile, libsndfile-dev
 sndfile.h, libsndfile-dev
 sox.h, sox-dev
-sphinx, Sphinx
-sphinx-build, Sphinx
+sphinx, pypi-sphinx
+sphinx-build, pypi-phinx
 sqlalchemy, SQLAlchemy
 sqlext.h usability, unixODBC-dev
 sqlext.h, unixODBC-dev
diff --git a/autospec/translate.dic b/autospec/translate.dic
index 2793341..5d47751 100644
--- a/autospec/translate.dic
+++ b/autospec/translate.dic
@@ -1,14 +1,14 @@
-async_timeout=async-timeout
-babel=Babel
-backports.ssl-match-hostname=backports.ssl_match_hostname
+async_timeout=pypi-async_timeout
+babel=pypi-babel
+backports.ssl-match-hostname=pypi-backports.ssl_match_hostname
 barbicanclient-python=python-barbicanclient
-BeautifulSoup=beautifulsoup4
-cryptography-python=cryptography
+BeautifulSoup=pypi-beautifulsoup4
+cryptography-python=pypi-cryptography
 Crypto-python=pycrypt-python
-dateutil-python=python-dateutil
-dateutil.relativedelta-python=python-dateutil
+dateutil-python=pypi-python_dateutil
+dateutil.relativedelta-python=pypi-python_dateutil
 designateclient-python=python-designateclient
-django-python=Django
+django-python=pypi-django
 enum-python=enum34
 formencode=FormEncode
 Genshi-python=Genshi
@@ -27,9 +27,9 @@ gopkg.in/yaml.v2=golang-github-go-yaml-yaml
 hacking-python=hacking
 httplib2-python=httplib2
 ironicclient-python=python-ironicclient
-jinja2=Jinja2
-jinja2-python=Jinja2
-Jinja2-python=Jinja2
+jinja2=pypi-jinja2
+jinja2-python=pypi-jinja2
+Jinja2-python=pypi-jinja2
 jsonpath_rw_ext=jsonpath-rw-ext
 keystoneclient.auth-python=python-keystoneclient
 keystoneclient.v3-python=python-keystoneclient
@@ -49,16 +49,16 @@ oslo_policy-python=oslo.policy
 oslo_reports-python=oslo.reports
 oslo_versionedobjects-python=oslo.versionedobjects
 oslo_versionedobjects.tests-python=oslo.versionedobjects
-pep8-python=pep8
-posix-ipc-python=posix_ipc
-PrettyTable-python=prettytable
-pyaml-python=pyaml
+pep8-python=pypi-pep8
+posix-ipc-python=pypi-posix_ipc
+PrettyTable-python=pypi-prettytable
+pyaml-python=pypi-pyaml
 PyECLib-python=pyeclib
-pygments=Pygments
-Pygments-python=Pygments
+pygments=pypi-pygments
+Pygments-python=pypi-pygments
 PyGObject=pygobject
 pylibmc-python=pylibmc
-PyOpenSSL=pyOpenSSL
+PyOpenSSL=pypi-pyopenssl
 pyqt5=PyQt5
 pytest_runner=pytest-runner
 python-memcached-python=python-memcached
@@ -67,16 +67,16 @@ qtawesome=QtAwesome
 qtpy=QtPy
 restructuredtext-lint=restructuredtext_lint
 semantic-version=semantic_version
-setuptools-scm-python=setuptools_scm
+setuptools-scm-python=pypi-setuptools_scm
 simplejson-python=simplejson
-sphinx=Sphinx
-sqlalchemy=SQLAlchemy
-sqlparse-python=sqlparse
+sphinx=pypi-sphinx
+sqlalchemy=pypi-sqlalchemy
+sqlparse-python=pypi-sqlparse
 stevedore-python=stevedore
 testresources-python=testresources
 testscenarios-python=testscenarios
 websocket-client=websocket_client
-WebTest-python=WebTest
+WebTest-python=pypi-webtest
 yaml-python=PyYAML
 zaqarclient.queues.v1-python=python-zaqarclient
 zaqarclient.transport-python=python-zaqarclient