diff --git a/src/DataTransferObject.php b/src/DataTransferObject.php
index bc8a5b4..52bf326 100755
--- a/src/DataTransferObject.php
+++ b/src/DataTransferObject.php
@@ -94,7 +94,7 @@ protected static function getCasts(): array
      * Get a property reference for code completion / refactoring on property names
      * References will return their string name
      *
-     * @return PropertyReference<static>|static Magic mixin for property name code completion / refactoring
+     * @return PropertyReference|static Magic mixin for property name code completion / refactoring
      */
     public static function ref(): PropertyReference
     {
@@ -105,7 +105,7 @@ public static function ref(): PropertyReference
      * Get a reference for defined properties
      * References will return bool isDefined
      *
-     * @return IsDefinedReference<static>|static Magic mixin for property name code completion / refactoring
+     * @return IsDefinedReference|static Magic mixin for property name code completion / refactoring
      */
     public function refIsDefined(): IsDefinedReference
     {
@@ -124,7 +124,7 @@ public function refIsDefined(): IsDefinedReference
      *  - throw if types are invalid
      *  - adapt exceptions thrown from nested properties to show full path
      *
-     * @param array|callable(PropertyReference<static>|static $ref): array $parameters
+     * @param array|callable(static $ref): array $parameters
      * @param int $flags
      *
      * @return static
@@ -263,7 +263,7 @@ public static function makeFromJson(
     }
 
     /**
-     * @param array|callable(PropertyReference<static>|static $ref): array $override
+     * @param array|callable(static $ref): array $override
      * @param null|int $flags Use current instance flags on null, else use provided flags
      *
      * @return static
@@ -279,8 +279,8 @@ public function remake($override, $flags = null): self
     }
 
     /**
-     * @param array|callable(PropertyReference<static>|static $ref): array $onlyPropertyNames
-     * @param array|callable(PropertyReference<static>|static $ref): array $override
+     * @param array|callable(static $ref): array $onlyPropertyNames
+     * @param array|callable(static $ref): array $override
      * @param null|int $flags Use current instance flags on null, else use provided flags
      *
      * @return static
@@ -307,8 +307,8 @@ public function remakeOnly(
     }
 
     /**
-     * @param array|callable(PropertyReference<static>|static $ref): array $exceptPropertyNames
-     * @param array|callable(PropertyReference<static>|static $ref): array $override
+     * @param array|callable(static $ref): array $exceptPropertyNames
+     * @param array|callable(static $ref): array $override
      * @param null|int $flags Use current instance flags on null, else use provided flags
      *
      * @return static
@@ -762,7 +762,7 @@ public function getUnknownProperties(): array
     /**
      * If $parameters is a callable, resolve it to an array
      * 
-     * @param array|callable(PropertyReference<static>|static $ref): array $parameters
+     * @param array|callable(static $ref): array $parameters
      * @return array
      */
     private static function resolveIfCallable($parameters): array