diff --git a/module/VuFind/src/VuFind/Db/Row/UserList.php b/module/VuFind/src/VuFind/Db/Row/UserList.php
index f5cd5ef6f5c62ab538344f6d2ee77b52137e9f6b..319e931e970117752d7e2ef9ddb07952d43fc4fb 100644
--- a/module/VuFind/src/VuFind/Db/Row/UserList.php
+++ b/module/VuFind/src/VuFind/Db/Row/UserList.php
@@ -88,9 +88,8 @@ class UserList extends RowGateway
      * Update and save the list object using a request object -- useful for
      * sharing form processing between multiple actions.
      *
-     * @param \VuFind\Db\Row\User|bool         $user    Logged-in user (false if
-     * none)
-     * @param Zend_Controller_Request_Abstract $request Request to process
+     * @param \VuFind\Db\Row\User|bool $user    Logged-in user (false if none)
+     * @param \Zend\Stdlib\Parameters  $request Request to process
      *
      * @return int ID of newly created row
      * @throws ListPermissionException
diff --git a/module/VuFind/src/VuFind/Db/Table/Resource.php b/module/VuFind/src/VuFind/Db/Table/Resource.php
index 85aae3e19c0e951c21c7380c951c609cbf91017c..6f12ae015a0e7b0a8660092be9e3cebf4344d298 100644
--- a/module/VuFind/src/VuFind/Db/Table/Resource.php
+++ b/module/VuFind/src/VuFind/Db/Table/Resource.php
@@ -195,10 +195,10 @@ class Resource extends Gateway
     /**
      * Apply a sort parameter to a query on the resource table.
      *
-     * @param Zend_Db_Select $query Query to modify
-     * @param string         $sort  Field to use for sorting (may include 'desc'
+     * @param \Zend\Db\Sql\Select $query Query to modify
+     * @param string              $sort  Field to use for sorting (may include 'desc'
      * qualifier)
-     * @param string         $alias Alias to the resource table (defaults to
+     * @param string              $alias Alias to the resource table (defaults to
      * 'resource')
      *
      * @return void
diff --git a/module/VuFind/src/VuFind/Session/AbstractBase.php b/module/VuFind/src/VuFind/Session/AbstractBase.php
index c8b067ca1290506dadaab3870cf4db07d04a7e91..15c52e4ba06638f605c732697c1ba0595f571310 100644
--- a/module/VuFind/src/VuFind/Session/AbstractBase.php
+++ b/module/VuFind/src/VuFind/Session/AbstractBase.php
@@ -45,7 +45,7 @@ abstract class AbstractBase implements SaveHandlerInterface
     /**
      * Constructor.
      *
-     * @param Zend_Config $config Session configuration ([Session] section of
+     * @param \Zend\Config\Config $config Session configuration ([Session] section of
      * config.ini)
      */
     public function __construct($config)
diff --git a/module/VuFind/src/VuFind/Session/Database.php b/module/VuFind/src/VuFind/Session/Database.php
index 878caf3f66d5be1464b8cadc53bc8ae6c0d5f8ca..c1ee7abd8c9747b0cc9cda045b8176970e7359d1 100644
--- a/module/VuFind/src/VuFind/Session/Database.php
+++ b/module/VuFind/src/VuFind/Session/Database.php
@@ -45,7 +45,7 @@ class Database extends AbstractBase
     /**
      * Constructor.
      *
-     * @param Zend_Config $config Session configuration ([Session] section of
+     * @param \Zend\Config\Config $config Session configuration ([Session] section of
      * config.ini)
      */
     public function __construct($config)
diff --git a/module/VuFind/src/VuFind/Session/File.php b/module/VuFind/src/VuFind/Session/File.php
index e77ed87d7a2b4a214173f71ea2779fe0778f11c2..86c708999c939ec92dd76d5569531afac2e835d2 100644
--- a/module/VuFind/src/VuFind/Session/File.php
+++ b/module/VuFind/src/VuFind/Session/File.php
@@ -43,7 +43,7 @@ class File extends AbstractBase
     /**
      * Constructor.
      *
-     * @param Zend_Config $config Session configuration ([Session] section of
+     * @param \Zend\Config\Config $config Session configuration ([Session] section of
      * config.ini)
      */
     public function __construct($config)
diff --git a/module/VuFind/src/VuFind/Session/Memcache.php b/module/VuFind/src/VuFind/Session/Memcache.php
index 1dde46732705c4cd0cfba16f533745684b1a0191..5783c1cfb99b1cb037f825ebc82c063b7aeb8f74 100644
--- a/module/VuFind/src/VuFind/Session/Memcache.php
+++ b/module/VuFind/src/VuFind/Session/Memcache.php
@@ -46,7 +46,7 @@ class Memcache extends AbstractBase
     /**
      * Constructor.
      *
-     * @param Zend_Config $config Session configuration ([Session] section of
+     * @param \Zend\Config\Config $config Session configuration ([Session] section of
      * config.ini)
      */
     public function __construct($config)