diff --git a/app/includes/messages.php b/app/includes/feedback-get.php
similarity index 100%
rename from app/includes/messages.php
rename to app/includes/feedback-get.php
diff --git a/app/includes/messages-show.php b/app/includes/feedback-show.php
similarity index 100%
rename from app/includes/messages-show.php
rename to app/includes/feedback-show.php
diff --git a/app/pages/agents.php b/app/pages/agents.php
index 6c84ad9..214a178 100644
--- a/app/pages/agents.php
+++ b/app/pages/agents.php
@@ -161,9 +161,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
          */
     }
 
-    // Get any new messages
-    include '../app/includes/messages.php';
-    include '../app/includes/messages-show.php';
+    // Get any new feedback messages
+    include '../app/includes/feedback-get.php';
+    include '../app/includes/feedback-show.php';
 
     // Load the template
     include '../app/templates/agents.php';
diff --git a/app/pages/components.php b/app/pages/components.php
index 8d15be9..2e3f5b5 100644
--- a/app/pages/components.php
+++ b/app/pages/components.php
@@ -100,9 +100,9 @@ if ($response['db'] === null) {
         array_push($filterMessage, 'Jitsi events for component ID&nbsp;"<strong>' . $_REQUEST['id'] . '</strong>"');
     }
 
-    // Get any new messages
-    include '../app/includes/messages.php';
-    include '../app/includes/messages-show.php';
+    // Get any new feedback messages
+    include '../app/includes/feedback-get.php';
+    include '../app/includes/feedback-show.php';
 
     // display the widget
     include '../app/templates/components.php';
diff --git a/app/pages/conferences.php b/app/pages/conferences.php
index 6998770..4011d91 100644
--- a/app/pages/conferences.php
+++ b/app/pages/conferences.php
@@ -159,9 +159,9 @@ if ($response['db'] === null) {
         array_push($filterMessage, 'Conferences with ID "<strong>' . $_REQUEST['id'] . '</strong>"');
     }
 
-    // Get any new messages
-    include '../app/includes/messages.php';
-    include '../app/includes/messages-show.php';
+    // Get any new feedback messages
+    include '../app/includes/feedback-get.php';
+    include '../app/includes/feedback-show.php';
 
     // display the widget
     include '../app/templates/conferences.php';
diff --git a/app/pages/config.php b/app/pages/config.php
index ed20a63..184fc80 100644
--- a/app/pages/config.php
+++ b/app/pages/config.php
@@ -6,9 +6,9 @@
  * This page handles the config file.
  */
 
-// Get any new messages
-include '../app/includes/messages.php';
-include '../app/includes/messages-show.php';
+// Get any new feedback messages
+include '../app/includes/feedback-get.php';
+include '../app/includes/feedback-show.php';
 
 require '../app/classes/config.php';
 
diff --git a/app/pages/dashboard.php b/app/pages/dashboard.php
index 25a7594..3e8138d 100644
--- a/app/pages/dashboard.php
+++ b/app/pages/dashboard.php
@@ -9,9 +9,9 @@
  * 3. The most recent 10 conferences.
  */
 
-// Get any new messages
-include '../app/includes/messages.php';
-include '../app/includes/messages-show.php';
+// Get any new feedback messages
+include '../app/includes/feedback-get.php';
+include '../app/includes/feedback-show.php';
 
 require '../app/classes/conference.php';
 require '../app/classes/participant.php';
diff --git a/app/pages/graphs.php b/app/pages/graphs.php
index cd2f264..5ef01c9 100644
--- a/app/pages/graphs.php
+++ b/app/pages/graphs.php
@@ -84,9 +84,9 @@ $widget['full'] = false;
 $widget['name'] = 'Graphs';
 $widget['title'] = 'Jitsi graphs';
 
-// Get any new messages
-include '../app/includes/messages.php';
-include '../app/includes/messages-show.php';
+// Get any new feedback messages
+include '../app/includes/feedback-get.php';
+include '../app/includes/feedback-show.php';
 
 // Load the template
 include '../app/templates/graphs.php';
diff --git a/app/pages/help.php b/app/pages/help.php
index 60c0556..adfaa1a 100644
--- a/app/pages/help.php
+++ b/app/pages/help.php
@@ -1,8 +1,8 @@
 <?php
 
-// Get any new messages
-include '../app/includes/messages.php';
-include '../app/includes/messages-show.php';
+// Get any new feedback messages
+include '../app/includes/feedback-get.php';
+include '../app/includes/feedback-show.php';
 
 include '../app/templates/help.php';
 
diff --git a/app/pages/latest.php b/app/pages/latest.php
index 3ddbf67..21893b0 100644
--- a/app/pages/latest.php
+++ b/app/pages/latest.php
@@ -99,9 +99,9 @@ foreach ($hosts as $host) {
     }
 }
 
-// Get any new messages
-include '../app/includes/messages.php';
-include '../app/includes/messages-show.php';
+// Get any new feedback messages
+include '../app/includes/feedback-get.php';
+include '../app/includes/feedback-show.php';
 
 // Load the template
 include '../app/templates/latest.php';
diff --git a/app/pages/livejs.php b/app/pages/livejs.php
index 4f3790e..b5df08f 100644
--- a/app/pages/livejs.php
+++ b/app/pages/livejs.php
@@ -9,9 +9,9 @@ $settingsObject = new Settings();
 
 $livejsData = $settingsObject->getPlatformJsFile($platformDetails[0]['jitsi_url'], $item, $raw);
 
-// Get any new messages
-include '../app/includes/messages.php';
-include '../app/includes/messages-show.php';
+// Get any new feedback messages
+include '../app/includes/feedback-get.php';
+include '../app/includes/feedback-show.php';
 
 // Load the template
 include '../app/templates/livejs.php';
