diff --git a/module/Common/config/doctrine.config.php b/module/Common/config/doctrine.config.php
index 0b569043..d85ef8e8 100644
--- a/module/Common/config/doctrine.config.php
+++ b/module/Common/config/doctrine.config.php
@@ -11,7 +11,7 @@ return [
     'entity_manager' => [
         'orm' => [
             'types' => [
-                Type\ChronosDateTimeType::CHRONOS_DATETIME => Type\ChronosDateTimeType::class,
+                Doctrine\Type\ChronosDateTimeType::CHRONOS_DATETIME => Doctrine\Type\ChronosDateTimeType::class,
             ],
         ],
     ],
diff --git a/module/Common/src/Type/ChronosDateTimeType.php b/module/Common/src/Doctrine/Type/ChronosDateTimeType.php
similarity index 96%
rename from module/Common/src/Type/ChronosDateTimeType.php
rename to module/Common/src/Doctrine/Type/ChronosDateTimeType.php
index a400106e..210eb03a 100644
--- a/module/Common/src/Type/ChronosDateTimeType.php
+++ b/module/Common/src/Doctrine/Type/ChronosDateTimeType.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\Type;
+namespace Shlinkio\Shlink\Common\Doctrine\Type;
 
 use Cake\Chronos\Chronos;
 use DateTimeInterface;
diff --git a/module/Common/test/Doctrine/EntityManagerFactoryTest.php b/module/Common/test/Doctrine/EntityManagerFactoryTest.php
index ade8d84d..419c7ffd 100644
--- a/module/Common/test/Doctrine/EntityManagerFactoryTest.php
+++ b/module/Common/test/Doctrine/EntityManagerFactoryTest.php
@@ -6,7 +6,7 @@ namespace ShlinkioTest\Shlink\Common\Doctrine;
 use Doctrine\ORM\EntityManager;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Common\Doctrine\EntityManagerFactory;
-use Shlinkio\Shlink\Common\Type\ChronosDateTimeType;
+use Shlinkio\Shlink\Common\Doctrine\Type\ChronosDateTimeType;
 use Zend\ServiceManager\ServiceManager;
 
 class EntityManagerFactoryTest extends TestCase
diff --git a/module/Common/test/Type/ChronosDateTimeTypeTest.php b/module/Common/test/Doctrine/Type/ChronosDateTimeTypeTest.php
similarity index 95%
rename from module/Common/test/Type/ChronosDateTimeTypeTest.php
rename to module/Common/test/Doctrine/Type/ChronosDateTimeTypeTest.php
index 34c98486..b86547cd 100644
--- a/module/Common/test/Type/ChronosDateTimeTypeTest.php
+++ b/module/Common/test/Doctrine/Type/ChronosDateTimeTypeTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Common\Type;
+namespace ShlinkioTest\Shlink\Common\Doctrine\Type;
 
 use Cake\Chronos\Chronos;
 use DateTime;
@@ -11,7 +11,7 @@ use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\ConversionException;
 use Doctrine\DBAL\Types\Type;
 use PHPUnit\Framework\TestCase;
-use Shlinkio\Shlink\Common\Type\ChronosDateTimeType;
+use Shlinkio\Shlink\Common\Doctrine\Type\ChronosDateTimeType;
 use stdClass;
 
 class ChronosDateTimeTypeTest extends TestCase
diff --git a/module/Core/config/entities-mappings/Shlinkio.Shlink.Core.Entity.ShortUrl.php b/module/Core/config/entities-mappings/Shlinkio.Shlink.Core.Entity.ShortUrl.php
index 05988210..a7f95b6c 100644
--- a/module/Core/config/entities-mappings/Shlinkio.Shlink.Core.Entity.ShortUrl.php
+++ b/module/Core/config/entities-mappings/Shlinkio.Shlink.Core.Entity.ShortUrl.php
@@ -5,7 +5,7 @@ namespace Shlinkio\Shlink\Core;
 
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
-use Shlinkio\Shlink\Common\Type\ChronosDateTimeType;
+use Shlinkio\Shlink\Common\Doctrine\Type\ChronosDateTimeType;
 
 /** @var $metadata ClassMetadata */
 $builder = new ClassMetadataBuilder($metadata);
diff --git a/module/Core/config/entities-mappings/Shlinkio.Shlink.Core.Entity.Visit.php b/module/Core/config/entities-mappings/Shlinkio.Shlink.Core.Entity.Visit.php
index 28f32470..081bbebb 100644
--- a/module/Core/config/entities-mappings/Shlinkio.Shlink.Core.Entity.Visit.php
+++ b/module/Core/config/entities-mappings/Shlinkio.Shlink.Core.Entity.Visit.php
@@ -5,7 +5,7 @@ namespace Shlinkio\Shlink\Core;
 
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
-use Shlinkio\Shlink\Common\Type\ChronosDateTimeType;
+use Shlinkio\Shlink\Common\Doctrine\Type\ChronosDateTimeType;
 
 /** @var $metadata ClassMetadata */
 $builder = new ClassMetadataBuilder($metadata);
diff --git a/module/Rest/config/entities-mappings/Shlinkio.Shlink.Rest.Entity.ApiKey.php b/module/Rest/config/entities-mappings/Shlinkio.Shlink.Rest.Entity.ApiKey.php
index edb80dcf..eabc2a6b 100644
--- a/module/Rest/config/entities-mappings/Shlinkio.Shlink.Rest.Entity.ApiKey.php
+++ b/module/Rest/config/entities-mappings/Shlinkio.Shlink.Rest.Entity.ApiKey.php
@@ -5,7 +5,7 @@ namespace Shlinkio\Shlink\Rest;
 
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
-use Shlinkio\Shlink\Common\Type\ChronosDateTimeType;
+use Shlinkio\Shlink\Common\Doctrine\Type\ChronosDateTimeType;
 
 /** @var $metadata ClassMetadata */
 $builder = new ClassMetadataBuilder($metadata);