diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index f20d694..7850709 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,6 +1,6 @@
 | Question           | Answer
 | ------------------ | ------------------
-| **JIRA issue**     | [EZP-XXXXX](https://jira.ez.no/browse/EZP-XXXXX)
+| **JIRA issue**     | [IBX-XXXXX](https://issues.ibexa.co/browse/IBX-XXXXX)
 | **Type**           | Bug/Improvement/Feature/Misc
 | **Target version** | latest stable `0.8` for bug fixes, `master` for new features
 | **BC breaks**      | yes/no
diff --git a/bootstrap.php b/bootstrap.php
index 92dc3a9..a9fe1d5 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 require_once __DIR__ . '/vendor/autoload.php';
diff --git a/composer.json b/composer.json
index e8e3b75..ae50a5a 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
     "authors": [
         {
             "name": "eZ Systems",
-            "email": "dev-team@ez.no"
+            "email": "dev-team@ibexa.co"
         }
     ],
     "require": {
diff --git a/docs/using_tags.md b/docs/using_tags.md
index c45137b..4aa0696 100644
--- a/docs/using_tags.md
+++ b/docs/using_tags.md
@@ -96,7 +96,7 @@ corresponding tags as listed above. These can be found in `src/ResponseTagger`.
 
 ### For responses with X-Location-Id
 
-For custom or eZ controllers _(like REST at the time of writing)_ still using `X-Location-Id`, a dedicated response
+For custom or Ibexa controllers _(like REST at the time of writing)_ still using `X-Location-Id`, a dedicated response
 listener `XLocationIdResponseSubscriber` handles translating this to tags so the cache can be properly invalidated by
 this bundle. It supports comma separated location id values which was only partially supported in earlier versions:
 
@@ -108,13 +108,13 @@ this bundle. It supports comma separated location id values which was only parti
     $response->headers->set('X-Location-Id', '123,212,42');
 ```
 
-*NOTE: This is currently marked as Deprecated, and for rendering eZ content it is thus adviced to refactor to use Content
+*NOTE: This is currently marked as Deprecated, and for rendering Ibexa content it is thus adviced to refactor to use Content
 View. For other needs there is an FOS tag handler for Twig and PHP that can be used, see below for further info.*
 
 
 ### For custom needs using FOSHttpCache (tagging relations and more)
 
-For custom needs, including template logic for eZ content relations which is here used for examples, there are two ways
+For custom needs, including template logic for Ibexa content relations which is here used for examples, there are two ways
 to tag your responses.
 
 #### Twig use
diff --git a/spec/EventSubscriber/HiddenLocationExceptionSubscriberSpec.php b/spec/EventSubscriber/HiddenLocationExceptionSubscriberSpec.php
index 17efecc..d80a803 100644
--- a/spec/EventSubscriber/HiddenLocationExceptionSubscriberSpec.php
+++ b/spec/EventSubscriber/HiddenLocationExceptionSubscriberSpec.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace spec\Ibexa\HttpCache\EventSubscriber;
diff --git a/spec/EventSubscriber/HttpCacheResponseSubscriberSpec.php b/spec/EventSubscriber/HttpCacheResponseSubscriberSpec.php
index 23c77fa..55b0ee2 100644
--- a/spec/EventSubscriber/HttpCacheResponseSubscriberSpec.php
+++ b/spec/EventSubscriber/HttpCacheResponseSubscriberSpec.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace spec\Ibexa\HttpCache\EventSubscriber;
diff --git a/spec/EventSubscriber/RestKernelViewSubscriberSpec.php b/spec/EventSubscriber/RestKernelViewSubscriberSpec.php
index eb381ea..f1e024f 100644
--- a/spec/EventSubscriber/RestKernelViewSubscriberSpec.php
+++ b/spec/EventSubscriber/RestKernelViewSubscriberSpec.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace spec\Ibexa\HttpCache\EventSubscriber;
diff --git a/spec/EventSubscriber/XLocationIdResponseSubscriberSpec.php b/spec/EventSubscriber/XLocationIdResponseSubscriberSpec.php
index 715d532..8b41701 100644
--- a/spec/EventSubscriber/XLocationIdResponseSubscriberSpec.php
+++ b/spec/EventSubscriber/XLocationIdResponseSubscriberSpec.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace spec\Ibexa\HttpCache\EventSubscriber;
diff --git a/spec/Handler/TagHandlerSpec.php b/spec/Handler/TagHandlerSpec.php
index f34bb76..b663459 100644
--- a/spec/Handler/TagHandlerSpec.php
+++ b/spec/Handler/TagHandlerSpec.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace spec\Ibexa\HttpCache\Handler;
diff --git a/spec/ProxyClient/VarnishSpec.php b/spec/ProxyClient/VarnishSpec.php
index e1816f3..11e3696 100644
--- a/spec/ProxyClient/VarnishSpec.php
+++ b/spec/ProxyClient/VarnishSpec.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace spec\Ibexa\HttpCache\ProxyClient;
diff --git a/src/bundle/Resources/config/services.yml b/src/bundle/Resources/config/services.yml
index 286747f..718c502 100644
--- a/src/bundle/Resources/config/services.yml
+++ b/src/bundle/Resources/config/services.yml
@@ -60,7 +60,7 @@ services:
          - '@logger'
          - header_formatter: '@fos_http_cache.tag_handler.header_formatter'
            strict: '%fos_http_cache.tag_handler.strict%'
-           # Custom eZ options (todo: Port to FOS)
+           # Custom Ibexa options (todo: Port to FOS)
            tag_max_length: '%ibexa.http_cache.tags.header_max_length%'
            tag_max_length_ttl: '%ibexa.http_cache.tags.header_reduced_ttl%'
 
diff --git a/src/lib/Twig/ContentTaggingExtension.php b/src/lib/Twig/ContentTaggingExtension.php
index 3567023..75ff531 100644
--- a/src/lib/Twig/ContentTaggingExtension.php
+++ b/src/lib/Twig/ContentTaggingExtension.php
@@ -13,7 +13,7 @@
 use Twig\TwigFunction;
 
 /**
- * Twig content extension for eZ Publish specific usage.
+ * Twig content extension for Ibexa specific usage.
  * Exposes helpers to play with public API objects.
  */
 class ContentTaggingExtension extends AbstractExtension