From 0f0de914f4d68fddded598a1ad7ad64f6825d99a Mon Sep 17 00:00:00 2001
From: tsmsogn <tsmsogn@gmail.com>
Date: Fri, 24 Mar 2017 22:09:32 +0900
Subject: [PATCH] Fix sample which does't work (#123)

---
 .../Calculations/Database/DAVERAGE.php        | 10 +++------
 .../Examples/Calculations/Database/DCOUNT.php | 10 +++------
 docs/Examples/Calculations/Database/DGET.php  | 10 +++------
 docs/Examples/Calculations/Database/DMAX.php  |  8 ++-----
 docs/Examples/Calculations/Database/DMIN.php  |  8 ++-----
 .../Calculations/Database/DPRODUCT.php        |  8 ++-----
 .../Examples/Calculations/Database/DSTDEV.php |  8 ++-----
 .../Calculations/Database/DSTDEVP.php         |  8 ++-----
 docs/Examples/Calculations/Database/DVAR.php  | 10 +++------
 docs/Examples/Calculations/Database/DVARP.php | 12 ++++-------
 docs/Examples/Calculations/DateTime/DATE.php  | 16 +++++++-------
 .../Calculations/DateTime/DATEVALUE.php       | 18 +++++++---------
 docs/Examples/Calculations/DateTime/TIME.php  | 16 +++++++-------
 .../Calculations/DateTime/TIMEVALUE.php       | 16 +++++++-------
 docs/Examples/Calculations/index.php          |  4 ++--
 docs/Examples/Reader/exampleReader01.php      | 10 +++------
 docs/Examples/Reader/exampleReader02.php      | 10 +++------
 docs/Examples/Reader/exampleReader03.php      | 10 +++------
 docs/Examples/Reader/exampleReader04.php      | 10 +++------
 docs/Examples/Reader/exampleReader05.php      | 10 +++------
 docs/Examples/Reader/exampleReader06.php      | 10 +++------
 docs/Examples/Reader/exampleReader07.php      | 10 +++------
 docs/Examples/Reader/exampleReader08.php      | 10 +++------
 docs/Examples/Reader/exampleReader09.php      | 10 +++------
 docs/Examples/Reader/exampleReader10.php      | 10 +++------
 docs/Examples/Reader/exampleReader11.php      | 12 ++++-------
 docs/Examples/Reader/exampleReader12.php      | 12 ++++-------
 docs/Examples/Reader/exampleReader13.php      | 10 +++------
 docs/Examples/Reader/exampleReader14.php      | 21 ++++++++++---------
 docs/Examples/Reader/exampleReader15.php      | 15 ++++++-------
 docs/Examples/Reader/exampleReader16.php      | 12 ++++-------
 docs/Examples/Reader/exampleReader17.php      | 10 +++------
 docs/Examples/Reader/exampleReader18.php      | 10 +++------
 docs/Examples/Reader/exampleReader19.php      | 10 +++------
 .../exampleWorkBookReader01.php               | 12 ++++-------
 .../exampleWorkBookReader02.php               | 12 ++++-------
 .../exampleWorkBookReader03.php               | 12 ++++-------
 .../exampleWorkBookReader04.php               | 16 ++++++--------
 docs/Examples/index.php                       |  4 ++--
 39 files changed, 150 insertions(+), 280 deletions(-)

diff --git a/docs/Examples/Calculations/Database/DAVERAGE.php b/docs/Examples/Calculations/Database/DAVERAGE.php
index 650e1324..b54a7d1d 100644
--- a/docs/Examples/Calculations/Database/DAVERAGE.php
+++ b/docs/Examples/Calculations/Database/DAVERAGE.php
@@ -19,14 +19,10 @@ date_default_timezone_set('Europe/London');
 <h2>Returns the average of selected database entries.</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
+require_once __DIR__ . '/../../../../src/Bootstrap.php';
 
-/** Include PhpSpreadsheet */
-include 'PHPExcel.php';
-
-// Create new PHPExcel object
-$spreadsheet = new PHPExcel();
+// Create new PhpSpreadsheet object
+$spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
 $worksheet = $spreadsheet->getActiveSheet();
 
 // Add some data
diff --git a/docs/Examples/Calculations/Database/DCOUNT.php b/docs/Examples/Calculations/Database/DCOUNT.php
index 22669b36..2cd0661d 100644
--- a/docs/Examples/Calculations/Database/DCOUNT.php
+++ b/docs/Examples/Calculations/Database/DCOUNT.php
@@ -19,14 +19,10 @@ date_default_timezone_set('Europe/London');
 <h2>Counts the cells that contain numbers in a database.</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
+require_once __DIR__ . '/../../../../src/Bootstrap.php';
 
-/** Include PhpSpreadsheet */
-include 'PHPExcel.php';
-
-// Create new PHPExcel object
-$spreadsheet = new PHPExcel();
+// Create new PhpSpreadsheet object
+$spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
 $worksheet = $spreadsheet->getActiveSheet();
 
 // Add some data
diff --git a/docs/Examples/Calculations/Database/DGET.php b/docs/Examples/Calculations/Database/DGET.php
index 6a133426..d64b1d6e 100644
--- a/docs/Examples/Calculations/Database/DGET.php
+++ b/docs/Examples/Calculations/Database/DGET.php
@@ -19,14 +19,10 @@ date_default_timezone_set('Europe/London');
 <h2>Extracts a single value from a column of a list or database that matches conditions that you specify.</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
+require_once __DIR__ . '/../../../../src/Bootstrap.php';
 
-/** Include PhpSpreadsheet */
-include 'PHPExcel.php';
-
-// Create new PHPExcel object
-$spreadsheet = new PHPExcel();
+// Create new PhpSpreadsheet object
+$spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
 $worksheet = $spreadsheet->getActiveSheet();
 
 // Add some data
diff --git a/docs/Examples/Calculations/Database/DMAX.php b/docs/Examples/Calculations/Database/DMAX.php
index 18936c5b..58d2f039 100644
--- a/docs/Examples/Calculations/Database/DMAX.php
+++ b/docs/Examples/Calculations/Database/DMAX.php
@@ -19,14 +19,10 @@ date_default_timezone_set('Europe/London');
 <h2>Returns the maximum value from selected database entries.</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
-
-/** Include PhpSpreadsheet */
-include 'PHPExcel.php';
+require_once __DIR__ . '/../../../../src/Bootstrap.php';
 
 // Create new PhpSpreadsheet object
-$spreadsheet = new PHPExcel();
+$spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
 $worksheet = $spreadsheet->getActiveSheet();
 
 // Add some data
diff --git a/docs/Examples/Calculations/Database/DMIN.php b/docs/Examples/Calculations/Database/DMIN.php
index 0184173b..e4fb7658 100644
--- a/docs/Examples/Calculations/Database/DMIN.php
+++ b/docs/Examples/Calculations/Database/DMIN.php
@@ -19,14 +19,10 @@ date_default_timezone_set('Europe/London');
 <h2>Returns the minimum value from selected database entries.</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
-
-/** Include PhpSpreadsheet */
-include 'PHPExcel.php';
+require_once __DIR__ . '/../../../../src/Bootstrap.php';
 
 // Create new PhpSpreadsheet object
-$spreadsheet = new PHPExcel();
+$spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
 $worksheet = $spreadsheet->getActiveSheet();
 
 // Add some data
diff --git a/docs/Examples/Calculations/Database/DPRODUCT.php b/docs/Examples/Calculations/Database/DPRODUCT.php
index 41d60a2f..382227df 100644
--- a/docs/Examples/Calculations/Database/DPRODUCT.php
+++ b/docs/Examples/Calculations/Database/DPRODUCT.php
@@ -19,14 +19,10 @@ date_default_timezone_set('Europe/London');
 <h2>Multiplies the values in a column of a list or database that match conditions that you specify.</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
-
-/** Include PhpSpreadsheet */
-include 'PHPExcel.php';
+require_once __DIR__ . '/../../../../src/Bootstrap.php';
 
 // Create new PhpSpreadsheet object
-$spreadsheet = new PHPExcel();
+$spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
 $worksheet = $spreadsheet->getActiveSheet();
 
 // Add some data
diff --git a/docs/Examples/Calculations/Database/DSTDEV.php b/docs/Examples/Calculations/Database/DSTDEV.php
index 2fbbda20..e1273e5a 100644
--- a/docs/Examples/Calculations/Database/DSTDEV.php
+++ b/docs/Examples/Calculations/Database/DSTDEV.php
@@ -19,14 +19,10 @@ date_default_timezone_set('Europe/London');
 <h2>Estimates the standard deviation based on a sample of selected database entries.</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
-
-/** Include PhpSpreadsheet */
-include 'PHPExcel.php';
+require_once __DIR__ . '/../../../../src/Bootstrap.php';
 
 // Create new PhpSpreadsheet object
-$spreadsheet = new PHPExcel();
+$spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
 $worksheet = $spreadsheet->getActiveSheet();
 
 // Add some data
diff --git a/docs/Examples/Calculations/Database/DSTDEVP.php b/docs/Examples/Calculations/Database/DSTDEVP.php
index 1f0a0fe6..3af791bb 100644
--- a/docs/Examples/Calculations/Database/DSTDEVP.php
+++ b/docs/Examples/Calculations/Database/DSTDEVP.php
@@ -19,14 +19,10 @@ date_default_timezone_set('Europe/London');
 <h2>Calculates the standard deviation based on the entire population of selected database entries.</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
-
-/** Include PhpSpreadsheet */
-include 'PHPExcel.php';
+require_once __DIR__ . '/../../../../src/Bootstrap.php';
 
 // Create new PhpSpreadsheet object
-$spreadsheet = new PHPExcel();
+$spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
 $worksheet = $spreadsheet->getActiveSheet();
 
 // Add some data
diff --git a/docs/Examples/Calculations/Database/DVAR.php b/docs/Examples/Calculations/Database/DVAR.php
index 00bd97aa..44e63994 100644
--- a/docs/Examples/Calculations/Database/DVAR.php
+++ b/docs/Examples/Calculations/Database/DVAR.php
@@ -19,14 +19,10 @@ date_default_timezone_set('Europe/London');
 <h2>Estimates variance based on a sample from selected database entries.</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
+require_once __DIR__ . '/../../../../src/Bootstrap.php';
 
