diff --git a/application/symfony/config/packages/twig.yaml b/application/symfony/config/packages/twig.yaml
index 9751f54..6f7b375 100644
--- a/application/symfony/config/packages/twig.yaml
+++ b/application/symfony/config/packages/twig.yaml
@@ -8,7 +8,7 @@ twig:
         requested_action_service: "@Infinito\\Domain\\Request\\Action\\RequestedActionService"
         action_icon_class_map: "@Infinito\\Domain\\TwigManagement\\ActionIconClassMap"
         layer_icon_class_map: "@Infinito\\Domain\\TwigManagement\\LayerIconClassMap"
-        action_template_name_service: "@Infinito\\Domain\\TemplateManagement\\ActionTemplateNameServiceInterface"
+        action_template_name_service: "@Infinito\\Domain\\Template\\ActionTemplateNameServiceInterface"
         # @todo rename variable
         action_template_data_store_service: "@Infinito\\Domain\\DataAccessManagement\\ActionsViewsDAOService"
         # @todo Remove dom service
diff --git a/application/symfony/config/services.yaml b/application/symfony/config/services.yaml
index 2953b6b..6fabd84 100644
--- a/application/symfony/config/services.yaml
+++ b/application/symfony/config/services.yaml
@@ -35,7 +35,7 @@ services:
     # please note that last definitions always *replace* previous ones
     
     # Map Interfaces to concrete classes
-    Infinito\Domain\TemplateManagement\TemplateNameServiceInterface: "@Infinito\\Domain\\TemplateManagement\\TemplateNameService"
+    Infinito\Domain\Template\TemplateNameServiceInterface: "@Infinito\\Domain\\Template\\TemplateNameService"
     
     # Needed for integration tests
     Infinito\Domain\Request\Entity\RequestedEntityService:
