diff --git a/README.md b/README.md
index fa88bad..2306675 100644
--- a/README.md
+++ b/README.md
@@ -32,11 +32,9 @@ Next up you need to create a configuration class `MyConfiguration` and document
 ```php
 <?php
 
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Configuration;
 
-/**
- * @Configuration
- */
+#[Configuration]
 class MyConfiguration
 {
 }
@@ -48,18 +46,14 @@ Doing this registers the instance with Disco and uses the type specified by the
 ```php
 <?php
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 
-/**
- * @Configuration
- */
+#[Configuration]
 class MyConfiguration
 {
-    /**
-     * @Bean
-     */
+     #[Bean]
     public function mySampleService() : SampleService
     {
         return new SampleService();
diff --git a/Upgrade.md b/Upgrade.md
index 9568e73..0f92e0d 100644
--- a/Upgrade.md
+++ b/Upgrade.md
@@ -76,8 +76,8 @@ While this was valid configuration code before the 0.5.0 release:
 ```php
 <?php
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 
 /**
@@ -101,8 +101,8 @@ This is how you have to define bean instances for the 0.5.0 release:
 ```php
 <?php
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 
 /**
diff --git a/composer.json b/composer.json
index ac571a9..774bd8b 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     "php": "^8.0.0",
     "bitexpert/slf4psrlog": "^0.1.3",
     "ocramius/proxy-manager": "^2.11.1",
-    "psr/container": "^1.1.1",
+    "psr/container": "^2.0.0",
     "webmozart/assert": "^1.10"
   },
   "require-dev": {
@@ -42,8 +42,7 @@
     }
   },
   "provide": {
-    "container-interop/container-interop-implementation": "^1.2",
-    "psr/container-implementation": "^1.0"
+    "psr/container-implementation": "^2.0"
   },
   "scripts": {
     "check": [
diff --git a/composer.lock b/composer.lock
index d802916..2a551be 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7d9e5aebce29e4853964bee7b0eb1a56",
+    "content-hash": "69d7a08ca78d73c6ec6f80d753f93753",
     "packages": [
         {
             "name": "bitexpert/slf4psrlog",
@@ -58,28 +58,24 @@
         },
         {
             "name": "laminas/laminas-code",
-            "version": "4.0.0",
+            "version": "4.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-code.git",
-                "reference": "28a6d70ea8b8bca687d7163300e611ae33baf82a"
+                "reference": "54251ab2b16c41c6980387839496b235f5f6e10b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-code/zipball/28a6d70ea8b8bca687d7163300e611ae33baf82a",
-                "reference": "28a6d70ea8b8bca687d7163300e611ae33baf82a",
+                "url": "https://api.github.com/repos/laminas/laminas-code/zipball/54251ab2b16c41c6980387839496b235f5f6e10b",
+                "reference": "54251ab2b16c41c6980387839496b235f5f6e10b",
                 "shasum": ""
             },
             "require": {
-                "laminas/laminas-eventmanager": "^3.3",
                 "php": "^7.4 || ~8.0.0"
             },
             "conflict": {
                 "phpspec/prophecy": "<1.9.0"
             },
-            "replace": {
-                "zendframework/zend-code": "self.version"
-            },
             "require-dev": {
                 "doctrine/annotations": "^1.10.4",
                 "ext-phar": "*",
@@ -125,155 +121,27 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2020-12-30T16:16:14+00:00"
-        },
-        {
-            "name": "laminas/laminas-eventmanager",
-            "version": "3.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-eventmanager.git",
-                "reference": "966c859b67867b179fde1eff0cd38df51472ce4a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/966c859b67867b179fde1eff0cd38df51472ce4a",
-                "reference": "966c859b67867b179fde1eff0cd38df51472ce4a",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^7.3 || ^8.0"
-            },
-            "replace": {
-                "zendframework/zend-eventmanager": "^3.2.1"
-            },
-            "require-dev": {
-                "container-interop/container-interop": "^1.1",
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-stdlib": "^2.7.3 || ^3.0",
-                "phpbench/phpbench": "^0.17.1",
-                "phpunit/phpunit": "^8.5.8"
-            },
-            "suggest": {
-                "container-interop/container-interop": "^1.1, to use the lazy listeners feature",
-                "laminas/laminas-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\EventManager\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Trigger and listen to events within a PHP application",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "event",
-                "eventmanager",
-                "events",
-                "laminas"
-            ],
-            "support": {
-                "chat": "https://laminas.dev/chat",
-                "docs": "https://docs.laminas.dev/laminas-eventmanager/",
-                "forum": "https://discourse.laminas.dev",
-                "issues": "https://github.com/laminas/laminas-eventmanager/issues",
-                "rss": "https://github.com/laminas/laminas-eventmanager/releases.atom",
-                "source": "https://github.com/laminas/laminas-eventmanager"
-            },
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
-            "time": "2021-03-08T15:24:29+00:00"
-        },
-        {
-            "name": "laminas/laminas-zendframework-bridge",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
-                "reference": "6cccbddfcfc742eb02158d6137ca5687d92cee32"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/6cccbddfcfc742eb02158d6137ca5687d92cee32",
-                "reference": "6cccbddfcfc742eb02158d6137ca5687d92cee32",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3",
-                "psalm/plugin-phpunit": "^0.15.1",
-                "squizlabs/php_codesniffer": "^3.5",
-                "vimeo/psalm": "^4.6"
-            },
-            "type": "library",
-            "extra": {
-                "laminas": {
-                    "module": "Laminas\\ZendFrameworkBridge"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/autoload.php"
-                ],
-                "psr-4": {
-                    "Laminas\\ZendFrameworkBridge\\": "src//"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Alias legacy ZF class names to Laminas Project equivalents.",
-            "keywords": [
-                "ZendFramework",
-                "autoloading",
-                "laminas",
-                "zf"
-            ],
-            "support": {
-                "forum": "https://discourse.laminas.dev/",
-                "issues": "https://github.com/laminas/laminas-zendframework-bridge/issues",
-                "rss": "https://github.com/laminas/laminas-zendframework-bridge/releases.atom",
-                "source": "https://github.com/laminas/laminas-zendframework-bridge"
-            },
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
-            "time": "2021-02-25T21:54:58+00:00"
+            "time": "2021-07-09T11:58:40+00:00"
         },
         {
             "name": "ocramius/proxy-manager",
-            "version": "2.11.1",
+            "version": "2.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Ocramius/ProxyManager.git",
-                "reference": "96bb91b7b52324080accf1d0137f491ff378ecf1"
+                "reference": "21e2b4aa7d7661e7641cc6362fc8635ddcfa8464"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/96bb91b7b52324080accf1d0137f491ff378ecf1",
-                "reference": "96bb91b7b52324080accf1d0137f491ff378ecf1",
+                "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/21e2b4aa7d7661e7641cc6362fc8635ddcfa8464",
+                "reference": "21e2b4aa7d7661e7641cc6362fc8635ddcfa8464",
                 "shasum": ""
             },
             "require": {
-                "composer-runtime-api": "^2.0.0",
-                "laminas/laminas-code": "^4.0.0",
+                "composer-runtime-api": "^2.1.0",
+                "laminas/laminas-code": "^4.3.0",
                 "php": "~7.4.1 || ~8.0.0",
-                "webimpress/safe-writer": "^2.0.1"
+                "webimpress/safe-writer": "^2.2.0"
             },
             "conflict": {
                 "doctrine/annotations": "<1.6.1",
@@ -282,16 +150,16 @@
                 "zendframework/zend-stdlib": "<3.2.1"
             },
             "require-dev": {
-                "codelicia/xulieta": "^0.1.5",
-                "doctrine/coding-standard": "^8.1.0",
+                "codelicia/xulieta": "^0.1.6",
+                "doctrine/coding-standard": "^8.2.1",
                 "ext-phar": "*",
-                "infection/infection": "^0.20.2",
-                "nikic/php-parser": "^4.6.0",
+                "infection/infection": "^0.21.5",
+                "nikic/php-parser": "^4.10.5",
                 "phpbench/phpbench": "^0.17.1 || 1.0.0-alpha2",
-                "phpunit/phpunit": "^9.4.1",
+                "phpunit/phpunit": "^9.5.4",
                 "slevomat/coding-standard": "^6.3.10",
-                "squizlabs/php_codesniffer": "^3.5.5",
-                "vimeo/psalm": "^4.3.2"
+                "squizlabs/php_codesniffer": "^3.6.0",
+                "vimeo/psalm": "^4.4.1"
             },
             "suggest": {
                 "laminas/laminas-json": "To have the JsonRpc adapter (Remote Object feature)",
@@ -332,7 +200,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Ocramius/ProxyManager/issues",
-                "source": "https://github.com/Ocramius/ProxyManager/tree/2.11.1"
+                "source": "https://github.com/Ocramius/ProxyManager/tree/2.13.0"
             },
             "funding": [
                 {
@@ -344,26 +212,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-10T16:12:59+00:00"
+            "time": "2021-06-09T10:16:06+00:00"
         },
         {
             "name": "psr/container",
-            "version": "1.1.1",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
+                "reference": "2ae37329ee82f91efadc282cc2d527fd6065a5ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
-                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/2ae37329ee82f91efadc282cc2d527fd6065a5ef",
+                "reference": "2ae37329ee82f91efadc282cc2d527fd6065a5ef",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Psr\\Container\\": "src/"
@@ -390,22 +263,22 @@
             ],
             "support": {
                 "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/1.1.1"
+                "source": "https://github.com/php-fig/container/tree/2.0.1"
             },
-            "time": "2021-03-05T17:36:06+00:00"
+            "time": "2021-03-24T13:40:57+00:00"
         },
         {
             "name": "psr/log",
-            "version": "1.1.3",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
                 "shasum": ""
             },
             "require": {
@@ -429,7 +302,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for logging libraries",
@@ -440,22 +313,22 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/1.1.3"
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
             },
-            "time": "2020-03-23T09:12:05+00:00"
+            "time": "2021-05-03T11:20:27+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.22.1",
+            "version": "v1.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e"
+                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e",
-                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
+                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
                 "shasum": ""
             },
             "require": {
@@ -467,7 +340,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -505,7 +378,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0"
             },
             "funding": [
                 {
@@ -521,35 +394,35 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-07T16:49:33+00:00"
+            "time": "2021-02-19T12:13:01+00:00"
         },
         {
             "name": "webimpress/safe-writer",
-            "version": "2.1.0",
+            "version": "2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webimpress/safe-writer.git",
-                "reference": "5cfafdec5873c389036f14bf832a5efc9390dcdd"
+                "reference": "9d37cc8bee20f7cb2f58f6e23e05097eab5072e6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webimpress/safe-writer/zipball/5cfafdec5873c389036f14bf832a5efc9390dcdd",
-                "reference": "5cfafdec5873c389036f14bf832a5efc9390dcdd",
+                "url": "https://api.github.com/repos/webimpress/safe-writer/zipball/9d37cc8bee20f7cb2f58f6e23e05097eab5072e6",
+                "reference": "9d37cc8bee20f7cb2f58f6e23e05097eab5072e6",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5.8 || ^9.3.7",
-                "vimeo/psalm": "^3.14.2",
-                "webimpress/coding-standard": "^1.1.5"
+                "phpunit/phpunit": "^9.5.4",
+                "vimeo/psalm": "^4.7",
+                "webimpress/coding-standard": "^1.2.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1.x-dev",
-                    "dev-develop": "2.2.x-dev",
+                    "dev-master": "2.2.x-dev",
+                    "dev-develop": "2.3.x-dev",
                     "dev-release-1.0": "1.0.x-dev"
                 }
             },
@@ -572,7 +445,7 @@
             ],
             "support": {
                 "issues": "https://github.com/webimpress/safe-writer/issues",
-                "source": "https://github.com/webimpress/safe-writer/tree/master"
+                "source": "https://github.com/webimpress/safe-writer/tree/2.2.0"
             },
             "funding": [
                 {
@@ -580,7 +453,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-08-25T07:21:11+00:00"
+            "time": "2021-04-19T16:34:45+00:00"
         },
         {
             "name": "webmozart/assert",
@@ -834,23 +707,22 @@
         },
         {
             "name": "bookdown/bookdown",
-            "version": "1.x-dev",
+            "version": "2.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bookdown/Bookdown.Bookdown.git",
-                "reference": "12037a2460ef13d37e0681430af9a55c851d84e5"
+                "reference": "853534f823fe86802b4108dc0fb902a660261650"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bookdown/Bookdown.Bookdown/zipball/12037a2460ef13d37e0681430af9a55c851d84e5",
-                "reference": "12037a2460ef13d37e0681430af9a55c851d84e5",
+                "url": "https://api.github.com/repos/bookdown/Bookdown.Bookdown/zipball/853534f823fe86802b4108dc0fb902a660261650",
+                "reference": "853534f823fe86802b4108dc0fb902a660261650",
                 "shasum": ""
             },
             "require": {
                 "aura/cli": "~2.0",
                 "aura/html": "~2.0",
                 "aura/view": "~2.0",
-                "bookdown/themes": "~1.0",
                 "league/commonmark": "~0.0",
                 "php": ">=5.6.0",
                 "psr/log": "~1.0"
@@ -861,7 +733,6 @@
                 "webuni/commonmark-attributes-extension": "~0.5",
                 "webuni/commonmark-table-extension": "~0.6"
             },
-            "default-branch": true,
             "bin": [
                 "bin/bookdown"
             ],
@@ -892,54 +763,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bookdown/Bookdown.Bookdown/issues",
-                "source": "https://github.com/bookdown/Bookdown.Bookdown/tree/1.1.1"
-            },
-            "time": "2019-04-23T15:53:49+00:00"
-        },
-        {
-            "name": "bookdown/themes",
-            "version": "1.1.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/bookdown/Bookdown.Themes.git",
-                "reference": "cf4986fcef40df4db1504bb62369d37a9e8bf6e7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/bookdown/Bookdown.Themes/zipball/cf4986fcef40df4db1504bb62369d37a9e8bf6e7",
-                "reference": "cf4986fcef40df4db1504bb62369d37a9e8bf6e7",
-                "shasum": ""
-            },
-            "type": "library",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Bookdown Bootswatch Templates Contributors",
-                    "homepage": "https://github.com/bookdown/Bookdown.Themes/contributors"
-                }
-            ],
-            "description": "Bookdown.io With Bootswatch Styles And Prism Syntax Highlighting",
-            "homepage": "https://github.com/bookdown/Bookdown.Themes",
-            "keywords": [
-                "bookdown",
-                "docbook",
-                "docs",
-                "documentation",
-                "highlighting",
-                "manual",
-                "markdown",
-                "static site",
-                "syntax",
-                "templates"
-            ],
-            "support": {
-                "issues": "https://github.com/bookdown/Bookdown.Themes/issues",
-                "source": "https://github.com/bookdown/Bookdown.Themes/tree/master"
+                "source": "https://github.com/bookdown/Bookdown.Bookdown/tree/1.x"
             },
-            "time": "2018-08-10T15:21:32+00:00"
+            "time": "2017-07-29T18:05:10+00:00"
         },
         {
             "name": "doctrine/instantiator",
@@ -1087,16 +913,16 @@
         },
         {
             "name": "mikey179/vfsstream",
-            "version": "v1.6.8",
+            "version": "v1.6.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bovigo/vfsStream.git",
-                "reference": "231c73783ebb7dd9ec77916c10037eff5a2b6efe"
+                "reference": "2257e326dc3d0f50e55d0a90f71e37899f029718"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/231c73783ebb7dd9ec77916c10037eff5a2b6efe",
-                "reference": "231c73783ebb7dd9ec77916c10037eff5a2b6efe",
+                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/2257e326dc3d0f50e55d0a90f71e37899f029718",
+                "reference": "2257e326dc3d0f50e55d0a90f71e37899f029718",
                 "shasum": ""
             },
             "require": {
@@ -1134,20 +960,20 @@
                 "source": "https://github.com/bovigo/vfsStream/tree/master",
                 "wiki": "https://github.com/bovigo/vfsStream/wiki"
             },
-            "time": "2019-10-30T15:31:00+00:00"
+            "time": "2021-07-16T08:08:02+00:00"
         },
         {
             "name": "monolog/monolog",
-            "version": "2.2.0",
+            "version": "2.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "1cb1cde8e8dd0f70cc0fe51354a59acad9302084"
+                "reference": "71312564759a7db5b789296369c1a264efc43aad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1cb1cde8e8dd0f70cc0fe51354a59acad9302084",
-                "reference": "1cb1cde8e8dd0f70cc0fe51354a59acad9302084",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/71312564759a7db5b789296369c1a264efc43aad",
+                "reference": "71312564759a7db5b789296369c1a264efc43aad",
                 "shasum": ""
             },
             "require": {
@@ -1166,7 +992,7 @@
                 "php-amqplib/php-amqplib": "~2.4",
                 "php-console/php-console": "^3.1.3",
                 "phpspec/prophecy": "^1.6.1",
-                "phpstan/phpstan": "^0.12.59",
+                "phpstan/phpstan": "^0.12.91",
                 "phpunit/phpunit": "^8.5",
                 "predis/predis": "^1.1",
                 "rollbar/rollbar": "^1.3",
@@ -1218,7 +1044,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/2.2.0"
+                "source": "https://github.com/Seldaek/monolog/tree/2.3.2"
             },
             "funding": [
                 {
@@ -1230,7 +1056,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-14T13:15:25+00:00"
+            "time": "2021-07-23T07:42:52+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -1292,16 +1118,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.10.4",
+            "version": "v4.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e"
+                "reference": "6608f01670c3cc5079e18c1dab1104e002579143"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c6d052fc58cb876152f89f532b95a8d7907e7f0e",
-                "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6608f01670c3cc5079e18c1dab1104e002579143",
+                "reference": "6608f01670c3cc5079e18c1dab1104e002579143",
                 "shasum": ""
             },
             "require": {
@@ -1342,22 +1168,22 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.4"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.12.0"
             },
-            "time": "2020-12-20T10:01:03+00:00"
+            "time": "2021-07-21T10:44:31+00:00"
         },
         {
             "name": "phar-io/manifest",
-            "version": "2.0.1",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133"
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
-                "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
                 "shasum": ""
             },
             "require": {
@@ -1402,9 +1228,9 @@
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
             "support": {
                 "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/master"
+                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
             },
-            "time": "2020-06-27T14:33:11+00:00"
+            "time": "2021-07-20T11:28:43+00:00"
         },
         {
             "name": "phar-io/version",
@@ -1617,16 +1443,16 @@
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.12.2",
+            "version": "1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "245710e971a030f42e08f4912863805570f23d39"
+                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/245710e971a030f42e08f4912863805570f23d39",
-                "reference": "245710e971a030f42e08f4912863805570f23d39",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea",
+                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea",
                 "shasum": ""
             },
             "require": {
@@ -1678,9 +1504,9 @@
             ],
             "support": {
                 "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/1.12.2"
+                "source": "https://github.com/phpspec/prophecy/tree/1.13.0"
             },
-            "time": "2020-12-19T10:15:11+00:00"
+            "time": "2021-03-17T13:42:18+00:00"
         },
         {
             "name": "phpstan/extension-installer",
@@ -1729,16 +1555,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "0.12.81",
+            "version": "0.12.94",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "0dd5b0ebeff568f7000022ea5f04aa86ad3124b8"
+                "reference": "3d0ba4c198a24e3c3fc489f3ec6ac9612c4be5d6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0dd5b0ebeff568f7000022ea5f04aa86ad3124b8",
-                "reference": "0dd5b0ebeff568f7000022ea5f04aa86ad3124b8",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/3d0ba4c198a24e3c3fc489f3ec6ac9612c4be5d6",
+                "reference": "3d0ba4c198a24e3c3fc489f3ec6ac9612c4be5d6",
                 "shasum": ""
             },
             "require": {
@@ -1769,13 +1595,17 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/0.12.81"
+                "source": "https://github.com/phpstan/phpstan/tree/0.12.94"
             },
             "funding": [
                 {
                     "url": "https://github.com/ondrejmirtes",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/phpstan",
+                    "type": "github"
+                },
                 {
                     "url": "https://www.patreon.com/phpstan",
                     "type": "patreon"
@@ -1785,34 +1615,33 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-08T22:03:02+00:00"
+            "time": "2021-07-30T09:05:27+00:00"
         },
         {
             "name": "phpstan/phpstan-phpunit",
-            "version": "0.12.18",
+            "version": "0.12.22",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan-phpunit.git",
-                "reference": "ab44aec7cfb5cb267b8bc30a8caea86dd50d1f72"
+                "reference": "7c01ef93bf128b4ac8bdad38c54b2a4fd6b0b3cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/ab44aec7cfb5cb267b8bc30a8caea86dd50d1f72",
-                "reference": "ab44aec7cfb5cb267b8bc30a8caea86dd50d1f72",
+                "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/7c01ef93bf128b4ac8bdad38c54b2a4fd6b0b3cc",
+                "reference": "7c01ef93bf128b4ac8bdad38c54b2a4fd6b0b3cc",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0",
-                "phpstan/phpstan": "^0.12.60"
+                "phpstan/phpstan": "^0.12.92"
             },
             "conflict": {
                 "phpunit/phpunit": "<7.0"
             },
             "require-dev": {
-                "phing/phing": "^2.16.3",
                 "php-parallel-lint/php-parallel-lint": "^1.2",
                 "phpstan/phpstan-strict-rules": "^0.12.6",
-                "phpunit/phpunit": "^7.5.20"
+                "phpunit/phpunit": "^9.5"
             },
             "type": "phpstan-extension",
             "extra": {
@@ -1838,22 +1667,22 @@
             "description": "PHPUnit extensions and rules for PHPStan",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan-phpunit/issues",
-                "source": "https://github.com/phpstan/phpstan-phpunit/tree/0.12.18"
+                "source": "https://github.com/phpstan/phpstan-phpunit/tree/0.12.22"
             },
-            "time": "2021-03-06T11:51:27+00:00"
+            "time": "2021-08-12T10:53:43+00:00"
         },
         {
             "name": "phpstan/phpstan-strict-rules",
-            "version": "0.12.9",
+            "version": "0.12.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan-strict-rules.git",
-                "reference": "0705fefc7c9168529fd130e341428f5f10f4f01d"
+                "reference": "ce82a050f9da4a32e438272907e38cdd04806223"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/0705fefc7c9168529fd130e341428f5f10f4f01d",
-                "reference": "0705fefc7c9168529fd130e341428f5f10f4f01d",
+                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/ce82a050f9da4a32e438272907e38cdd04806223",
+                "reference": "ce82a050f9da4a32e438272907e38cdd04806223",
                 "shasum": ""
             },
             "require": {
@@ -1861,10 +1690,9 @@
                 "phpstan/phpstan": "^0.12.66"
             },
             "require-dev": {
-                "phing/phing": "^2.16.3",
                 "php-parallel-lint/php-parallel-lint": "^1.2",
                 "phpstan/phpstan-phpunit": "^0.12.16",
-                "phpunit/phpunit": "^7.5.20"
+                "phpunit/phpunit": "^9.5"
             },
             "type": "phpstan-extension",
             "extra": {
@@ -1889,22 +1717,22 @@
             "description": "Extra strict and opinionated rules for PHPStan",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan-strict-rules/issues",
-                "source": "https://github.com/phpstan/phpstan-strict-rules/tree/0.12.9"
+                "source": "https://github.com/phpstan/phpstan-strict-rules/tree/0.12.10"
             },
-            "time": "2021-01-13T08:50:28+00:00"
+            "time": "2021-07-04T14:57:39+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.5",
+            "version": "9.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "f3e026641cc91909d421802dd3ac7827ebfd97e1"
+                "reference": "f6293e1b30a2354e8428e004689671b83871edde"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f3e026641cc91909d421802dd3ac7827ebfd97e1",
-                "reference": "f3e026641cc91909d421802dd3ac7827ebfd97e1",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f6293e1b30a2354e8428e004689671b83871edde",
+                "reference": "f6293e1b30a2354e8428e004689671b83871edde",
                 "shasum": ""
             },
             "require": {
@@ -1960,7 +1788,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.5"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.6"
             },
             "funding": [
                 {
@@ -1968,7 +1796,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-28T06:44:49+00:00"
+            "time": "2021-03-28T07:26:59+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -2213,16 +2041,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.2",
+            "version": "9.5.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "f661659747f2f87f9e72095bb207bceb0f151cb4"
+                "reference": "191768ccd5c85513b4068bdbe99bb6390c7d54fb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f661659747f2f87f9e72095bb207bceb0f151cb4",
-                "reference": "f661659747f2f87f9e72095bb207bceb0f151cb4",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/191768ccd5c85513b4068bdbe99bb6390c7d54fb",
+                "reference": "191768ccd5c85513b4068bdbe99bb6390c7d54fb",
                 "shasum": ""
             },
             "require": {
@@ -2234,7 +2062,7 @@
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
                 "myclabs/deep-copy": "^1.10.1",
-                "phar-io/manifest": "^2.0.1",
+                "phar-io/manifest": "^2.0.3",
                 "phar-io/version": "^3.0.2",
                 "php": ">=7.3",
                 "phpspec/prophecy": "^1.12.1",
@@ -2252,7 +2080,7 @@
                 "sebastian/global-state": "^5.0.1",
                 "sebastian/object-enumerator": "^4.0.3",
                 "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^2.3",
+                "sebastian/type": "^2.3.4",
                 "sebastian/version": "^3.0.2"
             },
             "require-dev": {
@@ -2300,7 +2128,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.2"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.8"
             },
             "funding": [
                 {
@@ -2312,7 +2140,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-02-02T14:45:58+00:00"
+            "time": "2021-07-31T15:17:34+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -2820,16 +2648,16 @@
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.2",
+            "version": "5.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "a90ccbddffa067b51f574dea6eb25d5680839455"
+                "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/a90ccbddffa067b51f574dea6eb25d5680839455",
-                "reference": "a90ccbddffa067b51f574dea6eb25d5680839455",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/23bd5951f7ff26f12d4e3242864df3e08dec4e49",
+                "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49",
                 "shasum": ""
             },
             "require": {
@@ -2872,7 +2700,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.2"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.3"
             },
             "funding": [
                 {
@@ -2880,7 +2708,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T15:55:19+00:00"
+            "time": "2021-06-11T13:31:12+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
@@ -3171,16 +2999,16 @@
         },
         {
             "name": "sebastian/type",
-            "version": "2.3.1",
+            "version": "2.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "81cd61ab7bbf2de744aba0ea61fae32f721df3d2"
+                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/81cd61ab7bbf2de744aba0ea61fae32f721df3d2",
-                "reference": "81cd61ab7bbf2de744aba0ea61fae32f721df3d2",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914",
+                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914",
                 "shasum": ""
             },
             "require": {
@@ -3215,7 +3043,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/2.3.1"
+                "source": "https://github.com/sebastianbergmann/type/tree/2.3.4"
             },
             "funding": [
                 {
@@ -3223,7 +3051,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:18:59+00:00"
+            "time": "2021-06-15T12:49:02+00:00"
         },
         {
             "name": "sebastian/version",
@@ -3280,16 +3108,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.5.8",
+            "version": "3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "9d583721a7157ee997f235f327de038e7ea6dac4"
+                "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9d583721a7157ee997f235f327de038e7ea6dac4",
-                "reference": "9d583721a7157ee997f235f327de038e7ea6dac4",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ffced0d2c8fa8e6cdc4d695a743271fab6c38625",
+                "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625",
                 "shasum": ""
             },
             "require": {
@@ -3332,20 +3160,20 @@
                 "source": "https://github.com/squizlabs/PHP_CodeSniffer",
                 "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
             },
-            "time": "2020-10-23T02:01:07+00:00"
+            "time": "2021-04-09T00:54:41+00:00"
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "75a63c33a8577608444246075ea0af0d052e452a"
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a",
-                "reference": "75a63c33a8577608444246075ea0af0d052e452a",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
                 "shasum": ""
             },
             "require": {
@@ -3374,7 +3202,7 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
                 "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/master"
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
             },
             "funding": [
                 {
@@ -3382,7 +3210,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-07-12T23:59:07+00:00"
+            "time": "2021-07-28T10:34:58+00:00"
         }
     ],
     "aliases": [],
diff --git a/docs/advanced/bean-post-processor.md b/docs/advanced/bean-post-processor.md
index b4169e6..825f63e 100644
--- a/docs/advanced/bean-post-processor.md
+++ b/docs/advanced/bean-post-processor.md
@@ -10,7 +10,9 @@ First of all you need to create a class that implements the
 ```php
 <?php
 
-class SampleServiceBeanPostProcessor implements \bitExpert\Disco\BeanPostProcessor
+use bitExpert\Disco\BeanPostProcessor;
+
+class SampleServiceBeanPostProcessor implements BeanPostProcessor
 {
     /**
      * {@inheritdoc}
@@ -25,23 +27,19 @@ class SampleServiceBeanPostProcessor implements \bitExpert\Disco\BeanPostProcess
 
 ```
 
-To register the `SampleServiceBeanPostProcessor` with Disco create a method in your configuration class and annotate it with the `@BeanPostProcessor` annotation.
+To register the `SampleServiceBeanPostProcessor` with Disco create a method in your configuration class and attribute it with `#[BeanPostProcessor]`.
 
 ```php
 <?php
 
-use bitExpert\Disco\Attributes\BeanPostProcessor;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\BeanPostProcessor;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleServiceBeanPostProcessor;
 
-/**
- * @Configuration
- */
+#[Configuration]
 class MyConfiguration
 {
-    /**
-     * @BeanPostProcessor
-     */
+    #[BeanPostProcessor]
     public function sampleServiceBeanPostProcessor() : SampleServiceBeanPostProcessor
     {
         return new SampleServiceBeanPostProcessor();
diff --git a/docs/advanced/structure-config.md b/docs/advanced/structure-config.md
index 9a0ffb3..ab436dc 100644
--- a/docs/advanced/structure-config.md
+++ b/docs/advanced/structure-config.md
@@ -16,27 +16,21 @@ type thus you are bound to return the same instance.
 ```php
 <?php
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 
-/**
- * @Configuration
- */
+#[Configuration]
 class ParentConfig
 {
-    /**
-     * @Bean
-     */
+    #[Bean]
     public function mySampleService() : SampleService
     {
         return new SampleService();
     }
 }
 
-/**
- * @Configuration
- */
+#[Configuration]
 class ChildConfig extends ParentConfig
 {
 }
@@ -57,27 +51,21 @@ statement in your config class.
 ```php
 <?php
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 
-/**
- * @Configuration
- */
+#[Configuration]
 trait SampleServiceConfig
 {
-    /**
-     * @Bean
-     */
+    #[Bean]
     public function mySampleService() : SampleService
     {
         return new SampleService();
     }
 }
 
-/**
- * @Configuration
- */
+#[Configuration]
 class Config
 {
     use SampleServiceConfig;
diff --git a/docs/basic/basic-concepts.md b/docs/basic/basic-concepts.md
index 77fcd55..7c913ac 100644
--- a/docs/basic/basic-concepts.md
+++ b/docs/basic/basic-concepts.md
@@ -1,45 +1,39 @@
 # Basic concepts
 
-## @Bean and @Configuration
+## #[Bean] and #[Configuration]
 
-The central artifacts used in Disco's PHP based configuration language are `@Configuration`-annotated classes and `@Bean`-annotated methods.
+The central artifacts used in Disco's PHP based configuration language are `#[Configuration]`-attributed classes and `#[Bean]`-attributed methods.
 
-The `@Bean` annotation is used to indicate that a method instantiates, configures and initializes a new object which is managed by Disco.
+The `#[Bean]` attribute is used to indicate that a method instantiates, configures and initializes a new object which is managed by Disco.
 
-Annotating a class with `@Configuration` indicates that its primary purpose is as a source of bean definitions. The simplest possible `@Configuration` class would read as follows:
+Attributing a class with `#[Configuration]` indicates that its primary purpose is as a source of bean definitions. The simplest possible `#[Configuration]` class would read as follows:
 
 ```php
 <?php
 
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Configuration;
 
-/**
- * @Configuration
- */
+#[Configuration]
 class MyConfiguration
 {
 }
 ```
 
-## Using the @Bean Annotation
+## Using the #[Bean] attribute
 
-To declare a bean, simply annotate a method with the `@Bean` annotation. You use this method to register a bean instance within Disco of the type specified as the method’s return value. The bean identifier is the method name. The following is a simple example of a `@Bean` method declaration:
+To declare a bean, simply attribute a method with `#[Bean]`. You use this method to register a bean instance within Disco of the type specified as the method’s return value. The bean identifier is the method name. The following is a simple example of a `#[Bean]` method declaration:
 
 ```php
 <?php
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 
-/**
- * @Configuration
- */
+#[Configuration]
 class MyConfiguration
 {
-    /**
-     * @Bean
-     */
+     #[Bean]
     public function mySampleService() : SampleService
     {
         return new SampleService();
@@ -49,31 +43,37 @@ class MyConfiguration
 
 Beans with a `public` visibility can be retrieved via the `\bitExpert\Disco\AnnotationBeanFactory`. Beans with a `protected` visibility are so-called internal dependencies and thus cannot be retrieved via the `\bitExpert\Disco\AnnotationBeanFactory`.
 
-Public methods of the configuration class have to while protected classes may be marked with the `@Bean` annotation. The `\bitExpert\Disco\AnnotationBeanFactory` will throw an exception when public methods without a `@Bean` annotation are found.
+Public methods of the configuration class have to while protected classes may be marked with the `#[Bean]` attribute. The `\bitExpert\Disco\AnnotationBeanFactory` will throw an exception when public methods without a `#[Bean]` annotation are found.
 
 ## PSR-11
 
-Disco implements the [PSR-11](http://www.php-fig.org/psr/psr-11/) interface. That means you can use Disco in any application that can deal with PSR-11 containers, e.g., [zend-expressive](https://github.com/zendframework/zend-expressive).
+Disco implements the [PSR-11](http://www.php-fig.org/psr/psr-11/) interface. That means you can use Disco in any application that can deal with PSR-11 containers, e.g., [Mezzio](https://docs.mezzio.dev/).
 
 In a nutshell the container-interop project provides a interface for DI containers that consists of two methods: `get()` & `has()`.
 
 ```php
 <?php
 
+declare(strict_types=1);
+
 namespace Psr\Container;
 
+/**
+ * Describes the interface of a container that exposes methods to read its entries.
+ */
 interface ContainerInterface
 {
     /**
      * Finds an entry of the container by its identifier and returns it.
      *
      * @param string $id Identifier of the entry to look for.
+     *
      * @throws NotFoundExceptionInterface  No entry was found for **this** identifier.
      * @throws ContainerExceptionInterface Error while retrieving the entry.
      *
      * @return mixed Entry.
      */
-    public function get($id);
+    public function get(string $id);
 
     /**
      * Returns true if the container can return an entry for the given identifier.
@@ -83,9 +83,10 @@ interface ContainerInterface
      * It does however mean that `get($id)` will not throw a `NotFoundExceptionInterface`.
      *
      * @param string $id Identifier of the entry to look for.
+     *
      * @return bool
      */
-    public function has($id);
+    public function has(string $id): bool;
 }
 ```
 
diff --git a/docs/basic/bean-config.md b/docs/basic/bean-config.md
index f6f87d7..944d3cc 100644
--- a/docs/basic/bean-config.md
+++ b/docs/basic/bean-config.md
@@ -1,6 +1,6 @@
 # Bean Configuration
 
-The `@Bean` annotation comes with a few attributes which influence how beans are created or how their internal state will be kept during different requests.
+The `#[Bean]` attribute comes with a few options which influence how beans are created or how their internal state will be kept during different requests.
 
 ## Singleton Beans
 
@@ -9,18 +9,14 @@ By default a bean instance is configured to be returned as a singleton instance
 ```php
 <?php
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 
-/**
- * @Configuration
- */
+#[Configuration]
 class MyConfiguration
 {
-    /**
-     * @Bean({"singleton" = true})
-     */
+    #[Bean(singleton: true)]
     public function mySampleService() : SampleService
     {
         return new SampleService();
@@ -29,23 +25,19 @@ class MyConfiguration
 ```
 
 In case you explicitly want to return a new instance for every
-`\bitExpert\Disco\AnnotationBeanFactory::get()` call, set the singleton attribute to `false`.
+`\bitExpert\Disco\AnnotationBeanFactory::get()` call, set the singleton option to `false`.
 
 ```php
 <?php
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 
-/**
- * @Configuration
- */
+#[Configuration]
 class MyConfiguration
 {
-    /**
-     * @Bean({"singleton" = false})
-     */
+    #[Bean(singleton: false)]
     public function mySampleService() : SampleService
     {
         return new SampleService();
@@ -55,23 +47,19 @@ class MyConfiguration
 
 ## Lazy Beans
 
-By default Disco will return non-lazy bean instances, which means you will get the exact same instance as you have defined in your configuration code. The explicit bean configuration to return non-lazy instances would read as follows:
+By default, Disco will return non-lazy bean instances, which means you will get the exact same instance as you have defined in your configuration code. The explicit bean configuration to return non-lazy instances would read as follows:
 
 ```php
 <?php
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 
-/**
- * @Configuration
- */
+#[Configuration]
 class MyConfiguration
 {
-    /**
-     * @Bean({"lazy" = false})
-     */
+    #[Bean(lazy: false)]
     public function mySampleService() : SampleService
     {
         return new SampleService();
@@ -79,23 +67,19 @@ class MyConfiguration
 }
 ```
 
-In case the construction of your bean is quite time consuming — e.g., a call to a remote service is made — you can instruct Disco to return a lazy instance of your bean, the concrete instance gets created upon the first method call. Simply set the lazy attribute to `true` to let Disco wrap your bean as a lazy instance:
+In case the construction of your bean is quite time-consuming — e.g., a call to a remote service is made — you can instruct Disco to return a lazy instance of your bean, the concrete instance gets created upon the first method call. Simply set the lazy option to `true` to let Disco wrap your bean as a lazy instance:
 
 ```php
 <?php
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 
-/**
- * @Configuration
- */
+#[Configuration]
 class MyConfiguration
 {
-    /**
-     * @Bean({"lazy" = true})
-     */
+    #[Bean(lazy: true)]
     public function mySampleService() : SampleService
     {
         return new SampleService();
@@ -119,18 +103,14 @@ By default beans are request scoped which means a new instance gets created for
 ```php
 <?php
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 
-/**
- * @Configuration
- */
+#[Configuration]
 class MyConfiguration
 {
-    /**
-     * @Bean({"scope" = request})
-     */
+    #[Bean(scope: Bean::SCOPE_REQUEST)]
     public function mySampleService() : SampleService
     {
         return new SampleService();
@@ -143,18 +123,14 @@ To let Disco create a session scoped bean, simply set the `scope` attribute to `
 ```php
 <?php
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 
-/**
- * @Configuration
- */
+#[Configuration]
 class MyConfiguration
 {
-    /**
-     * @Bean({"scope" = session})
-     */
+    #[Bean(scope: Bean::SCOPE_SESSION)]
     public function mySampleService() : SampleService
     {
         return new SampleService();
@@ -172,32 +148,30 @@ As a drawback you are quite limited when it comes to bean names. To quote the [P
 
 > A valid function name starts with a letter or underscore, followed by any number of letters, numbers, or underscores.
 
-This led to introducing aliases for beans. Each bean can have multiple aliases and two types of aliases are possible. In case of collisions (the same alias is used for different beans) Disco will throw an exception.
+This led to introducing aliases for beans. Each bean can have multiple aliases and two types of aliases are possible: 
+a name alias `#[Alias]` or a type alias `#[TypeAlias]`.
+
+In case of collisions (the same alias is used for different beans) Disco will throw an exception.
 You're asked to avoid/resolve such conflicts. Since version 0.10.0 of Disco collision detection will only take the configuration class into account the alias is defined in, this allows you to overwrite aliases in child configuration.
 
-Simply add the `aliases` attribute to the `@Bean` annotation to define a list of `@Alias`:
+Simply attribute the Bean with `#[Alias(name: 'some_alias')]` to define a named alias or `#[TypeAlias]` to define the return type as an aliases.
+Multiple name aliases are allowed. 
 
 ```php
 <?php
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Annotations\Àlias;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Alias;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
+use bitExpert\Disco\Annotations\TypeAlias;
 use bitExpert\Disco\Helper\SampleService;
 
-/**
- * @Configuration
- */
+#[Configuration]
 class MyConfiguration
 {
-    /**
-      * @Bean({
-      *   "aliases"={
-      *      @Alias({"name" = "\Identifier\With\Namespace"}),
-      *      @Alias({"type" = true})
-      *   }
-      * })
-      */
+    #[Bean]
+    #[Alias(name: '\Identifier\With\Namespace')]
+    #[TypeAlias]
     public function mySampleService() : SampleService
     {
         return new SampleService();
@@ -211,15 +185,15 @@ The example uses both available alias types. Let's look at them one after the ot
 
 ### Named Alias
 
-`@Alias({"name" = "\Identifier\With\Namespace"})`
+`#[Alias(name: '\Identifier\With\Namespace')]`
 
 This alias type is pretty much self explaining. What you define as name can later be used to get the service from the bean factory.
 
 ### Return Type Alias
 
-`@Alias({"type" = true})`
+`#[TypeAlias]`
 
-Setting the `type` attribute to `true` (name attribute must be omitted in this case) tells Disco to use the return type of the method as an alias.
+Using thy `#[TypeAlias]` attribute tells Disco to use the return type of the method as an alias.
 
 This is very useful because you can work with PHP's `::class` language construct like in this example: `$annotationBeanFactory->get(SampleService::class)`.
 
diff --git a/docs/basic/bean-parameters.md b/docs/basic/bean-parameters.md
index 72ea0e6..1b7ed00 100644
--- a/docs/basic/bean-parameters.md
+++ b/docs/basic/bean-parameters.md
@@ -1,32 +1,26 @@
 # Bean Parameters
 
-Bean instances can be parameterized by a given configuration. To access the configuration add a `parameters` attribute to your bean configuration method, which holds a collection of `@Parameter` annotations.
+Bean instances can be parameterized by a given configuration. To access the configuration add a `#[Parameter]` attribute to your Bean method.
 
-The `@Parameter` annotation requires at least a name which will be used as key to look for in the configuration array.
+The `#[Parameter(name: 'paramName', key: 'config.key')]` attribute requires at least the `param` (which must match a param name of the Bean method) and the `key` which will be used to look for in the configuration array.
 
-In the following example the value of configuration key `test` gets passed to the bean configuration method as method parameter. The configuration parameters are passed in the same order as noted to the bean configuration method:
+In the following example the value of configuration key `configKey` gets passed to the bean configuation for the argument named `$test`.
+Configuration parameters are passed to the bean configuration method using [named arguments](https://www.php.net/manual/en/functions.arguments.php#functions.named-arguments):
 
 ```php
 <?php
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Parameter;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Parameter;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 
-/**
- * @Configuration
- */
+#[Configuration]
 class MyConfiguration
 {
-    /**
-     * @Bean({
-     *   "parameters"={
-     *      @Parameter({"name" = "test"})
-     *   }
-     * })
-     */
-    public function mySampleService($test = '') : SampleService
+    #[Bean]
+    #[Parameter(name: 'test', key: 'configKey')]
+    public function mySampleService(string $test = '') : SampleService
     {
         $service = new SampleService();
         $service->setTest($test);
@@ -40,13 +34,17 @@ The configuration array gets passed to the `\bitExpert\Disco\AnnotationBeanFacto
 ```php
 <?php
 
-$parameters = ['test' => 'This is a test.'];
+$parameters = ['configKey' => 'This is a test.'];
 
 $beanFactory = new \bitExpert\Disco\AnnotationBeanFactory(
   MyConfiguration::class,
   $parameters
 );
 \bitExpert\Disco\BeanFactoryRegistry::register($beanFactory);
+
+$sampleService = $beanFactory->get('mySampleService');
+
+echo $sampleService->test; // Output: This is a test.
 ```
 
 ## Default Parameter Values
@@ -56,30 +54,35 @@ Whenever a requested configuration key is not found — the key does not exist o
 ```php
 <?php
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Parameter;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Parameter;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 
-/**
- * @Configuration
- */
+#[Configuration]
 class MyConfiguration
 {
-    /**
-     * @Bean({
-     *   "parameters"={
-     *      @Parameter({"name" = "test", "default" = "Some default value"})
-     *   }
-     * })
-     */
-    public function mySampleService($test = '') : SampleService
+    #[Bean]
+    #[Parameter(name: 'test', key: 'configKey', default: 'Some default value')]
+    public function mySampleService(string $test = '') : SampleService
     {
         $service = new SampleService();
         $service->setTest($test);
         return $service;
     }
 }
+
+$parameters = []; // empty
+
+$beanFactory = new \bitExpert\Disco\AnnotationBeanFactory(
+  MyConfiguration::class,
+  $parameters
+);
+\bitExpert\Disco\BeanFactoryRegistry::register($beanFactory);
+
+$sampleService = $beanFactory->get('mySampleService');
+
+echo $sampleService->test; // Output: Some default value.
 ```
 
 ## Default Bean Configuration Method Parameter Values
@@ -108,24 +111,17 @@ Use the '.' notation to access the nested elements:
 ```php
 <?php
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Parameter;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Parameter;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 
-/**
- * @Configuration
- */
+#[Configuration]
 class MyConfiguration
 {
-    /**
-     * @Bean({
-     *   "parameters"={
-     *      @Parameter({"name" = "nested.key"})
-     *   }
-     * })
-     */
-    public function mySampleService($test = '') : SampleService
+    #[Bean]
+    #[Parameter(name: 'test', key: 'nested.key')]
+    public function mySampleService(string $test = '') : SampleService
     {
         $service = new SampleService();
         $service->setTest($test);
diff --git a/docs/basic/injecting-dependencies.md b/docs/basic/injecting-dependencies.md
index 3274194..231d9bd 100644
--- a/docs/basic/injecting-dependencies.md
+++ b/docs/basic/injecting-dependencies.md
@@ -5,8 +5,8 @@ To inject a bean as a dependency simply call the respective method of the config
 ```php
 <?php
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 use bitExpert\Disco\Helper\MasterService;
 
diff --git a/docs/intro/getting-started.md b/docs/intro/getting-started.md
index 238f1a0..701e755 100644
--- a/docs/intro/getting-started.md
+++ b/docs/intro/getting-started.md
@@ -2,7 +2,10 @@
 
 ## Prerequisites
 
-Disco needs at least [PHP](http://php.net) 7.1 to run. Disco relies on the [return type declarations](http://php.net/manual/en/functions.returning-values.php#functions.returning-values.type-declaration) feature introduced with PHP 7.0 as well as the `ocramius/proxy-manager` package which in the latest version is only compatible with PHP 7.1.
+Version 1 of Disco needs at least [PHP](http://php.net) 8.0 to run. Disco relies on the [return type declarations](http://php.net/manual/en/functions.returning-values.php#functions.returning-values.type-declaration) 
+and [attributes](https://www.php.net/manual/en/language.attributes.overview.php) feature introduced with PHP 8.0 as well as the `ocramius/proxy-manager` package.
+
+:warning: Look at version 0.x if you are still on [PHP](http://php.net) 7.4.
 
 ## Installation
 
@@ -26,16 +29,14 @@ $beanFactory = new \bitExpert\Disco\AnnotationBeanFactory(MyConfiguration::class
 \bitExpert\Disco\BeanFactoryRegistry::register($beanFactory);
 ```
 
-Next up you need to create a configuration class ```MyConfiguration```. The class needs to be marked with a `@Configuration` annotation.
+Next up you need to create a configuration class ```MyConfiguration```. The class needs to be attributed with `#[Configuration]`.
 
 ```php
 <?php
 
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Configuration;
 
-/**
- * @Configuration
- */
+#[Configuration]
 class MyConfiguration
 {
 }
diff --git a/docs/intro/what-is-disco.md b/docs/intro/what-is-disco.md
index 6213f34..55b0b4c 100644
--- a/docs/intro/what-is-disco.md
+++ b/docs/intro/what-is-disco.md
@@ -1,6 +1,6 @@
 # What Is Disco?
 
-Disco is a [PSR-11](http://www.php-fig.org/psr/psr-11/) compatible, annotation-based dependency injection container.
+Disco is a [PSR-11](http://www.php-fig.org/psr/psr-11/) compatible, attribute-based dependency injection container.
 
 ## Why Disco?
 
diff --git a/src/bitExpert/Disco/AnnotationBeanFactory.php b/src/bitExpert/Disco/AnnotationBeanFactory.php
index 2033343..9d30ec3 100644
--- a/src/bitExpert/Disco/AnnotationBeanFactory.php
+++ b/src/bitExpert/Disco/AnnotationBeanFactory.php
@@ -34,7 +34,11 @@ class AnnotationBeanFactory implements BeanFactory
      * @param array<string, mixed> $parameters
      * @param BeanFactoryConfiguration $config
      */
-    public function __construct($configClassName, array $parameters = [], BeanFactoryConfiguration $config = null)
+    public function __construct(
+        string                   $configClassName,
+        array                    $parameters = [],
+        BeanFactoryConfiguration $config = null
+    )
     {
         if ($config === null) {
             $config = new BeanFactoryConfiguration(sys_get_temp_dir());
@@ -79,7 +83,7 @@ public function get(string $id)
     /**
      * {@inheritDoc}
      */
-    public function has(string $id)
+    public function has(string $id): bool
     {
         return is_callable([$this->beanConfig, $id]) || $this->beanConfig->hasAlias($id);
     }
diff --git a/src/bitExpert/Disco/Attributes/Alias.php b/src/bitExpert/Disco/Annotations/Alias.php
similarity index 88%
rename from src/bitExpert/Disco/Attributes/Alias.php
rename to src/bitExpert/Disco/Annotations/Alias.php
index 3c43133..ae14ba0 100644
--- a/src/bitExpert/Disco/Attributes/Alias.php
+++ b/src/bitExpert/Disco/Annotations/Alias.php
@@ -10,7 +10,7 @@
  */
 declare(strict_types=1);
 
-namespace bitExpert\Disco\Attributes;
+namespace bitExpert\Disco\Annotations;
 
 use Attribute;
 use Webmozart\Assert\Assert;
@@ -29,7 +29,6 @@ final class Alias
     private string $name;
 
     /**
-     * Creates a new {@link \bitExpert\Disco\Annotations\Alias}.
      *
      * @param string $name
      */
diff --git a/src/bitExpert/Disco/Attributes/Bean.php b/src/bitExpert/Disco/Annotations/Bean.php
similarity index 97%
rename from src/bitExpert/Disco/Attributes/Bean.php
rename to src/bitExpert/Disco/Annotations/Bean.php
index 242ae4e..dbcc5b9 100644
--- a/src/bitExpert/Disco/Attributes/Bean.php
+++ b/src/bitExpert/Disco/Annotations/Bean.php
@@ -10,7 +10,7 @@
  */
 declare(strict_types=1);
 
-namespace bitExpert\Disco\Attributes;
+namespace bitExpert\Disco\Annotations;
 
 use Attribute;
 use Webmozart\Assert\Assert;
diff --git a/src/bitExpert/Disco/Attributes/BeanPostProcessor.php b/src/bitExpert/Disco/Annotations/BeanPostProcessor.php
similarity index 91%
rename from src/bitExpert/Disco/Attributes/BeanPostProcessor.php
rename to src/bitExpert/Disco/Annotations/BeanPostProcessor.php
index 5609cdf..6812dde 100644
--- a/src/bitExpert/Disco/Attributes/BeanPostProcessor.php
+++ b/src/bitExpert/Disco/Annotations/BeanPostProcessor.php
@@ -10,7 +10,7 @@
  */
 declare(strict_types=1);
 
-namespace bitExpert\Disco\Attributes;
+namespace bitExpert\Disco\Annotations;
 
 use Attribute;
 
diff --git a/src/bitExpert/Disco/Attributes/Configuration.php b/src/bitExpert/Disco/Annotations/Configuration.php
similarity index 91%
rename from src/bitExpert/Disco/Attributes/Configuration.php
rename to src/bitExpert/Disco/Annotations/Configuration.php
index b3af012..8f58351 100644
--- a/src/bitExpert/Disco/Attributes/Configuration.php
+++ b/src/bitExpert/Disco/Annotations/Configuration.php
@@ -10,7 +10,7 @@
  */
 declare(strict_types=1);
 
-namespace bitExpert\Disco\Attributes;
+namespace bitExpert\Disco\Annotations;
 
 use Attribute;
 
diff --git a/src/bitExpert/Disco/Attributes/Parameter.php b/src/bitExpert/Disco/Annotations/Parameter.php
similarity index 98%
rename from src/bitExpert/Disco/Attributes/Parameter.php
rename to src/bitExpert/Disco/Annotations/Parameter.php
index cc5f0df..94d4185 100644
--- a/src/bitExpert/Disco/Attributes/Parameter.php
+++ b/src/bitExpert/Disco/Annotations/Parameter.php
@@ -10,7 +10,7 @@
  */
 declare(strict_types=1);
 
-namespace bitExpert\Disco\Attributes;
+namespace bitExpert\Disco\Annotations;
 
 use Attribute;
 use Webmozart\Assert\Assert;
diff --git a/src/bitExpert/Disco/Attributes/ReturnTypeAlias.php b/src/bitExpert/Disco/Annotations/TypeAlias.php
similarity index 87%
rename from src/bitExpert/Disco/Attributes/ReturnTypeAlias.php
rename to src/bitExpert/Disco/Annotations/TypeAlias.php
index bf642f0..3d1e255 100644
--- a/src/bitExpert/Disco/Attributes/ReturnTypeAlias.php
+++ b/src/bitExpert/Disco/Annotations/TypeAlias.php
@@ -10,7 +10,7 @@
  */
 declare(strict_types=1);
 
-namespace bitExpert\Disco\Attributes;
+namespace bitExpert\Disco\Annotations;
 
 use Attribute;
 
@@ -20,6 +20,6 @@
  * Used in conjunction with the #[Bean] attribute.
  */
 #[Attribute(Attribute::TARGET_METHOD)]
-final class ReturnTypeAlias
+final class TypeAlias
 {
 }
diff --git a/src/bitExpert/Disco/BeanFactoryConfiguration.php b/src/bitExpert/Disco/BeanFactoryConfiguration.php
index add5622..82086ee 100644
--- a/src/bitExpert/Disco/BeanFactoryConfiguration.php
+++ b/src/bitExpert/Disco/BeanFactoryConfiguration.php
@@ -31,19 +31,22 @@ class BeanFactoryConfiguration
     /**
      * @var BeanStore
      */
-    protected $sessionBeanStore;
+    protected BeanStore $sessionBeanStore;
+
     /**
      * @var string
      */
-    protected $proxyTargetDir;
+    protected string $proxyTargetDir;
+
     /**
-     * @var ?GeneratorStrategyInterface
+     * @var GeneratorStrategyInterface
      */
-    protected $proxyWriterGenerator;
+    protected GeneratorStrategyInterface $proxyWriterGenerator;
+
     /**
-     * @var ?AutoloaderInterface
+     * @var AutoloaderInterface|null
      */
-    protected $proxyAutoloader;
+    protected ?AutoloaderInterface $proxyAutoloader = null;
 
     /**
      * Creates a new {@link \bitExpert\Disco\BeanFactoryConfiguration}.
@@ -51,7 +54,7 @@ class BeanFactoryConfiguration
      * @param string $proxyTargetDir
      * @throws InvalidArgumentException
      */
-    public function __construct($proxyTargetDir)
+    public function __construct(string $proxyTargetDir)
     {
         try {
             $proxyFileLocator = new FileLocator($proxyTargetDir);
diff --git a/src/bitExpert/Disco/Proxy/Configuration/ConfigurationGenerator.php b/src/bitExpert/Disco/Proxy/Configuration/ConfigurationGenerator.php
index 4699152..fb3c726 100644
--- a/src/bitExpert/Disco/Proxy/Configuration/ConfigurationGenerator.php
+++ b/src/bitExpert/Disco/Proxy/Configuration/ConfigurationGenerator.php
@@ -12,12 +12,13 @@
 
 namespace bitExpert\Disco\Proxy\Configuration;
 
-use bitExpert\Disco\Attributes\Alias;
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\BeanPostProcessor;
-use bitExpert\Disco\Attributes\Configuration;
-use bitExpert\Disco\Attributes\Parameter;
-use bitExpert\Disco\Attributes\ReturnTypeAlias;
+use Attribute;
+use bitExpert\Disco\Annotations\Alias;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\BeanPostProcessor;
+use bitExpert\Disco\Annotations\Configuration;
+use bitExpert\Disco\Annotations\Parameter;
+use bitExpert\Disco\Annotations\TypeAlias;
 use bitExpert\Disco\Proxy\Configuration\MethodGenerator\BeanMethod;
 use bitExpert\Disco\Proxy\Configuration\MethodGenerator\BeanPostProcessorMethod;
 use bitExpert\Disco\Proxy\Configuration\MethodGenerator\Constructor;
@@ -42,6 +43,7 @@
 use Laminas\Code\Generator\ClassGenerator;
 use Laminas\Code\Generator\Exception\InvalidArgumentException;
 use Laminas\Code\Reflection\MethodReflection;
+use ReflectionNamedType;
 use ReflectionUnionType;
 
 /**
@@ -95,6 +97,18 @@ public function generate(ReflectionClass $originalClass, ClassGenerator $classGe
         $localAliases = [];
         $methods = $originalClass->getMethods(ReflectionMethod::IS_PUBLIC | ReflectionMethod::IS_PROTECTED);
         foreach ($methods as $method) {
+            /** @var null|ReflectionUnionType|ReflectionNamedType $returnTypeRefl */
+            $returnTypeRefl = $method->getReturnType();
+            if ($returnTypeRefl instanceof ReflectionUnionType) {
+                throw new InvalidProxiedClassException(
+                    sprintf(
+                        'Method "%s" on "%s" uses the unsupported union type.',
+                        $method->name,
+                        $originalClass->name
+                    )
+                );
+            }
+
             $reflectionMethod = new MethodReflection(
                 $method->class,
                 $method->name
@@ -138,22 +152,10 @@ public function generate(ReflectionClass $originalClass, ClassGenerator $classGe
 
             $beanAliases = [];
 
-            /** @var \bitExpert\Disco\Attributes\ReturnTypeAlias $returnTypeAlias */
-            $returnTypeAlias = ($reflectionMethod->getAttributes(ReturnTypeAlias::class)[0] ?? null)
+            /** @var TypeAlias|null $returnTypeAlias */
+            $returnTypeAlias = ($reflectionMethod->getAttributes(TypeAlias::class)[0] ?? null)
                 ?->newInstance();
             if (null !== $returnTypeAlias) {
-                $returnTypeRefl = $method->getReturnType();
-
-                if ($returnTypeRefl instanceof ReflectionUnionType) {
-                    throw new InvalidProxiedClassException(
-                        sprintf(
-                            'Method "%s" on "%s" uses the unsupported union type.',
-                            $method->name,
-                            $originalClass->name
-                        )
-                    );
-                }
-
                 if (null === $returnTypeRefl || $returnTypeRefl->allowsNull() || $returnTypeRefl->isBuiltin()) {
                     throw new InvalidProxiedClassException(
                         sprintf(
@@ -172,6 +174,7 @@ public function generate(ReflectionClass $originalClass, ClassGenerator $classGe
             }
 
             $beanAliases = [...$beanAliases, ...\array_map(
+                /** @phpstan-ignore-next-line */
                 fn($attr) => $attr->newInstance()->getName(),
                 $reflectionMethod->getAttributes(Alias::class)
             )];
@@ -206,7 +209,7 @@ public function generate(ReflectionClass $originalClass, ClassGenerator $classGe
                 $reflectionMethod,
                 $beanAttribute,
                 $parameterAttributes,
-                $method->getReturnType(),
+                $returnTypeRefl,
                 $forceLazyInitProperty,
                 $sessionBeansProperty,
                 $postProcessorsProperty,
diff --git a/src/bitExpert/Disco/Proxy/Configuration/MethodGenerator/BeanMethod.php b/src/bitExpert/Disco/Proxy/Configuration/MethodGenerator/BeanMethod.php
index b924d69..80689be 100644
--- a/src/bitExpert/Disco/Proxy/Configuration/MethodGenerator/BeanMethod.php
+++ b/src/bitExpert/Disco/Proxy/Configuration/MethodGenerator/BeanMethod.php
@@ -12,8 +12,8 @@
 
 namespace bitExpert\Disco\Proxy\Configuration\MethodGenerator;
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Parameter;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Parameter;
 use bitExpert\Disco\BeanException;
 use bitExpert\Disco\InitializedBean;
 use bitExpert\Disco\Proxy\Configuration\PropertyGenerator\BeanFactoryConfigurationProperty;
@@ -21,6 +21,7 @@
 use bitExpert\Disco\Proxy\Configuration\PropertyGenerator\ForceLazyInitProperty;
 use bitExpert\Disco\Proxy\Configuration\PropertyGenerator\SessionBeansProperty;
 use bitExpert\Disco\Proxy\LazyBean\LazyBeanFactory;
+use Laminas\Code\Generator\Exception\InvalidArgumentException;
 use ProxyManager\Exception\InvalidProxiedClassException;
 use ProxyManager\Proxy\LazyLoadingInterface;
 use ReflectionNamedType;
@@ -40,9 +41,9 @@ class BeanMethod extends ParameterAwareMethodGenerator
      * Creates a new {@link \bitExpert\Disco\Proxy\Configuration\MethodGenerator\BeanMethod}.
      *
      * @param MethodReflection $originalMethod
-     * @param \bitExpert\Disco\Attributes\Bean $beanMetadata
-     * @param \bitExpert\Disco\Attributes\Parameter[] $parameters
-     * @param ReflectionNamedType|null $beanTypeName
+     * @param Bean $beanMetadata
+     * @param Parameter[] $parameters
+     * @param ReflectionNamedType|null $beanType
      * @param ForceLazyInitProperty $forceLazyInitProperty
      * @param SessionBeansProperty $sessionBeansProperty
      * @param BeanPostProcessorsProperty $postProcessorsProperty
@@ -50,8 +51,8 @@ class BeanMethod extends ParameterAwareMethodGenerator
      * @param GetParameter $parameterValuesMethod
      * @param WrapBeanAsLazy $wrapBeanAsLazy
      * @return MethodGenerator
-     * @throws \Laminas\Code\Generator\Exception\InvalidArgumentException
-     * @throws \ProxyManager\Exception\InvalidProxiedClassException
+     * @throws InvalidArgumentException
+     * @throws InvalidProxiedClassException
      */
     public static function generateMethod(
         MethodReflection                 $originalMethod,
@@ -130,7 +131,7 @@ public static function generateMethod(
      * @override Enforces generation of \ProxyManager\Generator\MethodGenerator.
      *
      * {@inheritDoc}
-     * @throws \Laminas\Code\Generator\Exception\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public static function fromReflection(MethodReflection $reflectionMethod): MethodGenerator
     {
@@ -157,7 +158,7 @@ public static function fromReflection(MethodReflection $reflectionMethod): Metho
      * @param string $padding
      * @param string $beanId
      * @param string $beanType
-     * @param \bitExpert\Disco\Attributes\Bean $beanMetadata
+     * @param Bean $beanMetadata
      * @param string $methodParams
      * @param ForceLazyInitProperty $forceLazyInitProperty
      * @param SessionBeansProperty $sessionBeansProperty
@@ -282,7 +283,7 @@ protected static function generateBeanCreationCode(
      * @param string $padding
      * @param string $beanId
      * @param string $beanType
-     * @param \bitExpert\Disco\Attributes\Bean $beanMetadata
+     * @param Bean $beanMetadata
      * @param string $methodParams
      * @param ForceLazyInitProperty $forceLazyInitProperty
      * @param SessionBeansProperty $sessionBeansProperty
diff --git a/src/bitExpert/Disco/Proxy/Configuration/MethodGenerator/BeanPostProcessorMethod.php b/src/bitExpert/Disco/Proxy/Configuration/MethodGenerator/BeanPostProcessorMethod.php
index 8e58f9e..1f5c059 100644
--- a/src/bitExpert/Disco/Proxy/Configuration/MethodGenerator/BeanPostProcessorMethod.php
+++ b/src/bitExpert/Disco/Proxy/Configuration/MethodGenerator/BeanPostProcessorMethod.php
@@ -12,8 +12,8 @@
 
 namespace bitExpert\Disco\Proxy\Configuration\MethodGenerator;
 
-use bitExpert\Disco\Attributes\BeanPostProcessor;
-use bitExpert\Disco\Attributes\Parameter;
+use bitExpert\Disco\Annotations\Parameter;
+use Laminas\Code\Generator\Exception\InvalidArgumentException;
 use Laminas\Code\Generator\MethodGenerator;
 use Laminas\Code\Reflection\MethodReflection;
 
@@ -23,10 +23,10 @@ class BeanPostProcessorMethod extends ParameterAwareMethodGenerator
      * Creates a new {@link \bitExpert\Disco\Proxy\Configuration\MethodGenerator\BeanPostProcessorMethod}.
      *
      * @param MethodReflection $originalMethod
-     * @param \bitExpert\Disco\Attributes\Parameter[] $beanPostProcessorParameters
+     * @param Parameter[] $beanPostProcessorParameters
      * @param GetParameter $parameterValuesMethod
      * @return MethodGenerator
-     * @throws \Laminas\Code\Generator\Exception\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public static function generateMethod(
         MethodReflection $originalMethod,
diff --git a/src/bitExpert/Disco/Proxy/Configuration/MethodGenerator/ParameterAwareMethodGenerator.php b/src/bitExpert/Disco/Proxy/Configuration/MethodGenerator/ParameterAwareMethodGenerator.php
index 8f3b119..0d45fab 100644
--- a/src/bitExpert/Disco/Proxy/Configuration/MethodGenerator/ParameterAwareMethodGenerator.php
+++ b/src/bitExpert/Disco/Proxy/Configuration/MethodGenerator/ParameterAwareMethodGenerator.php
@@ -12,7 +12,7 @@
 
 namespace bitExpert\Disco\Proxy\Configuration\MethodGenerator;
 
-use bitExpert\Disco\Attributes\Parameter;
+use bitExpert\Disco\Annotations\Parameter;
 use Laminas\Code\Generator\MethodGenerator;
 
 /**
diff --git a/tests/bitExpert/Disco/Annotations/AliasUnitTest.php b/tests/bitExpert/Disco/Annotations/AliasUnitTest.php
index 412659a..f0ef434 100644
--- a/tests/bitExpert/Disco/Annotations/AliasUnitTest.php
+++ b/tests/bitExpert/Disco/Annotations/AliasUnitTest.php
@@ -12,12 +12,12 @@
 
 namespace bitExpert\Disco\Annotations;
 
-use bitExpert\Disco\Attributes\Alias;
+use bitExpert\Disco\Annotations\Alias;
 use PHPUnit\Framework\TestCase;
 use Webmozart\Assert\InvalidArgumentException;
 
 /**
- * Unit tests for {@link \bitExpert\Disco\Attributes\Alias}.
+ * Unit tests for {@link \bitExpert\Disco\Annotations\NameAlias}.
  */
 class AliasUnitTest extends TestCase
 {
diff --git a/tests/bitExpert/Disco/Annotations/BeanUnitTest.php b/tests/bitExpert/Disco/Annotations/BeanUnitTest.php
index ddab97c..bfb22a7 100644
--- a/tests/bitExpert/Disco/Annotations/BeanUnitTest.php
+++ b/tests/bitExpert/Disco/Annotations/BeanUnitTest.php
@@ -12,12 +12,12 @@
 
 namespace bitExpert\Disco\Annotations;
 
-use bitExpert\Disco\Attributes\Bean;
+use bitExpert\Disco\Annotations\Bean;
 use PHPUnit\Framework\TestCase;
 use Webmozart\Assert\InvalidArgumentException;
 
 /**
- * Unit tests for {@link \bitExpert\Disco\Attributes\Bean}.
+ * Unit tests for {@link \bitExpert\Disco\Annotations\Bean}.
  */
 class BeanUnitTest extends TestCase
 {
diff --git a/tests/bitExpert/Disco/Annotations/ParameterUnitTest.php b/tests/bitExpert/Disco/Annotations/ParameterUnitTest.php
index f04c0ed..30f9180 100644
--- a/tests/bitExpert/Disco/Annotations/ParameterUnitTest.php
+++ b/tests/bitExpert/Disco/Annotations/ParameterUnitTest.php
@@ -12,12 +12,12 @@
 
 namespace bitExpert\Disco\Annotations;
 
-use bitExpert\Disco\Attributes\Parameter;
+use bitExpert\Disco\Annotations\Parameter;
 use PHPUnit\Framework\TestCase;
 use Webmozart\Assert\InvalidArgumentException;
 
 /**
- * Unit tests for {@link \bitExpert\Disco\Attributes\Parameter}.
+ * Unit tests for {@link \bitExpert\Disco\Annotations\Parameter}.
  */
 class ParameterUnitTest extends TestCase
 {
diff --git a/tests/bitExpert/Disco/Config/BeanConfiguration.php b/tests/bitExpert/Disco/Config/BeanConfiguration.php
index 0bc175e..a4cd298 100644
--- a/tests/bitExpert/Disco/Config/BeanConfiguration.php
+++ b/tests/bitExpert/Disco/Config/BeanConfiguration.php
@@ -12,8 +12,8 @@
 
 namespace bitExpert\Disco\Config;
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\InitializedService;
 use bitExpert\Disco\Helper\MasterService;
 use bitExpert\Disco\Helper\SampleService;
diff --git a/tests/bitExpert/Disco/Config/BeanConfigurationPersistence.php b/tests/bitExpert/Disco/Config/BeanConfigurationPersistence.php
index ebc088b..5f24492 100644
--- a/tests/bitExpert/Disco/Config/BeanConfigurationPersistence.php
+++ b/tests/bitExpert/Disco/Config/BeanConfigurationPersistence.php
@@ -12,8 +12,8 @@
 
 namespace bitExpert\Disco\Config;
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 
 #[Configuration]
diff --git a/tests/bitExpert/Disco/Config/BeanConfigurationSubclass.php b/tests/bitExpert/Disco/Config/BeanConfigurationSubclass.php
index dff83ed..d488a3b 100644
--- a/tests/bitExpert/Disco/Config/BeanConfigurationSubclass.php
+++ b/tests/bitExpert/Disco/Config/BeanConfigurationSubclass.php
@@ -12,8 +12,8 @@
 
 namespace bitExpert\Disco\Config;
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\MasterService;
 
 #[Configuration]
diff --git a/tests/bitExpert/Disco/Config/BeanConfigurationTrait.php b/tests/bitExpert/Disco/Config/BeanConfigurationTrait.php
index aa6fde3..d3ae2c2 100644
--- a/tests/bitExpert/Disco/Config/BeanConfigurationTrait.php
+++ b/tests/bitExpert/Disco/Config/BeanConfigurationTrait.php
@@ -12,7 +12,7 @@
 
 namespace bitExpert\Disco\Config;
 
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Config\Traits\NonSingletonNonLazyRequestBean;
 
 #[Configuration]
diff --git a/tests/bitExpert/Disco/Config/BeanConfigurationWithAliases.php b/tests/bitExpert/Disco/Config/BeanConfigurationWithAliases.php
index 1897635..79cb4e5 100644
--- a/tests/bitExpert/Disco/Config/BeanConfigurationWithAliases.php
+++ b/tests/bitExpert/Disco/Config/BeanConfigurationWithAliases.php
@@ -12,10 +12,10 @@
 
 namespace bitExpert\Disco\Config;
 
-use bitExpert\Disco\Attributes\Alias;
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
-use bitExpert\Disco\Attributes\ReturnTypeAlias;
+use bitExpert\Disco\Annotations\Alias;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
+use bitExpert\Disco\Annotations\TypeAlias;
 use bitExpert\Disco\Helper\SampleService;
 use bitExpert\Disco\Helper\SampleServiceInterface;
 
@@ -27,14 +27,14 @@ class BeanConfigurationWithAliases
     #[Alias(name: 'my::Custom::Namespace')]
     #[Alias(name: 'Alias_With_Underscore')]
     #[Alias(name: '123456')]
-    #[ReturnTypeAlias]
+    #[TypeAlias]
     public function sampleServiceWithAliases(): SampleService
     {
         return new SampleService();
     }
 
     #[Bean]
-    #[ReturnTypeAlias]
+    #[TypeAlias]
     public function sampleServiceWithInterfaceReturnTypeAlias(): SampleServiceInterface
     {
         return new SampleService();
diff --git a/tests/bitExpert/Disco/Config/BeanConfigurationWithConflictingAliases.php b/tests/bitExpert/Disco/Config/BeanConfigurationWithConflictingAliases.php
index e66ce31..a344a9e 100644
--- a/tests/bitExpert/Disco/Config/BeanConfigurationWithConflictingAliases.php
+++ b/tests/bitExpert/Disco/Config/BeanConfigurationWithConflictingAliases.php
@@ -12,9 +12,9 @@
 
 namespace bitExpert\Disco\Config;
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
-use bitExpert\Disco\Attributes\ReturnTypeAlias;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
+use bitExpert\Disco\Annotations\TypeAlias;
 use bitExpert\Disco\Helper\SampleService;
 use bitExpert\Disco\Helper\SampleServiceInterface;
 
@@ -22,14 +22,14 @@
 class BeanConfigurationWithConflictingAliases
 {
     #[Bean]
-    #[ReturnTypeAlias]
+    #[TypeAlias]
     public function sampleService1(): SampleServiceInterface
     {
         return new SampleService();
     }
 
     #[Bean]
-    #[ReturnTypeAlias]
+    #[TypeAlias]
     public function sampleService2(): SampleServiceInterface
     {
         return new SampleService();
diff --git a/tests/bitExpert/Disco/Config/BeanConfigurationWithConflictingAliasesInParentClass.php b/tests/bitExpert/Disco/Config/BeanConfigurationWithConflictingAliasesInParentClass.php
index e65952c..194e971 100644
--- a/tests/bitExpert/Disco/Config/BeanConfigurationWithConflictingAliasesInParentClass.php
+++ b/tests/bitExpert/Disco/Config/BeanConfigurationWithConflictingAliasesInParentClass.php
@@ -12,9 +12,9 @@
 
 namespace bitExpert\Disco\Config;
 
-use bitExpert\Disco\Attributes\Alias;
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Alias;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 use bitExpert\Disco\Helper\SampleServiceInterface;
 
@@ -22,7 +22,7 @@
 class BeanConfigurationWithConflictingAliasesInParentClass extends BeanConfigurationWithConflictingAliases
 {
     #[Bean]
-    #[Alias(name: 'SampleService3Alias')]
+    #[NameAlias(name: 'SampleService3Alias')]
     public function sampleService3(): SampleServiceInterface
     {
         return new SampleService();
diff --git a/tests/bitExpert/Disco/Config/BeanConfigurationWithParameterizedPostProcessor.php b/tests/bitExpert/Disco/Config/BeanConfigurationWithParameterizedPostProcessor.php
index f42053b..ea660b0 100644
--- a/tests/bitExpert/Disco/Config/BeanConfigurationWithParameterizedPostProcessor.php
+++ b/tests/bitExpert/Disco/Config/BeanConfigurationWithParameterizedPostProcessor.php
@@ -12,10 +12,10 @@
 
 namespace bitExpert\Disco\Config;
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\BeanPostProcessor;
-use bitExpert\Disco\Attributes\Configuration;
-use bitExpert\Disco\Attributes\Parameter;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\BeanPostProcessor;
+use bitExpert\Disco\Annotations\Configuration;
+use bitExpert\Disco\Annotations\Parameter;
 use bitExpert\Disco\Helper\ParameterizedSampleServiceBeanPostProcessor;
 use bitExpert\Disco\Helper\SampleService;
 
diff --git a/tests/bitExpert/Disco/Config/BeanConfigurationWithParameters.php b/tests/bitExpert/Disco/Config/BeanConfigurationWithParameters.php
index 3b7c697..74478db 100644
--- a/tests/bitExpert/Disco/Config/BeanConfigurationWithParameters.php
+++ b/tests/bitExpert/Disco/Config/BeanConfigurationWithParameters.php
@@ -12,9 +12,9 @@
 
 namespace bitExpert\Disco\Config;
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
-use bitExpert\Disco\Attributes\Parameter;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
+use bitExpert\Disco\Annotations\Parameter;
 use bitExpert\Disco\Helper\SampleService;
 
 #[Configuration]
diff --git a/tests/bitExpert/Disco/Config/BeanConfigurationWithPostProcessor.php b/tests/bitExpert/Disco/Config/BeanConfigurationWithPostProcessor.php
index 58bcd92..3bb8a9b 100644
--- a/tests/bitExpert/Disco/Config/BeanConfigurationWithPostProcessor.php
+++ b/tests/bitExpert/Disco/Config/BeanConfigurationWithPostProcessor.php
@@ -12,9 +12,9 @@
 
 namespace bitExpert\Disco\Config;
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\BeanPostProcessor;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\BeanPostProcessor;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 use bitExpert\Disco\Helper\SampleServiceBeanPostProcessor;
 
diff --git a/tests/bitExpert/Disco/Config/BeanConfigurationWithPostProcessorAndParameterizedDependency.php b/tests/bitExpert/Disco/Config/BeanConfigurationWithPostProcessorAndParameterizedDependency.php
index 3f75596..eda3687 100644
--- a/tests/bitExpert/Disco/Config/BeanConfigurationWithPostProcessorAndParameterizedDependency.php
+++ b/tests/bitExpert/Disco/Config/BeanConfigurationWithPostProcessorAndParameterizedDependency.php
@@ -12,10 +12,10 @@
 
 namespace bitExpert\Disco\Config;
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\BeanPostProcessor;
-use bitExpert\Disco\Attributes\Configuration;
-use bitExpert\Disco\Attributes\Parameter;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\BeanPostProcessor;
+use bitExpert\Disco\Annotations\Configuration;
+use bitExpert\Disco\Annotations\Parameter;
 use bitExpert\Disco\Helper\ParameterizedSampleServiceBeanPostProcessor;
 use bitExpert\Disco\Helper\SampleService;
 
diff --git a/tests/bitExpert/Disco/Config/BeanConfigurationWithPrimitives.php b/tests/bitExpert/Disco/Config/BeanConfigurationWithPrimitives.php
index 59c3ee5..63cc0e3 100644
--- a/tests/bitExpert/Disco/Config/BeanConfigurationWithPrimitives.php
+++ b/tests/bitExpert/Disco/Config/BeanConfigurationWithPrimitives.php
@@ -12,8 +12,8 @@
 
 namespace bitExpert\Disco\Config;
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 
 #[Configuration]
diff --git a/tests/bitExpert/Disco/Config/BeanConfigurationWithProtectedMethod.php b/tests/bitExpert/Disco/Config/BeanConfigurationWithProtectedMethod.php
index c157052..c21194d 100644
--- a/tests/bitExpert/Disco/Config/BeanConfigurationWithProtectedMethod.php
+++ b/tests/bitExpert/Disco/Config/BeanConfigurationWithProtectedMethod.php
@@ -12,8 +12,8 @@
 
 namespace bitExpert\Disco\Config;
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\MasterService;
 use bitExpert\Disco\Helper\SampleService;
 
diff --git a/tests/bitExpert/Disco/Config/ExtendedBeanConfigurationOverwritingParentAlias.php b/tests/bitExpert/Disco/Config/ExtendedBeanConfigurationOverwritingParentAlias.php
index 5d0bc1f..6cc6dae 100644
--- a/tests/bitExpert/Disco/Config/ExtendedBeanConfigurationOverwritingParentAlias.php
+++ b/tests/bitExpert/Disco/Config/ExtendedBeanConfigurationOverwritingParentAlias.php
@@ -12,9 +12,9 @@
 
 namespace bitExpert\Disco\Config;
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
-use bitExpert\Disco\Attributes\ReturnTypeAlias;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
+use bitExpert\Disco\Annotations\TypeAlias;
 use bitExpert\Disco\Helper\SampleService;
 use bitExpert\Disco\Helper\SampleServiceInterface;
 
@@ -22,7 +22,7 @@
 class ExtendedBeanConfigurationOverwritingParentAlias extends BeanConfigurationWithAliases
 {
     #[Bean]
-    #[ReturnTypeAlias]
+    #[TypeAlias]
     public function extendedSampleServiceWithInterfaceReturnTypeAlias(): SampleServiceInterface
     {
         return new SampleService();
diff --git a/tests/bitExpert/Disco/Config/InterfaceConfiguration.php b/tests/bitExpert/Disco/Config/InterfaceConfiguration.php
index 46b6282..a9daff4 100644
--- a/tests/bitExpert/Disco/Config/InterfaceConfiguration.php
+++ b/tests/bitExpert/Disco/Config/InterfaceConfiguration.php
@@ -12,7 +12,7 @@
 
 namespace bitExpert\Disco\Config;
 
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Configuration;
 
 #[Configuration]
 interface InterfaceConfiguration
diff --git a/tests/bitExpert/Disco/Config/MissingBeanAnnotationConfiguration.php b/tests/bitExpert/Disco/Config/MissingBeanAnnotationConfiguration.php
index 66fbc45..354236b 100644
--- a/tests/bitExpert/Disco/Config/MissingBeanAnnotationConfiguration.php
+++ b/tests/bitExpert/Disco/Config/MissingBeanAnnotationConfiguration.php
@@ -12,7 +12,7 @@
 
 namespace bitExpert\Disco\Config;
 
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 
 #[Configuration]
diff --git a/tests/bitExpert/Disco/Config/MissingReturnTypeConfiguration.php b/tests/bitExpert/Disco/Config/MissingReturnTypeConfiguration.php
index 6f9ab04..4638966 100644
--- a/tests/bitExpert/Disco/Config/MissingReturnTypeConfiguration.php
+++ b/tests/bitExpert/Disco/Config/MissingReturnTypeConfiguration.php
@@ -12,8 +12,8 @@
 
 namespace bitExpert\Disco\Config;
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 
 #[Configuration]
diff --git a/tests/bitExpert/Disco/Config/NonExistentReturnTypeConfiguration.php b/tests/bitExpert/Disco/Config/NonExistentReturnTypeConfiguration.php
index 4ed0891..367207e 100644
--- a/tests/bitExpert/Disco/Config/NonExistentReturnTypeConfiguration.php
+++ b/tests/bitExpert/Disco/Config/NonExistentReturnTypeConfiguration.php
@@ -12,8 +12,8 @@
 
 namespace bitExpert\Disco\Config;
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\SampleService;
 
 #[Configuration]
diff --git a/tests/bitExpert/Disco/Config/Traits/NonSingletonNonLazyRequestBean.php b/tests/bitExpert/Disco/Config/Traits/NonSingletonNonLazyRequestBean.php
index 521036d..c4c613b 100644
--- a/tests/bitExpert/Disco/Config/Traits/NonSingletonNonLazyRequestBean.php
+++ b/tests/bitExpert/Disco/Config/Traits/NonSingletonNonLazyRequestBean.php
@@ -12,7 +12,7 @@
 
 namespace bitExpert\Disco\Config\Traits;
 
-use bitExpert\Disco\Attributes\Bean;
+use bitExpert\Disco\Annotations\Bean;
 use bitExpert\Disco\Helper\SampleService;
 
 trait NonSingletonNonLazyRequestBean
diff --git a/tests/bitExpert/Disco/Config/WrongReturnTypeConfiguration.php b/tests/bitExpert/Disco/Config/WrongReturnTypeConfiguration.php
index 5e90562..8476d07 100644
--- a/tests/bitExpert/Disco/Config/WrongReturnTypeConfiguration.php
+++ b/tests/bitExpert/Disco/Config/WrongReturnTypeConfiguration.php
@@ -12,8 +12,8 @@
 
 namespace bitExpert\Disco\Config;
 
-use bitExpert\Disco\Attributes\Bean;
-use bitExpert\Disco\Attributes\Configuration;
+use bitExpert\Disco\Annotations\Bean;
+use bitExpert\Disco\Annotations\Configuration;
 use bitExpert\Disco\Helper\MasterService;
 use bitExpert\Disco\Helper\SampleService;