diff --git a/composer.json b/composer.json
index 6d47fca11f0e..06d07b6bf3bd 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,9 @@
             "OC\\": "lib/private",
             "OC\\Core\\": "core/",
             "OC\\Settings\\": "settings/",
-            "OCP\\": "lib/public"
+            "OCP\\": "lib/public",
+            "Tests\\Acceptance\\": "tests/acceptance/features/bootstrap",
+            "Tests\\Acceptance\\Page\\": "tests/acceptance/features/lib"
         },
         "classmap": ["lib/private/legacy"],
         "files": [
diff --git a/tests/acceptance/features/bootstrap/AppConfigurationContext.php b/tests/acceptance/features/bootstrap/AppConfigurationContext.php
index 377be9d79963..0b2c01922821 100644
--- a/tests/acceptance/features/bootstrap/AppConfigurationContext.php
+++ b/tests/acceptance/features/bootstrap/AppConfigurationContext.php
@@ -22,6 +22,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use GuzzleHttp\Exception\GuzzleException;
 use PHPUnit\Framework\Assert;
diff --git a/tests/acceptance/features/bootstrap/AppManagementContext.php b/tests/acceptance/features/bootstrap/AppManagementContext.php
index 33615a55fddd..fb5226a5da45 100644
--- a/tests/acceptance/features/bootstrap/AppManagementContext.php
+++ b/tests/acceptance/features/bootstrap/AppManagementContext.php
@@ -19,6 +19,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
diff --git a/tests/acceptance/features/bootstrap/AuthContext.php b/tests/acceptance/features/bootstrap/AuthContext.php
index 0f58b5043586..05bea7187a71 100644
--- a/tests/acceptance/features/bootstrap/AuthContext.php
+++ b/tests/acceptance/features/bootstrap/AuthContext.php
@@ -19,6 +19,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use TestHelpers\HttpRequestHelper;
 use Behat\Gherkin\Node\TableNode;
diff --git a/tests/acceptance/features/bootstrap/CalDavContext.php b/tests/acceptance/features/bootstrap/CalDavContext.php
index 1f95f7ba706a..edc44284450a 100644
--- a/tests/acceptance/features/bootstrap/CalDavContext.php
+++ b/tests/acceptance/features/bootstrap/CalDavContext.php
@@ -19,6 +19,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use PHPUnit\Framework\Assert;
diff --git a/tests/acceptance/features/bootstrap/CapabilitiesContext.php b/tests/acceptance/features/bootstrap/CapabilitiesContext.php
index 2695fca43539..b3cfb738e9d7 100644
--- a/tests/acceptance/features/bootstrap/CapabilitiesContext.php
+++ b/tests/acceptance/features/bootstrap/CapabilitiesContext.php
@@ -22,6 +22,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use PHPUnit\Framework\Assert;
diff --git a/tests/acceptance/features/bootstrap/CardDavContext.php b/tests/acceptance/features/bootstrap/CardDavContext.php
index 3e778e6e8abe..1af5c7284b1d 100644
--- a/tests/acceptance/features/bootstrap/CardDavContext.php
+++ b/tests/acceptance/features/bootstrap/CardDavContext.php
@@ -19,6 +19,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use PHPUnit\Framework\Assert;
diff --git a/tests/acceptance/features/bootstrap/ChecksumContext.php b/tests/acceptance/features/bootstrap/ChecksumContext.php
index 17f8496b0706..80c2bb144418 100644
--- a/tests/acceptance/features/bootstrap/ChecksumContext.php
+++ b/tests/acceptance/features/bootstrap/ChecksumContext.php
@@ -19,6 +19,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use PHPUnit\Framework\Assert;
diff --git a/tests/acceptance/features/bootstrap/CommentsContext.php b/tests/acceptance/features/bootstrap/CommentsContext.php
index 8b65e87d7bef..490b404a8d05 100644
--- a/tests/acceptance/features/bootstrap/CommentsContext.php
+++ b/tests/acceptance/features/bootstrap/CommentsContext.php
@@ -20,6 +20,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
diff --git a/tests/acceptance/features/bootstrap/CorsContext.php b/tests/acceptance/features/bootstrap/CorsContext.php
index 0f394744f623..62dc49c87c85 100644
--- a/tests/acceptance/features/bootstrap/CorsContext.php
+++ b/tests/acceptance/features/bootstrap/CorsContext.php
@@ -20,6 +20,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use PHPUnit\Framework\Assert;
diff --git a/tests/acceptance/features/bootstrap/EmailContext.php b/tests/acceptance/features/bootstrap/EmailContext.php
index 05f46d7f3624..359a762d8111 100644
--- a/tests/acceptance/features/bootstrap/EmailContext.php
+++ b/tests/acceptance/features/bootstrap/EmailContext.php
@@ -20,6 +20,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\PyStringNode;
diff --git a/tests/acceptance/features/bootstrap/EncryptionContext.php b/tests/acceptance/features/bootstrap/EncryptionContext.php
index 5fa6f7227504..75b19fd5361e 100644
--- a/tests/acceptance/features/bootstrap/EncryptionContext.php
+++ b/tests/acceptance/features/bootstrap/EncryptionContext.php
@@ -20,6 +20,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use PHPUnit\Framework\Assert;
diff --git a/tests/acceptance/features/bootstrap/FavoritesContext.php b/tests/acceptance/features/bootstrap/FavoritesContext.php
index 80eeb7b061af..b0d379962184 100644
--- a/tests/acceptance/features/bootstrap/FavoritesContext.php
+++ b/tests/acceptance/features/bootstrap/FavoritesContext.php
@@ -20,6 +20,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
diff --git a/tests/acceptance/features/bootstrap/FeatureContext.php b/tests/acceptance/features/bootstrap/FeatureContext.php
index f43dfc75176d..8c194e0b5fa6 100644
--- a/tests/acceptance/features/bootstrap/FeatureContext.php
+++ b/tests/acceptance/features/bootstrap/FeatureContext.php
@@ -21,6 +21,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Hook\Scope\BeforeStepScope;
 use GuzzleHttp\Exception\GuzzleException;
 use Helmich\JsonAssert\JsonAssertions;
diff --git a/tests/acceptance/features/bootstrap/FederationContext.php b/tests/acceptance/features/bootstrap/FederationContext.php
index e4b11c6fe98c..3f468dc2360e 100644
--- a/tests/acceptance/features/bootstrap/FederationContext.php
+++ b/tests/acceptance/features/bootstrap/FederationContext.php
@@ -22,6 +22,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use TestHelpers\SharingHelper;
diff --git a/tests/acceptance/features/bootstrap/FilesVersionsContext.php b/tests/acceptance/features/bootstrap/FilesVersionsContext.php
index 0f8836c9334e..739f04fdff6b 100644
--- a/tests/acceptance/features/bootstrap/FilesVersionsContext.php
+++ b/tests/acceptance/features/bootstrap/FilesVersionsContext.php
@@ -20,6 +20,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
diff --git a/tests/acceptance/features/bootstrap/IpContext.php b/tests/acceptance/features/bootstrap/IpContext.php
index c212402f293d..4f8ab6e8d4aa 100644
--- a/tests/acceptance/features/bootstrap/IpContext.php
+++ b/tests/acceptance/features/bootstrap/IpContext.php
@@ -20,6 +20,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use TestHelpers\IpHelper;
diff --git a/tests/acceptance/features/bootstrap/LoggingContext.php b/tests/acceptance/features/bootstrap/LoggingContext.php
index 994403efa69c..7827329943a0 100644
--- a/tests/acceptance/features/bootstrap/LoggingContext.php
+++ b/tests/acceptance/features/bootstrap/LoggingContext.php
@@ -20,6 +20,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
diff --git a/tests/acceptance/features/bootstrap/NotificationsCoreContext.php b/tests/acceptance/features/bootstrap/NotificationsCoreContext.php
index 9d8d9c1d653a..3c468bf5c0f1 100644
--- a/tests/acceptance/features/bootstrap/NotificationsCoreContext.php
+++ b/tests/acceptance/features/bootstrap/NotificationsCoreContext.php
@@ -20,6 +20,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
diff --git a/tests/acceptance/features/bootstrap/OCSContext.php b/tests/acceptance/features/bootstrap/OCSContext.php
index 050b00114b94..758c7cea87f4 100644
--- a/tests/acceptance/features/bootstrap/OCSContext.php
+++ b/tests/acceptance/features/bootstrap/OCSContext.php
@@ -20,6 +20,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\PyStringNode;
diff --git a/tests/acceptance/features/bootstrap/OccAppManagementContext.php b/tests/acceptance/features/bootstrap/OccAppManagementContext.php
index 7258482cb0a9..99cb24c5e9aa 100644
--- a/tests/acceptance/features/bootstrap/OccAppManagementContext.php
+++ b/tests/acceptance/features/bootstrap/OccAppManagementContext.php
@@ -20,6 +20,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
diff --git a/tests/acceptance/features/bootstrap/OccContext.php b/tests/acceptance/features/bootstrap/OccContext.php
index 4b486834a7fe..92506d2aac2d 100644
--- a/tests/acceptance/features/bootstrap/OccContext.php
+++ b/tests/acceptance/features/bootstrap/OccContext.php
@@ -20,6 +20,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
diff --git a/tests/acceptance/features/bootstrap/OccUsersGroupsContext.php b/tests/acceptance/features/bootstrap/OccUsersGroupsContext.php
index b08ec9339725..4392b2fec30f 100644
--- a/tests/acceptance/features/bootstrap/OccUsersGroupsContext.php
+++ b/tests/acceptance/features/bootstrap/OccUsersGroupsContext.php
@@ -20,6 +20,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
diff --git a/tests/acceptance/features/bootstrap/Provisioning.php b/tests/acceptance/features/bootstrap/Provisioning.php
index 511c5adaa63a..bf61c270d11e 100644
--- a/tests/acceptance/features/bootstrap/Provisioning.php
+++ b/tests/acceptance/features/bootstrap/Provisioning.php
@@ -19,6 +19,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Gherkin\Node\TableNode;
 use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Exception\GuzzleException;
diff --git a/tests/acceptance/features/bootstrap/PublicWebDavContext.php b/tests/acceptance/features/bootstrap/PublicWebDavContext.php
index 37d02153d420..21abc70062db 100644
--- a/tests/acceptance/features/bootstrap/PublicWebDavContext.php
+++ b/tests/acceptance/features/bootstrap/PublicWebDavContext.php
@@ -20,6 +20,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use PHPUnit\Framework\Assert;
diff --git a/tests/acceptance/features/bootstrap/SearchContext.php b/tests/acceptance/features/bootstrap/SearchContext.php
index 1f9e8a4d1e88..6d56a0faee25 100644
--- a/tests/acceptance/features/bootstrap/SearchContext.php
+++ b/tests/acceptance/features/bootstrap/SearchContext.php
@@ -20,6 +20,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
diff --git a/tests/acceptance/features/bootstrap/ShareesContext.php b/tests/acceptance/features/bootstrap/ShareesContext.php
index 2fc8cbf146af..189ef21b5662 100644
--- a/tests/acceptance/features/bootstrap/ShareesContext.php
+++ b/tests/acceptance/features/bootstrap/ShareesContext.php
@@ -22,6 +22,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
diff --git a/tests/acceptance/features/bootstrap/Sharing.php b/tests/acceptance/features/bootstrap/Sharing.php
index f1bd50755761..12f9e5cd566f 100644
--- a/tests/acceptance/features/bootstrap/Sharing.php
+++ b/tests/acceptance/features/bootstrap/Sharing.php
@@ -22,6 +22,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Gherkin\Node\PyStringNode;
 use Behat\Gherkin\Node\TableNode;
 use Psr\Http\Message\ResponseInterface;
diff --git a/tests/acceptance/features/bootstrap/TUSContext.php b/tests/acceptance/features/bootstrap/TUSContext.php
index ed53c0e4572f..0cb441a4e562 100644
--- a/tests/acceptance/features/bootstrap/TUSContext.php
+++ b/tests/acceptance/features/bootstrap/TUSContext.php
@@ -19,6 +19,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
diff --git a/tests/acceptance/features/bootstrap/TagsContext.php b/tests/acceptance/features/bootstrap/TagsContext.php
index 19c645969175..86bb7fddeb25 100644
--- a/tests/acceptance/features/bootstrap/TagsContext.php
+++ b/tests/acceptance/features/bootstrap/TagsContext.php
@@ -20,6 +20,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
diff --git a/tests/acceptance/features/bootstrap/TransferOwnershipContext.php b/tests/acceptance/features/bootstrap/TransferOwnershipContext.php
index 8a8b466a6a76..ddbb6ec42bd4 100644
--- a/tests/acceptance/features/bootstrap/TransferOwnershipContext.php
+++ b/tests/acceptance/features/bootstrap/TransferOwnershipContext.php
@@ -20,6 +20,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 
diff --git a/tests/acceptance/features/bootstrap/TrashbinContext.php b/tests/acceptance/features/bootstrap/TrashbinContext.php
index 3c06eae5ff65..39137f033c70 100644
--- a/tests/acceptance/features/bootstrap/TrashbinContext.php
+++ b/tests/acceptance/features/bootstrap/TrashbinContext.php
@@ -19,6 +19,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
diff --git a/tests/acceptance/features/bootstrap/WebDav.php b/tests/acceptance/features/bootstrap/WebDav.php
index c896b17ba7c9..7b1d721d2139 100644
--- a/tests/acceptance/features/bootstrap/WebDav.php
+++ b/tests/acceptance/features/bootstrap/WebDav.php
@@ -19,6 +19,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Gherkin\Node\PyStringNode;
 use Behat\Gherkin\Node\TableNode;
 use GuzzleHttp\Exception\BadResponseException;
diff --git a/tests/acceptance/features/bootstrap/WebDavLockingContext.php b/tests/acceptance/features/bootstrap/WebDavLockingContext.php
index 22ccfa92804d..34275bb43888 100644
--- a/tests/acceptance/features/bootstrap/WebDavLockingContext.php
+++ b/tests/acceptance/features/bootstrap/WebDavLockingContext.php
@@ -20,6 +20,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
diff --git a/tests/acceptance/features/bootstrap/WebDavPropertiesContext.php b/tests/acceptance/features/bootstrap/WebDavPropertiesContext.php
index 7da9fbe0205b..42a2d16a3f58 100644
--- a/tests/acceptance/features/bootstrap/WebDavPropertiesContext.php
+++ b/tests/acceptance/features/bootstrap/WebDavPropertiesContext.php
@@ -20,6 +20,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
diff --git a/tests/acceptance/features/bootstrap/WebUIAdminAppsSettingsContext.php b/tests/acceptance/features/bootstrap/WebUIAdminAppsSettingsContext.php
index 73a25e526558..b943c367fc4f 100644
--- a/tests/acceptance/features/bootstrap/WebUIAdminAppsSettingsContext.php
+++ b/tests/acceptance/features/bootstrap/WebUIAdminAppsSettingsContext.php
@@ -21,10 +21,12 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\MinkExtension\Context\RawMinkContext;
-use Page\AdminAppsSettingsPage;
+use Tests\Acceptance\Page\AdminAppsSettingsPage;
 
 require_once 'bootstrap.php';
 
diff --git a/tests/acceptance/features/bootstrap/WebUIAdminEncryptionSettingsContext.php b/tests/acceptance/features/bootstrap/WebUIAdminEncryptionSettingsContext.php
index 44790d30b93a..4bee7f43544d 100644
--- a/tests/acceptance/features/bootstrap/WebUIAdminEncryptionSettingsContext.php
+++ b/tests/acceptance/features/bootstrap/WebUIAdminEncryptionSettingsContext.php
@@ -20,6 +20,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\MinkExtension\Context\RawMinkContext;
diff --git a/tests/acceptance/features/bootstrap/WebUIAdminGeneralSettingsContext.php b/tests/acceptance/features/bootstrap/WebUIAdminGeneralSettingsContext.php
index dbdc4ed2fac5..2d8a4273ec1b 100644
--- a/tests/acceptance/features/bootstrap/WebUIAdminGeneralSettingsContext.php
+++ b/tests/acceptance/features/bootstrap/WebUIAdminGeneralSettingsContext.php
@@ -21,14 +21,16 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
 use Behat\MinkExtension\Context\RawMinkContext;
-use Page\AdminGeneralSettingsPage;
 use PHPUnit\Framework\Assert;
 use TestHelpers\AppConfigHelper;
 use TestHelpers\SetupHelper;
+use Tests\Acceptance\Page\AdminGeneralSettingsPage;
 
 require_once 'bootstrap.php';
 
diff --git a/tests/acceptance/features/bootstrap/WebUIAdminSharingSettingsContext.php b/tests/acceptance/features/bootstrap/WebUIAdminSharingSettingsContext.php
index 91cc0b7a29cb..fec3d359b1f4 100644
--- a/tests/acceptance/features/bootstrap/WebUIAdminSharingSettingsContext.php
+++ b/tests/acceptance/features/bootstrap/WebUIAdminSharingSettingsContext.php
@@ -21,13 +21,15 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Mink\Element\NodeElement;
 use Behat\MinkExtension\Context\RawMinkContext;
-use Page\AdminSharingSettingsPage;
 use PHPUnit\Framework\Assert;
 use TestHelpers\SetupHelper;
+use Tests\Acceptance\Page\AdminSharingSettingsPage;
 
 require_once 'bootstrap.php';
 
diff --git a/tests/acceptance/features/bootstrap/WebUIAdminStorageSettingsContext.php b/tests/acceptance/features/bootstrap/WebUIAdminStorageSettingsContext.php
index 68553e55aa73..4514951f5d93 100644
--- a/tests/acceptance/features/bootstrap/WebUIAdminStorageSettingsContext.php
+++ b/tests/acceptance/features/bootstrap/WebUIAdminStorageSettingsContext.php
@@ -21,12 +21,14 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\MinkExtension\Context\RawMinkContext;
-use Page\AdminStorageSettingsPage;
 use PHPUnit\Framework\Assert;
 use TestHelpers\SetupHelper;
+use Tests\Acceptance\Page\AdminStorageSettingsPage;
 
 require_once 'bootstrap.php';
 
diff --git a/tests/acceptance/features/bootstrap/WebUIFileActionsMenuContext.php b/tests/acceptance/features/bootstrap/WebUIFileActionsMenuContext.php
index b43555189049..d2e9893d2477 100644
--- a/tests/acceptance/features/bootstrap/WebUIFileActionsMenuContext.php
+++ b/tests/acceptance/features/bootstrap/WebUIFileActionsMenuContext.php
@@ -20,12 +20,14 @@
  *
  */
 
-require_once 'bootstrap.php';
+namespace Tests\Acceptance;
 
 use Behat\Behat\Context\Context;
 use Behat\Gherkin\Node\TableNode;
 use Behat\MinkExtension\Context\RawMinkContext;
-use Page\FilesPage;
+use Tests\Acceptance\Page\FilesPage;
+
+require_once 'bootstrap.php';
 
 /**
  * Context for file actions menu
diff --git a/tests/acceptance/features/bootstrap/WebUIFilesContext.php b/tests/acceptance/features/bootstrap/WebUIFilesContext.php
index 41e275e18150..23eed2d80c65 100644
--- a/tests/acceptance/features/bootstrap/WebUIFilesContext.php
+++ b/tests/acceptance/features/bootstrap/WebUIFilesContext.php
@@ -20,25 +20,27 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
 use Behat\MinkExtension\Context\RawMinkContext;
 use GuzzleHttp\Exception\GuzzleException;
-use Page\ExternalStoragePage;
-use Page\FavoritesPage;
-use Page\FilesPage;
-use Page\FilesPageBasic;
-use Page\FilesPageElement\DetailsDialog;
-use Page\FilesPageElement\FileRow;
-use Page\OwncloudPage;
-use Page\SharedByLinkPage;
-use Page\SharedWithOthersPage;
-use Page\SharedWithYouPage;
-use Page\TagsPage;
-use Page\TrashbinPage;
-use Page\FilesPageElement\ConflictDialog;
-use Page\FilesPageElement\FileActionsMenu;
+use Tests\Acceptance\Page\ExternalStoragePage;
+use Tests\Acceptance\Page\FavoritesPage;
+use Tests\Acceptance\Page\FilesPage;
+use Tests\Acceptance\Page\FilesPageBasic;
+use Tests\Acceptance\Page\FilesPageElement\DetailsDialog;
+use Tests\Acceptance\Page\FilesPageElement\FileRow;
+use Tests\Acceptance\Page\OwncloudPage;
+use Tests\Acceptance\Page\SharedByLinkPage;
+use Tests\Acceptance\Page\SharedWithOthersPage;
+use Tests\Acceptance\Page\SharedWithYouPage;
+use Tests\Acceptance\Page\TagsPage;
+use Tests\Acceptance\Page\TrashbinPage;
+use Tests\Acceptance\Page\FilesPageElement\ConflictDialog;
+use Tests\Acceptance\Page\FilesPageElement\FileActionsMenu;
 use PHPUnit\Framework\Assert;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Exception\ElementNotFoundException;
 use TestHelpers\Asserts\WebDav as WebDavAssert;
diff --git a/tests/acceptance/features/bootstrap/WebUIGeneralContext.php b/tests/acceptance/features/bootstrap/WebUIGeneralContext.php
index 3278fb9b8f3f..a08601ccba40 100644
--- a/tests/acceptance/features/bootstrap/WebUIGeneralContext.php
+++ b/tests/acceptance/features/bootstrap/WebUIGeneralContext.php
@@ -20,22 +20,24 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\AfterScenarioScope;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
 use Behat\MinkExtension\Context\RawMinkContext;
 use GuzzleHttp\Exception\GuzzleException;
-use Page\LoginPage;
-use Page\OwncloudPage;
+use Tests\Acceptance\Page\LoginPage;
+use Tests\Acceptance\Page\OwncloudPage;
 use PHPUnit\Framework\Assert;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Exception\ElementNotFoundException;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
 use TestHelpers\AppConfigHelper;
 use TestHelpers\EmailHelper;
 use TestHelpers\SetupHelper;
-use Page\GeneralErrorPage;
-use Page\GeneralExceptionPage;
+use Tests\Acceptance\Page\GeneralErrorPage;
+use Tests\Acceptance\Page\GeneralExceptionPage;
 
 require_once 'bootstrap.php';
 
diff --git a/tests/acceptance/features/bootstrap/WebUIHelpAndTipsContext.php b/tests/acceptance/features/bootstrap/WebUIHelpAndTipsContext.php
index 07becd8befa7..51d085761fe3 100644
--- a/tests/acceptance/features/bootstrap/WebUIHelpAndTipsContext.php
+++ b/tests/acceptance/features/bootstrap/WebUIHelpAndTipsContext.php
@@ -21,10 +21,12 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\MinkExtension\Context\RawMinkContext;
-use Page\HelpAndTipsPage;
+use Tests\Acceptance\Page\HelpAndTipsPage;
 use PHPUnit\Framework\Assert;
 use TestHelpers\SetupHelper;
 
diff --git a/tests/acceptance/features/bootstrap/WebUILoginContext.php b/tests/acceptance/features/bootstrap/WebUILoginContext.php
index 6790659b0633..a2dcd4fa969b 100644
--- a/tests/acceptance/features/bootstrap/WebUILoginContext.php
+++ b/tests/acceptance/features/bootstrap/WebUILoginContext.php
@@ -20,15 +20,17 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\PyStringNode;
 use Behat\Mink\Exception\ElementNotFoundException;
 use Behat\MinkExtension\Context\RawMinkContext;
 use GuzzleHttp\Exception\GuzzleException;
-use Page\LoginPage;
 use PHPUnit\Framework\Assert;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
+use Tests\Acceptance\Page\LoginPage;
 
 require_once 'bootstrap.php';
 
diff --git a/tests/acceptance/features/bootstrap/WebUINewFileMenuContext.php b/tests/acceptance/features/bootstrap/WebUINewFileMenuContext.php
index a7ea5a887eaf..21cbc09bc46c 100644
--- a/tests/acceptance/features/bootstrap/WebUINewFileMenuContext.php
+++ b/tests/acceptance/features/bootstrap/WebUINewFileMenuContext.php
@@ -21,10 +21,12 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\MinkExtension\Context\RawMinkContext;
-use Page\FilesPageElement\NewFileMenu;
 use PHPUnit\Framework\Assert;
+use Tests\Acceptance\Page\FilesPageElement\NewFileMenu;
 
 require_once 'bootstrap.php';
 
diff --git a/tests/acceptance/features/bootstrap/WebUINotificationsContext.php b/tests/acceptance/features/bootstrap/WebUINotificationsContext.php
index c751c9f1fe56..ee4dbc963bba 100644
--- a/tests/acceptance/features/bootstrap/WebUINotificationsContext.php
+++ b/tests/acceptance/features/bootstrap/WebUINotificationsContext.php
@@ -19,6 +19,9 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
+namespace Tests\Acceptance;
+
 require_once 'bootstrap.php';
 
 use Behat\Behat\Context\Context;
@@ -26,9 +29,9 @@
 use Behat\Gherkin\Node\TableNode;
 use Behat\Mink\Session;
 use Behat\MinkExtension\Context\RawMinkContext;
-use Page\Notification;
-use Page\NotificationsEnabledOwncloudPage;
 use PHPUnit\Framework\Assert;
+use Tests\Acceptance\Page\Notification;
+use Tests\Acceptance\Page\NotificationsEnabledOwncloudPage;
 
 /**
  * Context for Notifications App
diff --git a/tests/acceptance/features/bootstrap/WebUIPersonalEncryptionSettingsContext.php b/tests/acceptance/features/bootstrap/WebUIPersonalEncryptionSettingsContext.php
index 985eda73ee66..35289251c249 100644
--- a/tests/acceptance/features/bootstrap/WebUIPersonalEncryptionSettingsContext.php
+++ b/tests/acceptance/features/bootstrap/WebUIPersonalEncryptionSettingsContext.php
@@ -20,9 +20,11 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\MinkExtension\Context\RawMinkContext;
-use Page\PersonalEncryptionSettingsPage;
+use Tests\Acceptance\Page\PersonalEncryptionSettingsPage;
 
 require_once 'bootstrap.php';
 
diff --git a/tests/acceptance/features/bootstrap/WebUIPersonalGeneralSettingsContext.php b/tests/acceptance/features/bootstrap/WebUIPersonalGeneralSettingsContext.php
index 09f3c669a654..b81d6bcf6e2c 100644
--- a/tests/acceptance/features/bootstrap/WebUIPersonalGeneralSettingsContext.php
+++ b/tests/acceptance/features/bootstrap/WebUIPersonalGeneralSettingsContext.php
@@ -20,12 +20,14 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\MinkExtension\Context\RawMinkContext;
-use Page\PersonalGeneralSettingsPage;
 use PHPUnit\Framework\Assert;
 use TestHelpers\EmailHelper;
+use Tests\Acceptance\Page\PersonalGeneralSettingsPage;
 
 require_once 'bootstrap.php';
 
diff --git a/tests/acceptance/features/bootstrap/WebUIPersonalSecuritySettingsContext.php b/tests/acceptance/features/bootstrap/WebUIPersonalSecuritySettingsContext.php
index 6fb66e552d6d..1bcd09bed108 100644
--- a/tests/acceptance/features/bootstrap/WebUIPersonalSecuritySettingsContext.php
+++ b/tests/acceptance/features/bootstrap/WebUIPersonalSecuritySettingsContext.php
@@ -20,12 +20,14 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\MinkExtension\Context\RawMinkContext;
-use Page\LoginPage;
-use Page\PersonalSecuritySettingsPage;
 use PHPUnit\Framework\Assert;
+use Tests\Acceptance\Page\LoginPage;
+use Tests\Acceptance\Page\PersonalSecuritySettingsPage;
 
 require_once 'bootstrap.php';
 
diff --git a/tests/acceptance/features/bootstrap/WebUIPersonalSharingSettingsContext.php b/tests/acceptance/features/bootstrap/WebUIPersonalSharingSettingsContext.php
index 96bf0b1b5b08..932785f04048 100644
--- a/tests/acceptance/features/bootstrap/WebUIPersonalSharingSettingsContext.php
+++ b/tests/acceptance/features/bootstrap/WebUIPersonalSharingSettingsContext.php
@@ -20,12 +20,14 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 require_once 'bootstrap.php';
 
 use Behat\Behat\Context\Context;
 use Behat\MinkExtension\Context\RawMinkContext;
-use Page\PersonalSharingSettingsPage;
 use PHPUnit\Framework\Assert;
+use Tests\Acceptance\Page\PersonalSharingSettingsPage;
 
 /**
  * steps for personal sharing settings
diff --git a/tests/acceptance/features/bootstrap/WebUISearchContext.php b/tests/acceptance/features/bootstrap/WebUISearchContext.php
index a757c45526d1..8062a10c84b1 100644
--- a/tests/acceptance/features/bootstrap/WebUISearchContext.php
+++ b/tests/acceptance/features/bootstrap/WebUISearchContext.php
@@ -20,11 +20,13 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\MinkExtension\Context\RawMinkContext;
-use Page\FilesPage;
-use Page\SearchResultInOtherFoldersPage;
+use Tests\Acceptance\Page\FilesPage;
+use Tests\Acceptance\Page\SearchResultInOtherFoldersPage;
 
 require_once 'bootstrap.php';
 
diff --git a/tests/acceptance/features/bootstrap/WebUISharingContext.php b/tests/acceptance/features/bootstrap/WebUISharingContext.php
index 61821f0b5255..b02907d87e68 100644
--- a/tests/acceptance/features/bootstrap/WebUISharingContext.php
+++ b/tests/acceptance/features/bootstrap/WebUISharingContext.php
@@ -20,17 +20,19 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
 use Behat\MinkExtension\Context\RawMinkContext;
 use Psr\Http\Message\ResponseInterface;
-use Page\FilesPage;
-use Page\FilesPageElement\SharingDialogElement\EditPublicLinkPopup;
-use Page\FilesPageElement\SharingDialogElement\PublicLinkTab;
-use Page\GeneralErrorPage;
-use Page\PublicLinkFilesPage;
-use Page\SharedWithYouPage;
+use Tests\Acceptance\Page\FilesPage;
+use Tests\Acceptance\Page\FilesPageElement\SharingDialogElement\EditPublicLinkPopup;
+use Tests\Acceptance\Page\FilesPageElement\SharingDialogElement\PublicLinkTab;
+use Tests\Acceptance\Page\GeneralErrorPage;
+use Tests\Acceptance\Page\PublicLinkFilesPage;
+use Tests\Acceptance\Page\SharedWithYouPage;
 use PHPUnit\Framework\Assert;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Exception\ElementNotFoundException;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
diff --git a/tests/acceptance/features/bootstrap/WebUITagsContext.php b/tests/acceptance/features/bootstrap/WebUITagsContext.php
index 5cb6af8efbfb..ddd65e71fdb5 100644
--- a/tests/acceptance/features/bootstrap/WebUITagsContext.php
+++ b/tests/acceptance/features/bootstrap/WebUITagsContext.php
@@ -20,12 +20,14 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\MinkExtension\Context\RawMinkContext;
 use Behat\Gherkin\Node\TableNode;
-use Page\FilesPage;
 use PHPUnit\Framework\Assert;
+use Tests\Acceptance\Page\FilesPage;
 
 require_once 'bootstrap.php';
 
diff --git a/tests/acceptance/features/bootstrap/WebUIUserContext.php b/tests/acceptance/features/bootstrap/WebUIUserContext.php
index 451f464ae44f..43598668ede1 100644
--- a/tests/acceptance/features/bootstrap/WebUIUserContext.php
+++ b/tests/acceptance/features/bootstrap/WebUIUserContext.php
@@ -20,10 +20,12 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\MinkExtension\Context\RawMinkContext;
-use Page\OwncloudPage;
 use PHPUnit\Framework\Assert;
+use Tests\Acceptance\Page\OwncloudPage;
 
 require_once 'bootstrap.php';
 
diff --git a/tests/acceptance/features/bootstrap/WebUIUsersContext.php b/tests/acceptance/features/bootstrap/WebUIUsersContext.php
index 851ac6f0ab68..35df00a6b02f 100644
--- a/tests/acceptance/features/bootstrap/WebUIUsersContext.php
+++ b/tests/acceptance/features/bootstrap/WebUIUsersContext.php
@@ -20,17 +20,19 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\AfterScenarioScope;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
 use Behat\Mink\Exception\ElementNotFoundException;
 use Behat\MinkExtension\Context\RawMinkContext;
-use Page\DisabledUserPage;
-use Page\GeneralErrorPage;
-use Page\LoginPage;
-use Page\UsersPage;
-use Page\OwncloudPage;
+use Tests\Acceptance\Page\DisabledUserPage;
+use Tests\Acceptance\Page\GeneralErrorPage;
+use Tests\Acceptance\Page\LoginPage;
+use Tests\Acceptance\Page\UsersPage;
+use Tests\Acceptance\Page\OwncloudPage;
 use PHPUnit\Framework\Assert;
 use TestHelpers\AppConfigHelper;
 use WebDriver\Exception\ElementNotVisible;
diff --git a/tests/acceptance/features/bootstrap/WebUIWebDavLockingContext.php b/tests/acceptance/features/bootstrap/WebUIWebDavLockingContext.php
index 36121dc54f81..494510cae1d9 100644
--- a/tests/acceptance/features/bootstrap/WebUIWebDavLockingContext.php
+++ b/tests/acceptance/features/bootstrap/WebUIWebDavLockingContext.php
@@ -20,6 +20,8 @@
  *
  */
 
+namespace Tests\Acceptance;
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\MinkExtension\Context\RawMinkContext;
diff --git a/tests/acceptance/features/lib/AdminAppsSettingsPage.php b/tests/acceptance/features/lib/AdminAppsSettingsPage.php
index f4479459cfc2..3af439dfbde3 100644
--- a/tests/acceptance/features/lib/AdminAppsSettingsPage.php
+++ b/tests/acceptance/features/lib/AdminAppsSettingsPage.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Session;
 use Exception;
diff --git a/tests/acceptance/features/lib/AdminEncryptionSettingsPage.php b/tests/acceptance/features/lib/AdminEncryptionSettingsPage.php
index 063790bd9642..14f7bea77e63 100644
--- a/tests/acceptance/features/lib/AdminEncryptionSettingsPage.php
+++ b/tests/acceptance/features/lib/AdminEncryptionSettingsPage.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Session;
 
diff --git a/tests/acceptance/features/lib/AdminGeneralSettingsPage.php b/tests/acceptance/features/lib/AdminGeneralSettingsPage.php
index 38c4f5cbf3cb..695bb3240757 100644
--- a/tests/acceptance/features/lib/AdminGeneralSettingsPage.php
+++ b/tests/acceptance/features/lib/AdminGeneralSettingsPage.php
@@ -6,7 +6,7 @@
  * @author Paurakh Sharma Humagain <paurakh@jankaritech.com>
  * @copyright Copyright (c) 2018 Paurakh Sharma Humagain paurakh@jankaritech.com
  *
- * This code is free software: you can redistribute it and/or modify
+ * This code is Tests\Acceptance\free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License,
  * as published by the Free Software Foundation;
  * either version 3 of the License, or any later version.
@@ -21,7 +21,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Gherkin\Node\TableNode;
 use Behat\Mink\Exception\ElementNotFoundException;
diff --git a/tests/acceptance/features/lib/AdminSharingSettingsPage.php b/tests/acceptance/features/lib/AdminSharingSettingsPage.php
index bc3b4ee2c57f..e8caf16c410e 100644
--- a/tests/acceptance/features/lib/AdminSharingSettingsPage.php
+++ b/tests/acceptance/features/lib/AdminSharingSettingsPage.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Element\NodeElement;
 use Behat\Mink\Session;
diff --git a/tests/acceptance/features/lib/AdminStorageSettingsPage.php b/tests/acceptance/features/lib/AdminStorageSettingsPage.php
index f3b63d8c8635..abdbbb002864 100644
--- a/tests/acceptance/features/lib/AdminStorageSettingsPage.php
+++ b/tests/acceptance/features/lib/AdminStorageSettingsPage.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Exception\ElementNotFoundException;
 use Behat\Mink\Session;
diff --git a/tests/acceptance/features/lib/DisabledUserPage.php b/tests/acceptance/features/lib/DisabledUserPage.php
index 3ffd87956931..8565b95ba307 100644
--- a/tests/acceptance/features/lib/DisabledUserPage.php
+++ b/tests/acceptance/features/lib/DisabledUserPage.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 /**
  * Disabled page.
diff --git a/tests/acceptance/features/lib/ExternalStoragePage.php b/tests/acceptance/features/lib/ExternalStoragePage.php
index ca2a16b64a0c..67c37ff0cddc 100644
--- a/tests/acceptance/features/lib/ExternalStoragePage.php
+++ b/tests/acceptance/features/lib/ExternalStoragePage.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Exception;
 
diff --git a/tests/acceptance/features/lib/FavoritesPage.php b/tests/acceptance/features/lib/FavoritesPage.php
index 45ebc2473a08..5f9148b715eb 100644
--- a/tests/acceptance/features/lib/FavoritesPage.php
+++ b/tests/acceptance/features/lib/FavoritesPage.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Session;
 use Page\FilesPageElement\FileRow;
diff --git a/tests/acceptance/features/lib/FilesPage.php b/tests/acceptance/features/lib/FilesPage.php
index 0e2e1c61664c..51e909b3f277 100644
--- a/tests/acceptance/features/lib/FilesPage.php
+++ b/tests/acceptance/features/lib/FilesPage.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Exception\DriverException;
 use Behat\Mink\Exception\UnsupportedDriverActionException;
diff --git a/tests/acceptance/features/lib/FilesPageBasic.php b/tests/acceptance/features/lib/FilesPageBasic.php
index d61c17e96187..f2d33a6e073d 100644
--- a/tests/acceptance/features/lib/FilesPageBasic.php
+++ b/tests/acceptance/features/lib/FilesPageBasic.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Element\NodeElement;
 use Behat\Mink\Session;
diff --git a/tests/acceptance/features/lib/FilesPageCRUD.php b/tests/acceptance/features/lib/FilesPageCRUD.php
index 10cbfd333014..b1cc7b6cc32c 100644
--- a/tests/acceptance/features/lib/FilesPageCRUD.php
+++ b/tests/acceptance/features/lib/FilesPageCRUD.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Session;
 use Behat\Mink\Element\NodeElement;
diff --git a/tests/acceptance/features/lib/FilesPageElement/ConflictDialog.php b/tests/acceptance/features/lib/FilesPageElement/ConflictDialog.php
index c794264d3bee..cea12d218ea4 100644
--- a/tests/acceptance/features/lib/FilesPageElement/ConflictDialog.php
+++ b/tests/acceptance/features/lib/FilesPageElement/ConflictDialog.php
@@ -21,9 +21,9 @@
  *
  */
 
-namespace Page\FilesPageElement;
+namespace Tests\Acceptance\Page\FilesPageElement;
 
-use Page\OwncloudPageElement\OCDialog;
+use Tests\Acceptance\Page\OwncloudPageElement\OCDialog;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Exception\ElementNotFoundException;
 
 /**
diff --git a/tests/acceptance/features/lib/FilesPageElement/DetailsDialog.php b/tests/acceptance/features/lib/FilesPageElement/DetailsDialog.php
index 818b2d9b956d..3012e6ba9fd8 100644
--- a/tests/acceptance/features/lib/FilesPageElement/DetailsDialog.php
+++ b/tests/acceptance/features/lib/FilesPageElement/DetailsDialog.php
@@ -21,12 +21,12 @@
  *
  */
 
-namespace Page\FilesPageElement;
+namespace Tests\Acceptance\Page\FilesPageElement;
 
 use Behat\Mink\Element\NodeElement;
 use Behat\Mink\Session;
 use Exception;
-use Page\OwncloudPage;
+use Tests\Acceptance\Page\OwncloudPage;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Exception\ElementNotFoundException;
 use WebDriver\Exception\NoSuchElement;
 use WebDriver\Exception\StaleElementReference;
diff --git a/tests/acceptance/features/lib/FilesPageElement/FavoritesFileRow.php b/tests/acceptance/features/lib/FilesPageElement/FavoritesFileRow.php
index 35c62cabcb87..6131d7478c48 100644
--- a/tests/acceptance/features/lib/FilesPageElement/FavoritesFileRow.php
+++ b/tests/acceptance/features/lib/FilesPageElement/FavoritesFileRow.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace Page\FilesPageElement;
+namespace Tests\Acceptance\Page\FilesPageElement;
 
 /**
  * Object of a row on the FilesPage
diff --git a/tests/acceptance/features/lib/FilesPageElement/FileActionsMenu.php b/tests/acceptance/features/lib/FilesPageElement/FileActionsMenu.php
index 86eabec91650..a0c3d037dd61 100644
--- a/tests/acceptance/features/lib/FilesPageElement/FileActionsMenu.php
+++ b/tests/acceptance/features/lib/FilesPageElement/FileActionsMenu.php
@@ -21,12 +21,12 @@
  *
  */
 
-namespace Page\FilesPageElement;
+namespace Tests\Acceptance\Page\FilesPageElement;
 
 use Behat\Mink\Session;
 use Behat\Mink\Element\NodeElement;
 use Exception;
-use Page\OwncloudPage;
+use Tests\Acceptance\Page\OwncloudPage;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Exception\ElementNotFoundException;
 
 /**
diff --git a/tests/acceptance/features/lib/FilesPageElement/FileRow.php b/tests/acceptance/features/lib/FilesPageElement/FileRow.php
index 70c659b1f27e..6ccce63128da 100644
--- a/tests/acceptance/features/lib/FilesPageElement/FileRow.php
+++ b/tests/acceptance/features/lib/FilesPageElement/FileRow.php
@@ -21,13 +21,13 @@
  *
  */
 
-namespace Page\FilesPageElement;
+namespace Tests\Acceptance\Page\FilesPageElement;
 
 use Behat\Mink\Element\NodeElement;
 use Behat\Mink\Session;
 use Exception;
-use Page\FilesPage;
-use Page\OwncloudPage;
+use Tests\Acceptance\Page\FilesPage;
+use Tests\Acceptance\Page\OwncloudPage;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Exception\ElementNotFoundException;
 
 /**
diff --git a/tests/acceptance/features/lib/FilesPageElement/LockDialog.php b/tests/acceptance/features/lib/FilesPageElement/LockDialog.php
index 73ed981d49fc..368717ef04cb 100644
--- a/tests/acceptance/features/lib/FilesPageElement/LockDialog.php
+++ b/tests/acceptance/features/lib/FilesPageElement/LockDialog.php
@@ -21,13 +21,13 @@
  *
  */
 
-namespace Page\FilesPageElement;
+namespace Tests\Acceptance\Page\FilesPageElement;
 
 use Behat\Mink\Session;
 use Behat\Mink\Element\NodeElement;
 use Exception;
-use Page\OwncloudPage;
-use Page\FilesPageElement\LockDialogElement\LockEntry;
+use Tests\Acceptance\Page\OwncloudPage;
+use Tests\Acceptance\Page\FilesPageElement\LockDialogElement\LockEntry;
 
 /**
  * The Lock Dialog, lists all the locks and gives a possibility to delete them
diff --git a/tests/acceptance/features/lib/FilesPageElement/LockDialogElement/LockEntry.php b/tests/acceptance/features/lib/FilesPageElement/LockDialogElement/LockEntry.php
index c43f3950dd89..fe3b38b844aa 100644
--- a/tests/acceptance/features/lib/FilesPageElement/LockDialogElement/LockEntry.php
+++ b/tests/acceptance/features/lib/FilesPageElement/LockDialogElement/LockEntry.php
@@ -21,12 +21,12 @@
  *
  */
 
-namespace Page\FilesPageElement\LockDialogElement;
+namespace Tests\Acceptance\Page\FilesPageElement\LockDialogElement;
 
 use Behat\Mink\Session;
 use Behat\Mink\Element\NodeElement;
 use Exception;
-use Page\OwncloudPage;
+use Tests\Acceptance\Page\OwncloudPage;
 
 /**
  * A single Lock Entry
diff --git a/tests/acceptance/features/lib/FilesPageElement/NewFileMenu.php b/tests/acceptance/features/lib/FilesPageElement/NewFileMenu.php
index 88c6ac008372..1b0181062308 100644
--- a/tests/acceptance/features/lib/FilesPageElement/NewFileMenu.php
+++ b/tests/acceptance/features/lib/FilesPageElement/NewFileMenu.php
@@ -22,12 +22,12 @@
  *
  */
 
-namespace Page\FilesPageElement;
+namespace Tests\Acceptance\Page\FilesPageElement;
 
 use ast\Node;
 use Behat\Mink\Session;
 use Behat\Mink\Element\NodeElement;
-use Page\OwncloudPage;
+use Tests\Acceptance\Page\OwncloudPage;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Exception\ElementNotFoundException;
 
 /**
diff --git a/tests/acceptance/features/lib/FilesPageElement/SharedByLinkFileRow.php b/tests/acceptance/features/lib/FilesPageElement/SharedByLinkFileRow.php
index bb663c1950e8..f7ca37cc1ec6 100644
--- a/tests/acceptance/features/lib/FilesPageElement/SharedByLinkFileRow.php
+++ b/tests/acceptance/features/lib/FilesPageElement/SharedByLinkFileRow.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace Page\FilesPageElement;
+namespace Tests\Acceptance\Page\FilesPageElement;
 
 /**
  * Object of a row on the SharedByLinkPage
diff --git a/tests/acceptance/features/lib/FilesPageElement/SharedWithOthersFileRow.php b/tests/acceptance/features/lib/FilesPageElement/SharedWithOthersFileRow.php
index 4dbc46cb1170..e69f37a69de2 100644
--- a/tests/acceptance/features/lib/FilesPageElement/SharedWithOthersFileRow.php
+++ b/tests/acceptance/features/lib/FilesPageElement/SharedWithOthersFileRow.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace Page\FilesPageElement;
+namespace Tests\Acceptance\Page\FilesPageElement;
 
 /**
  * Object of a row on the Shared with others page
diff --git a/tests/acceptance/features/lib/FilesPageElement/SharingDialog.php b/tests/acceptance/features/lib/FilesPageElement/SharingDialog.php
index 2489b40e8e77..5cdb6b5e67ce 100644
--- a/tests/acceptance/features/lib/FilesPageElement/SharingDialog.php
+++ b/tests/acceptance/features/lib/FilesPageElement/SharingDialog.php
@@ -21,15 +21,15 @@
  *
  */
 
-namespace Page\FilesPageElement;
+namespace Tests\Acceptance\Page\FilesPageElement;
 
 use Behat\Mink\Element\NodeElement;
 use Behat\Mink\Session;
 use Exception;
-use Page\FilesPageElement\SharingDialogElement\PublicLinkTab;
-use Page\OwncloudPage;
+use Tests\Acceptance\Page\FilesPageElement\SharingDialogElement\PublicLinkTab;
+use Tests\Acceptance\Page\OwncloudPage;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Exception\ElementNotFoundException;
-use Page\OwncloudPageElement\OCDialog;
+use Tests\Acceptance\Page\OwncloudPageElement\OCDialog;
 use WebDriver\Exception\StaleElementReference;
 use PHPUnit\Framework\Assert;
 
diff --git a/tests/acceptance/features/lib/FilesPageElement/SharingDialogElement/EditPublicLinkPopup.php b/tests/acceptance/features/lib/FilesPageElement/SharingDialogElement/EditPublicLinkPopup.php
index 2755b1d8c229..0a3973f433a8 100644
--- a/tests/acceptance/features/lib/FilesPageElement/SharingDialogElement/EditPublicLinkPopup.php
+++ b/tests/acceptance/features/lib/FilesPageElement/SharingDialogElement/EditPublicLinkPopup.php
@@ -21,12 +21,12 @@
  *
  */
 
-namespace Page\FilesPageElement\SharingDialogElement;
+namespace Tests\Acceptance\Page\FilesPageElement\SharingDialogElement;
 
 use Behat\Mink\Session;
 use Behat\Mink\Element\NodeElement;
 use Exception;
-use Page\OwncloudPage;
+use Tests\Acceptance\Page\OwncloudPage;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Exception\ElementNotFoundException;
 
 /**
diff --git a/tests/acceptance/features/lib/FilesPageElement/SharingDialogElement/PublicLinkTab.php b/tests/acceptance/features/lib/FilesPageElement/SharingDialogElement/PublicLinkTab.php
index eb797a1f7e3c..a647cd16b9e3 100644
--- a/tests/acceptance/features/lib/FilesPageElement/SharingDialogElement/PublicLinkTab.php
+++ b/tests/acceptance/features/lib/FilesPageElement/SharingDialogElement/PublicLinkTab.php
@@ -21,12 +21,12 @@
  *
  */
 
-namespace Page\FilesPageElement\SharingDialogElement;
+namespace Tests\Acceptance\Page\FilesPageElement\SharingDialogElement;
 
 use Behat\Mink\Element\NodeElement;
 use Behat\Mink\Session;
 use Exception;
-use Page\OwncloudPage;
+use Tests\Acceptance\Page\OwncloudPage;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Exception\ElementNotFoundException;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
 
diff --git a/tests/acceptance/features/lib/FilesPageElement/TrashBinFileRow.php b/tests/acceptance/features/lib/FilesPageElement/TrashBinFileRow.php
index c4cca1c07a6a..7ee682005f6e 100644
--- a/tests/acceptance/features/lib/FilesPageElement/TrashBinFileRow.php
+++ b/tests/acceptance/features/lib/FilesPageElement/TrashBinFileRow.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace Page\FilesPageElement;
+namespace Tests\Acceptance\Page\FilesPageElement;
 
 /**
  * Object of a row on the FilesPage
diff --git a/tests/acceptance/features/lib/GeneralErrorPage.php b/tests/acceptance/features/lib/GeneralErrorPage.php
index aa44c9b2b311..3819d401f678 100644
--- a/tests/acceptance/features/lib/GeneralErrorPage.php
+++ b/tests/acceptance/features/lib/GeneralErrorPage.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Session;
 use Exception;
diff --git a/tests/acceptance/features/lib/GeneralExceptionPage.php b/tests/acceptance/features/lib/GeneralExceptionPage.php
index efc744a60c0c..15af157804f5 100644
--- a/tests/acceptance/features/lib/GeneralExceptionPage.php
+++ b/tests/acceptance/features/lib/GeneralExceptionPage.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Session;
 use Exception;
diff --git a/tests/acceptance/features/lib/HelpAndTipsPage.php b/tests/acceptance/features/lib/HelpAndTipsPage.php
index 185e2fe0b01b..9fa32cc9793d 100644
--- a/tests/acceptance/features/lib/HelpAndTipsPage.php
+++ b/tests/acceptance/features/lib/HelpAndTipsPage.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Element\NodeElement;
 
diff --git a/tests/acceptance/features/lib/LoginPage.php b/tests/acceptance/features/lib/LoginPage.php
index cbeebe9e1996..a7dd45c7917f 100644
--- a/tests/acceptance/features/lib/LoginPage.php
+++ b/tests/acceptance/features/lib/LoginPage.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Element\NodeElement;
 use Behat\Mink\Session;
diff --git a/tests/acceptance/features/lib/Notification.php b/tests/acceptance/features/lib/Notification.php
index ac1d08cd7c78..e70f253e56a7 100644
--- a/tests/acceptance/features/lib/Notification.php
+++ b/tests/acceptance/features/lib/Notification.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Session;
 use Behat\Mink\Element\NodeElement;
diff --git a/tests/acceptance/features/lib/NotificationsAppDialog.php b/tests/acceptance/features/lib/NotificationsAppDialog.php
index 659f824f906e..377420a3c6d2 100644
--- a/tests/acceptance/features/lib/NotificationsAppDialog.php
+++ b/tests/acceptance/features/lib/NotificationsAppDialog.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Session;
 use Exception;
diff --git a/tests/acceptance/features/lib/NotificationsEnabledOwncloudPage.php b/tests/acceptance/features/lib/NotificationsEnabledOwncloudPage.php
index 79eed8fcaabc..807a9cee19b9 100644
--- a/tests/acceptance/features/lib/NotificationsEnabledOwncloudPage.php
+++ b/tests/acceptance/features/lib/NotificationsEnabledOwncloudPage.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Session;
 use Behat\Mink\Element\NodeElement;
diff --git a/tests/acceptance/features/lib/OwncloudPage.php b/tests/acceptance/features/lib/OwncloudPage.php
index 24b2fe4b406a..3bfae0c7c0d1 100644
--- a/tests/acceptance/features/lib/OwncloudPage.php
+++ b/tests/acceptance/features/lib/OwncloudPage.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Element\NodeElement;
 use Behat\Mink\Exception\DriverException;
diff --git a/tests/acceptance/features/lib/OwncloudPageElement/OCDialog.php b/tests/acceptance/features/lib/OwncloudPageElement/OCDialog.php
index 4011dc8c6337..c0ea3199876c 100644
--- a/tests/acceptance/features/lib/OwncloudPageElement/OCDialog.php
+++ b/tests/acceptance/features/lib/OwncloudPageElement/OCDialog.php
@@ -21,12 +21,12 @@
  *
  */
 
-namespace Page\OwncloudPageElement;
+namespace Tests\Acceptance\Page\OwncloudPageElement;
 
 use Behat\Mink\Element\NodeElement;
 use Behat\Mink\Session;
 use Exception;
-use Page\OwncloudPage;
+use Tests\Acceptance\Page\OwncloudPage;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Exception\ElementNotFoundException;
 
 /**
diff --git a/tests/acceptance/features/lib/OwncloudPageElement/SettingsMenu.php b/tests/acceptance/features/lib/OwncloudPageElement/SettingsMenu.php
index 360acf9122af..b13ef1e5a314 100644
--- a/tests/acceptance/features/lib/OwncloudPageElement/SettingsMenu.php
+++ b/tests/acceptance/features/lib/OwncloudPageElement/SettingsMenu.php
@@ -21,11 +21,11 @@
  *
  */
 
-namespace Page\OwncloudPageElement;
+namespace Tests\Acceptance\Page\OwncloudPageElement;
 
 use Behat\Mink\Session;
 use Exception;
-use Page\OwncloudPage;
+use Tests\Acceptance\Page\OwncloudPage;
 
 /**
  * The Settings Menu
diff --git a/tests/acceptance/features/lib/PersonalEncryptionSettingsPage.php b/tests/acceptance/features/lib/PersonalEncryptionSettingsPage.php
index 5e3acf0f6120..0f6b86c1978b 100644
--- a/tests/acceptance/features/lib/PersonalEncryptionSettingsPage.php
+++ b/tests/acceptance/features/lib/PersonalEncryptionSettingsPage.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Session;
 use Exception;
diff --git a/tests/acceptance/features/lib/PersonalGeneralSettingsPage.php b/tests/acceptance/features/lib/PersonalGeneralSettingsPage.php
index 62c73b3336cb..176c112e9c62 100644
--- a/tests/acceptance/features/lib/PersonalGeneralSettingsPage.php
+++ b/tests/acceptance/features/lib/PersonalGeneralSettingsPage.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Session;
 use Exception;
diff --git a/tests/acceptance/features/lib/PersonalSecuritySettingsPage.php b/tests/acceptance/features/lib/PersonalSecuritySettingsPage.php
index a4f8a3a80c0c..d85c8a0dc71b 100644
--- a/tests/acceptance/features/lib/PersonalSecuritySettingsPage.php
+++ b/tests/acceptance/features/lib/PersonalSecuritySettingsPage.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Session;
 use Behat\Mink\Element\NodeElement;
diff --git a/tests/acceptance/features/lib/PersonalSharingSettingsPage.php b/tests/acceptance/features/lib/PersonalSharingSettingsPage.php
index 9df1937b689b..d41dc6b9257f 100644
--- a/tests/acceptance/features/lib/PersonalSharingSettingsPage.php
+++ b/tests/acceptance/features/lib/PersonalSharingSettingsPage.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Session;
 use Exception;
diff --git a/tests/acceptance/features/lib/PublicLinkFilesPage.php b/tests/acceptance/features/lib/PublicLinkFilesPage.php
index ad2ffcbd6ef5..38f71a587f9a 100644
--- a/tests/acceptance/features/lib/PublicLinkFilesPage.php
+++ b/tests/acceptance/features/lib/PublicLinkFilesPage.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Session;
 use Exception;
diff --git a/tests/acceptance/features/lib/SearchResultInOtherFoldersPage.php b/tests/acceptance/features/lib/SearchResultInOtherFoldersPage.php
index f129fde46a97..ab6629130a0e 100644
--- a/tests/acceptance/features/lib/SearchResultInOtherFoldersPage.php
+++ b/tests/acceptance/features/lib/SearchResultInOtherFoldersPage.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 /**
  * Page that shows the search results.
diff --git a/tests/acceptance/features/lib/SharedByLinkPage.php b/tests/acceptance/features/lib/SharedByLinkPage.php
index 4b2e039dd12e..0ea0a104c429 100644
--- a/tests/acceptance/features/lib/SharedByLinkPage.php
+++ b/tests/acceptance/features/lib/SharedByLinkPage.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Session;
 use Exception;
diff --git a/tests/acceptance/features/lib/SharedWithOthersPage.php b/tests/acceptance/features/lib/SharedWithOthersPage.php
index 8f672fe4c94f..da8356cf6f2a 100644
--- a/tests/acceptance/features/lib/SharedWithOthersPage.php
+++ b/tests/acceptance/features/lib/SharedWithOthersPage.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Session;
 use Exception;
diff --git a/tests/acceptance/features/lib/SharedWithYouPage.php b/tests/acceptance/features/lib/SharedWithYouPage.php
index 7c79ab0e2436..e14269516185 100644
--- a/tests/acceptance/features/lib/SharedWithYouPage.php
+++ b/tests/acceptance/features/lib/SharedWithYouPage.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Session;
 use Exception;
diff --git a/tests/acceptance/features/lib/SharingSettingsPage.php b/tests/acceptance/features/lib/SharingSettingsPage.php
index bb3976e24656..a110857544f6 100644
--- a/tests/acceptance/features/lib/SharingSettingsPage.php
+++ b/tests/acceptance/features/lib/SharingSettingsPage.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Session;
 use Exception;
diff --git a/tests/acceptance/features/lib/TagsPage.php b/tests/acceptance/features/lib/TagsPage.php
index 29b6f2967b93..08bccc6a003d 100644
--- a/tests/acceptance/features/lib/TagsPage.php
+++ b/tests/acceptance/features/lib/TagsPage.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Session;
 use Exception;
diff --git a/tests/acceptance/features/lib/TrashbinPage.php b/tests/acceptance/features/lib/TrashbinPage.php
index e5a20b7fe837..3f61708fabba 100644
--- a/tests/acceptance/features/lib/TrashbinPage.php
+++ b/tests/acceptance/features/lib/TrashbinPage.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Element\NodeElement;
 use Behat\Mink\Session;
diff --git a/tests/acceptance/features/lib/UserPageElement/GroupList.php b/tests/acceptance/features/lib/UserPageElement/GroupList.php
index 927dad1e889a..699053b70954 100644
--- a/tests/acceptance/features/lib/UserPageElement/GroupList.php
+++ b/tests/acceptance/features/lib/UserPageElement/GroupList.php
@@ -21,12 +21,12 @@
  *
  */
 
-namespace Page\UserPageElement;
+namespace Tests\Acceptance\Page\UserPageElement;
 
 use Behat\Mink\Element\NodeElement;
 use Exception;
-use Page\OwncloudPage;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Exception\ElementNotFoundException;
+use Tests\Acceptance\Page\OwncloudPage;
 
 /**
  * The list of groups
diff --git a/tests/acceptance/features/lib/UsersPage.php b/tests/acceptance/features/lib/UsersPage.php
index 71fbd2181bf3..e75edd8cd21c 100644
--- a/tests/acceptance/features/lib/UsersPage.php
+++ b/tests/acceptance/features/lib/UsersPage.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace Page;
+namespace Tests\Acceptance\Page;
 
 use Behat\Mink\Element\NodeElement;
 use Behat\Mink\Session;