diff --git a/module/VuFind/Module.php b/module/VuFind/Module.php
index 97f335a89ca0e11702dd740d4392a73a1266ae51..32e9bad7a5b381254b698e97f99743d259e696ca 100644
--- a/module/VuFind/Module.php
+++ b/module/VuFind/Module.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ZF2 module definition for the VuFind application
+ * Code module for the core of the VuFind application
  *
  * PHP version 7
  *
@@ -30,7 +30,7 @@ namespace VuFind;
 use Zend\Mvc\MvcEvent;
 
 /**
- * ZF2 module definition for the VuFind application
+ * Code module for the core of the VuFind application
  *
  * @category VuFind
  * @package  Module
diff --git a/module/VuFind/src/VuFind/Controller/Plugin/AbstractRequestBase.php b/module/VuFind/src/VuFind/Controller/Plugin/AbstractRequestBase.php
index 665f4d20c3df9eda106d3c8b88c500bb90575a0f..2dcc349d6d43fb0151ab1177f56debdac9f894c1 100644
--- a/module/VuFind/src/VuFind/Controller/Plugin/AbstractRequestBase.php
+++ b/module/VuFind/src/VuFind/Controller/Plugin/AbstractRequestBase.php
@@ -114,7 +114,8 @@ abstract class AbstractRequestBase extends AbstractPlugin
     public function rememberValidId($id)
     {
         // The session container doesn't allow modification of entries (as of
-        // ZF2beta5 anyway), so we have to do this in a roundabout way.
+        // 2012, anyway), so we have to do this in a roundabout way.
+        // TODO: investigate whether this limitation has been lifted.
         $existingArray = $this->getSession()->validIds;
         $existingArray[] = $id;
         $this->getSession()->validIds = $existingArray;
diff --git a/module/VuFind/src/VuFind/Log/Logger.php b/module/VuFind/src/VuFind/Log/Logger.php
index 1ce144ba9d3253e0d700e5cdcbc7daea0ac3b7b7..3eb1c967bf3a0982aacff84626aa1d11b08eb455 100644
--- a/module/VuFind/src/VuFind/Log/Logger.php
+++ b/module/VuFind/src/VuFind/Log/Logger.php
@@ -114,7 +114,7 @@ class Logger extends BaseLogger
     }
 
     /**
-     * Log an exception triggered by ZF2 for administrative purposes.
+     * Log an exception triggered by the framework for administrative purposes.
      *
      * @param \Exception              $error  Exception to log
      * @param \Zend\Stdlib\Parameters $server Server metadata
diff --git a/module/VuFindConsole/Module.php b/module/VuFindConsole/Module.php
index 8a509e31dea80326a825dc5f3dc88da1bece8315..955619d36a10ff0a3bf565884e765a041fde10d9 100644
--- a/module/VuFindConsole/Module.php
+++ b/module/VuFindConsole/Module.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ZF2 module definition for the VuFind console module
+ * Code module for VuFind's console functionality
  *
  * PHP version 7
  *
@@ -30,7 +30,7 @@ namespace VuFindConsole;
 use Zend\Console\Adapter\AdapterInterface as Console;
 
 /**
- * ZF2 module definition for the VuFind console module
+ * Code module for VuFind's console functionality
  *
  * @category VuFind
  * @package  Module
diff --git a/module/VuFindLocalTemplate/Module.php b/module/VuFindLocalTemplate/Module.php
index b28d9363f32fdf9d079abae759abb05f0c48d7e7..e9796e405dd677b8a784e6b13ead80ea55d39e45 100644
--- a/module/VuFindLocalTemplate/Module.php
+++ b/module/VuFindLocalTemplate/Module.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Template for ZF2 module for storing local overrides.
+ * Template for code module for storing local overrides.
  *
  * PHP version 7
  *
@@ -31,7 +31,7 @@ use Zend\ModuleManager\ModuleManager;
 use Zend\Mvc\MvcEvent;
 
 /**
- * Template for ZF2 module for storing local overrides.
+ * Template for code module for storing local overrides.
  *
  * @category VuFind
  * @package  Module
diff --git a/module/VuFindSearch/Module.php b/module/VuFindSearch/Module.php
index 9810779d622ebebfaaa0ab32a3e673b7f7608058..7b0278dd2ad7a3a099066b8804729cf7981bab1f 100644
--- a/module/VuFindSearch/Module.php
+++ b/module/VuFindSearch/Module.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ZF2 module definition for the VF2 search service.
+ * Code module containing the VuFind search service.
  *
  * PHP version 7
  *
@@ -29,7 +29,7 @@
 namespace VuFindSearch;
 
 /**
- * ZF2 module definition for the VF2 search service.
+ * Code module containing the VuFind search service.
  *
  * PHP version 7
  *
diff --git a/module/VuFindTheme/src/VuFindTheme/InjectTemplateListener.php b/module/VuFindTheme/src/VuFindTheme/InjectTemplateListener.php
index afce4b21732e62351c63048de156f43a111f4f8f..247331164510a5c75730f926dda6837143af139d 100644
--- a/module/VuFindTheme/src/VuFindTheme/InjectTemplateListener.php
+++ b/module/VuFindTheme/src/VuFindTheme/InjectTemplateListener.php
@@ -28,7 +28,7 @@
 namespace VuFindTheme;
 
 /**
- * VuFind "Inject Template" Listener -- this extends the core ZF2 class to adjust
+ * VuFind "Inject Template" Listener -- this extends the core MVC class to adjust
  * default template configurations to something more appropriate for VuFind.
  *
  * @category VuFind