diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5155784b..ac6614fb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ aliases:
   - &container_config
     working_directory: /app
     docker:
-      - image: integratedexperts/circleci2-builder
+      - image: drevops/ci-builder
         environment:
           DRUPAL_VERSION: 8
 
@@ -26,7 +26,7 @@ jobs:
   build_d7:
     <<: *build
     docker:
-      - image: integratedexperts/circleci2-builder
+      - image: drevops/ci-builder
         environment:
           DRUPAL_VERSION: 7
 
diff --git a/README.md b/README.md
index 6b6208ac..864a7b21 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 # Behat Steps
 Collection of Behat steps for Drupal 8 and Drupal 7 development.
 
-[![CircleCI](https://circleci.com/gh/integratedexperts/behat-steps.svg?style=shield)](https://circleci.com/gh/integratedexperts/behat-steps)
-[![Latest Stable Version](https://poser.pugx.org/integratedexperts/behat-steps/v/stable)](https://packagist.org/packages/integratedexperts/behat-steps)
-[![Total Downloads](https://poser.pugx.org/integratedexperts/behat-steps/downloads)](https://packagist.org/packages/integratedexperts/behat-steps)
-[![License](https://poser.pugx.org/integratedexperts/behat-steps/license)](https://packagist.org/packages/integratedexperts/behat-steps)
+[![CircleCI](https://circleci.com/gh/drevops/behat-steps.svg?style=shield)](https://circleci.com/gh/drevops/behat-steps)
+[![Latest Stable Version](https://poser.pugx.org/drevops/behat-steps/v/stable)](https://packagist.org/packages/drevops/behat-steps)
+[![Total Downloads](https://poser.pugx.org/drevops/behat-steps/downloads)](https://packagist.org/packages/drevops/behat-steps)
+[![License](https://poser.pugx.org/drevops/behat-steps/license)](https://packagist.org/packages/drevops/behat-steps)
 
 # Why traits?
 Usually, such packages implement own Drupal driver with several contexts, service containers and a lot of other useful architectural structures.
@@ -12,7 +12,7 @@ But for this simple library, using traits helps to lower entry barrier for usage
 This package may later be refactored to use proper architecture. 
 
 # Installation
-`composer require --dev integratedexperts/behat-steps`
+`composer require --dev drevops/behat-steps`
 
 # Usage
 Add required traits to `FeatureContext.php`:
@@ -21,7 +21,7 @@ Add required traits to `FeatureContext.php`:
 <?php
 
 use Drupal\DrupalExtension\Context\DrupalContext;
-use IntegratedExperts\BehatSteps\D7\ContentTrait;
+use DrevOps\BehatSteps\D7\ContentTrait;
 
 /**
  * Defines application features from the specific context.
diff --git a/composer.json b/composer.json
index 24b26a7c..93448e43 100644
--- a/composer.json
+++ b/composer.json
@@ -1,13 +1,13 @@
 {
-    "name": "integratedexperts/behat-steps",
+    "name": "drevops/behat-steps",
     "type": "library",
     "description": "Collection of Behat traits",
     "license": "GPL-2.0-or-later",
     "autoload": {
         "psr-4": {
-            "IntegratedExperts\\BehatSteps\\": "src/",
-            "IntegratedExperts\\BehatSteps\\D7\\": "src/D7/",
-            "IntegratedExperts\\BehatSteps\\D8\\": "src/D8/"
+            "DrevOps\\BehatSteps\\": "src/",
+            "DrevOps\\BehatSteps\\D7\\": "src/D7/",
+            "DrevOps\\BehatSteps\\D8\\": "src/D8/"
         }
     },
     "require": {
diff --git a/docker-compose.yml b/docker-compose.yml
index b1221bb0..3395ba3b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-# For reference, @see https://github.com/integratedexperts/drupal-dev/blob/8.x/docker-compose.yml
+# For reference, @see https://github.com/drevops/drupal-dev/blob/8.x/docker-compose.yml
 version: '2.3'
 
 x-project:
diff --git a/src/D7/ContentTrait.php b/src/D7/ContentTrait.php
index 8ec813de..78da893f 100644
--- a/src/D7/ContentTrait.php
+++ b/src/D7/ContentTrait.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D7;
+namespace DrevOps\BehatSteps\D7;
 
 use Behat\Gherkin\Node\TableNode;
 
 /**
  * Trait ContentTrait.
  *
- * @package IntegratedExperts\BehatSteps\D7
+ * @package DrevOps\BehatSteps\D7
  */
 trait ContentTrait {
 
diff --git a/src/D7/DomainTrait.php b/src/D7/DomainTrait.php
index 6848dfb4..8374507d 100644
--- a/src/D7/DomainTrait.php
+++ b/src/D7/DomainTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D7;
+namespace DrevOps\BehatSteps\D7;
 
 use Drupal\DrupalExtension\Hook\Scope\BeforeNodeCreateScope;
 use Drupal\DrupalExtension\Hook\Scope\BeforeUserCreateScope;
@@ -8,7 +8,7 @@
 /**
  * Trait DomainTrait.
  *
- * @package IntegratedExperts\BehatSteps\D7
+ * @package DrevOps\BehatSteps\D7
  */
 trait DomainTrait {
 
diff --git a/src/D7/EmailTrait.php b/src/D7/EmailTrait.php
index 9b615cbd..785a6d7a 100644
--- a/src/D7/EmailTrait.php
+++ b/src/D7/EmailTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D7;
+namespace DrevOps\BehatSteps\D7;
 
 use Behat\Behat\Hook\Scope\AfterScenarioScope;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
@@ -9,7 +9,7 @@
 /**
  * Trait EmailTrait.
  *
- * @package IntegratedExperts\BehatSteps\D7
+ * @package DrevOps\BehatSteps\D7
  */
 trait EmailTrait {
 
diff --git a/src/D7/FieldCollectionTrait.php b/src/D7/FieldCollectionTrait.php
index 4b3361f3..f2d78707 100644
--- a/src/D7/FieldCollectionTrait.php
+++ b/src/D7/FieldCollectionTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D7;
+namespace DrevOps\BehatSteps\D7;
 
 use Drupal\Driver\DrupalDriver;
 use Drupal\DrupalExtension\Hook\Scope\AfterNodeCreateScope;
@@ -9,7 +9,7 @@
 /**
  * Trait FieldCollectionTrait.
  *
- * @package IntegratedExperts\BehatSteps\D7
+ * @package DrevOps\BehatSteps\D7
  */
 trait FieldCollectionTrait {
 
diff --git a/src/D7/FileDownloadTrait.php b/src/D7/FileDownloadTrait.php
index 8739514b..f86519ee 100644
--- a/src/D7/FileDownloadTrait.php
+++ b/src/D7/FileDownloadTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D7;
+namespace DrevOps\BehatSteps\D7;
 
 use Behat\Behat\Hook\Scope\AfterScenarioScope;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
@@ -17,7 +17,7 @@
  *
  * @see https://www.php.net/manual/en/zip.installation.php
  *
- * @package IntegratedExperts\BehatSteps\D7
+ * @package DrevOps\BehatSteps\D7
  */
 trait FileDownloadTrait {
 
diff --git a/src/D7/FileTrait.php b/src/D7/FileTrait.php
index 6d764701..c264a06b 100644
--- a/src/D7/FileTrait.php
+++ b/src/D7/FileTrait.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D7;
+namespace DrevOps\BehatSteps\D7;
 
 use Behat\Gherkin\Node\TableNode;
 
 /**
  * Trait FileTrait.
  *
- * @package IntegratedExperts\BehatSteps\D7
+ * @package DrevOps\BehatSteps\D7
  */
 trait FileTrait {
 
diff --git a/src/D7/MediaTrait.php b/src/D7/MediaTrait.php
index 3028907b..caf4dd30 100644
--- a/src/D7/MediaTrait.php
+++ b/src/D7/MediaTrait.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D7;
+namespace DrevOps\BehatSteps\D7;
 
 /**
  * Trait MediaTrait.
  *
- * @package IntegratedExperts\BehatSteps\D7
+ * @package DrevOps\BehatSteps\D7
  */
 trait MediaTrait {
 
diff --git a/src/D7/OverrideTrait.php b/src/D7/OverrideTrait.php
index add5e083..3cd96f30 100644
--- a/src/D7/OverrideTrait.php
+++ b/src/D7/OverrideTrait.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D7;
+namespace DrevOps\BehatSteps\D7;
 
 /**
  * Trait OverrideTrait.
  *
  * Used to override standard Drupal Extension methods.
  *
- * @package IntegratedExperts\BehatSteps\D7
+ * @package DrevOps\BehatSteps\D7
  */
 trait OverrideTrait {
 
diff --git a/src/D7/ParagraphsTrait.php b/src/D7/ParagraphsTrait.php
index 1635f66a..44268732 100644
--- a/src/D7/ParagraphsTrait.php
+++ b/src/D7/ParagraphsTrait.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D7;
+namespace DrevOps\BehatSteps\D7;
 
 use Behat\Gherkin\Node\TableNode;
 
 /**
  * Trait ParagraphsTrait.
  *
- * @package IntegratedExperts\BehatSteps\D7
+ * @package DrevOps\BehatSteps\D7
  */
 trait ParagraphsTrait {
 
diff --git a/src/D7/TaxonomyTrait.php b/src/D7/TaxonomyTrait.php
index a537060d..7b5382b3 100644
--- a/src/D7/TaxonomyTrait.php
+++ b/src/D7/TaxonomyTrait.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D7;
+namespace DrevOps\BehatSteps\D7;
 
 use Behat\Gherkin\Node\TableNode;
 
 /**
  * Trait TaxonomyTrait.
  *
- * @package IntegratedExperts\BehatSteps\D7
+ * @package DrevOps\BehatSteps\D7
  */
 trait TaxonomyTrait {
 
diff --git a/src/D7/UserTrait.php b/src/D7/UserTrait.php
index cdb6e4a8..fceb6bd2 100644
--- a/src/D7/UserTrait.php
+++ b/src/D7/UserTrait.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D7;
+namespace DrevOps\BehatSteps\D7;
 
 use Behat\Gherkin\Node\TableNode;
 
 /**
  * Trait UserTrait.
  *
- * @package IntegratedExperts\BehatSteps\D7
+ * @package DrevOps\BehatSteps\D7
  */
 trait UserTrait {
 
diff --git a/src/D7/VariableTrait.php b/src/D7/VariableTrait.php
index ac27759c..015055d3 100644
--- a/src/D7/VariableTrait.php
+++ b/src/D7/VariableTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D7;
+namespace DrevOps\BehatSteps\D7;
 
 use Behat\Behat\Hook\Scope\AfterScenarioScope;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
@@ -8,7 +8,7 @@
 /**
  * Trait VariableTrait.
  *
- * @package IntegratedExperts\BehatSteps\D7
+ * @package DrevOps\BehatSteps\D7
  */
 trait VariableTrait {
 
diff --git a/src/D7/WatchdogTrait.php b/src/D7/WatchdogTrait.php
index 0a0ecef0..71ca2e86 100644
--- a/src/D7/WatchdogTrait.php
+++ b/src/D7/WatchdogTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D7;
+namespace DrevOps\BehatSteps\D7;
 
 use Behat\Behat\Hook\Scope\AfterScenarioScope;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
@@ -8,7 +8,7 @@
 /**
  * Trait WatchdogTrait.
  *
- * @package IntegratedExperts\BehatSteps\D7
+ * @package DrevOps\BehatSteps\D7
  */
 trait WatchdogTrait {
 
diff --git a/src/D8/BigPipeTrait.php b/src/D8/BigPipeTrait.php
index 8f08abc4..ee058795 100644
--- a/src/D8/BigPipeTrait.php
+++ b/src/D8/BigPipeTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D8;
+namespace DrevOps\BehatSteps\D8;
 
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Mink\Driver\Selenium2Driver;
diff --git a/src/D8/ContentTrait.php b/src/D8/ContentTrait.php
index e5754241..5814a169 100644
--- a/src/D8/ContentTrait.php
+++ b/src/D8/ContentTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D8;
+namespace DrevOps\BehatSteps\D8;
 
 use Behat\Gherkin\Node\TableNode;
 use Drupal\user\Entity\User;
@@ -8,7 +8,7 @@
 /**
  * Trait ContentTrait.
  *
- * @package IntegratedExperts\BehatSteps\D8
+ * @package DrevOps\BehatSteps\D8
  */
 trait ContentTrait {
 
diff --git a/src/D8/DraggableViewsTrait.php b/src/D8/DraggableViewsTrait.php
index 25f850a5..53b674c8 100644
--- a/src/D8/DraggableViewsTrait.php
+++ b/src/D8/DraggableViewsTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D8;
+namespace DrevOps\BehatSteps\D8;
 
 use Behat\Gherkin\Node\TableNode;
 use Drupal\Core\Cache\Cache;
diff --git a/src/D8/EmailTrait.php b/src/D8/EmailTrait.php
index af8404ce..0f312ea3 100644
--- a/src/D8/EmailTrait.php
+++ b/src/D8/EmailTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D8;
+namespace DrevOps\BehatSteps\D8;
 
 use Behat\Behat\Hook\Scope\AfterScenarioScope;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
diff --git a/src/D8/FileDownloadTrait.php b/src/D8/FileDownloadTrait.php
index 51be83e1..3ffe1eb2 100644
--- a/src/D8/FileDownloadTrait.php
+++ b/src/D8/FileDownloadTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D8;
+namespace DrevOps\BehatSteps\D8;
 
 use Behat\Behat\Hook\Scope\AfterScenarioScope;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
diff --git a/src/D8/FileTrait.php b/src/D8/FileTrait.php
index 0bc3023e..24f290a6 100644
--- a/src/D8/FileTrait.php
+++ b/src/D8/FileTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D8;
+namespace DrevOps\BehatSteps\D8;
 
 use Behat\Behat\Hook\Scope\AfterScenarioScope;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
diff --git a/src/D8/MediaTrait.php b/src/D8/MediaTrait.php
index 0232a5d4..639a3fbc 100644
--- a/src/D8/MediaTrait.php
+++ b/src/D8/MediaTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D8;
+namespace DrevOps\BehatSteps\D8;
 
 use Behat\Behat\Hook\Scope\AfterScenarioScope;
 use Behat\Gherkin\Node\TableNode;
diff --git a/src/D8/MenuTrait.php b/src/D8/MenuTrait.php
index ac349b86..70ade315 100644
--- a/src/D8/MenuTrait.php
+++ b/src/D8/MenuTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D8;
+namespace DrevOps\BehatSteps\D8;
 
 use Behat\Behat\Hook\Scope\AfterScenarioScope;
 use Behat\Gherkin\Node\TableNode;
@@ -10,7 +10,7 @@
 /**
  * Trait MenuTrait.
  *
- * @package IntegratedExperts\BehatSteps\D8
+ * @package DrevOps\BehatSteps\D8
  */
 trait MenuTrait {
 
diff --git a/src/D8/OverrideTrait.php b/src/D8/OverrideTrait.php
index bedef0b4..47131980 100644
--- a/src/D8/OverrideTrait.php
+++ b/src/D8/OverrideTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D8;
+namespace DrevOps\BehatSteps\D8;
 
 use Behat\Gherkin\Node\TableNode;
 
@@ -9,7 +9,7 @@
  *
  * Used to override standard Drupal Extension methods.
  *
- * @package IntegratedExperts\BehatSteps\D8
+ * @package DrevOps\BehatSteps\D8
  */
 trait OverrideTrait {
 
diff --git a/src/D8/ParagraphsTrait.php b/src/D8/ParagraphsTrait.php
index 0eaca434..cc1d2acf 100644
--- a/src/D8/ParagraphsTrait.php
+++ b/src/D8/ParagraphsTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D8;
+namespace DrevOps\BehatSteps\D8;
 
 use Behat\Behat\Hook\Scope\AfterScenarioScope;
 use Behat\Gherkin\Node\TableNode;
diff --git a/src/D8/RoleTrait.php b/src/D8/RoleTrait.php
index a9e5232e..01c4d131 100644
--- a/src/D8/RoleTrait.php
+++ b/src/D8/RoleTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D8;
+namespace DrevOps\BehatSteps\D8;
 
 use Behat\Behat\Hook\Scope\AfterScenarioScope;
 use Behat\Gherkin\Node\TableNode;
diff --git a/src/D8/SearchApiTrait.php b/src/D8/SearchApiTrait.php
index 280a709c..5bffa6de 100644
--- a/src/D8/SearchApiTrait.php
+++ b/src/D8/SearchApiTrait.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D8;
+namespace DrevOps\BehatSteps\D8;
 
 use Drupal\node\Entity\Node;
 
 /**
  * Trait SearchApiTrait.
  *
- * @package IntegratedExperts\BehatSteps\D8
+ * @package DrevOps\BehatSteps\D8
  */
 trait SearchApiTrait {
 
diff --git a/src/D8/TaxonomyTrait.php b/src/D8/TaxonomyTrait.php
index 4562ccc0..ffb86d85 100644
--- a/src/D8/TaxonomyTrait.php
+++ b/src/D8/TaxonomyTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D8;
+namespace DrevOps\BehatSteps\D8;
 
 use Behat\Gherkin\Node\TableNode;
 use Drupal\taxonomy\Entity\Vocabulary;
@@ -9,7 +9,7 @@
 /**
  * Trait TaxonomyTrait.
  *
- * @package IntegratedExperts\BehatSteps\D8
+ * @package DrevOps\BehatSteps\D8
  */
 trait TaxonomyTrait {
 
diff --git a/src/D8/TestmodeTrait.php b/src/D8/TestmodeTrait.php
index c2cfa5ea..f938cae9 100644
--- a/src/D8/TestmodeTrait.php
+++ b/src/D8/TestmodeTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D8;
+namespace DrevOps\BehatSteps\D8;
 
 use Behat\Behat\Hook\Scope\AfterScenarioScope;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
diff --git a/src/D8/UserTrait.php b/src/D8/UserTrait.php
index 04a79088..976e6497 100644
--- a/src/D8/UserTrait.php
+++ b/src/D8/UserTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D8;
+namespace DrevOps\BehatSteps\D8;
 
 use Behat\Gherkin\Node\TableNode;
 use Drupal\user\Entity\User;
@@ -8,7 +8,7 @@
 /**
  * Trait UserTrait.
  *
- * @package IntegratedExperts\BehatSteps\D7
+ * @package DrevOps\BehatSteps\D7
  */
 trait UserTrait {
 
diff --git a/src/D8/WatchdogTrait.php b/src/D8/WatchdogTrait.php
index e4b1676a..3975f265 100644
--- a/src/D8/WatchdogTrait.php
+++ b/src/D8/WatchdogTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D8;
+namespace DrevOps\BehatSteps\D8;
 
 use Behat\Behat\Hook\Scope\AfterScenarioScope;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
@@ -9,7 +9,7 @@
 /**
  * Trait WatchdogTrait.
  *
- * @package IntegratedExperts\BehatSteps\D8
+ * @package DrevOps\BehatSteps\D8
  */
 trait WatchdogTrait {
 
diff --git a/src/D8/WysiwygTrait.php b/src/D8/WysiwygTrait.php
index b3e83f79..44b496b9 100644
--- a/src/D8/WysiwygTrait.php
+++ b/src/D8/WysiwygTrait.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps\D8;
+namespace DrevOps\BehatSteps\D8;
 
 use Behat\Mink\Driver\Selenium2Driver;
 use Behat\Mink\Exception\ElementNotFoundException;
-use IntegratedExperts\BehatSteps\KeyboardTrait;
+use DrevOps\BehatSteps\KeyboardTrait;
 
 /**
  * Trait WysiwygTrait.
diff --git a/src/DateTrait.php b/src/DateTrait.php
index c56f4490..7a094e0d 100644
--- a/src/DateTrait.php
+++ b/src/DateTrait.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps;
+namespace DrevOps\BehatSteps;
 
 /**
  * Trait DateTrait.
  *
- * @package IntegratedExperts\BehatSteps
+ * @package DrevOps\BehatSteps
  */
 trait DateTrait {
 
diff --git a/src/ElementTrait.php b/src/ElementTrait.php
index 352a4b1b..1b2f3b6b 100644
--- a/src/ElementTrait.php
+++ b/src/ElementTrait.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps;
+namespace DrevOps\BehatSteps;
 
 /**
  * Trait Element.
  *
- * @package IntegratedExperts\BehatSteps
+ * @package DrevOps\BehatSteps
  */
 trait ElementTrait {
 
diff --git a/src/FieldTrait.php b/src/FieldTrait.php
index 616dc02e..0ee5d5a4 100644
--- a/src/FieldTrait.php
+++ b/src/FieldTrait.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps;
+namespace DrevOps\BehatSteps;
 
 use Behat\Mink\Exception\ElementNotFoundException;
 
 /**
  * Trait Field.
  *
- * @package IntegratedExperts\BehatSteps
+ * @package DrevOps\BehatSteps
  */
 trait FieldTrait {
 
diff --git a/src/JsTrait.php b/src/JsTrait.php
index 5510557c..de9c9469 100644
--- a/src/JsTrait.php
+++ b/src/JsTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps;
+namespace DrevOps\BehatSteps;
 
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Mink\Driver\Selenium2Driver;
@@ -8,7 +8,7 @@
 /**
  * Trait JsTrait.
  *
- * @package IntegratedExperts\BehatSteps
+ * @package DrevOps\BehatSteps
  */
 trait JsTrait {
 
diff --git a/src/KeyboardTrait.php b/src/KeyboardTrait.php
index 1f9b706f..1c08f54b 100644
--- a/src/KeyboardTrait.php
+++ b/src/KeyboardTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps;
+namespace DrevOps\BehatSteps;
 
 use Behat\Mink\Driver\Selenium2Driver;
 use Behat\Mink\Exception\UnsupportedDriverActionException;
diff --git a/src/LinkTrait.php b/src/LinkTrait.php
index 74791e6e..6d4b0031 100644
--- a/src/LinkTrait.php
+++ b/src/LinkTrait.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps;
+namespace DrevOps\BehatSteps;
 
 /**
  * Trait LinkTrait.
  *
- * @package IntegratedExperts\BehatSteps
+ * @package DrevOps\BehatSteps
  */
 trait LinkTrait {
 
diff --git a/src/PathTrait.php b/src/PathTrait.php
index 385124e3..217ea07f 100644
--- a/src/PathTrait.php
+++ b/src/PathTrait.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps;
+namespace DrevOps\BehatSteps;
 
 /**
  * Trait PathTrait.
  *
- * @package IntegratedExperts\BehatSteps
+ * @package DrevOps\BehatSteps
  */
 trait PathTrait {
 
diff --git a/src/ResponseTrait.php b/src/ResponseTrait.php
index c711af93..772012fe 100644
--- a/src/ResponseTrait.php
+++ b/src/ResponseTrait.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps;
+namespace DrevOps\BehatSteps;
 
 /**
  * Trait ResponseTrait.
  *
- * @package IntegratedExperts\BehatSteps
+ * @package DrevOps\BehatSteps
  */
 trait ResponseTrait {
 
diff --git a/src/SelectTrait.php b/src/SelectTrait.php
index 89b2c22d..a2f9ff67 100644
--- a/src/SelectTrait.php
+++ b/src/SelectTrait.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps;
+namespace DrevOps\BehatSteps;
 
 /**
  * Trait SelectTrait.
  *
- * @package IntegratedExperts\BehatSteps
+ * @package DrevOps\BehatSteps
  */
 trait SelectTrait {
 
diff --git a/src/VisibilityTrait.php b/src/VisibilityTrait.php
index f538fc35..9e366ac6 100644
--- a/src/VisibilityTrait.php
+++ b/src/VisibilityTrait.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps;
+namespace DrevOps\BehatSteps;
 
 /**
  * Trait VisibilityTrait.
  *
- * @package IntegratedExperts\BehatSteps
+ * @package DrevOps\BehatSteps
  */
 trait VisibilityTrait {
 
diff --git a/src/WaitTrait.php b/src/WaitTrait.php
index 94dbb7a3..f970c365 100644
--- a/src/WaitTrait.php
+++ b/src/WaitTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IntegratedExperts\BehatSteps;
+namespace DrevOps\BehatSteps;
 
 use Behat\Mink\Driver\Selenium2Driver;
 use Behat\Mink\Exception\UnsupportedDriverActionException;
@@ -8,7 +8,7 @@
 /**
  * Trait WaitTrait.
  *
- * @package IntegratedExperts\BehatSteps
+ * @package DrevOps\BehatSteps
  */
 trait WaitTrait {
 
diff --git a/tests/behat/bootstrap/BehatCliTrait.php b/tests/behat/bootstrap/BehatCliTrait.php
index 4f6a98a2..ea8e57d6 100644
--- a/tests/behat/bootstrap/BehatCliTrait.php
+++ b/tests/behat/bootstrap/BehatCliTrait.php
@@ -57,7 +57,7 @@ public function behatCliWriteFeatureContextFile(array $traits = []) {
       '{{USE_IN_CLASS}}' => '',
     ];
     foreach ($traits as $trait) {
-      $tokens['{{USE_DECLARATION}}'] .= sprintf('use IntegratedExperts\\BehatSteps\\%s;' . PHP_EOL, $trait);
+      $tokens['{{USE_DECLARATION}}'] .= sprintf('use DrevOps\\BehatSteps\\%s;' . PHP_EOL, $trait);
       $trait_name__parts = explode('\\', $trait);
       $trait_name = end($trait_name__parts);
       $tokens['{{USE_IN_CLASS}}'] .= sprintf('use %s;' . PHP_EOL, $trait_name);
diff --git a/tests/behat/bootstrap/FeatureContextD7.php b/tests/behat/bootstrap/FeatureContextD7.php
index f8a204ab..449576c9 100644
--- a/tests/behat/bootstrap/FeatureContextD7.php
+++ b/tests/behat/bootstrap/FeatureContextD7.php
@@ -14,22 +14,22 @@
 use Behat\Behat\Hook\Scope\AfterFeatureScope;
 use Behat\Gherkin\Node\PyStringNode;
 use Drupal\DrupalExtension\Context\DrupalContext;
-use IntegratedExperts\BehatSteps\D7\ContentTrait;
-use IntegratedExperts\BehatSteps\D7\EmailTrait;
-use IntegratedExperts\BehatSteps\D7\FieldCollectionTrait;
-use IntegratedExperts\BehatSteps\D7\FileDownloadTrait;
-use IntegratedExperts\BehatSteps\D7\FileTrait;
-use IntegratedExperts\BehatSteps\D7\MediaTrait;
-use IntegratedExperts\BehatSteps\D7\ParagraphsTrait;
-use IntegratedExperts\BehatSteps\D7\TaxonomyTrait;
-use IntegratedExperts\BehatSteps\D7\UserTrait;
-use IntegratedExperts\BehatSteps\D7\VariableTrait;
-use IntegratedExperts\BehatSteps\D7\WatchdogTrait;
-use IntegratedExperts\BehatSteps\FieldTrait;
-use IntegratedExperts\BehatSteps\LinkTrait;
-use IntegratedExperts\BehatSteps\PathTrait;
-use IntegratedExperts\BehatSteps\ResponseTrait;
-use IntegratedExperts\BehatSteps\WaitTrait;
+use DrevOps\BehatSteps\D7\ContentTrait;
+use DrevOps\BehatSteps\D7\EmailTrait;
+use DrevOps\BehatSteps\D7\FieldCollectionTrait;
+use DrevOps\BehatSteps\D7\FileDownloadTrait;
+use DrevOps\BehatSteps\D7\FileTrait;
+use DrevOps\BehatSteps\D7\MediaTrait;
+use DrevOps\BehatSteps\D7\ParagraphsTrait;
+use DrevOps\BehatSteps\D7\TaxonomyTrait;
+use DrevOps\BehatSteps\D7\UserTrait;
+use DrevOps\BehatSteps\D7\VariableTrait;
+use DrevOps\BehatSteps\D7\WatchdogTrait;
+use DrevOps\BehatSteps\FieldTrait;
+use DrevOps\BehatSteps\LinkTrait;
+use DrevOps\BehatSteps\PathTrait;
+use DrevOps\BehatSteps\ResponseTrait;
+use DrevOps\BehatSteps\WaitTrait;
 
 /**
  * Defines application features from the specific context.
diff --git a/tests/behat/bootstrap/FeatureContextD8.php b/tests/behat/bootstrap/FeatureContextD8.php
index a1e330fd..ea2d7c09 100644
--- a/tests/behat/bootstrap/FeatureContextD8.php
+++ b/tests/behat/bootstrap/FeatureContextD8.php
@@ -19,30 +19,30 @@
 use Drupal\DrupalExtension\Context\DrupalContext;
 use Drupal\file\Entity\File;
 use Drupal\user\Entity\User;
-use IntegratedExperts\BehatSteps\D8\BigPipeTrait;
-use IntegratedExperts\BehatSteps\D8\ContentTrait;
-use IntegratedExperts\BehatSteps\D8\DraggableViewsTrait;
-use IntegratedExperts\BehatSteps\D8\EmailTrait;
-use IntegratedExperts\BehatSteps\D8\FileDownloadTrait;
-use IntegratedExperts\BehatSteps\D8\FileTrait;
-use IntegratedExperts\BehatSteps\D8\MediaTrait;
-use IntegratedExperts\BehatSteps\D8\MenuTrait;
-use IntegratedExperts\BehatSteps\D8\OverrideTrait;
-use IntegratedExperts\BehatSteps\D8\ParagraphsTrait;
-use IntegratedExperts\BehatSteps\D8\RoleTrait;
-use IntegratedExperts\BehatSteps\D8\SearchApiTrait;
-use IntegratedExperts\BehatSteps\D8\TaxonomyTrait;
-use IntegratedExperts\BehatSteps\D8\TestmodeTrait;
-use IntegratedExperts\BehatSteps\D8\UserTrait;
-use IntegratedExperts\BehatSteps\D8\WatchdogTrait;
-use IntegratedExperts\BehatSteps\D8\WysiwygTrait;
-use IntegratedExperts\BehatSteps\ElementTrait;
-use IntegratedExperts\BehatSteps\FieldTrait;
-use IntegratedExperts\BehatSteps\LinkTrait;
-use IntegratedExperts\BehatSteps\PathTrait;
-use IntegratedExperts\BehatSteps\ResponseTrait;
-use IntegratedExperts\BehatSteps\SelectTrait;
-use IntegratedExperts\BehatSteps\WaitTrait;
+use DrevOps\BehatSteps\D8\BigPipeTrait;
+use DrevOps\BehatSteps\D8\ContentTrait;
+use DrevOps\BehatSteps\D8\DraggableViewsTrait;
+use DrevOps\BehatSteps\D8\EmailTrait;
+use DrevOps\BehatSteps\D8\FileDownloadTrait;
+use DrevOps\BehatSteps\D8\FileTrait;
+use DrevOps\BehatSteps\D8\MediaTrait;
+use DrevOps\BehatSteps\D8\MenuTrait;
+use DrevOps\BehatSteps\D8\OverrideTrait;
+use DrevOps\BehatSteps\D8\ParagraphsTrait;
+use DrevOps\BehatSteps\D8\RoleTrait;
+use DrevOps\BehatSteps\D8\SearchApiTrait;
+use DrevOps\BehatSteps\D8\TaxonomyTrait;
+use DrevOps\BehatSteps\D8\TestmodeTrait;
+use DrevOps\BehatSteps\D8\UserTrait;
+use DrevOps\BehatSteps\D8\WatchdogTrait;
+use DrevOps\BehatSteps\D8\WysiwygTrait;
+use DrevOps\BehatSteps\ElementTrait;
+use DrevOps\BehatSteps\FieldTrait;
+use DrevOps\BehatSteps\LinkTrait;
+use DrevOps\BehatSteps\PathTrait;
+use DrevOps\BehatSteps\ResponseTrait;
+use DrevOps\BehatSteps\SelectTrait;
+use DrevOps\BehatSteps\WaitTrait;
 
 /**
  * Defines application features from the specific context.
diff --git a/tests/behat/features/behatcli.feature b/tests/behat/features/behatcli.feature
index a60d8d54..a2d82471 100644
--- a/tests/behat/features/behatcli.feature
+++ b/tests/behat/features/behatcli.feature
@@ -15,7 +15,7 @@ Feature: Behat CLI context
       """
       <?php
       use Drupal\DrupalExtension\Context\DrupalContext;
-      use IntegratedExperts\BehatSteps\PathTrait;
+      use DrevOps\BehatSteps\PathTrait;
       class FeatureContext extends DrupalContext {
         use PathTrait;