diff --git a/module/VuFind/src/VuFind/Recommend/RecommendInterface.php b/module/VuFind/src/VuFind/Recommend/RecommendInterface.php
index cb0e9a9287049a3265985dc4854a752d2974f11d..034c6141ed02750f9d743b11f266cbf886e858cb 100644
--- a/module/VuFind/src/VuFind/Recommend/RecommendInterface.php
+++ b/module/VuFind/src/VuFind/Recommend/RecommendInterface.php
@@ -35,7 +35,7 @@ namespace VuFind\Recommend;
  *
  * Note that every class implementing this interface needs to be accompanied by
  * a template file in the Recommend subdirectory of every theme's template
- * directory.  For example, VF_Recommend_SideFacets needs a corresponding
+ * directory.  For example, \VuFind\Recommend\SideFacets needs a corresponding
  * Recommend/SideFacets.phtml template.  The template will be rendered as a
  * partial with two available variables: recommend (the recommendation object)
  * and results (the search results object).
diff --git a/module/VuFind/src/VuFind/Related/RelatedInterface.php b/module/VuFind/src/VuFind/Related/RelatedInterface.php
index a3c60eb82a67542fcbc65a04fdcdc3b792658f67..95a586b9a76d4ab73df2d456b52ef4fbd7834a31 100644
--- a/module/VuFind/src/VuFind/Related/RelatedInterface.php
+++ b/module/VuFind/src/VuFind/Related/RelatedInterface.php
@@ -35,7 +35,7 @@ namespace VuFind\Related;
  *
  * Note that every class implementing this interface needs to be accompanied by
  * a template file in the Related subdirectory of every theme's template
- * directory.  For example, VF_Related_Similar needs a corresponding
+ * directory.  For example, \VuFind\Related\Similar needs a corresponding
  * Related/Similar.phtml template.  The template will be rendered as a
  * partial with two available variables: related (the related records object)
  * and driver (the record driver representing the source record).
diff --git a/module/VuFind/src/VuFind/Search/Base/Params.php b/module/VuFind/src/VuFind/Search/Base/Params.php
index 795e1103dc369968733859834d0a1d23771e3adc..f142fe0773f239e4b70d827cd968027ba8f6d10e 100644
--- a/module/VuFind/src/VuFind/Search/Base/Params.php
+++ b/module/VuFind/src/VuFind/Search/Base/Params.php
@@ -1365,7 +1365,7 @@ class Params
     /**
      * Restore settings from a minified object found in the database.
      *
-     * @param VF_MS $minified Minified Search Object
+     * @param \VuFind\Search\Minified $minified Minified Search Object
      *
      * @return void
      */
diff --git a/module/VuFind/src/VuFind/Search/Base/Results.php b/module/VuFind/src/VuFind/Search/Base/Results.php
index e176368d40032a791a1a9e7269347e4198b50b47..237872ef6a95164967b1450fcca617d5b1b232dc 100644
--- a/module/VuFind/src/VuFind/Search/Base/Results.php
+++ b/module/VuFind/src/VuFind/Search/Base/Results.php
@@ -176,7 +176,7 @@ abstract class Results
                 $retVal[] = static::getRecord($id);
             } catch (\Exception $e) {
                 // Just omit missing records from the return array; calling code
-                // in the VF_Record::loadBatch() method will deal with this.
+                // in the \VuFind\Record::loadBatch() method will deal with this.
             }
         }
         return $retVal;
@@ -468,7 +468,7 @@ abstract class Results
     /**
      * Restore settings from a minified object found in the database.
      *
-     * @param VF_MS $minified Minified Search Object
+     * @param \VuFind\Search\Minified $minified Minified Search Object
      *
      * @return void
      */
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Related.php b/module/VuFind/src/VuFind/Theme/Root/Helper/Related.php
index 4feb1a2441c6cc4af2d58f36289edcd3fb6e572a..8758eca8d34128e68b4466ac6bfad17df556cb61 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/Related.php
+++ b/module/VuFind/src/VuFind/Theme/Root/Helper/Related.php
@@ -42,7 +42,8 @@ class Related extends AbstractHelper
     /**
      * Render the output of a related records module.
      *
-     * @param VF_Related_Interface $related The related records object to render
+     * @param \VuFind\Related\RelatedInterface $related The related records object to
+     * render
      *
      * @return string
      */