diff --git a/data/Macports/Portfile b/data/Macports/Portfile
index cfd0c539a414..4b82072f1ddf 100644
--- a/data/Macports/Portfile
+++ b/data/Macports/Portfile
@@ -10,7 +10,7 @@ categories          python
 platforms           darwin
 maintainers         nomaintainer
 homepage            http://sympy.org
-description         Sympy is a Python library for symbolic mathematics
+description         SymPy is a Python library for symbolic mathematics
 long_description    SymPy is a Python library for symbolic mathematics. \
                     It aims to become a full-featured computer algebra \
                     system (CAS) while keeping the code as simple as \
diff --git a/doc/apidoc.conf b/doc/apidoc.conf
index 81e957f65c88..10f1dcd3eaf9 100644
--- a/doc/apidoc.conf
+++ b/doc/apidoc.conf
@@ -1,6 +1,6 @@
 [epydoc]
 
-name : Sympy
+name : SymPy
 url: http://code.google.com/p/sympy
 
 modules : sympy, sympy.core, sympy.modules
diff --git a/doc/ext/docscrape_sphinx.py b/doc/ext/docscrape_sphinx.py
index ea9eb6c535db..df55204eab59 100644
--- a/doc/ext/docscrape_sphinx.py
+++ b/doc/ext/docscrape_sphinx.py
@@ -69,7 +69,7 @@ def _str_member_list(self, name):
                 prefix = '~%s.' % prefix
             
             ## Lines that are commented out are used to make the
-            ## autosummary:: table. Since Sympy does not use the
+            ## autosummary:: table. Since SymPy does not use the
             ## autosummary:: functionality, it is easiest to just comment it
             ## out.
             #autosum = []
diff --git a/doc/logo/LogoInfo.txt b/doc/logo/LogoInfo.txt
index dd7df536c820..89c2cf48e502 100644
--- a/doc/logo/LogoInfo.txt
+++ b/doc/logo/LogoInfo.txt
@@ -1,4 +1,4 @@
-I created these logo's and permit their free use on the same terms as the rest of Sympy's code and documentation.
+I created these logo's and permit their free use on the same terms as the rest of SymPy's code and documentation.
 
 Fredrik Johansson
 
diff --git a/doc/src/aboutus.txt b/doc/src/aboutus.txt
index d5e0bcd411cf..c8359803c68c 100644
--- a/doc/src/aboutus.txt
+++ b/doc/src/aboutus.txt
@@ -47,7 +47,7 @@ want to be mentioned here, so see our repository history for a full list).
 #. Vinzent Steinberg: docstring patches, a lot of bug fixes, nsolve (nonlinear equation systems solver), compiling functions to machine code, patches review
 #. Riccardo Gori: improvements and speedups to matrices, many bug fixes
 #. Case Van Horsen: implemented optional support for gmpy in mpmath
-#. Štěpán Roučka: a lot of bug fixes all over sympy (matrix, simplification, limits, series, ...)
+#. Štěpán Roučka: a lot of bug fixes all over SymPy (matrix, simplification, limits, series, ...)
 #. Ali Raza Syed: pretty printing/isympy on windows fix
 #. Stefano Maggiolo: many bug fixes, polishings and improvements
 #. Robert Cimrman: matrix patches
@@ -227,7 +227,7 @@ Financial and Infrastructure Support
 
 * `the Space Telescope Science Institute <http://www.stsci.edu/portal/>`_: STScI hosted 1 GSoC 2007 student (Mateusz)
 
-* `Simula Research Laboratory <http://www.simula.no/>`_: supports Pearu Peterson work in SymPy/Sympy Core projects
+* `Simula Research Laboratory <http://www.simula.no/>`_: supports Pearu Peterson work in SymPy/SymPy Core projects
 
 * `GitHub <https://github.com/about>`_ is providing us with development
   and collaboration tools
diff --git a/doc/src/guide.txt b/doc/src/guide.txt
index 7afb3b55c668..357455cdd996 100644
--- a/doc/src/guide.txt
+++ b/doc/src/guide.txt
@@ -9,7 +9,7 @@ SymPy User's Guide
 Introduction
 ============
 
-If you are new to Sympy, start with the :ref:`Tutorial <tutorial>`. If you went
+If you are new to SymPy, start with the :ref:`Tutorial <tutorial>`. If you went
 through it, now
 it's time to learn how SymPy works internally and this is what this guide is
 about. Once you grasp the idea behind SymPy, you will be able to use it
