diff --git a/composer.json b/composer.json
index 499122fa..bee31f76 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
     "authors": [
         {
             "name": "eZ Systems dev team",
-            "email": "dev-team@ez.no"
+            "email": "dev-team@ibexa.co"
         }
     ],
     "require": {
diff --git a/src/lib/Handler.php b/src/lib/Handler.php
index 49c1c588..4fe28c09 100644
--- a/src/lib/Handler.php
+++ b/src/lib/Handler.php
@@ -71,7 +71,7 @@ class Handler implements VersatileHandler
     /**
      * Result extractor.
      *
-     * @deprecated since eZ Platform 3.2.0, to be removed in eZ Platform 4.0.0. Use $contentResultExtractor or $locationResultExtractor instead of $resultExtractor.
+     * @deprecated since eZ Platform 3.2.0, to be removed in Ibexa 4.0.0. Use $contentResultExtractor or $locationResultExtractor instead of $resultExtractor.
      *
      * @var \Ibexa\Solr\ResultExtractor
      */
diff --git a/src/lib/Indexer.php b/src/lib/Indexer.php
index 2ceb5188..fbd310f5 100644
--- a/src/lib/Indexer.php
+++ b/src/lib/Indexer.php
@@ -33,7 +33,7 @@ public function __construct(
 
     public function getName()
     {
-        return 'eZ Platform Solr Search Engine';
+        return 'Ibexa Solr Search Engine';
     }
 
     public function purge()
diff --git a/src/lib/Query/Common/FacetBuilderVisitor/Aggregate.php b/src/lib/Query/Common/FacetBuilderVisitor/Aggregate.php
index 26d6244e..4c3f848a 100644
--- a/src/lib/Query/Common/FacetBuilderVisitor/Aggregate.php
+++ b/src/lib/Query/Common/FacetBuilderVisitor/Aggregate.php
@@ -13,7 +13,7 @@
 /**
  * Visits the facet builder tree into a Solr query.
  *
- * @deprecated since eZ Platform 3.2.0, to be removed in eZ Platform 4.0.0.
+ * @deprecated since eZ Platform 3.2.0, to be removed in Ibexa 4.0.0.
  */
 class Aggregate extends FacetBuilderVisitor implements FacetFieldVisitor
 {
diff --git a/src/lib/Query/Common/FacetBuilderVisitor/ContentType.php b/src/lib/Query/Common/FacetBuilderVisitor/ContentType.php
index 20e6edd8..c3f5abd6 100644
--- a/src/lib/Query/Common/FacetBuilderVisitor/ContentType.php
+++ b/src/lib/Query/Common/FacetBuilderVisitor/ContentType.php
@@ -14,7 +14,7 @@
 /**
  * Visits the ContentType facet builder.
  *
- * @deprecated since eZ Platform 3.2.0, to be removed in eZ Platform 4.0.0.
+ * @deprecated since eZ Platform 3.2.0, to be removed in Ibexa 4.0.0.
  */
 class ContentType extends FacetBuilderVisitor implements FacetFieldVisitor
 {
diff --git a/src/lib/Query/Common/FacetBuilderVisitor/Section.php b/src/lib/Query/Common/FacetBuilderVisitor/Section.php
index 37ce2f1d..6358b527 100644
--- a/src/lib/Query/Common/FacetBuilderVisitor/Section.php
+++ b/src/lib/Query/Common/FacetBuilderVisitor/Section.php
@@ -14,7 +14,7 @@
 /**
  * Visits the Section facet builder.
  *
- * @deprecated since eZ Platform 3.2.0, to be removed in eZ Platform 4.0.0.
+ * @deprecated since eZ Platform 3.2.0, to be removed in Ibexa 4.0.0.
  */
 class Section extends FacetBuilderVisitor implements FacetFieldVisitor
 {
diff --git a/src/lib/Query/Common/FacetBuilderVisitor/User.php b/src/lib/Query/Common/FacetBuilderVisitor/User.php
index 7cb333b4..d7da0198 100644
--- a/src/lib/Query/Common/FacetBuilderVisitor/User.php
+++ b/src/lib/Query/Common/FacetBuilderVisitor/User.php
@@ -15,7 +15,7 @@
 /**
  * Visits the User facet builder.
  *
- * @deprecated since eZ Platform 3.2.0, to be removed in eZ Platform 4.0.0.
+ * @deprecated since eZ Platform 3.2.0, to be removed in Ibexa 4.0.0.
  */
 class User extends FacetBuilderVisitor implements FacetFieldVisitor
 {
diff --git a/src/lib/Query/FacetBuilderVisitor.php b/src/lib/Query/FacetBuilderVisitor.php
index 4da3294d..31cb281b 100644
--- a/src/lib/Query/FacetBuilderVisitor.php
+++ b/src/lib/Query/FacetBuilderVisitor.php
@@ -11,7 +11,7 @@
 /**
  * Visits the facet builder tree into a Solr query.
  *
- * @deprecated since eZ Platform 3.2.0, to be removed in eZ Platform 4.0.0.
+ * @deprecated since eZ Platform 3.2.0, to be removed in Ibexa 4.0.0.
  */
 abstract class FacetBuilderVisitor
 {
diff --git a/src/lib/Query/FacetFieldVisitor.php b/src/lib/Query/FacetFieldVisitor.php
index ff4f8938..6f06cf0a 100644
--- a/src/lib/Query/FacetFieldVisitor.php
+++ b/src/lib/Query/FacetFieldVisitor.php
@@ -11,7 +11,7 @@
 /**
  * Visits Solr results into correct facet and facet builder combination.
  *
- * @deprecated since eZ Platform 3.2.0, to be removed in eZ Platform 4.0.0.
+ * @deprecated since eZ Platform 3.2.0, to be removed in Ibexa 4.0.0.
  */
 interface FacetFieldVisitor
 {
diff --git a/tests/lib/Resources/config/cloud.yml b/tests/lib/Resources/config/cloud.yml
index 4cf5fac8..59681e84 100644
--- a/tests/lib/Resources/config/cloud.yml
+++ b/tests/lib/Resources/config/cloud.yml
@@ -7,7 +7,7 @@ parameters:
         - eng-GB
     ignored_storage_files:
         -
-            var/ezdemo_site/storage/images/design/plain-site/172-2-eng-US/eZ-Publish-Demo-Design-without-demo-content1.png
+            var/ibexa_demo_site/storage/images/design/plain-site/172-2-eng-US/Ibexa-Demo-Design-without-demo-content1.png
     ezpublish.solr.endpoint.class: Ibexa\Solr\Gateway\Endpoint
 
     ezpublish.search.solr.default.distribution_strategy: cloud
diff --git a/tests/lib/Resources/config/multicore_dedicated.yml b/tests/lib/Resources/config/multicore_dedicated.yml
index b2349512..870e7f4b 100644
--- a/tests/lib/Resources/config/multicore_dedicated.yml
+++ b/tests/lib/Resources/config/multicore_dedicated.yml
@@ -7,7 +7,7 @@ parameters:
         - eng-GB
     ignored_storage_files:
         -
-            var/ezdemo_site/storage/images/design/plain-site/172-2-eng-US/eZ-Publish-Demo-Design-without-demo-content1.png
+            var/ibexa_demo_site/storage/images/design/plain-site/172-2-eng-US/Ibexa-Demo-Design-without-demo-content1.png
     ezpublish.solr.endpoint.class: Ibexa\Solr\Gateway\Endpoint
 
     ibexa.search.solr.entry_endpoints:
diff --git a/tests/lib/Resources/config/multicore_shared.yml b/tests/lib/Resources/config/multicore_shared.yml
index 7c6d5d08..7f85ffbc 100644
--- a/tests/lib/Resources/config/multicore_shared.yml
+++ b/tests/lib/Resources/config/multicore_shared.yml
@@ -7,7 +7,7 @@ parameters:
         - eng-GB
     ignored_storage_files:
         -
-            var/ezdemo_site/storage/images/design/plain-site/172-2-eng-US/eZ-Publish-Demo-Design-without-demo-content1.png
+            var/ibexa_demo_site/storage/images/design/plain-site/172-2-eng-US/Ibexa-Demo-Design-without-demo-content1.png
     ezpublish.solr.endpoint.class: Ibexa\Solr\Gateway\Endpoint
 
     ibexa.search.solr.entry_endpoints:
diff --git a/tests/lib/Resources/config/single_core.yml b/tests/lib/Resources/config/single_core.yml
index 1c57a585..0445d95c 100644
--- a/tests/lib/Resources/config/single_core.yml
+++ b/tests/lib/Resources/config/single_core.yml
@@ -7,7 +7,7 @@ parameters:
         - eng-GB
     ignored_storage_files:
         -
-            var/ezdemo_site/storage/images/design/plain-site/172-2-eng-US/eZ-Publish-Demo-Design-without-demo-content1.png
+            var/ibexa_demo_site/storage/images/design/plain-site/172-2-eng-US/Ibexa-Demo-Design-without-demo-content1.png
     ezpublish.solr.endpoint.class: Ibexa\Solr\Gateway\Endpoint
 
     ibexa.search.solr.entry_endpoints: