diff --git a/module/VuFind/src/VuFind/AjaxHandler/GetRecordDetails.php b/module/VuFind/src/VuFind/AjaxHandler/GetRecordDetails.php
index 0f0db6dcf59ae4e955559b7be7ff37085eb33b86..68ff8ac64141261bb903124eff4331e1df484d2b 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/GetRecordDetails.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/GetRecordDetails.php
@@ -28,7 +28,7 @@
 namespace VuFind\AjaxHandler;
 
 use VuFind\Record\Loader;
-use VuFind\RecordTab\PluginManager;
+use VuFind\RecordTab\PluginManager as TabManager;
 use Zend\Http\PhpEnvironment\Request;
 use Zend\Mvc\Controller\Plugin\Params;
 use Zend\View\Renderer\RendererInterface;
@@ -70,7 +70,7 @@ class GetRecordDetails extends AbstractBase
     /**
      * Record tab plugin manager
      *
-     * @var PluginManager
+     * @var TabManager
      */
     protected $pluginManager;
 
@@ -87,11 +87,11 @@ class GetRecordDetails extends AbstractBase
      * @param array             $config   ZF configuration
      * @param Request           $request  HTTP request
      * @param Loader            $loader   Record loader
-     * @param PluginManager     $pm       RecordTab plugin manager
+     * @param TabManager        $pm       RecordTab plugin manager
      * @param RendererInterface $renderer Renderer
      */
     public function __construct(array $config, Request $request, Loader $loader,
-        PluginManager $pm, RendererInterface $renderer
+        TabManager $pm, RendererInterface $renderer
     ) {
         $this->config = $config;
         $this->request = $request;
diff --git a/module/VuFind/src/VuFind/AjaxHandler/GetResolverLinks.php b/module/VuFind/src/VuFind/AjaxHandler/GetResolverLinks.php
index 9f4a60f23452fa673ba88121329949e9c4ce3981..7ccb410d40fd5d8482c1763eadb1c6240083fa39 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/GetResolverLinks.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/GetResolverLinks.php
@@ -30,7 +30,7 @@ namespace VuFind\AjaxHandler;
 
 use VuFind\I18n\Translator\TranslatorAwareInterface;
 use VuFind\Resolver\Connection;
-use VuFind\Resolver\Driver\PluginManager;
+use VuFind\Resolver\Driver\PluginManager as ResolverManager;
 use VuFind\Session\Settings as SessionSettings;
 use Zend\Config\Config;
 use Zend\Mvc\Controller\Plugin\Params;
@@ -56,7 +56,7 @@ class GetResolverLinks extends AbstractBase implements TranslatorAwareInterface
     /**
      * Resolver driver plugin manager
      *
-     * @var PluginManager
+     * @var ResolverManager
      */
     protected $pluginManager;
 
@@ -78,11 +78,11 @@ class GetResolverLinks extends AbstractBase implements TranslatorAwareInterface
      * Constructor
      *
      * @param SessionSettings   $ss       Session settings
-     * @param PluginManager     $pm       Resolver driver plugin manager
+     * @param ResolverManager   $pm       Resolver driver plugin manager
      * @param RendererInterface $renderer View renderer
      * @param Config            $config   Top-level VuFind configuration (config.ini)
      */
-    public function __construct(SessionSettings $ss, PluginManager $pm,
+    public function __construct(SessionSettings $ss, ResolverManager $pm,
         RendererInterface $renderer, Config $config
     ) {
         $this->sessionSettings = $ss;
diff --git a/module/VuFind/src/VuFind/AjaxHandler/Recommend.php b/module/VuFind/src/VuFind/AjaxHandler/Recommend.php
index e7d50b11e8218d8576c705c0808bca8a65a21aa8..b28ef776bcb341f2f193191b9201b0499b3e4d2b 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/Recommend.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/Recommend.php
@@ -27,7 +27,7 @@
  */
 namespace VuFind\AjaxHandler;
 
-use VuFind\Recommend\PluginManager;
+use VuFind\Recommend\PluginManager as RecommendManager;
 use VuFind\Search\Solr\Results;
 use VuFind\Session\Settings as SessionSettings;
 use Zend\Mvc\Controller\Plugin\Params;
@@ -48,7 +48,7 @@ class Recommend extends AbstractBase
     /**
      * Recommendation plugin manager
      *
-     * @var PluginManager
+     * @var RecommendManager
      */
     protected $pluginManager;
 
@@ -70,11 +70,11 @@ class Recommend extends AbstractBase
      * Constructor
      *
      * @param SessionSettings   $ss       Session settings
-     * @param PluginManager     $pm       Recommendation plugin manager
+     * @param RecommendManager  $pm       Recommendation plugin manager
      * @param Results           $results  Solr results object
      * @param RendererInterface $renderer View renderer
      */
-    public function __construct(SessionSettings $ss, PluginManager $pm,
+    public function __construct(SessionSettings $ss, RecommendManager $pm,
         Results $results, RendererInterface $renderer
     ) {
         $this->sessionSettings = $ss;
diff --git a/module/VuFind/src/VuFind/AjaxHandler/SystemStatus.php b/module/VuFind/src/VuFind/AjaxHandler/SystemStatus.php
index f8be40d76dca231eff86f1dd148d345245600ce9..53c7704a74e8b0c7bbff60281fd32aaf12c1eb41 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/SystemStatus.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/SystemStatus.php
@@ -28,7 +28,7 @@
 namespace VuFind\AjaxHandler;
 
 use VuFind\Db\Table\Session;
-use VuFind\Search\Results\PluginManager;
+use VuFind\Search\Results\PluginManager as ResultsManager;
 use Zend\Config\Config;
 use Zend\Mvc\Controller\Plugin\Params;
 use Zend\Session\SessionManager;
@@ -64,7 +64,7 @@ class SystemStatus extends AbstractBase
     /**
      * Results manager
      *
-     * @var PluginManager
+     * @var ResultsManager
      */
     protected $resultsManager;
 
@@ -79,11 +79,11 @@ class SystemStatus extends AbstractBase
      * Constructor
      *
      * @param SessionManager $sm     Session manager
-     * @param PluginManager  $rm     Results manager
+     * @param ResultsManager $rm     Results manager
      * @param Config         $config Top-level VuFind configuration (config.ini)
      * @param Session        $table  Session database table
      */
-    public function __construct(SessionManager $sm, PluginManager $rm,
+    public function __construct(SessionManager $sm, ResultsManager $rm,
         Config $config, Session $table
     ) {
         $this->sessionManager = $sm;