@@ -518,13 +518,13 @@ Go to issues_ that are sorted by priority and simply find something that you
 would like to get fixed and fix it. If you find something odd, please report it
 into issues_ first before fixing it. Feel free to consult with us on the
 mailinglist_.  Then send your patch either to the issues_ or the mailinglist_.
-See the SympyDevelopment_ wiki, but don't worry about it too much if you find
+See the SymPyDevelopment_ wiki, but don't worry about it too much if you find
 it too formal - simply get in touch with us on the mailinglist_ and we'll help
 you get your patch accepted.
 
 .. _issues:             http://code.google.com/p/sympy/issues/list
 .. _mailinglist:        http://groups.google.com/group/sympy
-.. _SympyDevelopment:   http://code.google.com/p/sympy/wiki/SympyDevelopment
+.. _SymPyDevelopment:   http://code.google.com/p/sympy/wiki/SymPyDevelopment
 
 Please read our excellent `SymPy Patches Tutorial
 <https://github.com/sympy/sympy/wiki/Development-workflow>`_ at our
diff --git a/doc/src/install.txt b/doc/src/install.txt
index 4e1227cc9d0f..f90df7053e0e 100644
--- a/doc/src/install.txt
+++ b/doc/src/install.txt
@@ -71,7 +71,7 @@ everything in the py3ksympy directory.
 Other Methods
 =============
 An installation executable is available for Windows users at the
-`downloads site`_ (.exe). In addition, various Linux distributions have Sympy
+`downloads site`_ (.exe). In addition, various Linux distributions have SymPy
 available as a package. Others are strongly encouraged to download from source
 (details above).
 
diff --git a/doc/src/modules/galgebra/GA/GAsympy.txt b/doc/src/modules/galgebra/GA/GAsympy.txt
index de97f3d94bac..ed864f1e5f68 100644
--- a/doc/src/modules/galgebra/GA/GAsympy.txt
+++ b/doc/src/modules/galgebra/GA/GAsympy.txt
@@ -1,5 +1,5 @@
 **************************************
-  Geometric Algebra Module for Sympy
+  Geometric Algebra Module for SymPy
 **************************************
 
 :Author: Alan Bromborsky
@@ -1314,7 +1314,7 @@ Basic Multivector Class Functions
    Set the multivector coefficient of index *(grade,base)* to *value*.
 
 
-Sympy Functions Applied Inplace to Multivector Coefficients
+SymPy Functions Applied Inplace to Multivector Coefficients
 -----------------------------------------------------------
 
 All the following fuctions belong to the :class:`MV` class and apply the
diff --git a/doc/src/modules/galgebra/latex_ex/latex_ex.txt b/doc/src/modules/galgebra/latex_ex/latex_ex.txt
index 61bec55be703..ec720f4c2699 100644
--- a/doc/src/modules/galgebra/latex_ex/latex_ex.txt
+++ b/doc/src/modules/galgebra/latex_ex/latex_ex.txt
@@ -1,7 +1,7 @@
 .. _extended-latex:
 
 **********************************
-  Extended LaTeXModule for Sympy  
+  Extended LaTeXModule for SymPy
 **********************************
 
 :Author: Alan Bromborsky
diff --git a/doc/src/modules/integrals/integrals.txt b/doc/src/modules/integrals/integrals.txt
index 64541a978c07..9bed39c31359 100644
--- a/doc/src/modules/integrals/integrals.txt
+++ b/doc/src/modules/integrals/integrals.txt
@@ -57,7 +57,7 @@ Integral Transforms
 
 .. module:: sympy.integrals.transforms
 
-Sympy has special support for definite integrals, and integral transforms.
+SymPy has special support for definite integrals, and integral transforms.
 
 .. autofunction:: mellin_transform
 .. autofunction:: inverse_mellin_transform
diff --git a/doc/src/modules/physics/mechanics/vectors.txt b/doc/src/modules/physics/mechanics/vectors.txt
index c8a856adff27..b62b11fb6e8f 100644
--- a/doc/src/modules/physics/mechanics/vectors.txt
+++ b/doc/src/modules/physics/mechanics/vectors.txt
@@ -607,7 +607,7 @@ SymPy has a ``diff`` function, but it does not currently work with
 :mod:`mechanics` Vectors, so please use ``Vector``'s ``diff`` method.  The
 reason for this is that when differentiating a ``Vector``, the frame of
 reference must be specified in addition to what you are taking the derivative
