diff --git a/Makefile b/Makefile
index 02d71e5e5a..7863a6a6a6 100644
--- a/Makefile
+++ b/Makefile
@@ -72,12 +72,14 @@ requirements_pypi:
 	    sudo pip install -r requirements/dev.txt; \
 	fi
 
-# "Install" awx package in development mode.  Creates link to working
+# "Install" ansible-tower package in development mode.  Creates link to working
 # copy in site-packages and installs awx-manage command.
 develop:
 	@if [ "$(VIRTUAL_ENV)" ]; then \
+	    pip uninstall -y awx; \
 	    $(PYTHON) setup.py develop; \
 	else \
+	    sudo pip uninstall -y awx; \
 	    sudo $(PYTHON) setup.py develop; \
 	fi
 
diff --git a/awx/main/utils.py b/awx/main/utils.py
index 88c11646f0..0ff157138e 100644
--- a/awx/main/utils.py
+++ b/awx/main/utils.py
@@ -77,7 +77,7 @@ def get_ansible_version():
 
 def get_awx_version():
     '''
-    Return AWX version as reported by setuptools.
+    Return Ansible Tower version as reported by setuptools.
     '''
     from awx import __version__
     try: