diff --git a/src/Infrastructure/InMemory/CommandBus.php b/src/Infrastructure/InMemory/CommandBus.php
index 3fece0c..d9c43f2 100644
--- a/src/Infrastructure/InMemory/CommandBus.php
+++ b/src/Infrastructure/InMemory/CommandBus.php
@@ -7,7 +7,7 @@
 use GeekCell\Ddd\Contracts\Application\Command;
 use GeekCell\Ddd\Contracts\Application\CommandBus as CommandBusInterface;
 use GeekCell\Ddd\Contracts\Application\CommandHandler;
-use GeekCell\Ddd\Support\Attributes\For\Command as ForCommand;
+use GeekCell\Ddd\Support\Attributes\ForType\Command as ForCommand;
 
 class CommandBus extends AbstractBus implements CommandBusInterface
 {
diff --git a/src/Infrastructure/InMemory/QueryBus.php b/src/Infrastructure/InMemory/QueryBus.php
index ab4857b..f61fc96 100644
--- a/src/Infrastructure/InMemory/QueryBus.php
+++ b/src/Infrastructure/InMemory/QueryBus.php
@@ -7,7 +7,7 @@
 use GeekCell\Ddd\Contracts\Application\Query;
 use GeekCell\Ddd\Contracts\Application\QueryBus as QueryBusInterface;
 use GeekCell\Ddd\Contracts\Application\QueryHandler;
-use GeekCell\Ddd\Support\Attributes\For\Query as ForQuery;
+use GeekCell\Ddd\Support\Attributes\ForType\Query as ForQuery;
 
 final class QueryBus extends AbstractBus implements QueryBusInterface
 {
diff --git a/src/Support/Attributes/For/Command.php b/src/Support/Attributes/ForType/Command.php
similarity index 86%
rename from src/Support/Attributes/For/Command.php
rename to src/Support/Attributes/ForType/Command.php
index 2d7b1b4..a8c6685 100644
--- a/src/Support/Attributes/For/Command.php
+++ b/src/Support/Attributes/ForType/Command.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace GeekCell\Ddd\Support\Attributes\For;
+namespace GeekCell\Ddd\Support\Attributes\ForType;
 
 use Attribute;
 use GeekCell\Ddd\Contracts\Application\Command as CommandInterface;
diff --git a/src/Support/Attributes/For/Query.php b/src/Support/Attributes/ForType/Query.php
similarity index 86%
rename from src/Support/Attributes/For/Query.php
rename to src/Support/Attributes/ForType/Query.php
index aa8a242..206971a 100644
--- a/src/Support/Attributes/For/Query.php
+++ b/src/Support/Attributes/ForType/Query.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace GeekCell\Ddd\Support\Attributes\For;
+namespace GeekCell\Ddd\Support\Attributes\ForType;
 
 use Attribute;
 use GeekCell\Ddd\Contracts\Application\Query as QueryInterface;
diff --git a/tests/Infrastructure/InMemory/CommandBusTest.php b/tests/Infrastructure/InMemory/CommandBusTest.php
index 5b5d72b..058e91a 100644
--- a/tests/Infrastructure/InMemory/CommandBusTest.php
+++ b/tests/Infrastructure/InMemory/CommandBusTest.php
@@ -7,7 +7,7 @@
 use GeekCell\Ddd\Contracts\Application\Command;
 use GeekCell\Ddd\Contracts\Application\CommandHandler;
 use GeekCell\Ddd\Infrastructure\InMemory\CommandBus as InMemoryCommandBus;
-use GeekCell\Ddd\Support\Attributes\For;
+use GeekCell\Ddd\Support\Attributes\ForType;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -27,7 +27,7 @@ class UnknownCommand implements Command
 /**
  * Test fixture for InMemoryCommandBus.
  */
-#[For\Command(TestCommand::class)]
+#[ForType\Command(TestCommand::class)]
 class TestCommandHandler implements CommandHandler
 {
     public function execute(Command $command): mixed
@@ -39,7 +39,7 @@ public function execute(Command $command): mixed
 /**
  * Test fixture for InMemoryCommandBus.
  */
-#[For\Command(TestCommand::class, 'handle')]
+#[ForType\Command(TestCommand::class, 'handle')]
 class TestCommandHandlerWithExplicitHandleMethod implements CommandHandler
 {
     public function handle(TestCommand $command): mixed
@@ -62,7 +62,7 @@ public function execute(Command $command): mixed
 /**
  * Test fixture for InMemoryCommandBus.
  */
-#[For\Command(TestCommand::class)]
+#[ForType\Command(TestCommand::class)]
 class TestComamndHandlerWithoutExecuteMethod implements CommandHandler
 {
 }
diff --git a/tests/Infrastructure/InMemory/QueryBusTest.php b/tests/Infrastructure/InMemory/QueryBusTest.php
index a0e938a..9727d04 100644
--- a/tests/Infrastructure/InMemory/QueryBusTest.php
+++ b/tests/Infrastructure/InMemory/QueryBusTest.php
@@ -7,7 +7,7 @@
 use GeekCell\Ddd\Contracts\Application\Query;
 use GeekCell\Ddd\Contracts\Application\QueryHandler;
 use GeekCell\Ddd\Infrastructure\InMemory\QueryBus as InMemoryQueryBus;
-use GeekCell\Ddd\Support\Attributes\For;
+use GeekCell\Ddd\Support\Attributes\ForType;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -27,7 +27,7 @@ class UnknownQuery implements Query
 /**
  * Test fixture for InMemoryQueryBus.
  */
-#[For\Query(TestQuery::class)]
+#[ForType\Query(TestQuery::class)]
 class TestQueryHandler implements QueryHandler
 {
     public function execute(Query $query): mixed
@@ -39,7 +39,7 @@ public function execute(Query $query): mixed
 /**
  * Test fixture for InMemoryQueryBus.
  */
-#[For\Query(TestQuery::class, 'handle')]
+#[ForType\Query(TestQuery::class, 'handle')]
 class TestQueryHandlerWithExplicitHandleMethod implements QueryHandler
 {
     public function handle(TestQuery $query): mixed
@@ -62,7 +62,7 @@ public function execute(Query $query): mixed
 /**
  * Test fixture for InMemoryCommandBus.
  */
-#[For\Query(TestQuery::class)]
+#[ForType\Query(TestQuery::class)]
 class TestQueryHandlerWithoutExecuteMethod implements QueryHandler
 {
 }