-with respect to; Sympy's ``diff`` function doesn't fit this mold.
+with respect to; SymPy's ``diff`` function doesn't fit this mold.
 
 The more interesting case arise with multiple reference frames. If we introduce
 a second reference frame, :math:`\mathbf{A}`, we now have two frames. Note that
diff --git a/doc/src/modules/printing.txt b/doc/src/modules/printing.txt
index 5245f981fc8c..01f94156defe 100644
--- a/doc/src/modules/printing.txt
+++ b/doc/src/modules/printing.txt
@@ -230,7 +230,7 @@ LatexPrinter
 
 This class implements LaTeX printing. See ``sympy.printing.latex``.
 
-See also the extended LatexPrinter: :ref:`Extended LaTeXModule for Sympy <extended-latex>`
+See also the extended LatexPrinter: :ref:`Extended LaTeXModule for SymPy <extended-latex>`
 
 .. autodata:: accepted_latex_functions
 
diff --git a/doc/src/modules/utilities/autowrap.txt b/doc/src/modules/utilities/autowrap.txt
index 5087935020d6..cd9dd259f0be 100644
--- a/doc/src/modules/utilities/autowrap.txt
+++ b/doc/src/modules/utilities/autowrap.txt
@@ -17,7 +17,7 @@ y[i] == A[i, j]*x[j]
 
 Because the code printers treat Indexed objects with repeated indices as a
 summation, the above equality instance will be translated to low-level code for
-a matrix vector product.  This is how you tell Sympy to generate the code,
+a matrix vector product.  This is how you tell SymPy to generate the code,
 compile it and wrap it as a python function:
 
 >>> matvec = autowrap(instruction)                 # doctest: +SKIP
diff --git a/doc/src/modules/utilities/codegen.txt b/doc/src/modules/utilities/codegen.txt
index fc0dbb88e3f5..9d314707a744 100644
--- a/doc/src/modules/utilities/codegen.txt
+++ b/doc/src/modules/utilities/codegen.txt
@@ -3,8 +3,8 @@ Codegen
 =======
 
 This module provides functionality to generate directly compilable code from
-Sympy expressions.  The ``codegen`` function is the user interface to the code
-generation functionality in Sympy.  Some details of the implementation is given
+SymPy expressions.  The ``codegen`` function is the user interface to the code
+generation functionality in SymPy.  Some details of the implementation is given
 below for advanced users that may want to use the framework directly.
 
 .. note:: The ``codegen`` callable is not in the sympy namespace automatically,
diff --git a/doc/src/tutorial.cs.po b/doc/src/tutorial.cs.po
index 64432e7749cd..60f1ccfd77dd 100644
--- a/doc/src/tutorial.cs.po
+++ b/doc/src/tutorial.cs.po
@@ -91,7 +91,7 @@ msgstr "SymPy jako kalkulačka"
 #: ../../src/tutorial.txt:126
 #, fuzzy
 msgid "SymPy has three built-in numeric types: Float, Rational and Integer."
-msgstr "Sympy má zabudované tři číselné typy: Float, Rational a Integer."
+msgstr "SymPy má zabudované tři číselné typy: Float, Rational a Integer."
 
 # 668a48de987a4bd6bb25e6319aa18ba2
 #: ../../src/tutorial.txt:128
diff --git a/doc/src/tutorial.ru.po b/doc/src/tutorial.ru.po
index 30e5c19a8a2f..bb2d8f1c3742 100644
--- a/doc/src/tutorial.ru.po
+++ b/doc/src/tutorial.ru.po
@@ -88,7 +88,7 @@ msgstr ""
 
 #: ../../src/tutorial.txt:126
 # 88460153b0404c1c80d7d9fef1b9d530
-msgid "Sympy has three built-in numeric types: Float, Rational and Integer."
+msgid "SymPy has three built-in numeric types: Float, Rational and Integer."
 msgstr ""
 
 #: ../../src/tutorial.txt:128
diff --git a/doc/src/tutorial.ru.txt b/doc/src/tutorial.ru.txt
index 091a8b1e3af9..ef4ae2c37a84 100644
--- a/doc/src/tutorial.ru.txt
+++ b/doc/src/tutorial.ru.txt
@@ -53,7 +53,7 @@ http://code.google.com/p/sympy/ и
 
 Если вы используете SymPy в вашей программе,
 рекомендуется использовать его как показано выше.
