diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 471320ee2c113..698a065a3a89d 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -40,6 +40,7 @@ with pkgs;
               isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy310 isPy3k isPyPy pythonAtLeast pythonOlder
               python bootstrapped-pip buildPythonPackage buildPythonApplication
               fetchPypi
+              fetchFromPyPI
               hasPythonModule requiredPythonModules makePythonPath disabledIf
               toPythonModule toPythonApplication
               buildSetupcfg
diff --git a/pkgs/development/interpreters/python/fetchpypi.nix b/pkgs/development/interpreters/python/fetchfrompypi.nix
similarity index 94%
rename from pkgs/development/interpreters/python/fetchpypi.nix
rename to pkgs/development/interpreters/python/fetchfrompypi.nix
index ebd277cd2bdf8..ebf260f10e613 100644
--- a/pkgs/development/interpreters/python/fetchpypi.nix
+++ b/pkgs/development/interpreters/python/fetchfrompypi.nix
@@ -1,4 +1,4 @@
-# `fetchPypi` function for fetching artifacts from PyPI.
+# `fetchFromPyPI` function for fetching artifacts from PyPI.
 { fetchurl
 , makeOverridable
 }:
diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
index d3642592ae43b..5aa8ca4387e9c 100755
--- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
+++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
@@ -232,6 +232,7 @@ def get_prefix(string):
 
 FETCHERS = {
     'fetchFromGitHub'   :   _get_latest_version_github,
+    'fetchFromPyPI'     :   _get_latest_version_pypi,
     'fetchPypi'         :   _get_latest_version_pypi,
     'fetchurl'          :   _get_latest_version_pypi,
 }
@@ -263,11 +264,11 @@ def _determine_extension(text, fetcher):
     """Determine what extension is used in the expression.
 
     If we use:
-    - fetchPypi, we check if format is specified.
+    - fetchFromPyPI or fetchPypi, we check if format is specified.
     - fetchurl, we determine the extension from the url.
     - fetchFromGitHub we simply use `.tar.gz`.
     """
-    if fetcher == 'fetchPypi':
+    if fetcher == 'fetchFromPyPI' or fetcher == 'fetchPypi' :
         try:
             src_format = _get_unique_value('format', text)
         except ValueError as e:
diff --git a/pkgs/development/python-modules/3to2/default.nix b/pkgs/development/python-modules/3to2/default.nix
index ff64a6d1a4730..e50acb6725c2b 100644
--- a/pkgs/development/python-modules/3to2/default.nix
+++ b/pkgs/development/python-modules/3to2/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromPyPI
 , pytest
 }:
 
@@ -8,7 +8,7 @@ buildPythonPackage rec {
   pname = "py3to2";
   version = "1.1.1";
 
-  src = fetchPypi {
+  src = fetchFromPyPI {
     inherit version;
     pname = "3to2";
     extension = "zip";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4bf25880ad3b4..bcd8efa7e2de2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -56,7 +56,8 @@ let
   # See build-setupcfg/default.nix for documentation.
   buildSetupcfg = import ../build-support/build-setupcfg self;
 
-  fetchPypi = callPackage ../development/interpreters/python/fetchpypi.nix { };
+  fetchPypi = fetchFromPyPI;
+  fetchFromPyPI = callPackage ../development/interpreters/python/fetchfrompypi.nix { };
 
   # Check whether a derivation provides a Python module.
   hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python;