diff --git a/src/Spout/Writer/Factory/EntityFactory.php b/src/Spout/Writer/Creator/EntityFactory.php
similarity index 84%
rename from src/Spout/Writer/Factory/EntityFactory.php
rename to src/Spout/Writer/Creator/EntityFactory.php
index 8ecbcd0..6277179 100644
--- a/src/Spout/Writer/Factory/EntityFactory.php
+++ b/src/Spout/Writer/Creator/EntityFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Box\Spout\Writer\Factory;
+namespace Box\Spout\Writer\Creator;
 
 use Box\Spout\Writer\Common\Sheet;
 use Box\Spout\Writer\Entity\Workbook;
@@ -8,9 +8,9 @@ use Box\Spout\Writer\Entity\Worksheet;
 
 /**
  * Class EntityFactory
- * Entity factory
+ * Factory to create entities
  *
- * @package Box\Spout\Writer\Factory
+ * @package Box\Spout\Writer\Creator
  */
 class EntityFactory
 {
diff --git a/src/Spout/Writer/Factory/InternalFactoryInterface.php b/src/Spout/Writer/Creator/InternalFactoryInterface.php
similarity index 84%
rename from src/Spout/Writer/Factory/InternalFactoryInterface.php
rename to src/Spout/Writer/Creator/InternalFactoryInterface.php
index bbf6775..f4f3809 100644
--- a/src/Spout/Writer/Factory/InternalFactoryInterface.php
+++ b/src/Spout/Writer/Creator/InternalFactoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Box\Spout\Writer\Factory;
+namespace Box\Spout\Writer\Creator;
 
 use Box\Spout\Writer\Manager\OptionsManagerInterface;
 use Box\Spout\Writer\Manager\WorkbookManagerInterface;
@@ -8,7 +8,7 @@ use Box\Spout\Writer\Manager\WorkbookManagerInterface;
 /**
  * Interface GeneralFactoryInterface
  *
- * @package Box\Spout\Writer\Factory
+ * @package Box\Spout\Writer\Creator
  */
 interface InternalFactoryInterface
 {
diff --git a/src/Spout/Writer/Manager/WorkbookManagerAbstract.php b/src/Spout/Writer/Manager/WorkbookManagerAbstract.php
index 04c6bca..c6b935f 100644
--- a/src/Spout/Writer/Manager/WorkbookManagerAbstract.php
+++ b/src/Spout/Writer/Manager/WorkbookManagerAbstract.php
@@ -12,7 +12,7 @@ use Box\Spout\Writer\Entity\Workbook;
 use Box\Spout\Writer\Entity\Worksheet;
 use Box\Spout\Writer\Exception\SheetNotFoundException;
 use Box\Spout\Writer\Exception\WriterException;
-use Box\Spout\Writer\Factory\EntityFactory;
+use Box\Spout\Writer\Creator\EntityFactory;
 use Box\Spout\Writer\Style\Style;
 
 /**
diff --git a/src/Spout/Writer/ODS/Factory/InternalFactory.php b/src/Spout/Writer/ODS/Creator/InternalFactory.php
similarity index 93%
rename from src/Spout/Writer/ODS/Factory/InternalFactory.php
rename to src/Spout/Writer/ODS/Creator/InternalFactory.php
index d775db2..1e455d4 100644
--- a/src/Spout/Writer/ODS/Factory/InternalFactory.php
+++ b/src/Spout/Writer/ODS/Creator/InternalFactory.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Box\Spout\Writer\ODS\Factory;
+namespace Box\Spout\Writer\ODS\Creator;
 
 use Box\Spout\Common\Helper\StringHelper;
 use Box\Spout\Writer\Manager\OptionsManagerInterface;
 use Box\Spout\Writer\Entity\Options;
-use Box\Spout\Writer\Factory\EntityFactory;
-use Box\Spout\Writer\Factory\InternalFactoryInterface;
+use Box\Spout\Writer\Creator\EntityFactory;
+use Box\Spout\Writer\Creator\InternalFactoryInterface;
 use Box\Spout\Writer\ODS\Helper\FileSystemHelper;
 use Box\Spout\Writer\ODS\Helper\StyleHelper;
 use Box\Spout\Writer\ODS\Manager\WorkbookManager;
@@ -17,7 +17,7 @@ use \Box\Spout\Common\Escaper;
  * Class InternalFactory
  * Factory for all useful types of objects needed by the ODS Writer
  *
- * @package Box\Spout\Writer\ODS\Factory
+ * @package Box\Spout\Writer\ODS\Creator
  */
 class InternalFactory implements InternalFactoryInterface
 {
diff --git a/src/Spout/Writer/WriterFactory.php b/src/Spout/Writer/WriterFactory.php
index 185bcd0..e71d023 100644
--- a/src/Spout/Writer/WriterFactory.php
+++ b/src/Spout/Writer/WriterFactory.php
@@ -5,7 +5,7 @@ namespace Box\Spout\Writer;
 use Box\Spout\Common\Exception\UnsupportedTypeException;
 use Box\Spout\Common\Helper\GlobalFunctionsHelper;
 use Box\Spout\Common\Type;
-use Box\Spout\Writer\Factory\EntityFactory;
+use Box\Spout\Writer\Creator\EntityFactory;
 use Box\Spout\Writer\Style\StyleBuilder;
 
 /**
@@ -65,7 +65,7 @@ class WriterFactory
     {
         $styleBuilder = new StyleBuilder();
         $optionsManager = new XLSX\Manager\OptionsManager($styleBuilder);
-        $generalFactory = new XLSX\Factory\InternalFactory(new EntityFactory());
+        $generalFactory = new XLSX\Creator\InternalFactory(new EntityFactory());
 
         return new XLSX\Writer($optionsManager, $generalFactory);
     }
@@ -77,7 +77,7 @@ class WriterFactory
     {
         $styleBuilder = new StyleBuilder();
         $optionsManager = new ODS\Manager\OptionsManager($styleBuilder);
-        $generalFactory = new ODS\Factory\InternalFactory(new EntityFactory());
+        $generalFactory = new ODS\Creator\InternalFactory(new EntityFactory());
 
         return new ODS\Writer($optionsManager, $generalFactory);
     }
diff --git a/src/Spout/Writer/WriterMultiSheetsAbstract.php b/src/Spout/Writer/WriterMultiSheetsAbstract.php
index a659679..4c82b8d 100644
--- a/src/Spout/Writer/WriterMultiSheetsAbstract.php
+++ b/src/Spout/Writer/WriterMultiSheetsAbstract.php
@@ -6,7 +6,7 @@ use Box\Spout\Writer\Manager\OptionsManagerInterface;
 use Box\Spout\Writer\Entity\Options;
 use Box\Spout\Writer\Entity\Worksheet;
 use Box\Spout\Writer\Exception\WriterNotOpenedException;
-use Box\Spout\Writer\Factory\InternalFactoryInterface;
+use Box\Spout\Writer\Creator\InternalFactoryInterface;
 use Box\Spout\Writer\Manager\WorkbookManagerInterface;
 
 /**
diff --git a/src/Spout/Writer/XLSX/Factory/InternalFactory.php b/src/Spout/Writer/XLSX/Creator/InternalFactory.php
similarity index 92%
rename from src/Spout/Writer/XLSX/Factory/InternalFactory.php
rename to src/Spout/Writer/XLSX/Creator/InternalFactory.php
index 249ef62..5d4ba1a 100644
--- a/src/Spout/Writer/XLSX/Factory/InternalFactory.php
+++ b/src/Spout/Writer/XLSX/Creator/InternalFactory.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Box\Spout\Writer\XLSX\Factory;
+namespace Box\Spout\Writer\XLSX\Creator;
 
 use Box\Spout\Common\Escaper;
 use Box\Spout\Common\Helper\StringHelper;
 use Box\Spout\Writer\Manager\OptionsManagerInterface;
 use Box\Spout\Writer\Entity\Options;
-use Box\Spout\Writer\Factory\EntityFactory;
-use Box\Spout\Writer\Factory\InternalFactoryInterface;
-use Box\Spout\Writer\Factory\WorkbookFactory;
-use Box\Spout\Writer\Factory\WorksheetFactory;
+use Box\Spout\Writer\Creator\EntityFactory;
+use Box\Spout\Writer\Creator\InternalFactoryInterface;
+use Box\Spout\Writer\Creator\WorkbookFactory;
+use Box\Spout\Writer\Creator\WorksheetFactory;
 use Box\Spout\Writer\XLSX\Helper\FileSystemHelper;
 use Box\Spout\Writer\XLSX\Helper\SharedStringsHelper;
 use Box\Spout\Writer\XLSX\Helper\StyleHelper;
@@ -20,7 +20,7 @@ use Box\Spout\Writer\XLSX\Manager\WorksheetManager;
  * Class InternalFactory
  * Factory for all useful types of objects needed by the XLSX Writer
  *
- * @package Box\Spout\Writer\XLSX\Factory
+ * @package Box\Spout\Writer\XLSX\Creator
  */
 class InternalFactory implements InternalFactoryInterface
 {