diff --git a/README.md b/README.md
index e401de24..2ee8e766 100755
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ We're reorganizing our documentation. Below are some of the most important thing
 The following is a basic example of the PhpWord library. More examples are provided in the [samples folder](samples/).
 
 ```php
-$phpWord = new PhpOffice\PhpWord();
+$phpWord = new PhpOffice\PhpWord\PhpWord();
 
 // Every element you want to append to the word document is placed in a section.
 // To create a basic section:
diff --git a/samples/Sample_01_SimpleText.php b/samples/Sample_01_SimpleText.php
index 34a93ecf..bdb163ba 100755
--- a/samples/Sample_01_SimpleText.php
+++ b/samples/Sample_01_SimpleText.php
@@ -6,7 +6,7 @@ require_once '../src/PhpWord.php';
 
 // New Word Document
 echo date('H:i:s') , " Create new PhpWord object" , EOL;
-$phpWord = new PhpOffice\PhpWord();
+$phpWord = new PhpOffice\PhpWord\PhpWord();
 $phpWord->addFontStyle('rStyle', array('bold' => true, 'italic' => true, 'size' => 16));
 $phpWord->addParagraphStyle('pStyle', array('align' => 'center', 'spaceAfter' => 100));
 $phpWord->addTitleStyle(1, array('bold' => true), array('spaceAfter' => 240));
diff --git a/samples/Sample_02_TabStops.php b/samples/Sample_02_TabStops.php
index 5eef59a8..1026cc09 100755
--- a/samples/Sample_02_TabStops.php
+++ b/samples/Sample_02_TabStops.php
@@ -6,7 +6,7 @@ require_once '../src/PhpWord.php';
 
 // New Word Document
 echo date('H:i:s') , ' Create new PhpWord object' , EOL;
-$phpWord = new PhpOffice\PhpWord();
+$phpWord = new PhpOffice\PhpWord\PhpWord();
 
 // Ads styles
 $phpWord->addParagraphStyle('multipleTab', array(
diff --git a/samples/Sample_03_Sections.php b/samples/Sample_03_Sections.php
index e066097c..4d269454 100755
--- a/samples/Sample_03_Sections.php
+++ b/samples/Sample_03_Sections.php
@@ -6,7 +6,7 @@ require_once '../src/PhpWord.php';
 
 // New Word Document
 echo date('H:i:s') , ' Create new PhpWord object' , EOL;
-$phpWord = new PhpOffice\PhpWord();
+$phpWord = new PhpOffice\PhpWord\PhpWord();
 
 // New portrait section
 $section = $phpWord->createSection(array('borderColor' => '00FF00', 'borderSize' => 12));
diff --git a/samples/Sample_04_Textrun.php b/samples/Sample_04_Textrun.php
index c0b6cf3a..ac0d274a 100644
--- a/samples/Sample_04_Textrun.php
+++ b/samples/Sample_04_Textrun.php
@@ -6,7 +6,7 @@ require_once '../src/PhpWord.php';
 
 // New Word Document
 echo date('H:i:s') , ' Create new PhpWord object' , EOL;
-$phpWord = new PhpOffice\PhpWord();
+$phpWord = new PhpOffice\PhpWord\PhpWord();
 
 // Ads styles
 $phpWord->addParagraphStyle('pStyle', array('spacing'=>100));
diff --git a/samples/Sample_05_Multicolumn.php b/samples/Sample_05_Multicolumn.php
index 2095f24a..3148177c 100644
--- a/samples/Sample_05_Multicolumn.php
+++ b/samples/Sample_05_Multicolumn.php
@@ -6,7 +6,7 @@ require_once '../src/PhpWord.php';
 
 // New Word Document
 echo date('H:i:s') , " Create new PhpWord object" , EOL;
-$phpWord = new PhpOffice\PhpWord();
+$phpWord = new PhpOffice\PhpWord\PhpWord();
 $filler = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. ' .
     'Nulla fermentum, tortor id adipiscing adipiscing, tortor turpis commodo. ' .
     'Donec vulputate iaculis metus, vel luctus dolor hendrerit ac. ' .
diff --git a/samples/Sample_06_Footnote.php b/samples/Sample_06_Footnote.php
index 9fc2cc57..b6d8aba4 100755
--- a/samples/Sample_06_Footnote.php
+++ b/samples/Sample_06_Footnote.php
@@ -6,7 +6,7 @@ require_once '../src/PhpWord.php';
 
 // New Word Document
 echo date('H:i:s') , " Create new PhpWord object" , EOL;
-$phpWord = new PhpOffice\PhpWord();
+$phpWord = new PhpOffice\PhpWord\PhpWord();
 
 // New portrait section
 $section = $phpWord->createSection();
diff --git a/samples/Sample_07_TemplateCloneRow.php b/samples/Sample_07_TemplateCloneRow.php
index f2feb155..bbe94a0f 100755
--- a/samples/Sample_07_TemplateCloneRow.php
+++ b/samples/Sample_07_TemplateCloneRow.php
@@ -6,7 +6,7 @@ require_once '../src/PhpWord.php';
 
 // New Word document
 echo date('H:i:s') , " Create new PhpWord object" , EOL;
-$phpWord = new PhpOffice\PhpWord();
+$phpWord = new PhpOffice\PhpWord\PhpWord();
 
 $document = $phpWord->loadTemplate('resources/Sample_07_TemplateCloneRow.docx');
 
diff --git a/samples/Sample_08_ParagraphPagination.php b/samples/Sample_08_ParagraphPagination.php
index cb52f7f0..588370f6 100644
--- a/samples/Sample_08_ParagraphPagination.php
+++ b/samples/Sample_08_ParagraphPagination.php
@@ -6,7 +6,7 @@ require_once '../src/PhpWord.php';
 
 // New Word document
 echo date('H:i:s') , " Create new PhpWord object" , EOL;
-$phpWord = new PhpOffice\PhpWord();
+$phpWord = new PhpOffice\PhpWord\PhpWord();
 $phpWord->setDefaultParagraphStyle(array(
     'align' => 'both',
     'spaceAfter' => PhpOffice\PhpWord\Shared\Font::pointSizeToTwips(12),
diff --git a/samples/Sample_09_Tables.php b/samples/Sample_09_Tables.php
index ec65e104..a184be5a 100644
--- a/samples/Sample_09_Tables.php
+++ b/samples/Sample_09_Tables.php
@@ -6,7 +6,7 @@ require_once '../src/PhpWord.php';
 
 // New Word Document
 echo date('H:i:s') , ' Create new PhpWord object' , EOL;
-$phpWord = new PhpOffice\PhpWord();
+$phpWord = new PhpOffice\PhpWord\PhpWord();
 $section = $phpWord->createSection();
 $header = array('size' => 16, 'bold' => true);
 
diff --git a/samples/Sample_10_EastAsianFontStyle.php b/samples/Sample_10_EastAsianFontStyle.php
index e3d19260..48a19539 100644
--- a/samples/Sample_10_EastAsianFontStyle.php
+++ b/samples/Sample_10_EastAsianFontStyle.php
@@ -6,7 +6,7 @@ require_once '../src/PhpWord.php';
 
 // New Word Document
 echo date('H:i:s') , ' Create new PhpWord object' , EOL;
-$phpWord = new PhpOffice\PhpWord();
+$phpWord = new PhpOffice\PhpWord\PhpWord();
 $section = $phpWord->createSection();
 $header = array('size' => 16, 'bold' => true);
 //1.Use EastAisa FontStyle
diff --git a/samples/Sample_12_HeaderFooter.php b/samples/Sample_12_HeaderFooter.php
index 86ff9190..73589d99 100644
--- a/samples/Sample_12_HeaderFooter.php
+++ b/samples/Sample_12_HeaderFooter.php
@@ -6,7 +6,7 @@ require_once '../src/PhpWord.php';
 
 // New Word document
 echo date('H:i:s') , " Create new PhpWord object" , EOL;
-$phpWord = new PhpOffice\PhpWord();
+$phpWord = new PhpOffice\PhpWord\PhpWord();
 
 // New portrait section
 $section = $phpWord->createSection();
diff --git a/samples/Sample_13_Images.php b/samples/Sample_13_Images.php
index 744b8b37..5bd480d8 100644
--- a/samples/Sample_13_Images.php
+++ b/samples/Sample_13_Images.php
@@ -10,7 +10,7 @@ require_once '../src/PhpWord.php';
 
 // New Word document
 echo date('H:i:s'), " Create new PhpWord object", EOL;
-$phpWord = new PhpOffice\PhpWord();
+$phpWord = new PhpOffice\PhpWord\PhpWord();
 
 // Begin code
 $section = $phpWord->createSection();
diff --git a/samples/Sample_14_ListItem.php b/samples/Sample_14_ListItem.php
index 78dca727..f3894d25 100644
--- a/samples/Sample_14_ListItem.php
+++ b/samples/Sample_14_ListItem.php
@@ -10,7 +10,7 @@ require_once '../src/PhpWord.php';
 
 // New Word document
 echo date('H:i:s'), " Create new PhpWord object", EOL;
-$phpWord = new PhpOffice\PhpWord();
+$phpWord = new PhpOffice\PhpWord\PhpWord();
 
 // Begin code
 $section = $phpWord->createSection();
diff --git a/samples/Sample_15_Link.php b/samples/Sample_15_Link.php
index 2907fc4e..69916ae6 100644
--- a/samples/Sample_15_Link.php
+++ b/samples/Sample_15_Link.php
@@ -10,7 +10,7 @@ require_once '../src/PhpWord.php';
 
 // New Word document
 echo date('H:i:s'), " Create new PhpWord object", EOL;
-$phpWord = new PhpOffice\PhpWord();
+$phpWord = new PhpOffice\PhpWord\PhpWord();
 
 // Begin code
 $section = $phpWord->createSection();
diff --git a/samples/Sample_16_Object.php b/samples/Sample_16_Object.php
index 06206d9c..29d62705 100644
--- a/samples/Sample_16_Object.php
+++ b/samples/Sample_16_Object.php
@@ -10,7 +10,7 @@ require_once '../src/PhpWord.php';
 
 // New Word document
 echo date('H:i:s'), " Create new PhpWord object", EOL;
-$phpWord = new PhpOffice\PhpWord();
+$phpWord = new PhpOffice\PhpWord\PhpWord();
 
 // Begin code
 $section = $phpWord->createSection();
diff --git a/samples/Sample_17_TitleTOC.php b/samples/Sample_17_TitleTOC.php
index a3aa36c3..cbed2d7f 100644
--- a/samples/Sample_17_TitleTOC.php
+++ b/samples/Sample_17_TitleTOC.php
@@ -10,7 +10,7 @@ require_once '../src/PhpWord.php';
 
 // New Word document
 echo date('H:i:s'), " Create new PhpWord object", EOL;
-$phpWord = new PhpOffice\PhpWord();
+$phpWord = new PhpOffice\PhpWord\PhpWord();
 
 // Begin code
 $section = $phpWord->createSection();
diff --git a/samples/Sample_18_Watermark.php b/samples/Sample_18_Watermark.php
index 667b7c65..e80a0530 100644
--- a/samples/Sample_18_Watermark.php
+++ b/samples/Sample_18_Watermark.php
@@ -10,7 +10,7 @@ require_once '../src/PhpWord.php';
 
 // New Word document
 echo date('H:i:s'), " Create new PhpWord object", EOL;
-$phpWord = new PhpOffice\PhpWord();
+$phpWord = new PhpOffice\PhpWord\PhpWord();
 
 // Begin code
 
diff --git a/samples/Sample_19_TextBreak.php b/samples/Sample_19_TextBreak.php
index 78f689aa..d6bdafc4 100644
--- a/samples/Sample_19_TextBreak.php
+++ b/samples/Sample_19_TextBreak.php
@@ -10,7 +10,7 @@ require_once '../src/PhpWord.php';
 
 // New Word document
 echo date('H:i:s'), " Create new PhpWord object", EOL;
-$phpWord = new PhpOffice\PhpWord();
+$phpWord = new PhpOffice\PhpWord\PhpWord();
 
 // Begin code
 $fontStyle = array('size' => 24);