diff --git a/module/VuFind/src/VuFind/Auth/AbstractBase.php b/module/VuFind/src/VuFind/Auth/AbstractBase.php
index db3e74fad62bc7489f59a92704bd41aa7f29a044..a6ac35a238d501b47b98147462160fba08c69d97 100644
--- a/module/VuFind/src/VuFind/Auth/AbstractBase.php
+++ b/module/VuFind/src/VuFind/Auth/AbstractBase.php
@@ -62,7 +62,7 @@ abstract class AbstractBase
      * account credentials.
      *
      * @throws VF_Exception_Auth
-     * @return Zend_Db_Table_Row_Abstract Object representing logged-in user.
+     * @return \VuFind\Db\Row\User Object representing logged-in user.
      */
     abstract public function authenticate($request);
 
@@ -84,7 +84,7 @@ abstract class AbstractBase
      * new account details.
      *
      * @throws AuthException
-     * @return Zend_Db_Table_Row_Abstract New user row.
+     * @return \VuFind\Db\Row\User New user row.
      */
     public function create($request)
     {
diff --git a/module/VuFind/src/VuFind/Auth/Database.php b/module/VuFind/src/VuFind/Auth/Database.php
index 7d9a8e242aedf26018ca46740106aad1b5498a79..bcb964a06bf5b93bc31e6d6e9bf860c9ded326ba 100644
--- a/module/VuFind/src/VuFind/Auth/Database.php
+++ b/module/VuFind/src/VuFind/Auth/Database.php
@@ -53,7 +53,7 @@ class Database extends AbstractBase
      * account credentials.
      *
      * @throws AuthException
-     * @return Zend_Db_Table_Row_Abstract Object representing logged-in user.
+     * @return \VuFind\Db\Row\User Object representing logged-in user.
      */
     public function authenticate($request)
     {
@@ -82,7 +82,7 @@ class Database extends AbstractBase
      * new account details.
      *
      * @throws AuthException
-     * @return Zend_Db_Table_Row_Abstract New user row.
+     * @return \VuFind\Db\Row\User New user row.
      */
     public function create($request)
     {
diff --git a/module/VuFind/src/VuFind/Auth/ILS.php b/module/VuFind/src/VuFind/Auth/ILS.php
index 4930a4cdf58db70a687afdae6a753d9f34521dcb..506a893eaacda56b3321067b56deac1296222eca 100644
--- a/module/VuFind/src/VuFind/Auth/ILS.php
+++ b/module/VuFind/src/VuFind/Auth/ILS.php
@@ -49,7 +49,7 @@ class ILS extends AbstractBase
      * account credentials.
      *
      * @throws AuthException
-     * @return Zend_Db_Table_Row_Abstract Object representing logged-in user.
+     * @return \VuFind\Db\Row\User Object representing logged-in user.
      */
     public function authenticate($request)
     {
@@ -81,7 +81,7 @@ class ILS extends AbstractBase
      * @param array $info User details returned by ILS driver.
      *
      * @throws AuthException
-     * @return Zend_Db_Table_Row_Abstract Processed User object.
+     * @return \VuFind\Db\Row\User Processed User object.
      */
     protected function processILSUser($info)
     {
diff --git a/module/VuFind/src/VuFind/Auth/Manager.php b/module/VuFind/src/VuFind/Auth/Manager.php
index daf1831cc9b24b8062fdfc8e85a4a289e0c67728..471e05abec6c5f6eaab0910a61a1167c9d81c981 100644
--- a/module/VuFind/src/VuFind/Auth/Manager.php
+++ b/module/VuFind/src/VuFind/Auth/Manager.php
@@ -152,7 +152,7 @@ class Manager
     /**
      * Checks whether the user is logged in.
      *
-     * @return Zend_Db_Table_Row_Abstract|bool Object if user is logged in, false
+     * @return \VuFind\Db\Row\User|bool Object if user is logged in, false
      * otherwise.
      */
     public function isLoggedIn()
@@ -177,7 +177,7 @@ class Manager
     /**
      * Updates the user information in the session.
      *
-     * @param Zend_Db_Table_Row_Abstract $user User object to store in the session
+     * @param \VuFind\Db\Row\User $user User object to store in the session
      *
      * @return void
      */
@@ -193,7 +193,7 @@ class Manager
      * new account details.
      *
      * @throws AuthException
-     * @return Zend_Db_Table_Row_Abstract New user row.
+     * @return \VuFind\Db\Row\User New user row.
      */
     public function create($request)
     {
@@ -210,7 +210,7 @@ class Manager
      * account credentials.
      *
      * @throws AuthException
-     * @return Zend_Db_Table_Row_Abstract Object representing logged-in user.
+     * @return \VuFind\Db\Row\User Object representing logged-in user.
      */
     public function login($request)
     {
diff --git a/module/VuFind/src/VuFind/Auth/SIP2.php b/module/VuFind/src/VuFind/Auth/SIP2.php
index 172dbd7b74fb11beb997e7380a2188a96aca0b0a..9c9c2b1263cb6cd1d78869135f16dece3a3a6886 100644
--- a/module/VuFind/src/VuFind/Auth/SIP2.php
+++ b/module/VuFind/src/VuFind/Auth/SIP2.php
@@ -48,7 +48,7 @@ class SIP2 extends AbstractBase
      * account credentials.
      *
      * @throws AuthException
-     * @return Zend_Db_Table_Row_Abstract Object representing logged-in user.
+     * @return \VuFind\Db\Row\User Object representing logged-in user.
      */
     public function authenticate($request)
     {
@@ -123,7 +123,7 @@ class SIP2 extends AbstractBase
      * @param string $password The user's ILS password
      *
      * @throws AuthException
-     * @return Zend_Db_Table_Row_Abstract Processed User object.
+     * @return \VuFind\Db\Row\User Processed User object.
      */
     protected function processSIP2User($info, $username, $password)
     {