diff --git a/bin/console b/bin/console
index 3b25858d..4b4b228a 100755
--- a/bin/console
+++ b/bin/console
@@ -1,6 +1,6 @@
 #!/usr/bin/env php
 <?php
-use App\Kernel;
+use Surfnet\Tiqr\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Debug\Debug;
diff --git a/composer.json b/composer.json
index d5d5fb0a..655a1858 100644
--- a/composer.json
+++ b/composer.json
@@ -7,13 +7,8 @@
   "prefer-stable": true,
   "autoload": {
     "psr-4": {
-      "App\\": "src"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "Dev\\": "dev",
-      "Tests\\": "tests/"
+      "Surfnet\\Tiqr\\": "src",
+      "Surfnet\\Tiqr\\Dev\\": "dev"
     }
   },
   "require": {
diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml
index f6f455a8..73515758 100644
--- a/config/packages/twig.yaml
+++ b/config/packages/twig.yaml
@@ -5,4 +5,4 @@ twig:
     debug: '%kernel.debug%'
     strict_variables: '%kernel.debug%'
     globals:
-        global_view_parameters: '@App\Service\GlobalViewParameters'
+        global_view_parameters: '@Surfnet\Tiqr\Service\GlobalViewParameters'
diff --git a/config/services.yaml b/config/services.yaml
index 33fdd9a4..3edf3b34 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -22,7 +22,7 @@ services:
 
     # makes classes in src/ available to be used as services
     # this creates a service per class whose id is the fully-qualified class name
-    App\:
+    Surfnet\Tiqr\:
         resource: '../src/*'
         exclude: '../src/{DependencyInjection,Entity,Migrations,Tests,Kernel.php}'
 
@@ -32,25 +32,25 @@ services:
     Symfony\Component\DependencyInjection\Container:
       alias: 'service_container'
 
-    App\Tiqr\Legacy\TiqrService:
-      factory: ['App\Tiqr\TiqrFactory', 'createService']
+    Surfnet\Tiqr\Tiqr\Legacy\TiqrService:
+      factory: ['Surfnet\Tiqr\Tiqr\TiqrFactory', 'createService']
 
-    App\Tiqr\Legacy\TiqrUserRepository:
-      factory: ['App\Tiqr\TiqrFactory', 'createUserRepository']
+    Surfnet\Tiqr\Tiqr\Legacy\TiqrUserRepository:
+      factory: ['Surfnet\Tiqr\Tiqr\TiqrFactory', 'createUserRepository']
 
-    App\Tiqr\TiqrUserRepositoryInterface:
-      alias: App\Tiqr\Legacy\TiqrUserRepository
+    Surfnet\Tiqr\Tiqr\TiqrUserRepositoryInterface:
+      alias: Surfnet\Tiqr\Tiqr\Legacy\TiqrUserRepository
 
     surfnet_saml.saml2.bridge_container:
       class: Surfnet\SamlBundle\SAML2\BridgeContainer
       arguments:
           - '@logger'
 
-    App\Service\UserAgentMatcher:
+    Surfnet\Tiqr\Service\UserAgentMatcher:
       bind:
         $pattern: '%mobile_app_user_agent_pattern%'
 
-    App\Controller\ExceptionController:
+    Surfnet\Tiqr\Controller\ExceptionController:
       tags: ['controller.service_arguments']
       arguments:
-        $errorPageHelper: '@App\Service\ErrorPageHelper'
+        $errorPageHelper: '@Surfnet\Tiqr\Service\ErrorPageHelper'
diff --git a/config/services_dev.yaml b/config/services_dev.yaml
index 382bd181..be22f548 100644
--- a/config/services_dev.yaml
+++ b/config/services_dev.yaml
@@ -6,15 +6,15 @@ services:
 
     # makes classes in src/ available to be used as services
     # this creates a service per class whose id is the fully-qualified class name
-    Dev\:
+    Surfnet\Tiqr\Dev\:
         resource: '../dev/*'
         exclude: '../dev/{DependencyInjection,Entity,Migrations,Tests,Kernel.php}'
 
-    Dev\Controller\:
+    Surfnet\Tiqr\Dev\Controller\:
         resource: '../dev/Controller'
         tags: ['controller.service_arguments']
     # add more service definitions when explicit configuration is needed
     # please note that last definitions always *replace* previous ones
     GuzzleHttp\Client:
         class: GuzzleHttp\Client
-        factory: ['Dev\HttpClientFactory', 'create']
+        factory: ['Surfnet\Tiqr\Dev\HttpClientFactory', 'create']
diff --git a/config/services_test.yaml b/config/services_test.yaml
index ee3299e9..67be77dc 100644
--- a/config/services_test.yaml
+++ b/config/services_test.yaml
@@ -3,16 +3,16 @@ imports:
     - { resource: 'services_dev.yaml' }
 
 services:
-    Dev\FileLogger:
+    Surfnet\Tiqr\Dev\FileLogger:
         public: true
         decorates: 'logger'
         arguments:
             - '@kernel'
 
     overide_matcher:
-        class: App\Service\UserAgentMatcher
+        class: Surfnet\Tiqr\Service\UserAgentMatcher
         public: true
-        decorates: App\Service\UserAgentMatcher
+        decorates: Surfnet\Tiqr\Service\UserAgentMatcher
         arguments:
             - '/^Behat UA$/'
 
diff --git a/dev/Command/AuthenticationCommand.php b/dev/Command/AuthenticationCommand.php
index 7ce68704..d433133d 100644
--- a/dev/Command/AuthenticationCommand.php
+++ b/dev/Command/AuthenticationCommand.php
@@ -17,7 +17,7 @@
 
 declare(strict_types = 1);
 
-namespace Dev\Command;
+namespace Surfnet\Tiqr\Dev\Command;
 
 use GuzzleHttp\Client;
 use OCRA;
diff --git a/dev/Command/RegistrationCommand.php b/dev/Command/RegistrationCommand.php
index ad214682..bc0cd78b 100644
--- a/dev/Command/RegistrationCommand.php
+++ b/dev/Command/RegistrationCommand.php
@@ -17,7 +17,7 @@
 
 declare(strict_types = 1);
 
-namespace Dev\Command;
+namespace Surfnet\Tiqr\Dev\Command;
 
 use GuzzleHttp\Client;
 use RuntimeException;
diff --git a/dev/Controller/QrLinkController.php b/dev/Controller/QrLinkController.php
index 46012aaa..3066ab30 100644
--- a/dev/Controller/QrLinkController.php
+++ b/dev/Controller/QrLinkController.php
@@ -17,9 +17,9 @@
 
 declare(strict_types = 1);
 
-namespace Dev\Controller;
+namespace Surfnet\Tiqr\Dev\Controller;
 
-use App\Tiqr\TiqrServiceInterface;
+use Surfnet\Tiqr\Tiqr\TiqrServiceInterface;
 use InvalidArgumentException;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use Symfony\Component\Routing\Annotation\Route;
diff --git a/dev/Controller/SPController.php b/dev/Controller/SPController.php
index 139b831e..68cba537 100644
--- a/dev/Controller/SPController.php
+++ b/dev/Controller/SPController.php
@@ -18,20 +18,18 @@
 
 declare(strict_types = 1);
 
-namespace Dev\Controller;
+namespace Surfnet\Tiqr\Dev\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
 use Symfony\Component\Routing\Annotation\Route;
 use DOMDocument;
 use RobRichards\XMLSecLibs\XMLSecurityKey;
-use SAML2\Assertion;
 use SAML2\Certificate\PrivateKeyLoader;
 use SAML2\Configuration\PrivateKey;
 use SAML2\DOMDocumentFactory;
 use SAML2\Message;
 use SAML2\Response;
-use Surfnet\GsspBundle\Service\RegistrationService;
 use Surfnet\SamlBundle\Entity\IdentityProvider;
 use Surfnet\SamlBundle\Entity\ServiceProvider;
 use Surfnet\SamlBundle\Http\Exception\AuthnFailedSamlResponseException;
diff --git a/dev/FileLogger.php b/dev/FileLogger.php
index 6c0ec206..001702de 100644
--- a/dev/FileLogger.php
+++ b/dev/FileLogger.php
@@ -17,7 +17,7 @@
 
 declare(strict_types = 1);
 
-namespace Dev;
+namespace Surfnet\Tiqr\Dev;
 
 use League\Csv\Reader;
 use League\Csv\Writer;
diff --git a/dev/HttpClientFactory.php b/dev/HttpClientFactory.php
index 41e30e4b..a3c80f71 100644
--- a/dev/HttpClientFactory.php
+++ b/dev/HttpClientFactory.php
@@ -17,7 +17,7 @@
 
 declare(strict_types = 1);
 
-namespace Dev;
+namespace Surfnet\Tiqr\Dev;
 
 use GuzzleHttp\Client;
 
diff --git a/dev/Twig/GsspExtension.php b/dev/Twig/GsspExtension.php
index fe61dc21..d4041163 100644
--- a/dev/Twig/GsspExtension.php
+++ b/dev/Twig/GsspExtension.php
@@ -17,7 +17,7 @@
 
 declare(strict_types = 1);
 
-namespace Dev\Twig;
+namespace Surfnet\Tiqr\Dev\Twig;
 
 use Surfnet\SamlBundle\Entity\HostedEntities;
 use Twig\Extension\AbstractExtension;
diff --git a/public/index.php b/public/index.php
index a20b1e57..4cc75fb3 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,5 +1,5 @@
 <?php
-use App\Kernel;
+use Surfnet\Tiqr\Kernel;
 
 require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
 require_once dirname(__DIR__).'/config/bootstrap.php';
diff --git a/src/Controller/AuthenticationController.php b/src/Controller/AuthenticationController.php
index fa12f448..1610ff76 100644
--- a/src/Controller/AuthenticationController.php
+++ b/src/Controller/AuthenticationController.php
@@ -18,20 +18,20 @@
  * limitations under the License.
  */
 
-namespace App\Controller;
-
-use App\Exception\NoActiveAuthenrequestException;
-use App\Exception\UserNotFoundException;
-use App\Exception\UserPermanentlyBlockedException;
-use App\Exception\UserTemporarilyBlockedException;
-use App\Tiqr\AuthenticationRateLimitServiceInterface;
-use App\Tiqr\Exception\UserNotExistsException;
-use App\Tiqr\Response\AuthenticationResponse;
-use App\Tiqr\Response\RateLimitedAuthenticationResponse;
-use App\Tiqr\TiqrServiceInterface;
-use App\Tiqr\TiqrUserInterface;
-use App\Tiqr\TiqrUserRepositoryInterface;
-use App\WithContextLogger;
+namespace Surfnet\Tiqr\Controller;
+
+use Surfnet\Tiqr\Exception\NoActiveAuthenrequestException;
+use Surfnet\Tiqr\Exception\UserNotFoundException;
+use Surfnet\Tiqr\Exception\UserPermanentlyBlockedException;
+use Surfnet\Tiqr\Exception\UserTemporarilyBlockedException;
+use Surfnet\Tiqr\Tiqr\AuthenticationRateLimitServiceInterface;
+use Surfnet\Tiqr\Tiqr\Exception\UserNotExistsException;
+use Surfnet\Tiqr\Tiqr\Response\AuthenticationResponse;
+use Surfnet\Tiqr\Tiqr\Response\RateLimitedAuthenticationResponse;
+use Surfnet\Tiqr\Tiqr\TiqrServiceInterface;
+use Surfnet\Tiqr\Tiqr\TiqrUserInterface;
+use Surfnet\Tiqr\Tiqr\TiqrUserRepositoryInterface;
+use Surfnet\Tiqr\WithContextLogger;
 use Exception;
 use InvalidArgumentException;
 use Psr\Log\LoggerInterface;
diff --git a/src/Controller/CancelController.php b/src/Controller/CancelController.php
index bed18383..abc17f80 100644
--- a/src/Controller/CancelController.php
+++ b/src/Controller/CancelController.php
@@ -18,9 +18,9 @@
  * limitations under the License.
  */
 
-namespace App\Controller;
+namespace Surfnet\Tiqr\Controller;
 
-use App\Exception\NoActiveAuthenrequestException;
+use Surfnet\Tiqr\Exception\NoActiveAuthenrequestException;
 use Psr\Log\LoggerInterface;
 use Surfnet\GsspBundle\Service\AuthenticationService;
 use Surfnet\GsspBundle\Service\RegistrationService;
diff --git a/src/Controller/ExceptionController.php b/src/Controller/ExceptionController.php
index 64ad4aab..ed14ba6d 100644
--- a/src/Controller/ExceptionController.php
+++ b/src/Controller/ExceptionController.php
@@ -18,13 +18,13 @@
  * limitations under the License.
  */
 
-namespace App\Controller;
+namespace Surfnet\Tiqr\Controller;
 
-use App\Exception\NoActiveAuthenrequestException;
-use App\Exception\UserNotFoundException;
-use App\Exception\UserPermanentlyBlockedException;
-use App\Exception\UserTemporarilyBlockedException;
-use App\Service\ErrorPageHelper;
+use Surfnet\Tiqr\Exception\NoActiveAuthenrequestException;
+use Surfnet\Tiqr\Exception\UserNotFoundException;
+use Surfnet\Tiqr\Exception\UserPermanentlyBlockedException;
+use Surfnet\Tiqr\Exception\UserTemporarilyBlockedException;
+use Surfnet\Tiqr\Service\ErrorPageHelper;
 use Error;
 use Exception;
 use Surfnet\GsspBundle\Exception\UnrecoverableErrorException;
diff --git a/src/Controller/InfoController.php b/src/Controller/InfoController.php
index f84c8875..bba1d793 100644
--- a/src/Controller/InfoController.php
+++ b/src/Controller/InfoController.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Controller;
+namespace Surfnet\Tiqr\Controller;
 
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
diff --git a/src/Controller/RegistrationController.php b/src/Controller/RegistrationController.php
index c7628f1c..4fed5bc9 100644
--- a/src/Controller/RegistrationController.php
+++ b/src/Controller/RegistrationController.php
@@ -18,10 +18,10 @@
  * limitations under the License.
  */
 
-namespace App\Controller;
+namespace Surfnet\Tiqr\Controller;
 
-use App\Exception\NoActiveAuthenrequestException;
-use App\Tiqr\TiqrServiceInterface;
+use Surfnet\Tiqr\Exception\NoActiveAuthenrequestException;
+use Surfnet\Tiqr\Tiqr\TiqrServiceInterface;
 use Psr\Log\LoggerInterface;
 use Surfnet\GsspBundle\Service\RegistrationService;
 use Surfnet\GsspBundle\Service\StateHandlerInterface;
diff --git a/src/Controller/TiqrAppApiController.php b/src/Controller/TiqrAppApiController.php
index a8384096..b1108db6 100644
--- a/src/Controller/TiqrAppApiController.php
+++ b/src/Controller/TiqrAppApiController.php
@@ -18,14 +18,14 @@
  * limitations under the License.
  */
 
-namespace App\Controller;
-
-use App\Service\UserAgentMatcherInterface;
-use App\Tiqr\AuthenticationRateLimitServiceInterface;
-use App\Tiqr\Exception\UserNotExistsException;
-use App\Tiqr\TiqrServiceInterface;
-use App\Tiqr\TiqrUserRepositoryInterface;
-use App\WithContextLogger;
+namespace Surfnet\Tiqr\Controller;
+
+use Surfnet\Tiqr\Service\UserAgentMatcherInterface;
+use Surfnet\Tiqr\Tiqr\AuthenticationRateLimitServiceInterface;
+use Surfnet\Tiqr\Tiqr\Exception\UserNotExistsException;
+use Surfnet\Tiqr\Tiqr\TiqrServiceInterface;
+use Surfnet\Tiqr\Tiqr\TiqrUserRepositoryInterface;
+use Surfnet\Tiqr\WithContextLogger;
 use Exception;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 20aa4dc2..26c1fbcb 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\DependencyInjection;
+namespace Surfnet\Tiqr\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
diff --git a/src/EventSubscriber/LocaleResponseListener.php b/src/EventSubscriber/LocaleResponseListener.php
index 1fc6f659..498f1a52 100644
--- a/src/EventSubscriber/LocaleResponseListener.php
+++ b/src/EventSubscriber/LocaleResponseListener.php
@@ -18,7 +18,7 @@
 
 declare(strict_types = 1);
 
-namespace App\EventSubscriber;
+namespace Surfnet\Tiqr\EventSubscriber;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
diff --git a/src/Exception/NoActiveAuthenrequestException.php b/src/Exception/NoActiveAuthenrequestException.php
index 82344ce4..75ee5361 100644
--- a/src/Exception/NoActiveAuthenrequestException.php
+++ b/src/Exception/NoActiveAuthenrequestException.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Exception;
+namespace Surfnet\Tiqr\Exception;
 
 use RuntimeException as CoreRuntimeException;
 
diff --git a/src/Exception/TiqrServerRuntimeException.php b/src/Exception/TiqrServerRuntimeException.php
index 4ed7091e..8904b83e 100644
--- a/src/Exception/TiqrServerRuntimeException.php
+++ b/src/Exception/TiqrServerRuntimeException.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Exception;
+namespace Surfnet\Tiqr\Exception;
 
 use Exception;
 use RuntimeException;
diff --git a/src/Exception/UserNotFoundException.php b/src/Exception/UserNotFoundException.php
index e33c9ede..9415192e 100644
--- a/src/Exception/UserNotFoundException.php
+++ b/src/Exception/UserNotFoundException.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Exception;
+namespace Surfnet\Tiqr\Exception;
 
 use RuntimeException as CoreRuntimeException;
 
diff --git a/src/Exception/UserPermanentlyBlockedException.php b/src/Exception/UserPermanentlyBlockedException.php
index 013a6cc4..7196914a 100644
--- a/src/Exception/UserPermanentlyBlockedException.php
+++ b/src/Exception/UserPermanentlyBlockedException.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Exception;
+namespace Surfnet\Tiqr\Exception;
 
 use RuntimeException as CoreRuntimeException;
 
diff --git a/src/Exception/UserTemporarilyBlockedException.php b/src/Exception/UserTemporarilyBlockedException.php
index a4c96d51..0fe17321 100644
--- a/src/Exception/UserTemporarilyBlockedException.php
+++ b/src/Exception/UserTemporarilyBlockedException.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Exception;
+namespace Surfnet\Tiqr\Exception;
 
 use RuntimeException as CoreRuntimeException;
 
diff --git a/src/Features/Context/ErrorReportContext.php b/src/Features/Context/ErrorReportContext.php
index 833bb0a7..e5b6beb1 100644
--- a/src/Features/Context/ErrorReportContext.php
+++ b/src/Features/Context/ErrorReportContext.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Features\Context;
+namespace Surfnet\Tiqr\Features\Context;
 
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\AfterStepScope;
diff --git a/src/Features/Context/TiqrContext.php b/src/Features/Context/TiqrContext.php
index 716d6068..7196ea8d 100644
--- a/src/Features/Context/TiqrContext.php
+++ b/src/Features/Context/TiqrContext.php
@@ -18,11 +18,11 @@
  * limitations under the License.
  */
 
-namespace App\Features\Context;
+namespace Surfnet\Tiqr\Features\Context;
 
-use App\Tiqr\TiqrConfiguration;
-use App\Tiqr\TiqrConfigurationInterface;
-use App\Tiqr\TiqrUserRepositoryInterface;
+use Surfnet\Tiqr\Tiqr\TiqrConfiguration;
+use Surfnet\Tiqr\Tiqr\TiqrConfigurationInterface;
+use Surfnet\Tiqr\Tiqr\TiqrUserRepositoryInterface;
 use Assert\Assertion;
 use Assert\AssertionFailedException;
 use Behat\Behat\Context\Context;
diff --git a/src/Features/Context/WebContext.php b/src/Features/Context/WebContext.php
index ca4ec499..db2cd8e9 100644
--- a/src/Features/Context/WebContext.php
+++ b/src/Features/Context/WebContext.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Features\Context;
+namespace Surfnet\Tiqr\Features\Context;
 
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
diff --git a/src/Kernel.php b/src/Kernel.php
index e45c7336..a53c688f 100644
--- a/src/Kernel.php
+++ b/src/Kernel.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App;
+namespace Surfnet\Tiqr;
 
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
diff --git a/src/Service/ErrorPageHelper.php b/src/Service/ErrorPageHelper.php
index 0a216db0..d19c2245 100644
--- a/src/Service/ErrorPageHelper.php
+++ b/src/Service/ErrorPageHelper.php
@@ -18,7 +18,7 @@
 
 declare(strict_types = 1);
 
-namespace App\Service;
+namespace Surfnet\Tiqr\Service;
 
 use DateTime;
 use DateTimeInterface;
diff --git a/src/Service/GlobalViewParameters.php b/src/Service/GlobalViewParameters.php
index c72aff25..51e55e1d 100644
--- a/src/Service/GlobalViewParameters.php
+++ b/src/Service/GlobalViewParameters.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Service;
+namespace Surfnet\Tiqr\Service;
 
 use Symfony\Contracts\Translation\TranslatorInterface;
 
diff --git a/src/Service/UserAgentMatcher.php b/src/Service/UserAgentMatcher.php
index 93e05164..c7fbe19c 100644
--- a/src/Service/UserAgentMatcher.php
+++ b/src/Service/UserAgentMatcher.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Service;
+namespace Surfnet\Tiqr\Service;
 
 use Symfony\Component\HttpFoundation\Request;
 
diff --git a/src/Service/UserAgentMatcherInterface.php b/src/Service/UserAgentMatcherInterface.php
index f592a386..0447525d 100644
--- a/src/Service/UserAgentMatcherInterface.php
+++ b/src/Service/UserAgentMatcherInterface.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Service;
+namespace Surfnet\Tiqr\Service;
 
 use Symfony\Component\HttpFoundation\Request;
 
diff --git a/src/Tiqr/AuthenticationRateLimitService.php b/src/Tiqr/AuthenticationRateLimitService.php
index 097c32ac..a38baf10 100644
--- a/src/Tiqr/AuthenticationRateLimitService.php
+++ b/src/Tiqr/AuthenticationRateLimitService.php
@@ -18,15 +18,15 @@
  * limitations under the License.
  */
 
-namespace App\Tiqr;
-
-use App\Exception\TiqrServerRuntimeException;
-use App\Tiqr\Response\AuthenticationResponse;
-use App\Tiqr\Response\PermanentlyBlockedAuthenticationResponse;
-use App\Tiqr\Response\RateLimitedAuthenticationResponse;
-use App\Tiqr\Response\RejectedAuthenticationResponse;
-use App\Tiqr\Response\TemporarilyBlockedAuthenticationResponse;
-use App\WithContextLogger;
+namespace Surfnet\Tiqr\Tiqr;
+
+use Surfnet\Tiqr\Exception\TiqrServerRuntimeException;
+use Surfnet\Tiqr\Tiqr\Response\AuthenticationResponse;
+use Surfnet\Tiqr\Tiqr\Response\PermanentlyBlockedAuthenticationResponse;
+use Surfnet\Tiqr\Tiqr\Response\RateLimitedAuthenticationResponse;
+use Surfnet\Tiqr\Tiqr\Response\RejectedAuthenticationResponse;
+use Surfnet\Tiqr\Tiqr\Response\TemporarilyBlockedAuthenticationResponse;
+use Surfnet\Tiqr\WithContextLogger;
 use DateTimeImmutable;
 use Psr\Log\LoggerInterface;
 
diff --git a/src/Tiqr/AuthenticationRateLimitServiceInterface.php b/src/Tiqr/AuthenticationRateLimitServiceInterface.php
index e833f14e..37cbcd0f 100644
--- a/src/Tiqr/AuthenticationRateLimitServiceInterface.php
+++ b/src/Tiqr/AuthenticationRateLimitServiceInterface.php
@@ -18,9 +18,9 @@
  * limitations under the License.
  */
 
-namespace App\Tiqr;
+namespace Surfnet\Tiqr\Tiqr;
 
-use App\Tiqr\Response\AuthenticationResponse;
+use Surfnet\Tiqr\Tiqr\Response\AuthenticationResponse;
 
 interface AuthenticationRateLimitServiceInterface
 {
diff --git a/src/Tiqr/Exception/ConfigurationException.php b/src/Tiqr/Exception/ConfigurationException.php
index a3bacb1d..ff2c5e30 100644
--- a/src/Tiqr/Exception/ConfigurationException.php
+++ b/src/Tiqr/Exception/ConfigurationException.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Tiqr\Exception;
+namespace Surfnet\Tiqr\Tiqr\Exception;
 
 use Exception;
 
diff --git a/src/Tiqr/Exception/UserNotExistsException.php b/src/Tiqr/Exception/UserNotExistsException.php
index fb2045c6..3ace9e5e 100644
--- a/src/Tiqr/Exception/UserNotExistsException.php
+++ b/src/Tiqr/Exception/UserNotExistsException.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Tiqr\Exception;
+namespace Surfnet\Tiqr\Tiqr\Exception;
 
 use Exception;
 
diff --git a/src/Tiqr/Legacy/TiqrService.php b/src/Tiqr/Legacy/TiqrService.php
index 924c6c4e..8ba41f1d 100644
--- a/src/Tiqr/Legacy/TiqrService.php
+++ b/src/Tiqr/Legacy/TiqrService.php
@@ -18,15 +18,15 @@
  * limitations under the License.
  */
 
-namespace App\Tiqr\Legacy;
-
-use App\Exception\TiqrServerRuntimeException;
-use App\Tiqr\Response\AuthenticationErrorResponse;
-use App\Tiqr\Response\AuthenticationResponse;
-use App\Tiqr\Response\RejectedAuthenticationResponse;
-use App\Tiqr\Response\ValidAuthenticationResponse;
-use App\Tiqr\TiqrServiceInterface;
-use App\Tiqr\TiqrUserInterface;
+namespace Surfnet\Tiqr\Tiqr\Legacy;
+
+use Surfnet\Tiqr\Exception\TiqrServerRuntimeException;
+use Surfnet\Tiqr\Tiqr\Response\AuthenticationErrorResponse;
+use Surfnet\Tiqr\Tiqr\Response\AuthenticationResponse;
+use Surfnet\Tiqr\Tiqr\Response\RejectedAuthenticationResponse;
+use Surfnet\Tiqr\Tiqr\Response\ValidAuthenticationResponse;
+use Surfnet\Tiqr\Tiqr\TiqrServiceInterface;
+use Surfnet\Tiqr\Tiqr\TiqrUserInterface;
 use Exception;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
diff --git a/src/Tiqr/Legacy/TiqrUser.php b/src/Tiqr/Legacy/TiqrUser.php
index 6155af6d..94e659e8 100644
--- a/src/Tiqr/Legacy/TiqrUser.php
+++ b/src/Tiqr/Legacy/TiqrUser.php
@@ -18,10 +18,10 @@
  * limitations under the License.
  */
 
-namespace App\Tiqr\Legacy;
+namespace Surfnet\Tiqr\Tiqr\Legacy;
 
-use App\Exception\TiqrServerRuntimeException;
-use App\Tiqr\TiqrUserInterface;
+use Surfnet\Tiqr\Exception\TiqrServerRuntimeException;
+use Surfnet\Tiqr\Tiqr\TiqrUserInterface;
 use Exception;
 use Tiqr_UserSecretStorage_Interface;
 use Tiqr_UserStorage_Interface;
diff --git a/src/Tiqr/Legacy/TiqrUserRepository.php b/src/Tiqr/Legacy/TiqrUserRepository.php
index 447c9a16..72bd3875 100644
--- a/src/Tiqr/Legacy/TiqrUserRepository.php
+++ b/src/Tiqr/Legacy/TiqrUserRepository.php
@@ -18,11 +18,11 @@
  * limitations under the License.
  */
 
-namespace App\Tiqr\Legacy;
+namespace Surfnet\Tiqr\Tiqr\Legacy;
 
-use App\Exception\TiqrServerRuntimeException;
-use App\Tiqr\Exception\UserNotExistsException;
-use App\Tiqr\TiqrUserRepositoryInterface;
+use Surfnet\Tiqr\Exception\TiqrServerRuntimeException;
+use Surfnet\Tiqr\Tiqr\Exception\UserNotExistsException;
+use Surfnet\Tiqr\Tiqr\TiqrUserRepositoryInterface;
 use Exception;
 use Tiqr_UserSecretStorage_Interface;
 use Tiqr_UserStorage_Interface;
diff --git a/src/Tiqr/Response/AuthenticationErrorResponse.php b/src/Tiqr/Response/AuthenticationErrorResponse.php
index dee97680..b20b977a 100644
--- a/src/Tiqr/Response/AuthenticationErrorResponse.php
+++ b/src/Tiqr/Response/AuthenticationErrorResponse.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Tiqr\Response;
+namespace Surfnet\Tiqr\Tiqr\Response;
 
 /**
  * An error response that is not directly caused by the user.
diff --git a/src/Tiqr/Response/AuthenticationResponse.php b/src/Tiqr/Response/AuthenticationResponse.php
index 54968d62..aff959eb 100644
--- a/src/Tiqr/Response/AuthenticationResponse.php
+++ b/src/Tiqr/Response/AuthenticationResponse.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Tiqr\Response;
+namespace Surfnet\Tiqr\Tiqr\Response;
 
 interface AuthenticationResponse
 {
diff --git a/src/Tiqr/Response/PermanentlyBlockedAuthenticationResponse.php b/src/Tiqr/Response/PermanentlyBlockedAuthenticationResponse.php
index 50b1f499..35a3eb1c 100644
--- a/src/Tiqr/Response/PermanentlyBlockedAuthenticationResponse.php
+++ b/src/Tiqr/Response/PermanentlyBlockedAuthenticationResponse.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Tiqr\Response;
+namespace Surfnet\Tiqr\Tiqr\Response;
 
 /**
  *
diff --git a/src/Tiqr/Response/RateLimitedAuthenticationResponse.php b/src/Tiqr/Response/RateLimitedAuthenticationResponse.php
index b1c1de7f..8971c6e7 100644
--- a/src/Tiqr/Response/RateLimitedAuthenticationResponse.php
+++ b/src/Tiqr/Response/RateLimitedAuthenticationResponse.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Tiqr\Response;
+namespace Surfnet\Tiqr\Tiqr\Response;
 
 /**
  *
diff --git a/src/Tiqr/Response/RejectedAuthenticationResponse.php b/src/Tiqr/Response/RejectedAuthenticationResponse.php
index 693cb647..d3e86263 100644
--- a/src/Tiqr/Response/RejectedAuthenticationResponse.php
+++ b/src/Tiqr/Response/RejectedAuthenticationResponse.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Tiqr\Response;
+namespace Surfnet\Tiqr\Tiqr\Response;
 
 /**
  * Response when the user has given a wrong password.
diff --git a/src/Tiqr/Response/TemporarilyBlockedAuthenticationResponse.php b/src/Tiqr/Response/TemporarilyBlockedAuthenticationResponse.php
index b4d7955b..ce4c70e5 100644
--- a/src/Tiqr/Response/TemporarilyBlockedAuthenticationResponse.php
+++ b/src/Tiqr/Response/TemporarilyBlockedAuthenticationResponse.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Tiqr\Response;
+namespace Surfnet\Tiqr\Tiqr\Response;
 
 /**
  *
diff --git a/src/Tiqr/Response/ValidAuthenticationResponse.php b/src/Tiqr/Response/ValidAuthenticationResponse.php
index 7604bac6..9cc8c4d0 100644
--- a/src/Tiqr/Response/ValidAuthenticationResponse.php
+++ b/src/Tiqr/Response/ValidAuthenticationResponse.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Tiqr\Response;
+namespace Surfnet\Tiqr\Tiqr\Response;
 
 class ValidAuthenticationResponse implements AuthenticationResponse
 {
diff --git a/src/Tiqr/TiqrConfiguration.php b/src/Tiqr/TiqrConfiguration.php
index 2cd46dae..f5b9b143 100644
--- a/src/Tiqr/TiqrConfiguration.php
+++ b/src/Tiqr/TiqrConfiguration.php
@@ -18,9 +18,9 @@
  * limitations under the License.
  */
 
-namespace App\Tiqr;
+namespace Surfnet\Tiqr\Tiqr;
 
-use App\Tiqr\Exception\ConfigurationException;
+use Surfnet\Tiqr\Tiqr\Exception\ConfigurationException;
 use Assert\Assertion;
 
 class TiqrConfiguration implements TiqrConfigurationInterface
diff --git a/src/Tiqr/TiqrConfigurationInterface.php b/src/Tiqr/TiqrConfigurationInterface.php
index 449f527d..aa59b8c7 100644
--- a/src/Tiqr/TiqrConfigurationInterface.php
+++ b/src/Tiqr/TiqrConfigurationInterface.php
@@ -17,9 +17,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-namespace App\Tiqr;
+namespace Surfnet\Tiqr\Tiqr;
 
-use App\Tiqr\Exception\ConfigurationException;
+use Surfnet\Tiqr\Tiqr\Exception\ConfigurationException;
 
 interface TiqrConfigurationInterface
 {
diff --git a/src/Tiqr/TiqrFactory.php b/src/Tiqr/TiqrFactory.php
index 207a6902..1d90ac72 100644
--- a/src/Tiqr/TiqrFactory.php
+++ b/src/Tiqr/TiqrFactory.php
@@ -18,10 +18,10 @@
  * limitations under the License.
  */
 
-namespace App\Tiqr;
+namespace Surfnet\Tiqr\Tiqr;
 
-use App\Tiqr\Legacy\TiqrService;
-use App\Tiqr\Legacy\TiqrUserRepository;
+use Surfnet\Tiqr\Tiqr\Legacy\TiqrService;
+use Surfnet\Tiqr\Tiqr\Legacy\TiqrUserRepository;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Tiqr_Service;
diff --git a/src/Tiqr/TiqrServiceInterface.php b/src/Tiqr/TiqrServiceInterface.php
index fb91ac86..696d700d 100644
--- a/src/Tiqr/TiqrServiceInterface.php
+++ b/src/Tiqr/TiqrServiceInterface.php
@@ -18,10 +18,10 @@
  * limitations under the License.
  */
 
-namespace App\Tiqr;
+namespace Surfnet\Tiqr\Tiqr;
 
-use App\Exception\TiqrServerRuntimeException;
-use App\Tiqr\Response\AuthenticationResponse;
+use Surfnet\Tiqr\Exception\TiqrServerRuntimeException;
+use Surfnet\Tiqr\Tiqr\Response\AuthenticationResponse;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 interface TiqrServiceInterface
diff --git a/src/Tiqr/TiqrUserInterface.php b/src/Tiqr/TiqrUserInterface.php
index 38a16394..952169f4 100644
--- a/src/Tiqr/TiqrUserInterface.php
+++ b/src/Tiqr/TiqrUserInterface.php
@@ -18,9 +18,9 @@
  * limitations under the License.
  */
 
-namespace App\Tiqr;
+namespace Surfnet\Tiqr\Tiqr;
 
-use App\Exception\TiqrServerRuntimeException;
+use Surfnet\Tiqr\Exception\TiqrServerRuntimeException;
 use DateTimeImmutable;
 
 interface TiqrUserInterface
diff --git a/src/Tiqr/TiqrUserRepositoryInterface.php b/src/Tiqr/TiqrUserRepositoryInterface.php
index 4c5c9137..5f3aab39 100644
--- a/src/Tiqr/TiqrUserRepositoryInterface.php
+++ b/src/Tiqr/TiqrUserRepositoryInterface.php
@@ -18,11 +18,11 @@
  * limitations under the License.
  */
 
-namespace App\Tiqr;
+namespace Surfnet\Tiqr\Tiqr;
 
-use App\Exception\TiqrServerRuntimeException;
-use App\Tiqr\Exception\UserNotExistsException;
-use App\Tiqr\Legacy\TiqrUser;
+use Surfnet\Tiqr\Exception\TiqrServerRuntimeException;
+use Surfnet\Tiqr\Tiqr\Exception\UserNotExistsException;
+use Surfnet\Tiqr\Tiqr\Legacy\TiqrUser;
 
 /**
  * Wrapper around the legacy Tiqr user repository.
diff --git a/src/WithContextLogger.php b/src/WithContextLogger.php
index da6a424e..ebcf4ce6 100644
--- a/src/WithContextLogger.php
+++ b/src/WithContextLogger.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App;
+namespace Surfnet\Tiqr;
 
 use Psr\Log\AbstractLogger;
 use Psr\Log\LoggerInterface;