diff --git a/src/BusinessLogic/AdminAPI/AdminAPI.php b/src/BusinessLogic/AdminAPI/AdminAPI.php
index 17d5782..c0bdbd4 100644
--- a/src/BusinessLogic/AdminAPI/AdminAPI.php
+++ b/src/BusinessLogic/AdminAPI/AdminAPI.php
@@ -30,7 +30,7 @@ protected function __construct()
     /**
      * Gets an AdminAPI instance.
      *
-     * @return AdminAPI
+     * @return Aspects
      */
     public static function get(): object
     {
diff --git a/src/BusinessLogic/Bootstrap/Aspect/Aspects.php b/src/BusinessLogic/Bootstrap/Aspect/Aspects.php
index ab0dac5..09335c2 100644
--- a/src/BusinessLogic/Bootstrap/Aspect/Aspects.php
+++ b/src/BusinessLogic/Bootstrap/Aspect/Aspects.php
@@ -36,12 +36,12 @@ protected function __construct(Aspect $aspect)
         $this->aspect = $aspect;
     }
 
-    public static function run(Aspect $aspect): self
+    public static function run(Aspect $aspect): Aspects
     {
         return new static($aspect);
     }
 
-    public function andRun(Aspect $aspect): self
+    public function andRun(Aspect $aspect): Aspects
     {
         $this->aspect = new CompositeAspect($this->aspect);
         $this->aspect->append($aspect);
@@ -50,12 +50,11 @@ public function andRun(Aspect $aspect): self
     }
 
     /**
-     * @template T
-     * @param    T $subject
+     * @param object $subject
      *
-     * @return T
+     * @return Aspects
      */
-    public function beforeEachMethodOfInstance($subject)
+    public function beforeEachMethodOfInstance($subject): Aspects
     {
         $this->subject = $subject;
         $this->subjectClassName = null;
diff --git a/src/BusinessLogic/CheckoutAPI/CheckoutAPI.php b/src/BusinessLogic/CheckoutAPI/CheckoutAPI.php
index 30f97dc..22986b5 100644
--- a/src/BusinessLogic/CheckoutAPI/CheckoutAPI.php
+++ b/src/BusinessLogic/CheckoutAPI/CheckoutAPI.php
@@ -21,7 +21,7 @@ protected function __construct()
     /**
      * Gets an CheckoutAPI instance.
      *
-     * @return CheckoutAPI
+     * @return Aspects
      */
     public static function get(): object
     {