diff --git a/module/VuFind/src/VuFind/Cache/Manager.php b/module/VuFind/src/VuFind/Cache/Manager.php
index 80dcde821661270083146da67ded7af77ac568bc..e455992190e7a185f759567ac8c7104bb93825ab 100644
--- a/module/VuFind/src/VuFind/Cache/Manager.php
+++ b/module/VuFind/src/VuFind/Cache/Manager.php
@@ -123,7 +123,7 @@ class Manager
      *
      * @param string      $name      Name of the requested cache.
      * @param string|null $namespace Optional namespace to use. Defaults to the
-     * value of {@see $name}.
+     * value of $name.
      *
      * @return StorageInterface
      * @throws \Exception
diff --git a/module/VuFind/src/VuFind/Session/SecureDelegator.php b/module/VuFind/src/VuFind/Session/SecureDelegator.php
index 8425c42fba18d1863bb3749005ac4755b173266b..6ae95a1efeb6c1441cc3f46ddff21b23a000bc76 100644
--- a/module/VuFind/src/VuFind/Session/SecureDelegator.php
+++ b/module/VuFind/src/VuFind/Session/SecureDelegator.php
@@ -69,8 +69,8 @@ class SecureDelegator
     /**
      * SecureDelegator constructor.
      *
-     * @param CookieManager    $cookieManager {@see $cookieHandler}
-     * @param HandlerInterface $handler       {@see $handler}
+     * @param CookieManager    $cookieManager VuFind cookie manager service.
+     * @param HandlerInterface $handler       The wrapped session handler.
      */
     public function __construct(
         CookieManager $cookieManager, HandlerInterface $handler
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Connector.php b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Connector.php
index 5b175d86f62b281922ba269c1e897aa145b03666..2075717d888456c2417a0ed60655cdcce98a5cc2 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Connector.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Connector.php
@@ -66,9 +66,9 @@ class Connector implements \Zend\Log\LoggerAwareInterface
     /**
      * Maximum length of a GET url.
      *
-     * Switches to POST if the SOLR target URL exeeds this length.
+     * Switches to POST if the SOLR target URL exceeds this length.
      *
-     * @see self::query()
+     * @see \VuFindSearch\Backend\Solr\Connector::query()
      *
      * @var int
      */
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/LuceneSyntaxHelper.php b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/LuceneSyntaxHelper.php
index 8b139cd908fa286a45e480a7c872cb74309ff3da..89dd7ef53b5e50a547b7358c6639f96e0cffc6e6 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/LuceneSyntaxHelper.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/LuceneSyntaxHelper.php
@@ -626,7 +626,7 @@ class LuceneSyntaxHelper
      *
      * @return string
      *
-     * @see self::capitalizeRanges
+     * @see \VuFindSearch\Backend\Solr\LuceneSyntaxHelper::capitalizeRanges()
      *
      * @todo Check possible problem with umlauts/non-ASCII word characters
      */
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/QueryBuilder.php b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/QueryBuilder.php
index cfaee9c6b32dd995672c799e51cd44bcba291e54..d846dd55fc2a7820a11260a4a5c510afa90e776a 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/QueryBuilder.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/QueryBuilder.php
@@ -332,7 +332,7 @@ class QueryBuilder implements QueryBuilderInterface
      *
      * @return string
      *
-     * @see self::reduceQueryGroup()
+     * @see \VuFindSearch\Backend\Solr\QueryBuilder::reduceQueryGroup()
      */
     protected function reduceQueryGroupComponents(AbstractQuery $component)
     {
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Response/Json/RecordCollection.php b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Response/Json/RecordCollection.php
index cd08495e0aa9833ba8348151545a9be8eb1be806..fbfbafac924872b3fad04fae25483f3886e76535 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Response/Json/RecordCollection.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Response/Json/RecordCollection.php
@@ -44,7 +44,7 @@ class RecordCollection extends AbstractRecordCollection
     /**
      * Template of deserialized SOLR response.
      *
-     * @see self::__construct()
+     * @see \VuFindSearch\Backend\Solr\Response\Json\RecordCollection::__construct()
      *
      * @var array
      */
diff --git a/module/VuFindSearch/src/VuFindSearch/Query/QueryGroup.php b/module/VuFindSearch/src/VuFindSearch/Query/QueryGroup.php
index d0d503f57831309d916840ebc982c0740416a457..0182d1b2f73a5fdc54bec48061029806542fcbbe 100644
--- a/module/VuFindSearch/src/VuFindSearch/Query/QueryGroup.php
+++ b/module/VuFindSearch/src/VuFindSearch/Query/QueryGroup.php
@@ -51,7 +51,7 @@ class QueryGroup extends AbstractQuery
     /**
      * Name of the handler to be used if the query group is reduced.
      *
-     * @see VuFindSearch\Backend\Solr\QueryBuilder::reduceQueryGroup()
+     * @see \VuFindSearch\Backend\Solr\QueryBuilder::reduceQueryGroup()
      *
      * @var string
      *