-Вы можете установить Sympy так же как и любой другой Python модуль,
+Вы можете установить SymPy так же как и любой другой Python модуль,
 используя ./setup.py install. Или, если вы работаете в Linux, можно
 установить пакет ``python-sympy`` с помощью системы установки программ:
 
@@ -174,7 +174,7 @@ Rational(5,2) является 5/2, и так далее.
     >>> R(1)/2 # R(1) - это Integer sympy, а результат деления Integer на int - Rational
     1/2
 
-Также в модуле Sympy зарезервированы особые константы, такие как e и pi,
+Также в модуле SymPy зарезервированы особые константы, такие как e и pi,
 которые ведут себя как переменные (то есть 1+pi не сконвертируется в число,
 а останется выражением 1+pi), и заданы с некоторой точностью::
 
diff --git a/examples/advanced/autowrap_integrators.py b/examples/advanced/autowrap_integrators.py
index b35c01f11eba..8a13c02ac8c1 100755
--- a/examples/advanced/autowrap_integrators.py
+++ b/examples/advanced/autowrap_integrators.py
@@ -3,7 +3,7 @@
 Numerical integration with autowrap
 -----------------------------------
 
-This example demonstrates how you can use the autowrap module in Sympy
+This example demonstrates how you can use the autowrap module in SymPy
 to create fast, numerical integration routines callable from python. See
 in the code for detailed explanations of the various steps. An
 autowrapped sympy expression can be significantly faster than what you
@@ -12,7 +12,7 @@
 We will find the coefficients needed to approximate a quantum mechanical
 Hydrogen wave function in terms of harmonic oscillator solutions. For
 the sake of demonstration, this will be done by setting up a simple
-numerical integration scheme as a Sympy expression, and obtain a binary
+numerical integration scheme as a SymPy expression, and obtain a binary
 implementation with autowrap.
 
 You need to have numpy installed to run this example, as well as a
@@ -119,7 +119,7 @@ def main():
         # setup basis wave functions
         #
         # To get inline expressions in the low level code, we attach the
-        # wave function expressions to a regular Sympy function using the
+        # wave function expressions to a regular SymPy function using the
         # implemented_function utility.  This is an extra step needed to avoid
         # erronous summations in the wave function expressions.
         #
diff --git a/examples/advanced/autowrap_ufuncify.py b/examples/advanced/autowrap_ufuncify.py
index 781b1801a76e..bb7ab525b72a 100755
--- a/examples/advanced/autowrap_ufuncify.py
+++ b/examples/advanced/autowrap_ufuncify.py
@@ -3,7 +3,7 @@
 Setup ufuncs for the legendre polynomials
 -----------------------------------------
 
-This example demonstrates how you can use the ufuncify utility in Sympy
+This example demonstrates how you can use the ufuncify utility in SymPy
 to create fast, customized universal functions for use with numpy
 arrays. An autowrapped sympy expression can be significantly faster than
 what you would get by applying a sequence of the ufuncs shipped with
@@ -49,7 +49,7 @@ def main():
     plot1 = Plot(visible=False)
     for n in range(6):
 
-        # Setup the Sympy expression to ufuncify
+        # Setup the SymPy expression to ufuncify
         expr = legendre(n, x)
         print "The polynomial of degree %i is" % n
         pprint(expr)
diff --git a/setup.py b/setup.py
index 0882c1b409ed..f3ee8ad1aa85 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
 
 # Make sure I have the right Python version.
 if sys.version_info[:2] < (2,5):
-    print "Sympy requires Python 2.5 or newer. Python %d.%d detected" % \
+    print "SymPy requires Python 2.5 or newer. Python %d.%d detected" % \
           sys.version_info[:2]
     sys.exit(-1)
 
@@ -89,12 +89,12 @@
   ]
 
 class audit(Command):