diff --git a/app/pages/login.php b/app/pages/login.php
index dc24171..d90a277 100644
--- a/app/pages/login.php
+++ b/app/pages/login.php
@@ -121,9 +121,9 @@ if (!empty($config['login_message'])) {
     echo Feedback::render('NOTICE', 'DEFAULT', $config['login_message'], false, false, false);
 }
 
-// Get any new messages
-include '../app/includes/messages.php';
-include '../app/includes/messages-show.php';
+// Get any new feedback messages
+include '../app/includes/feedback-get.php';
+include '../app/includes/feedback-show.php';
 
 // Load the template
 include '../app/templates/form-login.php';
diff --git a/app/pages/logs.php b/app/pages/logs.php
index a2c2d26..cadca72 100644
--- a/app/pages/logs.php
+++ b/app/pages/logs.php
@@ -8,9 +8,9 @@
  * It supports pagination and filtering.
  */
 
-// Get any new messages
-include '../app/includes/messages.php';
-include '../app/includes/messages-show.php';
+// Get any new feedback messages
+include '../app/includes/feedback-get.php';
+include '../app/includes/feedback-show.php';
 
 // Check for rights; user or system
 $has_system_access = ($userObject->hasRight($user_id, 'superuser') ||
diff --git a/app/pages/participants.php b/app/pages/participants.php
index 1beee5e..7e24ca4 100644
--- a/app/pages/participants.php
+++ b/app/pages/participants.php
@@ -169,9 +169,9 @@ if ($response['db'] === null) {
         array_push($filterMessage, 'Conferences with participant IP matching "<strong>' . $participantIp . '</strong>"');
     }
 
-    // Get any new messages
-    include '../app/includes/messages.php';
-    include '../app/includes/messages-show.php';
+    // Get any new feedback messages
+    include '../app/includes/feedback-get.php';
+    include '../app/includes/feedback-show.php';
 
     // display the widget
     include '../app/templates/participants.php';
diff --git a/app/pages/profile.php b/app/pages/profile.php
index edbf30e..cd3a2a4 100644
--- a/app/pages/profile.php
+++ b/app/pages/profile.php
@@ -12,9 +12,9 @@
  * - `edit`: Edit user profile details, rights, or avatar.
  */
 
-// Get any new messages
-include '../app/includes/messages.php';
-include '../app/includes/messages-show.php';
+// Get any new feedback messages
+include '../app/includes/feedback-get.php';
+include '../app/includes/feedback-show.php';
 
 $action = $_REQUEST['action'] ?? '';
 
diff --git a/app/pages/register.php b/app/pages/register.php
index 28805dc..01235fa 100644
--- a/app/pages/register.php
+++ b/app/pages/register.php
@@ -65,9 +65,9 @@ if ($config['registration_enabled'] == true) {
         Feedback::flash('ERROR', 'DEFAULT', $e->getMessage());
     }
 
-    // Get any new messages
-    include '../app/includes/messages.php';
-    include '../app/includes/messages-show.php';
+    // Get any new feedback messages
+    include '../app/includes/feedback-get.php';
+    include '../app/includes/feedback-show.php';
 
     // Load the template
     include '../app/templates/form-register.php';
diff --git a/app/pages/security.php b/app/pages/security.php
index 60d8d0c..2e37413 100644
--- a/app/pages/security.php
+++ b/app/pages/security.php
@@ -154,9 +154,9 @@ if ($section === 'ratelimit') {
 $whitelisted = $rateLimiter->getWhitelistedIps();
 $blacklisted = $rateLimiter->getBlacklistedIps();
 
-// Get any new messages
-include '../app/includes/messages.php';
-include '../app/includes/messages-show.php';
+// Get any new feedback messages
+include '../app/includes/feedback-get.php';
+include '../app/includes/feedback-show.php';
 
 // Load the template
 include '../app/templates/security.php';
diff --git a/app/pages/settings.php b/app/pages/settings.php
index 2092121..eb1c7a4 100644
--- a/app/pages/settings.php
+++ b/app/pages/settings.php
@@ -7,9 +7,9 @@
  * adding, editing, and deleting platforms, hosts, agents.
  */
 
-// Get any new messages
-include '../app/includes/messages.php';
-include '../app/includes/messages-show.php';
+// Get any new feedback messages
+include '../app/includes/feedback-get.php';
+include '../app/includes/feedback-show.php';
 
 $action = $_REQUEST['action'] ?? '';
 $agent = $_REQUEST['agent'] ?? '';
diff --git a/app/pages/status.php b/app/pages/status.php
index 7ac45ff..4b88dec 100644
--- a/app/pages/status.php
+++ b/app/pages/status.php
@@ -8,9 +8,9 @@
  * It generates output for each platform and agent.
  */
 
-// Get any new messages
-include '../app/includes/messages.php';
-include '../app/includes/messages-show.php';
+// Get any new feedback messages
+include '../app/includes/feedback-get.php';
+include '../app/includes/feedback-show.php';
 
 require '../app/classes/agent.php';
 require '../app/classes/host.php';
diff --git a/public_html/index.php b/public_html/index.php
index 65b362f..51b99d9 100644
--- a/public_html/index.php
+++ b/public_html/index.php
@@ -125,8 +125,8 @@ try {
 } catch (Exception $e) {
     Feedback::flash('ERROR', 'DEFAULT', getError('Error connecting to the database.', $e->getMessage()));
     include '../app/templates/page-header.php';
-    include '../app/includes/messages.php';
-    include '../app/includes/messages-show.php';
+    include '../app/includes/feedback-get.php';
+    include '../app/includes/feedback-show.php';
     include '../app/templates/page-footer.php';
     exit();
 }