diff --git a/server/model/monitor.js b/server/model/monitor.js
index 1464a1861..2dae06c81 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -161,8 +161,8 @@ class Monitor extends BeanModel {
             kafkaProducerMessage: this.kafkaProducerMessage,
             screenshot,
             remote_browser: this.remote_browser,
-            request: this.request,
-            startTls: this.getStartTls(),
+            tcpRequest: this.tcpRequest,
+            tcpStartTls: this.getTcpStartTls(),
         };
 
         if (includeSensitiveData) {
@@ -331,8 +331,8 @@ class Monitor extends BeanModel {
      * Parse to boolean
      * @returns {boolean} Enable STARTTLS for TCP Port (TLS)
      */
-    getStartTls() {
-        return Boolean(this.startTls);
+    getTcpStartTls() {
+        return Boolean(this.tcpStartTls);
     }
 
     /**
diff --git a/server/monitor-types/tls.js b/server/monitor-types/tls.js
index 8b2c1a26b..9461ec142 100644
--- a/server/monitor-types/tls.js
+++ b/server/monitor-types/tls.js
@@ -18,8 +18,8 @@ class TlsMonitorType extends MonitorType {
         const options = {
             hostname: monitor.hostname,
             port: monitor.port,
-            useStartTls: monitor.startTls || false,
-            request: monitor.request || null,
+            useStartTls: monitor.tcpStartTls || false,
+            request: monitor.tcpRequest || null,
             interval: monitor.interval || 30,
         };
 
diff --git a/server/server.js b/server/server.js
index fad344f46..7616eef0f 100644
--- a/server/server.js
+++ b/server/server.js
@@ -831,8 +831,8 @@ let needSetup = false;
                     monitor.kafkaProducerAllowAutoTopicCreation;
                 bean.gamedigGivenPortOnly = monitor.gamedigGivenPortOnly;
                 bean.remote_browser = monitor.remote_browser;
-                bean.request = monitor.request;
-                bean.startTls = monitor.startTls;
+                bean.tcpRequest = monitor.tcpRequest;
+                bean.tcpStartTls = monitor.tcpStartTls;
 
                 bean.validate();