7 files changed, 20 insertions, 20 deletions
diff --git a/numpy/lib/_version.py b/numpy/lib/_version.py
index 54b9c1dc7..0019c5607 100644
--- a/numpy/lib/_version.py
+++ b/numpy/lib/_version.py
@@ -1,4 +1,4 @@
-"""Utility to compare (Numpy) version strings.
+"""Utility to compare (NumPy) version strings.
 
 The NumpyVersion class allows properly comparing numpy version strings.
 The LooseVersion and StrictVersion classes that distutils provides don't
@@ -18,7 +18,7 @@ __all__ = ['NumpyVersion']
 class NumpyVersion():
     """Parse and compare numpy version strings.
 
-    Numpy has the following versioning scheme (numbers given are examples; they
+    NumPy has the following versioning scheme (numbers given are examples; they
     can be > 9) in principle):
 
     - Released version: '1.8.0', '1.8.1', etc.
@@ -40,7 +40,7 @@ class NumpyVersion():
     Parameters
     ----------
     vstring : str
-        Numpy version string (``np.__version__``).
+        NumPy version string (``np.__version__``).
 
     Examples
     --------
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
index b74e04028..11cfb2c99 100644
--- a/numpy/lib/function_base.py
+++ b/numpy/lib/function_base.py
@@ -489,8 +489,8 @@ def histogram(a, bins=10, range=None, normed=False, weights=None,
         based on the actual data within `range`, the bin count will fill
         the entire range including portions containing no data.
     normed : bool, optional
-        This keyword is deprecated in Numpy 1.6 due to confusing/buggy
-        behavior. It will be removed in Numpy 2.0. Use the ``density``
+        This keyword is deprecated in NumPy 1.6 due to confusing/buggy
+        behavior. It will be removed in NumPy 2.0. Use the ``density``
         keyword instead. If ``False``, the result will contain the
         number of samples in each bin. If ``True``, the result is the
         value of the probability *density* function at the bin,
@@ -809,7 +809,7 @@ def histogram(a, bins=10, range=None, normed=False, weights=None,
         else:
             return n, bins
     else:
-        # deprecated, buggy behavior. Remove for Numpy 2.0
+        # deprecated, buggy behavior. Remove for NumPy 2.0
         if normed:
             db = array(np.diff(bins), float)
             return n/(n*db).sum(), bins
diff --git a/numpy/lib/nanfunctions.py b/numpy/lib/nanfunctions.py
index 7f7aea9bc..ab88c6a37 100644
--- a/numpy/lib/nanfunctions.py
+++ b/numpy/lib/nanfunctions.py
@@ -204,7 +204,7 @@ def nanmin(a, axis=None, out=None, keepdims=np._NoValue):
 
     Notes
     -----
-    Numpy uses the IEEE Standard for Binary Floating-Point for Arithmetic
+    NumPy uses the IEEE Standard for Binary Floating-Point for Arithmetic
     (IEEE 754). This means that Not a Number is not equivalent to infinity.
     Positive infinity is treated as a very large number and negative
     infinity is treated as a very small (i.e. negative) number.
@@ -311,7 +311,7 @@ def nanmax(a, axis=None, out=None, keepdims=np._NoValue):
 
     Notes
     -----
-    Numpy uses the IEEE Standard for Binary Floating-Point for Arithmetic
+    NumPy uses the IEEE Standard for Binary Floating-Point for Arithmetic
     (IEEE 754). This means that Not a Number is not equivalent to infinity.
     Positive infinity is treated as a very large number and negative
     infinity is treated as a very small (i.e. negative) number.
@@ -453,7 +453,7 @@ def nansum(a, axis=None, dtype=None, out=None, keepdims=np._NoValue):
     Return the sum of array elements over a given axis treating Not a
     Numbers (NaNs) as zero.
 
-    In Numpy versions <= 1.8 Nan is returned for slices that are all-NaN or
+    In NumPy versions <= 1.8 Nan is returned for slices that are all-NaN or
     empty. In later versions zero is returned.
 
     Parameters
diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py
index 0b2fdfaba..376d34b91 100644
--- a/numpy/lib/npyio.py
+++ b/numpy/lib/npyio.py
@@ -376,9 +376,9 @@ def load(file, mmap_mode=None, allow_pickle=True, fix_imports=True,
 
     if encoding not in ('ASCII', 'latin1', 'bytes'):
         # The 'encoding' value for pickle also affects what encoding
-        # the serialized binary data of Numpy arrays is loaded
+        # the serialized binary data of NumPy arrays is loaded
         # in. Pickle does not pass on the encoding information to
-        # Numpy. The unpickling code in numpy.core.multiarray is
+        # NumPy. The unpickling code in numpy.core.multiarray is
         # written to assume that unicode data appearing where binary
         # should be is in 'latin1'. 'bytes' is also safe, as is 'ASCII'.
         #
@@ -466,7 +466,7 @@ def save(file, arr, allow_pickle=True, fix_imports=True):
     Notes
     -----
     For a description of the ``.npy`` format, see the module docstring
-    of `numpy.lib.format` or the Numpy Enhancement Proposal
+    of `numpy.lib.format` or the NumPy Enhancement Proposal
     http://docs.scipy.org/doc/numpy/neps/npy-format.html
 
     Examples
@@ -552,7 +552,7 @@ def savez(file, *args, **kwds):
     variables they contain.  The archive is not compressed and each file
     in the archive contains one variable in ``.npy`` format. For a
     description of the ``.npy`` format, see `numpy.lib.format` or the
-    Numpy Enhancement Proposal
+    NumPy Enhancement Proposal
     http://docs.scipy.org/doc/numpy/neps/npy-format.html
 
     When opening the saved ``.npz`` file with `load` a `NpzFile` object is
@@ -1428,7 +1428,7 @@ def genfromtxt(fname, dtype=float, comments='#', delimiter=None,
 
     References
     ----------
-    .. [1] Numpy User Guide, section `I/O with Numpy
+    .. [1] NumPy User Guide, section `I/O with NumPy
            <http://docs.scipy.org/doc/numpy/user/basics.io.genfromtxt.html>`_.
 
     Examples
diff --git a/numpy/lib/type_check.py b/numpy/lib/type_check.py
index f620d49d5..07f4463c5 100644
--- a/numpy/lib/type_check.py
+++ b/numpy/lib/type_check.py
@@ -350,7 +350,7 @@ def nan_to_num(x):
 
     Notes
     -----
-    Numpy uses the IEEE Standard for Binary Floating-Point for Arithmetic
+    NumPy uses the IEEE Standard for Binary Floating-Point for Arithmetic
     (IEEE 754). This means that Not a Number is not equivalent to infinity.
 
 
diff --git a/numpy/lib/ufunclike.py b/numpy/lib/ufunclike.py
index e91f64d0e..b6c017b96 100644
--- a/numpy/lib/ufunclike.py
+++ b/numpy/lib/ufunclike.py
@@ -82,7 +82,7 @@ def isposinf(x, y=None):
 
     Notes
     -----
-    Numpy uses the IEEE Standard for Binary Floating-Point for Arithmetic
+    NumPy uses the IEEE Standard for Binary Floating-Point for Arithmetic
     (IEEE 754).
 
     Errors result if the second argument is also supplied when `x` is a
@@ -145,7 +145,7 @@ def isneginf(x, y=None):
 
     Notes
     -----
-    Numpy uses the IEEE Standard for Binary Floating-Point for Arithmetic
+    NumPy uses the IEEE Standard for Binary Floating-Point for Arithmetic
     (IEEE 754).
 
     Errors result if the second argument is also supplied when x is a scalar
diff --git a/numpy/lib/utils.py b/numpy/lib/utils.py
index 133704d13..97b93cace 100644
--- a/numpy/lib/utils.py
+++ b/numpy/lib/utils.py
@@ -241,10 +241,10 @@ def byte_bounds(a):
 
 def who(vardict=None):
     """
-    Print the Numpy arrays in the given dictionary.
+    Print the NumPy arrays in the given dictionary.
 
     If there is no dictionary passed in or `vardict` is None then returns
-    Numpy arrays in the globals() dictionary (all Numpy arrays in the
+    NumPy arrays in the globals() dictionary (all NumPy arrays in the
     namespace).
 
     Parameters
@@ -646,7 +646,7 @@ def info(object=None, maxwidth=76, output=sys.stdout, toplevel='numpy'):
 
 def source(object, output=sys.stdout):
     """
-    Print or write to a file the source code for a Numpy object.
+    Print or write to a file the source code for a NumPy object.
 
     The source code is only returned for objects written in Python. Many
     functions and classes are defined in C and will therefore not return