-/** Include PhpSpreadsheet */
-include 'PHPExcel.php';
-
-// Create new PHPExcel object
-$spreadsheet = new PhpSpreadsheet();
+// Create new PhpSpreadsheet object
+$spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
 $worksheet = $spreadsheet->getActiveSheet();
 
 // Add some data
diff --git a/docs/Examples/Calculations/Database/DVARP.php b/docs/Examples/Calculations/Database/DVARP.php
index c6cc0677..c630e731 100644
--- a/docs/Examples/Calculations/Database/DVARP.php
+++ b/docs/Examples/Calculations/Database/DVARP.php
@@ -10,7 +10,7 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Calculation Examples</title>
+<title>PhpSpreadsheet Calculation Examples</title>
 
 </head>
 <body>
@@ -19,14 +19,10 @@ date_default_timezone_set('Europe/London');
 <h2>Calculates variance based on the entire population of selected database entries,</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
+require_once __DIR__ . '/../../../../src/Bootstrap.php';
 
-/** Include PHPExcel */
-include 'PHPExcel.php';
-
-// Create new PHPExcel object
-$spreadsheet = new PHPExcel();
+// Create new PhpSpreadsheet object
+$spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
 $worksheet = $spreadsheet->getActiveSheet();
 
 // Add some data
diff --git a/docs/Examples/Calculations/DateTime/DATE.php b/docs/Examples/Calculations/DateTime/DATE.php
index 0179b7c1..1af05e3e 100644
--- a/docs/Examples/Calculations/DateTime/DATE.php
+++ b/docs/Examples/Calculations/DateTime/DATE.php
@@ -10,7 +10,7 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Calculation Examples</title>
+<title>PhpSpreadsheet Calculation Examples</title>
 
 </head>
 <body>
@@ -19,14 +19,10 @@ date_default_timezone_set('Europe/London');
 <h2>Returns the serial number of a particular date.</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
+require_once __DIR__ . '/../../../../src/Bootstrap.php';
 
-/** Include PHPExcel */
-include 'PHPExcel.php';
-
-// Create new PHPExcel object
-$spreadsheet = new PHPExcel();
+// Create new PhpSpreadsheet object
+$spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
 $worksheet = $spreadsheet->getActiveSheet();
 
 // Add some data
@@ -76,4 +72,6 @@ echo '<hr />';
         echo '</tr>';
     }
     ?>
-</table>
\ No newline at end of file
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/Examples/Calculations/DateTime/DATEVALUE.php b/docs/Examples/Calculations/DateTime/DATEVALUE.php
index 7b0a8556..42996a4e 100644
--- a/docs/Examples/Calculations/DateTime/DATEVALUE.php
+++ b/docs/Examples/Calculations/DateTime/DATEVALUE.php
@@ -10,7 +10,7 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Calculation Examples</title>
+<title>PhpSpreadsheet Calculation Examples</title>
 
 </head>
 <body>
@@ -19,14 +19,10 @@ date_default_timezone_set('Europe/London');
 <h2>Converts a date in the form of text to a serial number.</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
+require_once __DIR__ . '/../../../../src/Bootstrap.php';
 
-/** Include PHPExcel */
-include 'PHPExcel.php';
-
-// Create new PHPExcel object
-$spreadsheet = new PHPExcel();
+// Create new PhpSpreadsheet object
+$spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
 $worksheet = $spreadsheet->getActiveSheet();
 
 // Add some data
@@ -51,7 +47,7 @@ echo '<hr />';
 
 // Test the formulae
 ?>
-<p><strong>Warning: </strong>The PHPExcel DATEVALUE() function accepts a wider range of date formats than MS Excel's DATEFORMAT() function.</p>
+<p><strong>Warning: </strong>The PhpSpreadsheet DATEVALUE() function accepts a wider range of date formats than MS Excel's DATEFORMAT() function.</p>
 <table border="1" cellspacing="0">
 	<tr>
 		<th>Date String</th>
@@ -69,4 +65,6 @@ echo '<hr />';
         echo '</tr>';
     }
     ?>
-</table>
\ No newline at end of file
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/Examples/Calculations/DateTime/TIME.php b/docs/Examples/Calculations/DateTime/TIME.php
index 3fae88c2..9c206304 100644
--- a/docs/Examples/Calculations/DateTime/TIME.php
+++ b/docs/Examples/Calculations/DateTime/TIME.php
@@ -10,7 +10,7 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Calculation Examples</title>
+<title>PhpSpreadsheet Calculation Examples</title>
 
 </head>
 <body>
@@ -19,14 +19,10 @@ date_default_timezone_set('Europe/London');
 <h2>Returns the serial number of a particular time.</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
+require_once __DIR__ . '/../../../../src/Bootstrap.php';
 
-/** Include PHPExcel */
-include 'PHPExcel.php';
-
-// Create new PHPExcel object
-$spreadsheet = new PHPExcel();
+// Create new PhpSpreadsheet object
+$spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
 $worksheet = $spreadsheet->getActiveSheet();
 
 // Add some data
@@ -74,4 +70,6 @@ echo '<hr />';
         echo '</tr>';
     }
     ?>
