diff --git a/db/patch-added-mqtt-monitor.sql b/db/patch-added-mqtt-monitor.sql
index a92b0746..744829b6 100644
--- a/db/patch-added-mqtt-monitor.sql
+++ b/db/patch-added-mqtt-monitor.sql
@@ -2,9 +2,9 @@
 BEGIN TRANSACTION;
 
 ALTER TABLE monitor
-	ADD topic VARCHAR(50);
+	ADD mqtt_topic VARCHAR(50);
 
 ALTER TABLE monitor
-	ADD success_message VARCHAR(255);
+	ADD mqtt_success_message VARCHAR(255);
 
 COMMIT;
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index e823caf8..7d982072 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -127,16 +127,16 @@
                                 </div>
 
                                 <div class="my-3">
-                                    <label for="topic" class="form-label">{{ $t("topic") }}</label>
-                                    <input id="topic" v-model="monitor.topic" type="text" class="form-control" required>
+                                    <label for="mqttTopic" class="form-label">{{ $t("topic") }}</label>
+                                    <input id="mqttTopic" v-model="monitor.topic" type="text" class="form-control" required>
                                     <div class="form-text">
                                         {{ $t("topicExplanation") }}
                                     </div>
                                 </div>
 
                                 <div class="my-3">
-                                    <label for="successMessage" class="form-label">{{ $t("successMessage") }}</label>
-                                    <input id="successMessage" v-model="monitor.successMessage" type="text" class="form-control" required>
+                                    <label for="mqttSuccessMessage" class="form-label">{{ $t("successMessage") }}</label>
+                                    <input id="mqttSuccessMessage" v-model="monitor.successMessage" type="text" class="form-control" required>
                                     <div class="form-text">
                                         {{ $t("successMessageExplanation") }}
                                     </div>