-    """Audits Sympy's source code for following issues:
+    """Audits SymPy's source code for following issues:
         - Names which are used but not defined or used before they are defined.
         - Names which are redefined without having been used.
     """
 
-    description = "Audit Sympy source with PyFlakes"
+    description = "Audit SymPy source with PyFlakes"
     user_options = []
 
     def initialize_options(self):
diff --git a/sympy/core/symbol.py b/sympy/core/symbol.py
index 0e63735c7732..3a977af10f0d 100644
--- a/sympy/core/symbol.py
+++ b/sympy/core/symbol.py
@@ -62,7 +62,7 @@ def __new__(cls, name, commutative=True, **assumptions):
         if 'dummy' in assumptions:
             warnings.warn(
                     "\nThe syntax Symbol('x', dummy=True) is deprecated and will"
-                    "\nbe dropped in a future version of Sympy. Please use Dummy()"
+                    "\nbe dropped in a future version of SymPy. Please use Dummy()"
                     "\nor symbols(..., cls=Dummy) to create dummy symbols.",
                     SymPyDeprecationWarning)
             if assumptions.pop('dummy'):
diff --git a/sympy/galgebra/GA.py b/sympy/galgebra/GA.py
index 03e3677f1fd4..c0bc8c78563a 100644
--- a/sympy/galgebra/GA.py
+++ b/sympy/galgebra/GA.py
@@ -10,7 +10,7 @@
     2. "Geometric Algebra for Computer Science" by Leo Dorst,
        Daniel Fontijne, and Stephen Mann, Morgan Kaufmann Publishers, 2007.
 
-    3. Sympy Tutorial, http://docs.sympy.org/
+    3. SymPy Tutorial, http://docs.sympy.org/
 """
 import sys
 import numpy, sympy
diff --git a/sympy/matrices/matrices.py b/sympy/matrices/matrices.py
index 17c2df976519..023d373c246e 100644
--- a/sympy/matrices/matrices.py
+++ b/sympy/matrices/matrices.py
@@ -119,7 +119,7 @@ def __init__(self, *args):
                         self.mat[i] = sympify(arr[i])
                     return
                 else:
-                    raise NotImplementedError("Sympy supports just 1D and 2D matrices")
+                    raise NotImplementedError("SymPy supports just 1D and 2D matrices")
             elif not is_sequence(mat, include=Matrix):
                 raise TypeError("Matrix constructor doesn't accept %s as input" % str(type(mat)))
             mat = []
@@ -4379,7 +4379,7 @@ def symarray(prefix, shape):
 
     The created symbols are named `prefix_i1_i2_`...  You should thus provide a
     non-empty prefix if you want your symbols to be unique for different output
-    arrays, as Sympy symbols with identical names are the same object.
+    arrays, as SymPy symbols with identical names are the same object.
 
     Parameters
     ----------
diff --git a/sympy/physics/mechanics/tests/test_functions.py b/sympy/physics/mechanics/tests/test_functions.py
index 43c66a785883..4c9bde364e89 100644
--- a/sympy/physics/mechanics/tests/test_functions.py
+++ b/sympy/physics/mechanics/tests/test_functions.py
@@ -167,7 +167,7 @@ def test_express():
 
     """
     These don't really test our code, they instead test the auto simplification
-    (or lack thereof) of Sympy.
+    (or lack thereof) of SymPy.
     assert N.x == express((
             (cos(q1)*cos(q3)-sin(q1)*sin(q2)*sin(q3))*C.x -
             sin(q1)*cos(q2)*C.y +
diff --git a/sympy/physics/quantum/qexpr.py b/sympy/physics/quantum/qexpr.py
index c21732a32679..e660a5c46be0 100644
--- a/sympy/physics/quantum/qexpr.py
+++ b/sympy/physics/quantum/qexpr.py
@@ -36,7 +36,7 @@ def _qsympify_sequence(seq):
     * other => sympify
 
     Strings are passed to Symbol, not sympify to make sure that variables like
-    'pi' are kept as Symbols, not the Sympy built-in number subclasses.
+    'pi' are kept as Symbols, not the SymPy built-in number subclasses.
 
     Examples
     ========
diff --git a/sympy/printing/printer.py b/sympy/printing/printer.py
index 63497e0a7374..e39ef46fdeb4 100644
--- a/sympy/printing/printer.py
+++ b/sympy/printing/printer.py
@@ -123,13 +123,13 @@ class we want to support -- only generic routine has to be provided
 
         class CustomStrPrinter(StrPrinter):
             \"\"\"
-            Examples of how to customize the StrPrinter for both a Sympy class and a
-            user defined class subclassed from the Sympy Basic class.
+            Examples of how to customize the StrPrinter for both a SymPy class and a
+            user defined class subclassed from the SymPy Basic class.
             \"\"\"
 
             def _print_Derivative(self, expr):
                 \"\"\"
-                Custom printing of the Sympy Derivative class.
+                Custom printing of the SymPy Derivative class.
 
                 Instead of:
 
diff --git a/sympy/tensor/index_methods.py b/sympy/tensor/index_methods.py
index fe22f1fee32b..de04fafd76fe 100644
--- a/sympy/tensor/index_methods.py
+++ b/sympy/tensor/index_methods.py
@@ -269,9 +269,9 @@ def get_contraction_structure(expr):
     1) A conforming summation of Indexed objects is described with a dict where
        the keys are summation indices and the corresponding values are sets
        containing all terms for which the summation applies.  All Add objects
-       in the Sympy expression tree are described like this.
+       in the SymPy expression tree are described like this.
 
-    2) For all nodes in the Sympy expression tree that are *not* of type Add, the
+    2) For all nodes in the SymPy expression tree that are *not* of type Add, the
        following applies:
 
        If a node discovers contractions in one of it's arguments, the node
diff --git a/sympy/utilities/autowrap.py b/sympy/utilities/autowrap.py
index 526ad92502d3..7b011a85b1e4 100644
--- a/sympy/utilities/autowrap.py
+++ b/sympy/utilities/autowrap.py
@@ -17,8 +17,8 @@
     -1.0
 
 The callable returned from autowrap() is a binary python function, not a
-Sympy object.  If it is desired to use the compiled function in symbolic
-expressions, it is better to use binary_function() which returns a Sympy
+SymPy object.  If it is desired to use the compiled function in symbolic
+expressions, it is better to use binary_function() which returns a SymPy
 Function object.  The binary callable is attached as the _imp_ attribute and
 invoked when a numerical evaluation is requested with evalf(), or with
 lambdify().
@@ -157,7 +157,7 @@ def _process_files(self, routine):
 class DummyWrapper(CodeWrapper):
     """Class used for testing independent of backends """
 
-    template = """# dummy module for testing of Sympy
+    template = """# dummy module for testing of SymPy
 def %(name)s():
     return "%(expr)s"
 %(name)s.args = "%(args)s"
@@ -391,7 +391,7 @@ def binary_function(symfunc, expr, **kwargs):
     """Returns a sympy function with expr as binary implementation
 
     This is a convenience function that automates the steps needed to