-</table>
\ No newline at end of file
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/Examples/Calculations/DateTime/TIMEVALUE.php b/docs/Examples/Calculations/DateTime/TIMEVALUE.php
index c482c374..c5745cc2 100644
--- a/docs/Examples/Calculations/DateTime/TIMEVALUE.php
+++ b/docs/Examples/Calculations/DateTime/TIMEVALUE.php
@@ -10,7 +10,7 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Calculation Examples</title>
+<title>PhpSpreadsheet Calculation Examples</title>
 
 </head>
 <body>
@@ -19,14 +19,10 @@ date_default_timezone_set('Europe/London');
 <h2>Converts a time in the form of text to a serial number.</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
+require_once __DIR__ . '/../../../../src/Bootstrap.php';
 
-/** Include PHPExcel */
-include 'PHPExcel.php';
-
-// Create new PHPExcel object
-$spreadsheet = new PHPExcel();
+// Create new PhpSpreadsheet object
+$spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
 $worksheet = $spreadsheet->getActiveSheet();
 
 // Add some data
@@ -65,4 +61,6 @@ echo '<hr />';
         echo '</tr>';
     }
     ?>
-</table>
\ No newline at end of file
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/Examples/Calculations/index.php b/docs/Examples/Calculations/index.php
index 0c3d8c00..5990ca23 100644
--- a/docs/Examples/Calculations/index.php
+++ b/docs/Examples/Calculations/index.php
@@ -10,14 +10,14 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Calculation Function Examples</title>
+<title>PhpSpreadsheet Calculation Function Examples</title>
 
 </head>
 <body>
 
 <?php
 
-echo '<h1>PHPExcel Calculation Function Examples</h1>';
+echo '<h1>PhpSpreadsheet Calculation Function Examples</h1>';
 
 $exampleTypeList = glob('./*', GLOB_ONLYDIR);
 
diff --git a/docs/Examples/Reader/exampleReader01.php b/docs/Examples/Reader/exampleReader01.php
index 1bad76d8..9ef1f565 100644
--- a/docs/Examples/Reader/exampleReader01.php
+++ b/docs/Examples/Reader/exampleReader01.php
@@ -10,20 +10,16 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reader Example #01</title>
+<title>PhpSpreadsheet Reader Example #01</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reader Example #01</h1>
+<h1>PhpSpreadsheet Reader Example #01</h1>
 <h2>Simple File Reader using \PhpOffice\PhpSpreadsheet\IOFactory::load()</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/** \PhpOffice\PhpSpreadsheet\IOFactory */
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 $inputFileName = './sampleData/example1.xls';
 echo 'Loading file ',pathinfo($inputFileName, PATHINFO_BASENAME),' using IOFactory to identify the format<br />';
diff --git a/docs/Examples/Reader/exampleReader02.php b/docs/Examples/Reader/exampleReader02.php
index 2eccc24d..b98b860d 100644
--- a/docs/Examples/Reader/exampleReader02.php
+++ b/docs/Examples/Reader/exampleReader02.php
@@ -5,23 +5,19 @@ set_time_limit(0);
 
 date_default_timezone_set('Europe/London');
 
-/* Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/** \PhpOffice\PhpSpreadsheet\IOFactory */
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 ?>
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reader Example #02</title>
+<title>PhpSpreadsheet Reader Example #02</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reader Example #02</h1>
+<h1>PhpSpreadsheet Reader Example #02</h1>
 <h2>Simple File Reader using a Specified Reader</h2>
 <?php
 
diff --git a/docs/Examples/Reader/exampleReader03.php b/docs/Examples/Reader/exampleReader03.php
index 50f63bc6..dbd584b4 100644
--- a/docs/Examples/Reader/exampleReader03.php
+++ b/docs/Examples/Reader/exampleReader03.php
@@ -10,20 +10,16 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reader Example #03</title>
+<title>PhpSpreadsheet Reader Example #03</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reader Example #03</h1>
+<h1>PhpSpreadsheet Reader Example #03</h1>
 <h2>Simple File Reader using the \PhpOffice\PhpSpreadsheet\IOFactory to Return a Reader</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/** \PhpOffice\PhpSpreadsheet\IOFactory */
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 $inputFileType = 'Xls';
 //	$inputFileType = 'Xlsx';
diff --git a/docs/Examples/Reader/exampleReader04.php b/docs/Examples/Reader/exampleReader04.php
index 2984310c..2267a9df 100644
--- a/docs/Examples/Reader/exampleReader04.php
+++ b/docs/Examples/Reader/exampleReader04.php
@@ -10,20 +10,16 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reader Example #04</title>
+<title>PhpSpreadsheet Reader Example #04</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reader Example #04</h1>
+<h1>PhpSpreadsheet Reader Example #04</h1>
 <h2>Simple File Reader using the \PhpOffice\PhpSpreadsheet\IOFactory to Identify a Reader to Use</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/** \PhpOffice\PhpSpreadsheet\IOFactory */
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 $inputFileName = './sampleData/example1.xls';
 
diff --git a/docs/Examples/Reader/exampleReader05.php b/docs/Examples/Reader/exampleReader05.php
index fade19e4..807e910d 100644
--- a/docs/Examples/Reader/exampleReader05.php
+++ b/docs/Examples/Reader/exampleReader05.php
@@ -10,20 +10,16 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reader Example #05</title>
+<title>PhpSpreadsheet Reader Example #05</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reader Example #05</h1>
+<h1>PhpSpreadsheet Reader Example #05</h1>
 <h2>Simple File Reader using the "Read Data Only" Option</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/** \PhpOffice\PhpSpreadsheet\IOFactory */
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 $inputFileType = 'Xls';
 //	$inputFileType = 'Xlsx';
