diff --git a/composer.json b/composer.json
index 37441b35..1559ad7b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
{
"name": "phpoffice/phpword",
- "description": "PhpWord - Read, Create, and Write DOCX, ODT, and RTF documents in PHP",
+ "description": "PHPWord - Read, Create, and Write DOCX, ODT, and RTF documents in PHP",
"keywords": [
"PHP", "PhpOffice", "office", "PhpWord", "word", "template", "reader", "writer",
"docx", "OOXML", "OpenXML", "Office Open XML", "ISO IEC 29500", "WordprocessingML",
diff --git a/docs/general.rst b/docs/general.rst
index 3774abcf..9b25551a 100644
--- a/docs/general.rst
+++ b/docs/general.rst
@@ -6,7 +6,7 @@ General usage
Basic example
-------------
-The following is a basic example of the PhpWord library. More examples
+The following is a basic example of the PHPWord library. More examples
are provided in the `samples folder `__.
.. code-block:: php
@@ -89,7 +89,7 @@ Measurement units
The base length unit in Open Office XML is twip. Twip means "TWentieth
of an Inch Point", i.e. 1 twip = 1/1440 inch.
-You can use PhpWord helper functions to convert inches, centimeters, or
+You can use PHPWord helper functions to convert inches, centimeters, or
points to twips.
.. code-block:: php
diff --git a/docs/index.rst b/docs/index.rst
index 4f899fb9..700694a5 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -3,14 +3,14 @@
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
-Welcome to PhpWord's documentation
+Welcome to PHPWord's documentation
==================================
-|PhpWord|
+|PHPWord|
-PhpWord is a library written in pure PHP that provides a set of classes to
+PHPWord is a library written in pure PHP that provides a set of classes to
write to and read from different document file formats. The current version of
-PhpWord supports Microsoft Office Open XML (OOXML or OpenXML), OASIS Open
+PHPWord supports Microsoft Office Open XML (OOXML or OpenXML), OASIS Open
Document Format for Office Applications (OpenDocument or ODF), and Rich Text
Format (RTF).
@@ -35,4 +35,4 @@ Indices and tables
* :ref:`modindex`
* :ref:`search`
-.. |PhpWord| image:: images/phpword.png
+.. |PHPWord| image:: images/phpword.png
diff --git a/docs/intro.rst b/docs/intro.rst
index 7ca37313..a30dc553 100644
--- a/docs/intro.rst
+++ b/docs/intro.rst
@@ -3,9 +3,9 @@
Introduction
============
-PhpWord is a library written in pure PHP that provides a set of classes
+PHPWord is a library written in pure PHP that provides a set of classes
to write to and read from different document file formats. The current
-version of PhpWord supports Microsoft `Office Open
+version of PHPWord supports Microsoft `Office Open
XML `__ (OOXML or
OpenXML), OASIS `Open Document Format for Office
Applications `__
@@ -16,8 +16,8 @@ No Windows operating system is needed for usage because the resulting
DOCX, ODT, or RTF files can be opened by all major `word processing
softwares `__.
-PhpWord is an open source project licensed under LGPL.
-PhpWord is `unit tested `__ to
+PHPWord is an open source project licensed under LGPL.
+PHPWord is `unit tested `__ to
make sure that the released versions are stable.
**Want to contribute?** `Fork
diff --git a/docs/setup.rst b/docs/setup.rst
index d148a99d..c773756f 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -23,7 +23,7 @@ Optional PHP extensions:
Installation
------------
-There are two ways to install PhpWord, i.e. via
+There are two ways to install PHPWord, i.e. via
`Composer `__ or manually by downloading the
library.
@@ -44,7 +44,7 @@ To install via Composer, add the following lines to your
Manual install
~~~~~~~~~~~~~~
-To install manually, `download PhpWord package from
+To install manually, `download PHPWord package from
github `__.
Extract the package and put the contents to your machine. To use the
library, include ``src/PhpWord/Autoloader.php`` in your script and
@@ -60,5 +60,5 @@ Using samples
After installation, you can browse and use the samples that we've
provided, either by command line or using browser. If you can access
-your PhpWord library folder using browser, point your browser to the
+your PHPWord library folder using browser, point your browser to the
``samples`` folder, e.g. ``http://localhost/PhpWord/samples/``.
diff --git a/docs/templates.rst b/docs/templates.rst
index 5d06cef6..6b627b06 100644
--- a/docs/templates.rst
+++ b/docs/templates.rst
@@ -8,7 +8,7 @@ replaced by any value you wish. Only single-line values can be replaced.
To load a template file, use the ``loadTemplate`` method. After loading
the docx template, you can use the ``setValue`` method to change the
value of a search pattern. The search-pattern model is:
-``${search-pattern}``. It is not possible to add new PhpWord elements to
+``${search-pattern}``. It is not possible to add new PHPWord elements to
a loaded template file.
Example:
diff --git a/src/PhpWord/Autoloader.php b/src/PhpWord/Autoloader.php
index 3186ca97..d1d96a75 100644
--- a/src/PhpWord/Autoloader.php
+++ b/src/PhpWord/Autoloader.php
@@ -1,8 +1,8 @@