diff --git a/application/symfony/config/packages/twig.yaml b/application/symfony/config/packages/twig.yaml
index 6f7b375..6bd7f5f 100644
--- a/application/symfony/config/packages/twig.yaml
+++ b/application/symfony/config/packages/twig.yaml
@@ -6,8 +6,8 @@ twig:
     globals:
         layer_action_map: "@Infinito\\Domain\\Layer\\LayerActionMap"
         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_icon_class_map: "@Infinito\\Domain\\Twig\\ActionIconClassMap"
+        layer_icon_class_map: "@Infinito\\Domain\\Twig\\LayerIconClassMap"
         action_template_name_service: "@Infinito\\Domain\\Template\\ActionTemplateNameServiceInterface"
         # @todo rename variable
         action_template_data_store_service: "@Infinito\\Domain\\DataAccessManagement\\ActionsViewsDAOService"
diff --git a/application/symfony/src/Domain/TwigManagement/ActionIconClassMap.php b/application/symfony/src/Domain/Twig/ActionIconClassMap.php
similarity index 87%
rename from application/symfony/src/Domain/TwigManagement/ActionIconClassMap.php
rename to application/symfony/src/Domain/Twig/ActionIconClassMap.php
index 298e39f..2770355 100644
--- a/application/symfony/src/Domain/TwigManagement/ActionIconClassMap.php
+++ b/application/symfony/src/Domain/Twig/ActionIconClassMap.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Infinito\Domain\TwigManagement;
+namespace Infinito\Domain\Twig;
 
 use Infinito\DBAL\Types\ActionType;
 use Infinito\Exception\Collection\NotSetElementException;
@@ -24,7 +24,7 @@ final class ActionIconClassMap implements ActionIconClassMapInterface
     /**
      * {@inheritdoc}
      *
-     * @see \Infinito\Domain\TwigManagement\ActionIconClassMapInterface::getIconClass()
+     * @see \Infinito\Domain\Twig\ActionIconClassMapInterface::getIconClass()
      */
     public function getIconClass(string $action): string
     {
diff --git a/application/symfony/src/Domain/TwigManagement/ActionIconClassMapInterface.php b/application/symfony/src/Domain/Twig/ActionIconClassMapInterface.php
similarity index 85%
rename from application/symfony/src/Domain/TwigManagement/ActionIconClassMapInterface.php
rename to application/symfony/src/Domain/Twig/ActionIconClassMapInterface.php
index 3536046..05ee10b 100644
--- a/application/symfony/src/Domain/TwigManagement/ActionIconClassMapInterface.php
+++ b/application/symfony/src/Domain/Twig/ActionIconClassMapInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Infinito\Domain\TwigManagement;
+namespace Infinito\Domain\Twig;
 
 /**
  * Maps actions to classes.
diff --git a/application/symfony/src/Domain/TwigManagement/LayerIconClassMap.php b/application/symfony/src/Domain/Twig/LayerIconClassMap.php
similarity index 87%
rename from application/symfony/src/Domain/TwigManagement/LayerIconClassMap.php
rename to application/symfony/src/Domain/Twig/LayerIconClassMap.php
index 80933b5..dbe6db8 100644
--- a/application/symfony/src/Domain/TwigManagement/LayerIconClassMap.php
+++ b/application/symfony/src/Domain/Twig/LayerIconClassMap.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Infinito\Domain\TwigManagement;
+namespace Infinito\Domain\Twig;
 
 use Infinito\DBAL\Types\Meta\Right\LayerType;
 use Infinito\Exception\Collection\NotSetElementException;
@@ -25,7 +25,7 @@ final class LayerIconClassMap implements LayerIconClassMapInterface
     /**
      * {@inheritdoc}
      *
-     * @see \Infinito\Domain\TwigManagement\LayerIconClassMapInterface::getIconClass()
+     * @see \Infinito\Domain\Twig\LayerIconClassMapInterface::getIconClass()
      */
     public static function getIconClass(string $layer): string
     {
diff --git a/application/symfony/src/Domain/TwigManagement/LayerIconClassMapInterface.php b/application/symfony/src/Domain/Twig/LayerIconClassMapInterface.php
similarity index 85%
rename from application/symfony/src/Domain/TwigManagement/LayerIconClassMapInterface.php
rename to application/symfony/src/Domain/Twig/LayerIconClassMapInterface.php
index 5349c3a..295cb9c 100644
--- a/application/symfony/src/Domain/TwigManagement/LayerIconClassMapInterface.php
+++ b/application/symfony/src/Domain/Twig/LayerIconClassMapInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Infinito\Domain\TwigManagement;
+namespace Infinito\Domain\Twig;
 
 /**
  * Maps actions to classes.
diff --git a/application/symfony/tests/Unit/Domain/TwigManagement/ActionIconClassMapTest.php b/application/symfony/tests/Unit/Domain/Twig/ActionIconClassMapTest.php
similarity index 84%
rename from application/symfony/tests/Unit/Domain/TwigManagement/ActionIconClassMapTest.php
rename to application/symfony/tests/Unit/Domain/Twig/ActionIconClassMapTest.php
index 0f0ef4a..14a29f3 100644
--- a/application/symfony/tests/Unit/Domain/TwigManagement/ActionIconClassMapTest.php
+++ b/application/symfony/tests/Unit/Domain/Twig/ActionIconClassMapTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace tests\Unit\Domain\TwigManagement;
+namespace tests\Unit\Domain\Twig;
 
 use PHPUnit\Framework\TestCase;
-use Infinito\Domain\TwigManagement\ActionIconClassMapInterface;
-use Infinito\Domain\TwigManagement\ActionIconClassMap;
+use Infinito\Domain\Twig\ActionIconClassMapInterface;
+use Infinito\Domain\Twig\ActionIconClassMap;
 use Infinito\DBAL\Types\ActionType;
 use Infinito\Exception\Collection\NotSetElementException;
 
diff --git a/application/symfony/tests/Unit/Domain/TwigManagement/LayerIconClassMapTest.php b/application/symfony/tests/Unit/Domain/Twig/LayerIconClassMapTest.php
similarity index 86%
rename from application/symfony/tests/Unit/Domain/TwigManagement/LayerIconClassMapTest.php
rename to application/symfony/tests/Unit/Domain/Twig/LayerIconClassMapTest.php
index feaf694..79507b4 100644
--- a/application/symfony/tests/Unit/Domain/TwigManagement/LayerIconClassMapTest.php
+++ b/application/symfony/tests/Unit/Domain/Twig/LayerIconClassMapTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace tests\Unit\Domain\TwigManagement;
+namespace tests\Unit\Domain\Twig;
 
 use PHPUnit\Framework\TestCase;
-use Infinito\Domain\TwigManagement\LayerIconClassMap;
+use Infinito\Domain\Twig\LayerIconClassMap;
 use Infinito\DBAL\Types\Meta\Right\LayerType;
 use Infinito\Exception\Collection\NotSetElementException;