diff --git a/Annotation/AnnotationReader.php b/Annotation/AnnotationReader.php
index bc36a80..f65e85b 100644
--- a/Annotation/AnnotationReader.php
+++ b/Annotation/AnnotationReader.php
@@ -10,7 +10,7 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Annotation;
+namespace Superbrave\GdprBundle\Annotation;
 
 use Doctrine\Common\Annotations\AnnotationReader as DoctrineAnnotationReader;
 use ReflectionClass;
diff --git a/Annotation/Anonymize.php b/Annotation/Anonymize.php
index 5280ffe..7650399 100644
--- a/Annotation/Anonymize.php
+++ b/Annotation/Anonymize.php
@@ -6,13 +6,13 @@
  *
  * @category  Bundle
  * @package   Gdpr
- * @author    Superbrave <info@superbrave.nl>
- * @copyright 2018 Superbrave <info@superbrave.nl>
+ * @author    SuperBrave <info@superbrave.nl>
+ * @copyright 2018 SuperBrave <info@superbrave.nl>
  * @license   https://github.com/superbrave/gdpr-bundle/blob/master/LICENSE MIT
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Annotation;
+namespace Superbrave\GdprBundle\Annotation;
 
 use Doctrine\Common\Annotations\Annotation;
 use Doctrine\Common\Annotations\Annotation\Attribute;
diff --git a/Annotation/Export.php b/Annotation/Export.php
index 4904f6e..d61a750 100644
--- a/Annotation/Export.php
+++ b/Annotation/Export.php
@@ -10,7 +10,7 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Annotation;
+namespace Superbrave\GdprBundle\Annotation;
 
 use Doctrine\Common\Annotations\Annotation;
 
diff --git a/Anonymize/Anonymizer.php b/Anonymize/Anonymizer.php
index 7d21551..aebc195 100644
--- a/Anonymize/Anonymizer.php
+++ b/Anonymize/Anonymizer.php
@@ -10,10 +10,10 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Anonymize;
+namespace Superbrave\GdprBundle\Anonymize;
 
-use SuperBrave\GdprBundle\Annotation\AnnotationReader;
-use SuperBrave\GdprBundle\Annotation\Anonymize;
+use Superbrave\GdprBundle\Annotation\AnnotationReader;
+use Superbrave\GdprBundle\Annotation\Anonymize;
 use InvalidArgumentException;
 use ReflectionException;
 use ReflectionClass;
