diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index 29fa0923..e1e10313 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -1363,7 +1363,7 @@ build_package_verify_py34() {
   build_package_verify_py33 "$1" "${2:-3.4}"
 }
 
-build_package_setuptools() {
+build_package_ez_setup() {
   { if [ "${EZ_SETUP+defined}" ] && [ -f "${EZ_SETUP}" ]; then
       echo "Installing setuptools from ${EZ_SETUP}..." 1>&2
       cat "${EZ_SETUP}"
@@ -1375,7 +1375,7 @@ build_package_setuptools() {
   } | "${PYTHON_BIN}" 1>&4 2>&1
 }
 
-build_package_pip() {
+build_package_getpip() {
   { if [ "${GET_PIP+defined}" ] && [ -f "${GET_PIP}" ]; then
       echo "Installing pip from ${GET_PIP}..." 1>&2
       cat "${GET_PIP}"
@@ -1389,8 +1389,8 @@ build_package_pip() {
 
 build_package_ensurepip() {
   "$PYTHON_BIN" -m ensurepip 1>/dev/null 2>&1 || {
-    build_package_setuptools "$@"
-    build_package_pip "$@"
+    build_package_ez_setup "$@"
+    build_package_getpip "$@"
   }
 
   create_symlinks "$("$PYTHON_BIN" -c 'import sys;v=sys.version_info;sys.stdout.write("python%d.%d"%(v[0],v[1]))')"
diff --git a/plugins/python-build/share/python-build/jython-2.7-beta1 b/plugins/python-build/share/python-build/jython-2.7-beta1
index 96a9b636..e4f83c6e 100644
--- a/plugins/python-build/share/python-build/jython-2.7-beta1
+++ b/plugins/python-build/share/python-build/jython-2.7-beta1
@@ -1,5 +1,5 @@
 require_java
-install_jar "jython-2.7-beta1" "http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7-b1/jython-installer-2.7-b1.jar" jython setuptools
+install_jar "jython-2.7-beta1" "http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7-b1/jython-installer-2.7-b1.jar" jython ez_setup
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15
 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1" python
diff --git a/plugins/python-build/share/python-build/jython-2.7-beta2 b/plugins/python-build/share/python-build/jython-2.7-beta2
index 6006bb09..5a18fce1 100644
--- a/plugins/python-build/share/python-build/jython-2.7-beta2
+++ b/plugins/python-build/share/python-build/jython-2.7-beta2
@@ -1,5 +1,5 @@
 require_java
-install_jar "jython-2.7-beta2" "http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7-b2/jython-installer-2.7-b2.jar" jython setuptools
+install_jar "jython-2.7-beta2" "http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7-b2/jython-installer-2.7-b2.jar" jython ez_setup
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15
 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1" python
diff --git a/plugins/python-build/share/python-build/jython-dev b/plugins/python-build/share/python-build/jython-dev
index 86258aa5..6e3c2858 100644
--- a/plugins/python-build/share/python-build/jython-dev
+++ b/plugins/python-build/share/python-build/jython-dev
@@ -1,5 +1,5 @@
 require_java
-install_hg "jython-dev" "http://hg.python.org/jython" "default" jython_builder setuptools
+install_hg "jython-dev" "http://hg.python.org/jython" "default" jython_builder ez_setup
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15
 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1" python