diff --git a/docs/Examples/Reader/exampleReader06.php b/docs/Examples/Reader/exampleReader06.php
index ef509648..84675c17 100644
--- a/docs/Examples/Reader/exampleReader06.php
+++ b/docs/Examples/Reader/exampleReader06.php
@@ -10,20 +10,16 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reader Example #06</title>
+<title>PhpSpreadsheet Reader Example #06</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reader Example #06</h1>
+<h1>PhpSpreadsheet Reader Example #06</h1>
 <h2>Simple File Reader Loading All WorkSheets</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/** \PhpOffice\PhpSpreadsheet\IOFactory */
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 $inputFileType = 'Xls';
 //	$inputFileType = 'Xlsx';
diff --git a/docs/Examples/Reader/exampleReader07.php b/docs/Examples/Reader/exampleReader07.php
index 8df59e4c..0463f37b 100644
--- a/docs/Examples/Reader/exampleReader07.php
+++ b/docs/Examples/Reader/exampleReader07.php
@@ -10,20 +10,16 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reader Example #07</title>
+<title>PhpSpreadsheet Reader Example #07</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reader Example #07</h1>
+<h1>PhpSpreadsheet Reader Example #07</h1>
 <h2>Simple File Reader Loading a Single Named WorkSheet</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/** \PhpOffice\PhpSpreadsheet\IOFactory */
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 $inputFileType = 'Xls';
 //	$inputFileType = 'Xlsx';
diff --git a/docs/Examples/Reader/exampleReader08.php b/docs/Examples/Reader/exampleReader08.php
index 4a8375ea..c5e9b39d 100644
--- a/docs/Examples/Reader/exampleReader08.php
+++ b/docs/Examples/Reader/exampleReader08.php
@@ -10,20 +10,16 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reader Example #08</title>
+<title>PhpSpreadsheet Reader Example #08</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reader Example #08</h1>
+<h1>PhpSpreadsheet Reader Example #08</h1>
 <h2>Simple File Reader Loading Several Named WorkSheets</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/** \PhpOffice\PhpSpreadsheet\IOFactory */
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 $inputFileType = 'Xls';
 //	$inputFileType = 'Xlsx';
diff --git a/docs/Examples/Reader/exampleReader09.php b/docs/Examples/Reader/exampleReader09.php
index fbaa90f7..e2464447 100644
--- a/docs/Examples/Reader/exampleReader09.php
+++ b/docs/Examples/Reader/exampleReader09.php
@@ -10,20 +10,16 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reader Example #09</title>
+<title>PhpSpreadsheet Reader Example #09</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reader Example #09</h1>
+<h1>PhpSpreadsheet Reader Example #09</h1>
 <h2>Simple File Reader Using a Read Filter</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/** \PhpOffice\PhpSpreadsheet\IOFactory */
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 $inputFileType = 'Xls';
 //	$inputFileType = 'Xlsx';
diff --git a/docs/Examples/Reader/exampleReader10.php b/docs/Examples/Reader/exampleReader10.php
index 56295014..965a1bb2 100644
--- a/docs/Examples/Reader/exampleReader10.php
+++ b/docs/Examples/Reader/exampleReader10.php
@@ -10,20 +10,16 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reader Example #10</title>
+<title>PhpSpreadsheet Reader Example #10</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reader Example #10</h1>
+<h1>PhpSpreadsheet Reader Example #10</h1>
 <h2>Simple File Reader Using a Configurable Read Filter</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/** \PhpOffice\PhpSpreadsheet\IOFactory */
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 $inputFileType = 'Xls';
 //	$inputFileType = 'Xlsx';
diff --git a/docs/Examples/Reader/exampleReader11.php b/docs/Examples/Reader/exampleReader11.php
index 05b55e51..5435629a 100644
--- a/docs/Examples/Reader/exampleReader11.php
+++ b/docs/Examples/Reader/exampleReader11.php
@@ -10,20 +10,16 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reader Example #11</title>
+<title>PhpSpreadsheet Reader Example #11</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reader Example #11</h1>
+<h1>PhpSpreadsheet Reader Example #11</h1>
 <h2>Reading a Workbook in "Chunks" Using a Configurable Read Filter (Version 1)</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/** \PhpOffice\PhpSpreadsheet\IOFactory */
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 $inputFileType = 'Xls';
 //	$inputFileType = 'Xlsx';
