diff --git a/module/VuFind/src/VuFind/Auth/MultiAuth.php b/module/VuFind/src/VuFind/Auth/MultiAuth.php
index bfa4cc02e0ac45ebb48202a051d3396ea6ef9c73..9a043a65d92f539a2f4df02de9867d83ab9adefa 100644
--- a/module/VuFind/src/VuFind/Auth/MultiAuth.php
+++ b/module/VuFind/src/VuFind/Auth/MultiAuth.php
@@ -211,7 +211,7 @@ class MultiAuth extends AbstractBase implements ServiceLocatorAwareInterface
      *
      * @param ServiceLocatorInterface $serviceLocator Locator to register
      *
-     * @return Manager
+     * @return MultiAuth
      */
     public function setServiceLocator(ServiceLocatorInterface $serviceLocator)
     {
diff --git a/module/VuFind/src/VuFind/Autocomplete/Solr.php b/module/VuFind/src/VuFind/Autocomplete/Solr.php
index 026e3f3661c436a7c734e09fc3847afa7023ac17..1efe1406eb80c27b3d0360569a6a5f76892e1bc8 100644
--- a/module/VuFind/src/VuFind/Autocomplete/Solr.php
+++ b/module/VuFind/src/VuFind/Autocomplete/Solr.php
@@ -292,7 +292,7 @@ class Solr implements AutocompleteInterface, ServiceLocatorAwareInterface
      *
      * @param ServiceLocatorInterface $serviceLocator Locator to register
      *
-     * @return Manager
+     * @return Solr
      */
     public function setServiceLocator(ServiceLocatorInterface $serviceLocator)
     {
diff --git a/module/VuFind/src/VuFind/Recommend/AbstractSearchManagerAwareModule.php b/module/VuFind/src/VuFind/Recommend/AbstractSearchManagerAwareModule.php
index 76cb941a936a86071f616b335e1401a6fc1dc31d..f3fafcc478907be2693c3d132074c4fcdd53d533 100644
--- a/module/VuFind/src/VuFind/Recommend/AbstractSearchManagerAwareModule.php
+++ b/module/VuFind/src/VuFind/Recommend/AbstractSearchManagerAwareModule.php
@@ -50,7 +50,7 @@ abstract class AbstractSearchManagerAwareModule implements RecommendInterface,
      *
      * @param ServiceLocatorInterface $serviceLocator Locator to register
      *
-     * @return Manager
+     * @return AbstractSearchManagerAwareModule
      */
     public function setServiceLocator(ServiceLocatorInterface $serviceLocator)
     {
diff --git a/module/VuFind/src/VuFind/Statistics/AbstractBase.php b/module/VuFind/src/VuFind/Statistics/AbstractBase.php
index 9bdd41f5466b32141b3e94383e236f31f94369e4..feb0b525b315784c0b571e200a4e8197abd6d625 100644
--- a/module/VuFind/src/VuFind/Statistics/AbstractBase.php
+++ b/module/VuFind/src/VuFind/Statistics/AbstractBase.php
@@ -60,7 +60,7 @@ abstract class AbstractBase implements ServiceLocatorAwareInterface
      *
      * @param ServiceLocatorInterface $serviceLocator Locator to register
      *
-     * @return Manager
+     * @return AbstractBase
      */
     public function setServiceLocator(ServiceLocatorInterface $serviceLocator)
     {
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/AbstractServiceLocator.php b/module/VuFind/src/VuFind/Theme/Root/Helper/AbstractServiceLocator.php
index b651cd5657e05c66d8025b62dd5300bf67a6a02f..da81af015a405773cc829d57abfac1f72a3afc48 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/AbstractServiceLocator.php
+++ b/module/VuFind/src/VuFind/Theme/Root/Helper/AbstractServiceLocator.php
@@ -49,7 +49,7 @@ abstract class AbstractServiceLocator extends AbstractHelper
      *
      * @param ServiceLocatorInterface $serviceLocator Locator to register
      *
-     * @return Manager
+     * @return AbstractServiceLocator
      */
     public function setServiceLocator(ServiceLocatorInterface $serviceLocator)
     {