diff --git a/src/CredentialRepository.php b/src/CredentialRepository.php
index f6e01ce..a1bcd0c 100644
--- a/src/CredentialRepository.php
+++ b/src/CredentialRepository.php
@@ -189,7 +189,7 @@ public function toArray(): array
      * @param string $memberID
      * @return CredentialRepository
      */
-    public static function fromArray(array $credentials, string $memberID): self
+    public static function fromArray(array $credentials, string $memberID): CredentialRepository
     {
         $new = new static($memberID);
         $new->setCredentials($credentials);
diff --git a/src/RegisterHandler.php b/src/RegisterHandler.php
index 64f2f50..9c5b2d2 100644
--- a/src/RegisterHandler.php
+++ b/src/RegisterHandler.php
@@ -72,9 +72,9 @@ class RegisterHandler implements RegisterHandlerInterface
      * Sets the {@see $logger} member variable
      *
      * @param LoggerInterface|null $logger
-     * @return self
+     * @return RegisterHandler
      */
-    public function setLogger(?LoggerInterface $logger): self
+    public function setLogger(?LoggerInterface $logger): RegisterHandler
     {
         $this->logger = $logger;
         return $this;
diff --git a/src/VerifyHandler.php b/src/VerifyHandler.php
index 218750c..b420e06 100644
--- a/src/VerifyHandler.php
+++ b/src/VerifyHandler.php
@@ -47,9 +47,9 @@ class VerifyHandler implements VerifyHandlerInterface
      * Sets the {@see $logger} member variable
      *
      * @param LoggerInterface|null $logger
-     * @return self
+     * @return VerifyHandler
      */
-    public function setLogger(?LoggerInterface $logger): self
+    public function setLogger(?LoggerInterface $logger): VerifyHandler
     {
         $this->logger = $logger;
         return $this;