diff --git a/application/symfony/src/Domain/TemplateManagement/ActionTemplateNameService.php b/application/symfony/src/Domain/Template/ActionTemplateNameService.php
similarity index 80%
rename from application/symfony/src/Domain/TemplateManagement/ActionTemplateNameService.php
rename to application/symfony/src/Domain/Template/ActionTemplateNameService.php
index 6487533..38bb902 100644
--- a/application/symfony/src/Domain/TemplateManagement/ActionTemplateNameService.php
+++ b/application/symfony/src/Domain/Template/ActionTemplateNameService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Infinito\Domain\TemplateManagement;
+namespace Infinito\Domain\Template;
 
 /**
  * @author kevinfrantz
@@ -27,7 +27,7 @@ final class ActionTemplateNameService extends TemplateNameService implements Act
     /**
      * {@inheritdoc}
      *
-     * @see \Infinito\Domain\TemplateManagement\ActionTemplateNameServiceInterface::setActionType()
+     * @see \Infinito\Domain\Template\ActionTemplateNameServiceInterface::setActionType()
      */
     public function setActionType(?string $actionType): void
     {
diff --git a/application/symfony/src/Domain/TemplateManagement/ActionTemplateNameServiceInterface.php b/application/symfony/src/Domain/Template/ActionTemplateNameServiceInterface.php
similarity index 88%
rename from application/symfony/src/Domain/TemplateManagement/ActionTemplateNameServiceInterface.php
rename to application/symfony/src/Domain/Template/ActionTemplateNameServiceInterface.php
index b907b77..4afb5e2 100644
--- a/application/symfony/src/Domain/TemplateManagement/ActionTemplateNameServiceInterface.php
+++ b/application/symfony/src/Domain/Template/ActionTemplateNameServiceInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Infinito\Domain\TemplateManagement;
+namespace Infinito\Domain\Template;
 
 /**
  * Allows to manually define the action type.
diff --git a/application/symfony/src/Domain/TemplateManagement/TemplateNameService.php b/application/symfony/src/Domain/Template/TemplateNameService.php
similarity index 88%
rename from application/symfony/src/Domain/TemplateManagement/TemplateNameService.php
rename to application/symfony/src/Domain/Template/TemplateNameService.php
index 8f16c99..3627ea9 100644
--- a/application/symfony/src/Domain/TemplateManagement/TemplateNameService.php
+++ b/application/symfony/src/Domain/Template/TemplateNameService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Infinito\Domain\TemplateManagement;
+namespace Infinito\Domain\Template;
 
 use Infinito\Domain\Request\Action\RequestedActionServiceInterface;
 
@@ -119,7 +119,7 @@ class TemplateNameService implements TemplateNameServiceInterface
     /**
      * {@inheritdoc}
      *
-     * @see \Infinito\Domain\TemplateManagement\TemplateNameServiceInterface::getAtomTemplateName()
+     * @see \Infinito\Domain\Template\TemplateNameServiceInterface::getAtomTemplateName()
      */
     public function getAtomTemplateName(): string
     {
@@ -129,7 +129,7 @@ class TemplateNameService implements TemplateNameServiceInterface
     /**
      * {@inheritdoc}
      *
-     * @see \Infinito\Domain\TemplateManagement\TemplateNameServiceInterface::getMoleculeTemplateName()
+     * @see \Infinito\Domain\Template\TemplateNameServiceInterface::getMoleculeTemplateName()
      */
     public function getMoleculeTemplateName(): string
     {
@@ -149,7 +149,7 @@ class TemplateNameService implements TemplateNameServiceInterface
     /**
      * {@inheritdoc}
      *
-     * @see \Infinito\Domain\TemplateManagement\TemplateNameServiceInterface::doesAtomTemplateExists()
+     * @see \Infinito\Domain\Template\TemplateNameServiceInterface::doesAtomTemplateExists()
      */
     public function doesAtomTemplateExist(): bool
     {
@@ -159,7 +159,7 @@ class TemplateNameService implements TemplateNameServiceInterface
     /**
      * {@inheritdoc}
      *
-     * @see \Infinito\Domain\TemplateManagement\TemplateNameServiceInterface::doesMoleculeTemplateExists()
+     * @see \Infinito\Domain\Template\TemplateNameServiceInterface::doesMoleculeTemplateExists()
      */
     public function doesMoleculeTemplateExist(): bool
     {
diff --git a/application/symfony/src/Domain/TemplateManagement/TemplateNameServiceInterface.php b/application/symfony/src/Domain/Template/TemplateNameServiceInterface.php
similarity index 92%
rename from application/symfony/src/Domain/TemplateManagement/TemplateNameServiceInterface.php
rename to application/symfony/src/Domain/Template/TemplateNameServiceInterface.php
index 6cfd06a..b3fc415 100644
--- a/application/symfony/src/Domain/TemplateManagement/TemplateNameServiceInterface.php
+++ b/application/symfony/src/Domain/Template/TemplateNameServiceInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Infinito\Domain\TemplateManagement;
+namespace Infinito\Domain\Template;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/src/Domain/ViewManagement/ViewBuilder.php b/application/symfony/src/Domain/ViewManagement/ViewBuilder.php
index 3227556..0f23eb7 100644
--- a/application/symfony/src/Domain/ViewManagement/ViewBuilder.php
+++ b/application/symfony/src/Domain/ViewManagement/ViewBuilder.php
@@ -4,7 +4,7 @@ namespace Infinito\Domain\ViewManagement;
 
 use FOS\RestBundle\View\View;
 use Infinito\Domain\Action\ActionFactoryServiceInterface;
-use Infinito\Domain\TemplateManagement\TemplateNameServiceInterface;
+use Infinito\Domain\Template\TemplateNameServiceInterface;
 use Infinito\Domain\Parameter\ValidGetParameterServiceInterface;
 use Infinito\Domain\Parameter\Parameter\FrameParameter;
 
diff --git a/application/symfony/tests/Unit/Domain/TemplateManagement/TemplateNameServiceTest.php b/application/symfony/tests/Unit/Domain/Template/TemplateNameServiceTest.php
similarity index 91%
rename from application/symfony/tests/Unit/Domain/TemplateManagement/TemplateNameServiceTest.php
rename to application/symfony/tests/Unit/Domain/Template/TemplateNameServiceTest.php
index 9985730..5920ea3 100644
--- a/application/symfony/tests/Unit/Domain/TemplateManagement/TemplateNameServiceTest.php
+++ b/application/symfony/tests/Unit/Domain/Template/TemplateNameServiceTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace tests\Unit\Domain\TemplateManagement;
+namespace tests\Unit\Domain\Template;
 
 use PHPUnit\Framework\TestCase;
-use Infinito\Domain\TemplateManagement\TemplateNameServiceInterface;
-use Infinito\Domain\TemplateManagement\TemplateNameService;
+use Infinito\Domain\Template\TemplateNameServiceInterface;
+use Infinito\Domain\Template\TemplateNameService;
 use Infinito\Domain\Request\Entity\RequestedEntityServiceInterface;
 use Infinito\Domain\Request\Action\RequestedActionServiceInterface;