@@ -78,7 +74,7 @@ for ($startRow = 2; $startRow <= 240; $startRow += $chunkSize) {
     $chunkFilter = new chunkReadFilter($startRow, $chunkSize);
     /*  Tell the Reader that we want to use the new Read Filter that we've just Instantiated  **/
     $reader->setReadFilter($chunkFilter);
-    /*  Load only the rows that match our filter from $inputFileName to a PHPExcel Object  **/
+    /*  Load only the rows that match our filter from $inputFileName to a PhpSpreadsheet Object  **/
     $spreadsheet = $reader->load($inputFileName);
 
     //	Do some processing here
diff --git a/docs/Examples/Reader/exampleReader12.php b/docs/Examples/Reader/exampleReader12.php
index 8ac4de27..673b2f14 100644
--- a/docs/Examples/Reader/exampleReader12.php
+++ b/docs/Examples/Reader/exampleReader12.php
@@ -10,20 +10,16 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reader Example #12</title>
+<title>PhpSpreadsheet Reader Example #12</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reader Example #12</h1>
+<h1>PhpSpreadsheet Reader Example #12</h1>
 <h2>Reading a Workbook in "Chunks" Using a Configurable Read Filter (Version 2)</h2>
 <?php
 
-/**  Set Include path to point at the PHPExcel Classes folder  **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/**  Include \PhpOffice\PhpSpreadsheet\IOFactory  **/
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 $inputFileType = 'Xls';
 //	$inputFileType = 'Xlsx';
@@ -81,7 +77,7 @@ for ($startRow = 2; $startRow <= 240; $startRow += $chunkSize) {
     echo 'Loading WorkSheet using configurable filter for headings row 1 and for rows ', $startRow, ' to ', ($startRow + $chunkSize - 1), '<br />';
     /*  Tell the Read Filter, the limits on which rows we want to read this iteration  **/
     $chunkFilter->setRows($startRow, $chunkSize);
-    /*  Load only the rows that match our filter from $inputFileName to a PHPExcel Object  **/
+    /*  Load only the rows that match our filter from $inputFileName to a PhpSpreadsheet Object  **/
     $spreadsheet = $reader->load($inputFileName);
 
     //	Do some processing here
diff --git a/docs/Examples/Reader/exampleReader13.php b/docs/Examples/Reader/exampleReader13.php
index 45f2c612..9977a83c 100644
--- a/docs/Examples/Reader/exampleReader13.php
+++ b/docs/Examples/Reader/exampleReader13.php
@@ -10,20 +10,16 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reader Example #13</title>
+<title>PhpSpreadsheet Reader Example #13</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reader Example #13</h1>
+<h1>PhpSpreadsheet Reader Example #13</h1>
 <h2>Simple File Reader for Multiple CSV Files</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/** \PhpOffice\PhpSpreadsheet\IOFactory */
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 $inputFileType = 'Csv';
 $inputFileNames = ['./sampleData/example1.csv', './sampleData/example2.csv'];
diff --git a/docs/Examples/Reader/exampleReader14.php b/docs/Examples/Reader/exampleReader14.php
index 60136251..933be4ac 100644
--- a/docs/Examples/Reader/exampleReader14.php
+++ b/docs/Examples/Reader/exampleReader14.php
@@ -1,24 +1,25 @@
 <?php
 
+error_reporting(E_ALL);
+set_time_limit(0);
+
+date_default_timezone_set('Europe/London');
+
 ?>
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reader Example #15</title>
+<title>PhpSpreadsheet Reader Example #14</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reader Example #14</h1>
+<h1>PhpSpreadsheet Reader Example #14</h1>
 <h2>Reading a Large CSV file in "Chunks" to split across multiple Worksheets</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/** \PhpOffice\PhpSpreadsheet\IOFactory */
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 $inputFileType = 'Csv';
 $inputFileName = './sampleData/example2.csv';
@@ -69,8 +70,8 @@ $chunkFilter = new chunkReadFilter();
 $reader->setReadFilter($chunkFilter)
           ->setContiguous(true);
 
-/*  Instantiate a new PHPExcel object manually  **/
-$spreadsheet = new PHPExcel();
+/*  Instantiate a new PhpSpreadsheet object manually  **/
+$spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
 
 /*  Set a sheet index  **/
 $sheet = 0;
@@ -83,7 +84,7 @@ for ($startRow = 2; $startRow <= 240; $startRow += $chunkSize) {
 
     /*  Increment the worksheet index pointer for the Reader  **/
     $reader->setSheetIndex($sheet);
-    /*  Load only the rows that match our filter into a new worksheet in the PHPExcel Object  **/
+    /*  Load only the rows that match our filter into a new worksheet in the PhpSpreadsheet Object  **/
     $reader->loadIntoExisting($inputFileName, $spreadsheet);
     /*  Set the worksheet title (to reference the "sheet" of data that we've loaded)  **/
     /*    and increment the sheet index as well  **/
diff --git a/docs/Examples/Reader/exampleReader15.php b/docs/Examples/Reader/exampleReader15.php
index 7931a073..a04a1adc 100644
--- a/docs/Examples/Reader/exampleReader15.php
+++ b/docs/Examples/Reader/exampleReader15.php
@@ -1,24 +1,25 @@
 <?php
 
+error_reporting(E_ALL);
+set_time_limit(0);
+
+date_default_timezone_set('Europe/London');
+
 ?>
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reader Example #15</title>
+<title>PhpSpreadsheet Reader Example #15</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reader Example #15</h1>
+<h1>PhpSpreadsheet Reader Example #15</h1>
 <h2>Simple File Reader for Tab-Separated Value File using the Advanced Value Binder</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/** \PhpOffice\PhpSpreadsheet\IOFactory */
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 \PhpOffice\PhpSpreadsheet\Cell::setValueBinder(new \PhpOffice\PhpSpreadsheet\Cell\AdvancedValueBinder());
 
diff --git a/docs/Examples/Reader/exampleReader16.php b/docs/Examples/Reader/exampleReader16.php
index a9a8c856..6e6a7583 100644
--- a/docs/Examples/Reader/exampleReader16.php
+++ b/docs/Examples/Reader/exampleReader16.php
@@ -10,26 +10,22 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reader Example #16</title>
+<title>PhpSpreadsheet Reader Example #16</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reader Example #16</h1>
+<h1>PhpSpreadsheet Reader Example #16</h1>
 <h2>Handling Loader Exceptions using Try/Catch</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/** \PhpOffice\PhpSpreadsheet\IOFactory */
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 $inputFileName = './sampleData/example_1.xls';
 echo 'Loading file ',pathinfo($inputFileName, PATHINFO_BASENAME),' using IOFactory to identify the format<br />';
 try {
     $spreadsheet = \PhpOffice\PhpSpreadsheet\IOFactory::load($inputFileName);
-} catch (\PHPExcel\Reader\Exception $e) {
+} catch (\InvalidArgumentException $e) {
     die('Error loading file "' . pathinfo($inputFileName, PATHINFO_BASENAME) . '": ' . $e->getMessage());
 }
 
diff --git a/docs/Examples/Reader/exampleReader17.php b/docs/Examples/Reader/exampleReader17.php
index fbcae6b1..f76994e9 100644
--- a/docs/Examples/Reader/exampleReader17.php
+++ b/docs/Examples/Reader/exampleReader17.php
@@ -10,20 +10,16 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reader Example #17</title>
+<title>PhpSpreadsheet Reader Example #17</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reader Example #17</h1>
+<h1>PhpSpreadsheet Reader Example #17</h1>
 <h2>Simple File Reader Loading Several Named WorkSheets</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/** \PhpOffice\PhpSpreadsheet\IOFactory */
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 $inputFileType = 'Xls';
 //	$inputFileType = 'Xlsx';
diff --git a/docs/Examples/Reader/exampleReader18.php b/docs/Examples/Reader/exampleReader18.php
index 9c34ec1f..6688e481 100644
--- a/docs/Examples/Reader/exampleReader18.php
+++ b/docs/Examples/Reader/exampleReader18.php
@@ -10,20 +10,16 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reader Example #18</title>
+<title>PhpSpreadsheet Reader Example #18</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reader Example #18</h1>
+<h1>PhpSpreadsheet Reader Example #18</h1>
 <h2>Reading list of WorkSheets without loading entire file</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/** \PhpOffice\PhpSpreadsheet\IOFactory */
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 $inputFileType = 'Xls';
 //	$inputFileType = 'Xlsx';
diff --git a/docs/Examples/Reader/exampleReader19.php b/docs/Examples/Reader/exampleReader19.php
index 5378c2ef..5ad3e5ba 100644
--- a/docs/Examples/Reader/exampleReader19.php
+++ b/docs/Examples/Reader/exampleReader19.php
@@ -10,20 +10,16 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reader Example #19</title>
+<title>PhpSpreadsheet Reader Example #19</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reader Example #19</h1>
+<h1>PhpSpreadsheet Reader Example #19</h1>
 <h2>Reading WorkSheet information without loading entire file</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/** \PhpOffice\PhpSpreadsheet\IOFactory */
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 $inputFileType = 'Xls';
 //	$inputFileType = 'Xlsx';
diff --git a/docs/Examples/Reading WorkBook Data/exampleWorkBookReader01.php b/docs/Examples/Reading WorkBook Data/exampleWorkBookReader01.php
index 187742b1..aa9bddd7 100644
--- a/docs/Examples/Reading WorkBook Data/exampleWorkBookReader01.php	
+++ b/docs/Examples/Reading WorkBook Data/exampleWorkBookReader01.php	
@@ -10,27 +10,23 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reading WorkBook Data Example #01</title>
+<title>PhpSpreadsheet Reading WorkBook Data Example #01</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reading WorkBook Data Example #01</h1>
+<h1>PhpSpreadsheet Reading WorkBook Data Example #01</h1>
 <h2>Read the WorkBook Properties</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/** \PhpOffice\PhpSpreadsheet\IOFactory */
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 $inputFileType = 'Xls';
 $inputFileName = './sampleData/example1.xls';
 
 /*  Create a new Reader of the type defined in $inputFileType  **/
 $reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader($inputFileType);
-/*  Load $inputFileName to a PHPExcel Object  **/
+/*  Load $inputFileName to a PhpSpreadsheet Object  **/
 $spreadsheet = $reader->load($inputFileName);
 
 echo '<hr />';
diff --git a/docs/Examples/Reading WorkBook Data/exampleWorkBookReader02.php b/docs/Examples/Reading WorkBook Data/exampleWorkBookReader02.php
index 5018ea00..c021728c 100644
--- a/docs/Examples/Reading WorkBook Data/exampleWorkBookReader02.php	
+++ b/docs/Examples/Reading WorkBook Data/exampleWorkBookReader02.php	
@@ -10,27 +10,23 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reading WorkBook Data Example #02</title>
+<title>PhpSpreadsheet Reading WorkBook Data Example #02</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reading WorkBook Data Example #02</h1>
+<h1>PhpSpreadsheet Reading WorkBook Data Example #02</h1>
 <h2>Read a list of Custom Properties for a WorkBook</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/** \PhpOffice\PhpSpreadsheet\IOFactory */
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 $inputFileType = 'Xlsx';
 $inputFileName = './sampleData/example1.xlsx';
 
 /*  Create a new Reader of the type defined in $inputFileType  **/
 $reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader($inputFileType);
-/*  Load $inputFileName to a PHPExcel Object  **/
+/*  Load $inputFileName to a PhpSpreadsheet Object  **/
 $spreadsheet = $reader->load($inputFileName);
 
 echo '<hr />';
diff --git a/docs/Examples/Reading WorkBook Data/exampleWorkBookReader03.php b/docs/Examples/Reading WorkBook Data/exampleWorkBookReader03.php
index 6d56a3fb..c02f51bd 100644
--- a/docs/Examples/Reading WorkBook Data/exampleWorkBookReader03.php	
+++ b/docs/Examples/Reading WorkBook Data/exampleWorkBookReader03.php	
@@ -10,27 +10,23 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reading WorkBook Data Example #03</title>
+<title>PhpSpreadsheet Reading WorkBook Data Example #03</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reading WorkBook Data Example #03</h1>
+<h1>PhpSpreadsheet Reading WorkBook Data Example #03</h1>
 <h2>Read Custom Property Values for a WorkBook</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/** \PhpOffice\PhpSpreadsheet\IOFactory */
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 $inputFileType = 'Xlsx';
 $inputFileName = './sampleData/example1.xlsx';
 
 /*  Create a new Reader of the type defined in $inputFileType  **/
 $reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader($inputFileType);
-/*  Load $inputFileName to a PHPExcel Object  **/
+/*  Load $inputFileName to a PhpSpreadsheet Object  **/
 $spreadsheet = $reader->load($inputFileName);
 
 echo '<hr />';
diff --git a/docs/Examples/Reading WorkBook Data/exampleWorkBookReader04.php b/docs/Examples/Reading WorkBook Data/exampleWorkBookReader04.php
index 307d8ede..88c7f9e0 100644
--- a/docs/Examples/Reading WorkBook Data/exampleWorkBookReader04.php	
+++ b/docs/Examples/Reading WorkBook Data/exampleWorkBookReader04.php	
@@ -10,38 +10,34 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reading WorkBook Data Example #04</title>
+<title>PhpSpreadsheet Reading WorkBook Data Example #04</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reading WorkBook Data Example #04</h1>
+<h1>PhpSpreadsheet Reading WorkBook Data Example #04</h1>
 <h2>Get a List of the Worksheets in a WorkBook</h2>
 <?php
 
-/** Include path **/
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../../Classes/');
-
-/** \PhpOffice\PhpSpreadsheet\IOFactory */
-include 'PHPExcel/IOFactory.php';
+require_once __DIR__ . '/../../../src/Bootstrap.php';
 
 $inputFileType = 'Xls';
 $inputFileName = './sampleData/example2.xls';
 
 /*  Create a new Reader of the type defined in $inputFileType  **/
 $reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader($inputFileType);
-/*  Load $inputFileName to a PHPExcel Object  **/
+/*  Load $inputFileName to a PhpSpreadsheet Object  **/
 $spreadsheet = $reader->load($inputFileName);
 
 echo '<hr />';
 
 echo 'Reading the number of Worksheets in the WorkBook<br />';
-/*  Use the PHPExcel object's getSheetCount() method to get a count of the number of WorkSheets in the WorkBook  */
+/*  Use the PhpSpreadsheet object's getSheetCount() method to get a count of the number of WorkSheets in the WorkBook  */
 $sheetCount = $spreadsheet->getSheetCount();
 echo 'There ',(($sheetCount == 1) ? 'is' : 'are'),' ',$sheetCount,' WorkSheet',(($sheetCount == 1) ? '' : 's'),' in the WorkBook<br /><br />';
 
 echo 'Reading the names of Worksheets in the WorkBook<br />';
-/*  Use the PHPExcel object's getSheetNames() method to get an array listing the names/titles of the WorkSheets in the WorkBook  */
+/*  Use the PhpSpreadsheet object's getSheetNames() method to get an array listing the names/titles of the WorkSheets in the WorkBook  */
 $sheetNames = $spreadsheet->getSheetNames();
 foreach ($sheetNames as $sheetIndex => $sheetName) {
     echo 'WorkSheet #',$sheetIndex,' is named "',$sheetName,'"<br />';
diff --git a/docs/Examples/index.php b/docs/Examples/index.php
index f776a26a..a2c51879 100644
--- a/docs/Examples/index.php
+++ b/docs/Examples/index.php
@@ -10,7 +10,7 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Examples</title>
+<title>PhpSpreadsheet Examples</title>
 
 </head>
 <body>
@@ -20,7 +20,7 @@ date_default_timezone_set('Europe/London');
 $exampleTypeList = glob('./*', GLOB_ONLYDIR);
 
 foreach ($exampleTypeList as $exampleType) {
-    echo '<h1>PHPExcel ' . pathinfo($exampleType, PATHINFO_BASENAME) . ' Examples</h1>';
+    echo '<h1>PhpSpreadsheet ' . pathinfo($exampleType, PATHINFO_BASENAME) . ' Examples</h1>';
 
     $exampleList = glob('./' . $exampleType . '/*.php');