-    autowrap the Sympy expression and attaching it to a Function object
+    autowrap the SymPy expression and attaching it to a Function object
     with implemented_function().
 
     >>> from sympy.abc import x, y, z
@@ -417,7 +417,7 @@ def ufuncify(args, expr, **kwargs):
         for the ufunc-like function.
 
     ``expr``
-        A Sympy expression that defines the element wise operation
+        A SymPy expression that defines the element wise operation
 
     ``kwargs``
         Optional keyword arguments are forwarded to autowrap().
diff --git a/sympy/utilities/codegen.py b/sympy/utilities/codegen.py
index a8836aec0e02..eaa159e53b65 100644
--- a/sympy/utilities/codegen.py
+++ b/sympy/utilities/codegen.py
@@ -13,7 +13,7 @@
   generate just one string. This code generator can be extended to support
   .pyf files for f2py.
 
-- Sympy functions are not concerned with programming-technical issues, such
+- SymPy functions are not concerned with programming-technical issues, such
   as input, output and input-output arguments. Other examples are contiguous
   or non-contiguous arrays, including headers of other libraries such as gsl
   or others.
diff --git a/sympy/utilities/lambdify.py b/sympy/utilities/lambdify.py
index 41e825e1c763..9219a6909ff1 100644
--- a/sympy/utilities/lambdify.py
+++ b/sympy/utilities/lambdify.py
@@ -149,7 +149,7 @@ def lambdify(args, expr, modules=None, printer=None, use_imps=True):
     >>> f(0, 5)
     0.0
 
-    If not specified differently by the user, Sympy functions are replaced as
+    If not specified differently by the user, SymPy functions are replaced as
     far as possible by either python-math, numpy (if available) or mpmath
     functions - exactly in this order.
     To change this behavior, the "modules" argument can be used.
diff --git a/sympy/utilities/tests/test_codegen.py b/sympy/utilities/tests/test_codegen.py
index 82b09994ac0d..224c0de75a61 100644
--- a/sympy/utilities/tests/test_codegen.py
+++ b/sympy/utilities/tests/test_codegen.py
@@ -1056,7 +1056,7 @@ def test_check_case():
     raises(CodeGenError, "codegen(('test', x*X), 'f95', 'prefix')")
 
 def test_check_case_false_positive():
-    # The upper case/lower case exception should not be triggered by Sympy
+    # The upper case/lower case exception should not be triggered by SymPy
     # objects that differ only because of assumptions.  (It may be useful to
     # have a check for that as well, but here we only want to test against
     # false positives with respect to case checking.)