@@ -21,7 +21,7 @@
 /**
  * Class Anonymizer
  *
- * @package SuperBrave\GdprBundle\Anonymize
+ * @package Superbrave\GdprBundle\Anonymize
  */
 class Anonymizer
 {
diff --git a/Anonymize/AnonymizerCollection.php b/Anonymize/AnonymizerCollection.php
index f5e22a9..a92e80f 100644
--- a/Anonymize/AnonymizerCollection.php
+++ b/Anonymize/AnonymizerCollection.php
@@ -10,15 +10,15 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Anonymize;
+namespace Superbrave\GdprBundle\Anonymize;
 
 use LogicException;
-use SuperBrave\GdprBundle\Anonymize\Type\AnonymizerInterface;
+use Superbrave\GdprBundle\Anonymize\Type\AnonymizerInterface;
 
 /**
  * Class AnonymizerCollection
  *
- * @package SuperBrave\GdprBundle\Anonymize
+ * @package Superbrave\GdprBundle\Anonymize
  */
 class AnonymizerCollection
 {
diff --git a/Anonymize/PropertyAnonymizer.php b/Anonymize/PropertyAnonymizer.php
index c26b558..a9532bb 100644
--- a/Anonymize/PropertyAnonymizer.php
+++ b/Anonymize/PropertyAnonymizer.php
@@ -10,15 +10,15 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Anonymize;
+namespace Superbrave\GdprBundle\Anonymize;
 
-use SuperBrave\GdprBundle\Annotation\Anonymize;
-use SuperBrave\GdprBundle\Manipulator\PropertyManipulator;
+use Superbrave\GdprBundle\Annotation\Anonymize;
+use Superbrave\GdprBundle\Manipulator\PropertyManipulator;
 
 /**
  * Class PropertyAnonymizer
  *
- * @package SuperBrave\GdprBundle\Anonymizer
+ * @package Superbrave\GdprBundle\Anonymizer
  */
 class PropertyAnonymizer
 {
diff --git a/Anonymize/Type/AnonymizerInterface.php b/Anonymize/Type/AnonymizerInterface.php
index a9f8544..0ca0f33 100644
--- a/Anonymize/Type/AnonymizerInterface.php
+++ b/Anonymize/Type/AnonymizerInterface.php
@@ -10,12 +10,12 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Anonymize\Type;
+namespace Superbrave\GdprBundle\Anonymize\Type;
 
 /**
  * Interface AnonymizerInterface
  *
- * @package SuperBrave\GdprBundle\Anonymize\Type
+ * @package Superbrave\GdprBundle\Anonymize\Type
  */
 interface AnonymizerInterface
 {
diff --git a/Anonymize/Type/ArrayAnonymizer.php b/Anonymize/Type/ArrayAnonymizer.php
index 89fa0ba..0580743 100644
--- a/Anonymize/Type/ArrayAnonymizer.php
+++ b/Anonymize/Type/ArrayAnonymizer.php
@@ -10,12 +10,12 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Anonymize\Type;
+namespace Superbrave\GdprBundle\Anonymize\Type;
 
 /**
  * Class ArrayAnonymizer
  *
- * @package SuperBrave\GdprBundle\Anonymize\Type
+ * @package Superbrave\GdprBundle\Anonymize\Type
  */
 class ArrayAnonymizer implements AnonymizerInterface
 {
diff --git a/Anonymize/Type/DateTimeAnonymizer.php b/Anonymize/Type/DateTimeAnonymizer.php
index 2b31b1d..50c012c 100644
--- a/Anonymize/Type/DateTimeAnonymizer.php
+++ b/Anonymize/Type/DateTimeAnonymizer.php
@@ -10,7 +10,7 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Anonymize\Type;
+namespace Superbrave\GdprBundle\Anonymize\Type;
 
 /**
  * DATE_RFC7231 is not natively supported in PHP 5.6
@@ -22,7 +22,7 @@
 /**
  * DateTime anonymizer class
  *
- * @package SuperBrave\GdprBundle\Anonymize\Type
+ * @package Superbrave\GdprBundle\Anonymize\Type
  */
 class DateTimeAnonymizer implements AnonymizerInterface
 {
diff --git a/Anonymize/Type/FixedAnonymizer.php b/Anonymize/Type/FixedAnonymizer.php
index 0386589..00270b5 100644
--- a/Anonymize/Type/FixedAnonymizer.php
+++ b/Anonymize/Type/FixedAnonymizer.php
@@ -10,15 +10,15 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Anonymize\Type;
+namespace Superbrave\GdprBundle\Anonymize\Type;
 
-use SuperBrave\GdprBundle\Manipulator\PropertyManipulator;
+use Superbrave\GdprBundle\Manipulator\PropertyManipulator;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * Fixed anonymizer class
  *
- * @package SuperBrave\GdprBundle\Anonymize\Type
+ * @package Superbrave\GdprBundle\Anonymize\Type
  */
 class FixedAnonymizer implements AnonymizerInterface
 {
diff --git a/Anonymize/Type/IpAnonymizer.php b/Anonymize/Type/IpAnonymizer.php
index fb5c64d..384f265 100644
--- a/Anonymize/Type/IpAnonymizer.php
+++ b/Anonymize/Type/IpAnonymizer.php
@@ -10,14 +10,14 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Anonymize\Type;
+namespace Superbrave\GdprBundle\Anonymize\Type;
 
 use InvalidArgumentException;
 
 /**
  * Class IpAnonymizer
  *
- * @package SuperBrave\GdprBundle\Anonymize\Type
+ * @package Superbrave\GdprBundle\Anonymize\Type
  */
 class IpAnonymizer implements AnonymizerInterface
 {
diff --git a/Anonymize/Type/NullAnonymizer.php b/Anonymize/Type/NullAnonymizer.php
index 52aa77f..03259a5 100644
--- a/Anonymize/Type/NullAnonymizer.php
+++ b/Anonymize/Type/NullAnonymizer.php
@@ -10,12 +10,12 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Anonymize\Type;
+namespace Superbrave\GdprBundle\Anonymize\Type;
 
 /**
  * Class NullAnonymizer
  *
- * @package SuperBrave\GdprBundle\Anonymize\Type
+ * @package Superbrave\GdprBundle\Anonymize\Type
  */
 class NullAnonymizer implements AnonymizerInterface
 {
diff --git a/Anonymize/Type/ObjectAnonymizer.php b/Anonymize/Type/ObjectAnonymizer.php
index 74b0c62..915771f 100644
--- a/Anonymize/Type/ObjectAnonymizer.php
+++ b/Anonymize/Type/ObjectAnonymizer.php
@@ -10,14 +10,14 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Anonymize\Type;
+namespace Superbrave\GdprBundle\Anonymize\Type;
 
-use SuperBrave\GdprBundle\Anonymize\Anonymizer;
+use Superbrave\GdprBundle\Anonymize\Anonymizer;
 
 /**
  * Class ObjectAnonymizer
  *
- * @package SuperBrave\GdprBundle\Anonymize\Type
+ * @package Superbrave\GdprBundle\Anonymize\Type
  */
 class ObjectAnonymizer implements AnonymizerInterface
 {
diff --git a/DependencyInjection/Compiler/AddAnonymizersCompilerPass.php b/DependencyInjection/Compiler/AddAnonymizersCompilerPass.php
index b943f14..4c23d86 100644
--- a/DependencyInjection/Compiler/AddAnonymizersCompilerPass.php
+++ b/DependencyInjection/Compiler/AddAnonymizersCompilerPass.php
@@ -10,10 +10,10 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\DependencyInjection\Compiler;
+namespace Superbrave\GdprBundle\DependencyInjection\Compiler;
 
 use LogicException;
-use SuperBrave\GdprBundle\Anonymize\Type\AnonymizerInterface;
+use Superbrave\GdprBundle\Anonymize\Type\AnonymizerInterface;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -21,7 +21,7 @@
 /**
  * Compiler pass to add the tagged anonymizers to the anonymizer manager's definition
  *
- * @package SuperBrave\GdprBundle\DependencyInjection\Compiler
+ * @package Superbrave\GdprBundle\DependencyInjection\Compiler
  */
 class AddAnonymizersCompilerPass implements CompilerPassInterface
 {
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 2d085b1..a2371a8 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -6,13 +6,13 @@
  *
  * @category  Bundle
  * @package   Gdpr
- * @author    Superbrave <info@superbrave.nl>
- * @copyright 2018 Superbrave <info@superbrave.nl>
+ * @author    SuperBrave <info@superbrave.nl>
+ * @copyright 2018 SuperBrave <info@superbrave.nl>
  * @license   https://github.com/superbrave/gdpr-bundle/blob/master/LICENSE MIT
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\DependencyInjection;
+namespace Superbrave\GdprBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
diff --git a/DependencyInjection/ObjectFactory.php b/DependencyInjection/ObjectFactory.php
index 5a6f278..2aeca4c 100644
--- a/DependencyInjection/ObjectFactory.php
+++ b/DependencyInjection/ObjectFactory.php
@@ -10,7 +10,7 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\DependencyInjection;
+namespace Superbrave\GdprBundle\DependencyInjection;
 
 use Symfony\Component\Serializer\Encoder\EncoderInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
diff --git a/DependencyInjection/SuperbraveGdprExtension.php b/DependencyInjection/SuperbraveGdprExtension.php
index 28a7418..d3b0ef2 100644
--- a/DependencyInjection/SuperbraveGdprExtension.php
+++ b/DependencyInjection/SuperbraveGdprExtension.php
@@ -6,13 +6,13 @@
  *
  * @category  Bundle
  * @package   Gdpr
- * @author    Superbrave <info@superbrave.nl>
- * @copyright 2018 Superbrave <info@superbrave.nl>
+ * @author    SuperBrave <info@superbrave.nl>
+ * @copyright 2018 SuperBrave <info@superbrave.nl>
  * @license   https://github.com/superbrave/gdpr-bundle/blob/master/LICENSE MIT
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\DependencyInjection;
+namespace Superbrave\GdprBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
diff --git a/Export/Exporter.php b/Export/Exporter.php
index 09a5b69..ec38026 100644
--- a/Export/Exporter.php
+++ b/Export/Exporter.php
@@ -10,7 +10,7 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Export;
+namespace Superbrave\GdprBundle\Export;
 
 use InvalidArgumentException;
 use ReflectionClass;
diff --git a/Manipulator/PropertyManipulator.php b/Manipulator/PropertyManipulator.php
index a91a24f..934a3e6 100644
--- a/Manipulator/PropertyManipulator.php
+++ b/Manipulator/PropertyManipulator.php
@@ -10,7 +10,7 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Manipulator;
+namespace Superbrave\GdprBundle\Manipulator;
 
 use ReflectionProperty;
 use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;
@@ -19,7 +19,7 @@
 /**
  * Class PropertyManipulator
  *
- * @package SuperBrave\GdprBundle\Manipulator
+ * @package Superbrave\GdprBundle\Manipulator
  */
 class PropertyManipulator
 {
diff --git a/Resources/config/services.anonymizer.types.yml b/Resources/config/services.anonymizer.types.yml
index a953e4c..9a3f213 100644
--- a/Resources/config/services.anonymizer.types.yml
+++ b/Resources/config/services.anonymizer.types.yml
@@ -3,37 +3,37 @@ services:
         public: false
 
     superbrave_gdpr.fixed_anonymizer:
-        class: SuperBrave\GdprBundle\Anonymize\Type\FixedAnonymizer
+        class: Superbrave\GdprBundle\Anonymize\Type\FixedAnonymizer
         arguments:
             - "@superbrave_gdpr.property_manipulator"
         tags:
             - { name: superbrave_gdpr.anonymizer, type: fixed }
 
     superbrave_gdpr.date_time_anonymizer:
-        class: SuperBrave\GdprBundle\Anonymize\Type\DateTimeAnonymizer
+        class: Superbrave\GdprBundle\Anonymize\Type\DateTimeAnonymizer
         tags:
             - { name: superbrave_gdpr.anonymizer, type: dateTime }
 
     superbrave_gdpr.ip_anonymizer:
-        class: SuperBrave\GdprBundle\Anonymize\Type\IpAnonymizer
+        class: Superbrave\GdprBundle\Anonymize\Type\IpAnonymizer
         tags:
             - { name: superbrave_gdpr.anonymizer, type: ip }
 
     superbrave_gdpr.object_anonymizer:
-        class: SuperBrave\GdprBundle\Anonymize\Type\ObjectAnonymizer
+        class: Superbrave\GdprBundle\Anonymize\Type\ObjectAnonymizer
         arguments:
             - "@superbrave_gdpr.anonymizer"
         tags:
             - { name: superbrave_gdpr.anonymizer, type: object }
 
     superbrave_gdpr.collection_anonymizer:
-        class: SuperBrave\GdprBundle\Anonymize\Type\ArrayAnonymizer
+        class: Superbrave\GdprBundle\Anonymize\Type\ArrayAnonymizer
         arguments:
             - "@superbrave_gdpr.object_anonymizer"
         tags:
             - { name: superbrave_gdpr.anonymizer, type: collection }
 
     superbrave_gdpr.null_anonymizer:
-        class: SuperBrave\GdprBundle\Anonymize\Type\NullAnonymizer
+        class: Superbrave\GdprBundle\Anonymize\Type\NullAnonymizer
         tags:
             - { name: superbrave_gdpr.anonymizer, type: "null" }
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
index ab794d4..b2742ed 100644
--- a/Resources/config/services.yml
+++ b/Resources/config/services.yml
@@ -3,17 +3,17 @@ services:
         public: false
 
     superbrave_gdpr.annotation.reader:
-        class: SuperBrave\GdprBundle\Annotation\AnnotationReader
+        class: Superbrave\GdprBundle\Annotation\AnnotationReader
 
     superbrave_gdpr.exporter:
-        class: SuperBrave\GdprBundle\Export\Exporter
+        class: Superbrave\GdprBundle\Export\Exporter
         arguments:
             - "@superbrave_gdpr.exporter.serializer"
             - "xml"
         public: true
 
     superbrave_gdpr.anonymizer:
-        class: SuperBrave\GdprBundle\Anonymize\Anonymizer
+        class: Superbrave\GdprBundle\Anonymize\Anonymizer
         arguments:
             - "@superbrave_gdpr.annotation.reader"
             - "@superbrave_gdpr.property_anonymizer"
@@ -21,16 +21,16 @@ services:
 
     superbrave_gdpr.exporter.serializer:
         class: Symfony\Component\Serializer\Serializer
-        factory: ["SuperBrave\\GdprBundle\\DependencyInjection\\ObjectFactory", "createSerializer"]
+        factory: ["Superbrave\\GdprBundle\\DependencyInjection\\ObjectFactory", "createSerializer"]
         arguments:
             - !tagged "superbrave_gdpr.serializer.normalizer"
             - !tagged "superbrave_gdpr.serializer.encoder"
 
     superbrave_gdpr.exporter.serializer.normalizer.export_annotation:
-        class: SuperBrave\GdprBundle\Serializer\Normalizer\AnnotationNormalizer
+        class: Superbrave\GdprBundle\Serializer\Normalizer\AnnotationNormalizer
         arguments:
             - "@superbrave_gdpr.annotation.reader"
-            - "SuperBrave\\GdprBundle\\Annotation\\Export"
+            - "Superbrave\\GdprBundle\\Annotation\\Export"
             - "@superbrave_gdpr.property_manipulator"
         tags:
             - { name: "superbrave_gdpr.serializer.normalizer" }
@@ -49,16 +49,16 @@ services:
         class: Symfony\Component\PropertyAccess\PropertyAccessor
 
     superbrave_gdpr.property_manipulator:
-        class: SuperBrave\GdprBundle\Manipulator\PropertyManipulator
+        class: Superbrave\GdprBundle\Manipulator\PropertyManipulator
         arguments:
             - "@superbrave_gdpr.property_accessor"
 
     superbrave_gdpr.anonymizer_collection:
-        class: SuperBrave\GdprBundle\Anonymize\AnonymizerCollection
+        class: Superbrave\GdprBundle\Anonymize\AnonymizerCollection
         public: true
 
     superbrave_gdpr.property_anonymizer:
-        class: SuperBrave\GdprBundle\Anonymize\PropertyAnonymizer
+        class: Superbrave\GdprBundle\Anonymize\PropertyAnonymizer
         arguments:
             - "@superbrave_gdpr.property_manipulator"
             - "@superbrave_gdpr.anonymizer_collection"
diff --git a/Resources/doc/anonymizer.md b/Resources/doc/anonymizer.md
index bbb631e..6cbf8c3 100644
--- a/Resources/doc/anonymizer.md
+++ b/Resources/doc/anonymizer.md
@@ -49,7 +49,7 @@ Setting a fixed value for the property.
 ```php
 <?php
 
-use SuperBrave\GdprBundle\Annotation as GDPR;
+use Superbrave\GdprBundle\Annotation as GDPR;
 
  /**
   * @var string
@@ -71,7 +71,7 @@ If the checks above both failed it resorts back to a ReflectionProperty
 ```php
 <?php
 
-use SuperBrave\GdprBundle\Annotation as GDPR;
+use Superbrave\GdprBundle\Annotation as GDPR;
 
  /**
   * @var string
@@ -88,7 +88,7 @@ Anonymizes the date time field by setting the month and day to 01 and hours, min
 ```php
 <?php
 
-use SuperBrave\GdprBundle\Annotation as GDPR;
+use Superbrave\GdprBundle\Annotation as GDPR;
 
  /**
   * @var \DateTimeInterface|string|int
@@ -105,7 +105,7 @@ Anonymizes the ip address by zeroing the last bytes of an ipv4 or ipv6 address.
 ```php
 <?php
 
-use SuperBrave\GdprBundle\Annotation as GDPR;
+use Superbrave\GdprBundle\Annotation as GDPR;
 
  /**
   * @var string
@@ -122,7 +122,7 @@ Anonymizes the property by setting it to null.
 ```php
 <?php
 
-use SuperBrave\GdprBundle\Annotation as GDPR;
+use Superbrave\GdprBundle\Annotation as GDPR;
 
  /**
   * @var mixed
@@ -139,7 +139,7 @@ The object type anonymizer is to indicate that the property is an actual object
 ```php
 <?php
 
-use SuperBrave\GdprBundle\Annotation AS GDPR;
+use Superbrave\GdprBundle\Annotation AS GDPR;
 
 class Order
 {
@@ -155,7 +155,7 @@ class Order
 ```php
 <?php
 
-use SuperBrave\GdprBundle\Annotation as GDPR;
+use Superbrave\GdprBundle\Annotation as GDPR;
 
  /**
   * @var Order
@@ -172,7 +172,7 @@ The collection type anonymizer is to indicate that the property is an collection
 ```php
 <?php
 
-use SuperBrave\GdprBundle\Annotation AS GDPR;
+use Superbrave\GdprBundle\Annotation AS GDPR;
 
 class Order
 {
@@ -188,7 +188,7 @@ class Order
 ```php
 <?php
 
-use SuperBrave\GdprBundle\Annotation as GDPR;
+use Superbrave\GdprBundle\Annotation as GDPR;
 
  /**
   * @var Order[]
diff --git a/Serializer/Normalizer/AnnotationNormalizer.php b/Serializer/Normalizer/AnnotationNormalizer.php
index 40b35a1..b3e89c5 100644
--- a/Serializer/Normalizer/AnnotationNormalizer.php
+++ b/Serializer/Normalizer/AnnotationNormalizer.php
@@ -10,11 +10,11 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Serializer\Normalizer;
+namespace Superbrave\GdprBundle\Serializer\Normalizer;
 
 use ReflectionClass;
-use SuperBrave\GdprBundle\Annotation\AnnotationReader;
-use SuperBrave\GdprBundle\Manipulator\PropertyManipulator;
+use Superbrave\GdprBundle\Annotation\AnnotationReader;
+use Superbrave\GdprBundle\Manipulator\PropertyManipulator;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
diff --git a/SuperbraveGdprBundle.php b/SuperbraveGdprBundle.php
index 249ba67..28a400f 100644
--- a/SuperbraveGdprBundle.php
+++ b/SuperbraveGdprBundle.php
@@ -6,20 +6,22 @@
  *
  * @category  Bundle
  * @package   Gdpr
- * @author    Superbrave <info@superbrave.nl>
- * @copyright 2018 Superbrave <info@superbrave.nl>
+ * @author    SuperBrave <info@superbrave.nl>
+ * @copyright 2018 SuperBrave <info@superbrave.nl>
  * @license   https://github.com/superbrave/gdpr-bundle/blob/master/LICENSE MIT
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle;
+namespace Superbrave\GdprBundle;
 
-use SuperBrave\GdprBundle\DependencyInjection\Compiler\AddAnonymizersCompilerPass;
+use Superbrave\GdprBundle\DependencyInjection\Compiler\AddAnonymizersCompilerPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
  * Class SuperbraveGdprBundle
+ *
+ * @package Superbrave\GdprBundle
  */
 class SuperbraveGdprBundle extends Bundle
 {
diff --git a/Tests/AnnotatedMock.php b/Tests/AnnotatedMock.php
index b3545ff..4f8300d 100644
--- a/Tests/AnnotatedMock.php
+++ b/Tests/AnnotatedMock.php
@@ -10,10 +10,10 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Tests;
+namespace Superbrave\GdprBundle\Tests;
 
 use Doctrine\Common\Collections\ArrayCollection;
-use SuperBrave\GdprBundle\Annotation as GDPR;
+use Superbrave\GdprBundle\Annotation as GDPR;
 
 /**
  * Class used to test the @see GDPR\AnnotationReader.
diff --git a/Tests/Annotation/AnnotationReaderTest.php b/Tests/Annotation/AnnotationReaderTest.php
index ad26b2e..fa308a7 100644
--- a/Tests/Annotation/AnnotationReaderTest.php
+++ b/Tests/Annotation/AnnotationReaderTest.php
@@ -10,15 +10,15 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Tests\Annotation;
+namespace Superbrave\GdprBundle\Tests\Annotation;
 
 use PHPUnit_Framework_TestCase;
 use ReflectionClass;
-use SuperBrave\GdprBundle\Annotation\AnnotationReader;
-use SuperBrave\GdprBundle\Annotation\Anonymize;
-use SuperBrave\GdprBundle\Annotation\Export;
-use SuperBrave\GdprBundle\Tests\AnnotatedMock;
-use SuperBrave\GdprBundle\Tests\ExtendedAnnotedMock;
+use Superbrave\GdprBundle\Annotation\AnnotationReader;
+use Superbrave\GdprBundle\Annotation\Anonymize;
+use Superbrave\GdprBundle\Annotation\Export;
+use Superbrave\GdprBundle\Tests\AnnotatedMock;
+use Superbrave\GdprBundle\Tests\ExtendedAnnotedMock;
 
 /**
  * AnnotationReaderTest.
diff --git a/Tests/Anonymizer/AnonymizerTest.php b/Tests/Anonymizer/AnonymizerTest.php
index c1bc185..b5ad0f4 100644
--- a/Tests/Anonymizer/AnonymizerTest.php
+++ b/Tests/Anonymizer/AnonymizerTest.php
@@ -10,20 +10,20 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Tests\Anonymizer;
+namespace Superbrave\GdprBundle\Tests\Anonymizer;
 
 use PHPUnit_Framework_MockObject_MockObject;
 use PHPUnit_Framework_TestCase;
-use SuperBrave\GdprBundle\Annotation\AnnotationReader;
-use SuperBrave\GdprBundle\Annotation\Anonymize;
-use SuperBrave\GdprBundle\Anonymize\Anonymizer;
-use SuperBrave\GdprBundle\Anonymize\PropertyAnonymizer;
-use SuperBrave\GdprBundle\Tests\AnnotatedMock;
+use Superbrave\GdprBundle\Annotation\AnnotationReader;
+use Superbrave\GdprBundle\Annotation\Anonymize;
+use Superbrave\GdprBundle\Anonymize\Anonymizer;
+use Superbrave\GdprBundle\Anonymize\PropertyAnonymizer;
+use Superbrave\GdprBundle\Tests\AnnotatedMock;
 
 /**
  * Class AnonymizerTest
  *
- * @package SuperBrave\GdprBundle\Tests\Anonymizer
+ * @package Superbrave\GdprBundle\Tests\Anonymizer
  */
 class AnonymizerTest extends PHPUnit_Framework_TestCase
 {
diff --git a/Tests/Anonymizer/PropertyAnonymizerTest.php b/Tests/Anonymizer/PropertyAnonymizerTest.php
index 15006c7..9cf3bd3 100644
--- a/Tests/Anonymizer/PropertyAnonymizerTest.php
+++ b/Tests/Anonymizer/PropertyAnonymizerTest.php
@@ -10,17 +10,17 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Tests\Anonymizer;
+namespace Superbrave\GdprBundle\Tests\Anonymizer;
 
 use PHPUnit_Framework_TestCase;
 use PHPUnit_Framework_MockObject_MockObject;
 use ReflectionClass;
-use SuperBrave\GdprBundle\Annotation\Anonymize;
-use SuperBrave\GdprBundle\Anonymize\AnonymizerCollection;
-use SuperBrave\GdprBundle\Anonymize\Type\AnonymizerInterface;
-use SuperBrave\GdprBundle\Anonymize\PropertyAnonymizer;
-use SuperBrave\GdprBundle\Manipulator\PropertyManipulator;
-use SuperBrave\GdprBundle\Tests\AnnotatedMock;
+use Superbrave\GdprBundle\Annotation\Anonymize;
+use Superbrave\GdprBundle\Anonymize\AnonymizerCollection;
+use Superbrave\GdprBundle\Anonymize\Type\AnonymizerInterface;
+use Superbrave\GdprBundle\Anonymize\PropertyAnonymizer;
+use Superbrave\GdprBundle\Manipulator\PropertyManipulator;
+use Superbrave\GdprBundle\Tests\AnnotatedMock;
 
 /**
  * Test the behaviour of the PropertyAnonymizer
diff --git a/Tests/Anonymizer/Type/DateTimeAnonymizerTest.php b/Tests/Anonymizer/Type/DateTimeAnonymizerTest.php
index 87fe005..1935bcd 100644
--- a/Tests/Anonymizer/Type/DateTimeAnonymizerTest.php
+++ b/Tests/Anonymizer/Type/DateTimeAnonymizerTest.php
@@ -10,10 +10,10 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Tests\Anonymizer;
+namespace Superbrave\GdprBundle\Tests\Anonymizer;
 
 use PHPUnit\Framework\TestCase;
-use SuperBrave\GdprBundle\Anonymize\Type\DateTimeAnonymizer;
+use Superbrave\GdprBundle\Anonymize\Type\DateTimeAnonymizer;
 
 /**
  * Class DateTimeAnonymizerTest
diff --git a/Tests/Anonymizer/Type/FixedAnonymizerTest.php b/Tests/Anonymizer/Type/FixedAnonymizerTest.php
index 3f554b8..ba2ad15 100644
--- a/Tests/Anonymizer/Type/FixedAnonymizerTest.php
+++ b/Tests/Anonymizer/Type/FixedAnonymizerTest.php
@@ -10,12 +10,12 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Tests\Anonymizer;
+namespace Superbrave\GdprBundle\Tests\Anonymizer;
 
 use PHPUnit_Framework_MockObject_MockObject;
-use SuperBrave\GdprBundle\Anonymize\Type\FixedAnonymizer;
-use SuperBrave\GdprBundle\Manipulator\PropertyManipulator;
-use SuperBrave\GdprBundle\Tests\AnnotatedMock;
+use Superbrave\GdprBundle\Anonymize\Type\FixedAnonymizer;
+use Superbrave\GdprBundle\Manipulator\PropertyManipulator;
+use Superbrave\GdprBundle\Tests\AnnotatedMock;
 use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 
@@ -119,7 +119,7 @@ public function testAnonymizeStringGivenAFormatWithInvalidPropertiesThrowsAnExce
     {
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage(
-            'The property "$nonexistent" does not exist on class "SuperBrave\GdprBundle\Tests\AnnotatedMock"'
+            'The property "$nonexistent" does not exist on class "Superbrave\GdprBundle\Tests\AnnotatedMock"'
         );
 
         $this->anonymizer->anonymize('johndoe@appleseed.com', [
diff --git a/Tests/Anonymizer/Type/IpAnonymizerTest.php b/Tests/Anonymizer/Type/IpAnonymizerTest.php
index 1932ed2..7f971a0 100644
--- a/Tests/Anonymizer/Type/IpAnonymizerTest.php
+++ b/Tests/Anonymizer/Type/IpAnonymizerTest.php
@@ -10,15 +10,15 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Tests\Anonymizer;
+namespace Superbrave\GdprBundle\Tests\Anonymizer;
 
 use PHPUnit\Framework\TestCase;
-use SuperBrave\GdprBundle\Anonymize\Type\IpAnonymizer;
+use Superbrave\GdprBundle\Anonymize\Type\IpAnonymizer;
 
 /**
  * Class IpAnonymizerTest
  *
- * @package SuperBrave\GdprBundle\Tests\Anonymizer
+ * @package Superbrave\GdprBundle\Tests\Anonymizer
  */
 class IpAnonymizerTest extends TestCase
 {
diff --git a/Tests/Export/ExporterTest.php b/Tests/Export/ExporterTest.php
index d0e8738..3d79a73 100644
--- a/Tests/Export/ExporterTest.php
+++ b/Tests/Export/ExporterTest.php
@@ -10,13 +10,13 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Tests\Export;
+namespace Superbrave\GdprBundle\Tests\Export;
 
 use InvalidArgumentException;
 use PHPUnit_Framework_MockObject_MockObject;
 use PHPUnit_Framework_TestCase;
-use SuperBrave\GdprBundle\Export\Exporter;
-use SuperBrave\GdprBundle\Tests\AnnotatedMock;
+use Superbrave\GdprBundle\Export\Exporter;
+use Superbrave\GdprBundle\Tests\AnnotatedMock;
 use Symfony\Component\Serializer\SerializerInterface;
 
 /**
diff --git a/Tests/ExtendedAnnotedMock.php b/Tests/ExtendedAnnotedMock.php
index 0225f57..fac6b41 100644
--- a/Tests/ExtendedAnnotedMock.php
+++ b/Tests/ExtendedAnnotedMock.php
@@ -10,9 +10,9 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Tests;
+namespace Superbrave\GdprBundle\Tests;
 
-use SuperBrave\GdprBundle\Annotation as GDPR;
+use Superbrave\GdprBundle\Annotation as GDPR;
 
 /**
  * Class used to test the @see GDPR\AnnotationReader.
diff --git a/Tests/Serializer/Normalizer/AnnotationNormalizerTest.php b/Tests/Serializer/Normalizer/AnnotationNormalizerTest.php
index 9b59dfb..031ad19 100644
--- a/Tests/Serializer/Normalizer/AnnotationNormalizerTest.php
+++ b/Tests/Serializer/Normalizer/AnnotationNormalizerTest.php
@@ -10,16 +10,16 @@
  * @link      https://www.superbrave.nl/
  */
 
-namespace SuperBrave\GdprBundle\Tests\Serializer\Normalizer;
+namespace Superbrave\GdprBundle\Tests\Serializer\Normalizer;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use PHPUnit_Framework_MockObject_MockObject;
 use ReflectionClass;
-use SuperBrave\GdprBundle\Annotation\AnnotationReader;
-use SuperBrave\GdprBundle\Annotation\Export;
-use SuperBrave\GdprBundle\Manipulator\PropertyManipulator;
-use SuperBrave\GdprBundle\Serializer\Normalizer\AnnotationNormalizer;
-use SuperBrave\GdprBundle\Tests\AnnotatedMock;
+use Superbrave\GdprBundle\Annotation\AnnotationReader;
+use Superbrave\GdprBundle\Annotation\Export;
+use Superbrave\GdprBundle\Manipulator\PropertyManipulator;
+use Superbrave\GdprBundle\Serializer\Normalizer\AnnotationNormalizer;
+use Superbrave\GdprBundle\Tests\AnnotatedMock;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\Serializer\Encoder\XmlEncoder;
 use Symfony\Component\Serializer\Serializer;
diff --git a/composer.json b/composer.json
index c6a3d61..1dea351 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
     "squizlabs/php_codesniffer": "^3.2"
   },
   "autoload"   : {
-    "psr-4": {"SuperBrave\\GdprBundle\\": ""}
+    "psr-4": {"Superbrave\\GdprBundle\\": ""}
   },
   "config"      : {
     "bin-dir"    : "bin",