diff --git a/src/module-elasticsuite-catalog/Model/Autocomplete/Category/DataProvider.php b/src/module-elasticsuite-catalog/Model/Autocomplete/Category/DataProvider.php
index 5155c289c..3d3f23421 100644
--- a/src/module-elasticsuite-catalog/Model/Autocomplete/Category/DataProvider.php
+++ b/src/module-elasticsuite-catalog/Model/Autocomplete/Category/DataProvider.php
@@ -5,7 +5,7 @@
  * versions in the future.
  *
  * @category  Smile
- * @package   Smile\ElasticSuiteCatalog
+ * @package   Smile\ElasticsuiteCatalog
  * @author    Romain Ruaud <romain.ruaud@smile.fr>
  * @copyright 2016 Smile
  * @license   Open Software License ("OSL") v. 3.0
@@ -22,7 +22,7 @@
  * Catalog category autocomplete data provider.
  *
  * @category Smile
- * @package  Smile\ElasticSuiteCatalog
+ * @package  Smile\ElasticsuiteCatalog
  * @author   Romain Ruaud <romain.ruaud@smile.fr>
  */
 class DataProvider implements DataProviderInterface
diff --git a/src/module-elasticsuite-catalog/Model/ResourceModel/Category/Fulltext/Collection.php b/src/module-elasticsuite-catalog/Model/ResourceModel/Category/Fulltext/Collection.php
index 7f1a4db42..65c6d34a0 100644
--- a/src/module-elasticsuite-catalog/Model/ResourceModel/Category/Fulltext/Collection.php
+++ b/src/module-elasticsuite-catalog/Model/ResourceModel/Category/Fulltext/Collection.php
@@ -5,7 +5,7 @@
  * versions in the future.
  *
  * @category  Smile
- * @package   Smile\ElasticSuiteCatalog
+ * @package   Smile\ElasticsuiteCatalog
  * @author    Romain Ruaud <romain.ruaud@smile.fr>
  * @copyright 2016 Smile
  * @license   Open Software License ("OSL") v. 3.0
@@ -26,7 +26,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @category Smile
- * @package  Smile\ElasticSuiteCatalog
+ * @package  Smile\ElasticsuiteCatalog
  * @author   Romain Ruaud <romain.ruaud@smile.fr>
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Category\Collection
diff --git a/src/module-elasticsuite-catalog/Model/ResourceModel/Product/Advanced/Collection.php b/src/module-elasticsuite-catalog/Model/ResourceModel/Product/Advanced/Collection.php
index 3c6ec3d6a..d9bda8597 100644
--- a/src/module-elasticsuite-catalog/Model/ResourceModel/Product/Advanced/Collection.php
+++ b/src/module-elasticsuite-catalog/Model/ResourceModel/Product/Advanced/Collection.php
@@ -5,7 +5,7 @@
  * versions in the future.
  *
  * @category  Smile
- * @package   Smile\ElasticSuiteCatalog
+ * @package   Smile\ElasticsuiteCatalog
  * @author    Romain Ruaud <romain.ruaud@smile.fr>
  * @copyright 2016 Smile
  * @license   Open Software License ("OSL") v. 3.0
@@ -20,7 +20,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @category Smile
- * @package  Smile\ElasticSuiteCatalog
+ * @package  Smile\ElasticsuiteCatalog
  * @author   Romain Ruaud <romain.ruaud@smile.fr>
  */
 class Collection extends FulltextCollection
diff --git a/src/module-elasticsuite-core/Model/Search.php b/src/module-elasticsuite-core/Model/Search.php
index cdf130256..943df8a6a 100644
--- a/src/module-elasticsuite-core/Model/Search.php
+++ b/src/module-elasticsuite-core/Model/Search.php
@@ -11,7 +11,7 @@
  * @license   Open Software License ("OSL") v. 3.0
  */
 
-namespace Smile\ElasticSuiteCore\Model;
+namespace Smile\ElasticsuiteCore\Model;
 
 /**
  * SearchInterface implementation using elasticsuite.
diff --git a/src/module-elasticsuite-core/Search/Request/RelevanceConfig/App/Config.php b/src/module-elasticsuite-core/Search/Request/RelevanceConfig/App/Config.php
index 0b9f5d67b..9eed714e7 100644
--- a/src/module-elasticsuite-core/Search/Request/RelevanceConfig/App/Config.php
+++ b/src/module-elasticsuite-core/Search/Request/RelevanceConfig/App/Config.php
@@ -18,7 +18,7 @@
  * Relevance configuration implementation.
  *
  * @category Smile
- * @package  Smile\ElasticSuiteCore
+ * @package  Smile\ElasticsuiteCore
  * @author   Romain Ruaud <romain.ruaud@smile.fr>
  */
 class Config implements ScopeConfigInterface
diff --git a/src/module-elasticsuite-core/Test/Unit/Model/SearchTest.php b/src/module-elasticsuite-core/Test/Unit/Model/SearchTest.php
index ece5d6101..99a503a39 100644
--- a/src/module-elasticsuite-core/Test/Unit/Model/SearchTest.php
+++ b/src/module-elasticsuite-core/Test/Unit/Model/SearchTest.php
@@ -14,7 +14,7 @@
  */
 namespace Smile\ElasticsuiteCore\Test\Unit\Model;
 
-use Smile\ElasticSuiteCore\Model\Search;
+use Smile\ElasticsuiteCore\Model\Search;
 
 /**
  * Search API unit testing.
diff --git a/src/module-elasticsuite-swatches/Model/Plugin/ProductSubstitute.php b/src/module-elasticsuite-swatches/Model/Plugin/ProductSubstitute.php
index 31fee8010..63bd115bf 100644
--- a/src/module-elasticsuite-swatches/Model/Plugin/ProductSubstitute.php
+++ b/src/module-elasticsuite-swatches/Model/Plugin/ProductSubstitute.php
@@ -5,7 +5,7 @@
  * versions in the future.
  *
  * @category  Smile
- * @package   Smile\ElasticSuiteSwatches
+ * @package   Smile\ElasticsuiteSwatches
  * @author    Romain Ruaud <romain.ruaud@smile.fr>
  * @copyright 2017 Smile
  * @license   Open Software License ("OSL") v. 3.0
diff --git a/src/module-elasticsuite-thesaurus/Setup/InstallData.php b/src/module-elasticsuite-thesaurus/Setup/InstallData.php
index 6708114b4..eb7c3ebee 100644
--- a/src/module-elasticsuite-thesaurus/Setup/InstallData.php
+++ b/src/module-elasticsuite-thesaurus/Setup/InstallData.php
@@ -5,7 +5,7 @@
  * versions in the future.
  *
  * @category  Smile
- * @package   Smile\ElasticSuiteThesaurus
+ * @package   Smile\ElasticsuiteThesaurus
  * @author    Romain Ruaud <romain.ruaud@smile.fr>
  * @copyright 2016 Smile
  * @license   Open Software License ("OSL") v. 3.0
@@ -21,7 +21,7 @@
  * Thesaurus Data Installer
  *
  * @category Smile
- * @package  Smile\ElasticSuiteThesaurus
+ * @package  Smile\ElasticsuiteThesaurus
  * @author   Romain Ruaud <romain.ruaud@smile.fr>
  */
 class InstallData implements InstallDataInterface