diff --git a/packages/node_modules/@node-red/nodes/core/function/89-trigger.html b/packages/node_modules/@node-red/nodes/core/function/89-trigger.html
index 5e250be28..187a87190 100644
--- a/packages/node_modules/@node-red/nodes/core/function/89-trigger.html
+++ b/packages/node_modules/@node-red/nodes/core/function/89-trigger.html
@@ -66,8 +66,8 @@
             <option value="all" data-i18n="trigger.alltopics"></option>
             <option value="topic" data-i18n="trigger.bytopics"></option>
         </select>
-        <span class="form-row" id="node-trigger-property">
-            <input type="text" id="node-input-property" style="width:46%;"/>
+        <span class="form-row" id="node-stream-topic">
+            <input type="text" id="node-input-topic" style="width:46%;"/>
         </span>
     </div>
     <div class="form-row">
@@ -93,7 +93,7 @@
             reset: {value:""},
             bytopic: {value:"all"},
             outputs: {value:1},
-            property: {value:"topic",required:true}
+            topic: {value:"topic",required:true}
         },
         inputs:1,
         outputs:1,
@@ -121,9 +121,9 @@
             $("#node-input-bytopic").on("change", function() {
                 console.log("BYT",$("#node-input-bytopic").val());
                 if ($("#node-input-bytopic").val() === "all") {
-                    $("#node-trigger-property").hide();
+                    $("#node-stream-topic").hide();
                 } else {
-                    $("#node-trigger-property").show();
+                    $("#node-stream-topic").show();
                 }
             });
         
diff --git a/packages/node_modules/@node-red/nodes/core/function/89-trigger.js b/packages/node_modules/@node-red/nodes/core/function/89-trigger.js
index d0a350e6a..dab7a83ab 100644
--- a/packages/node_modules/@node-red/nodes/core/function/89-trigger.js
+++ b/packages/node_modules/@node-red/nodes/core/function/89-trigger.js
@@ -25,7 +25,7 @@ module.exports = function(RED) {
         this.op1type = n.op1type || "str";
         this.op2type = n.op2type || "str";
         this.second = n.second || false;
-        this.property = n.property || "topic";
+        this.topic = n.topic || "topic";
 
         if (this.op1type === 'val') {
             if (this.op1 === 'true' || this.op1 === 'false') {
@@ -113,7 +113,7 @@ module.exports = function(RED) {
         });
 
         var processMessage = function(msg) {
-            var topic = RED.util.getMessageProperty(msg,node.property) || "_none";
+            var topic = RED.util.getMessageProperty(msg,node.topic) || "_none";
             var promise;
             if (node.bytopic === "all") { topic = "_none"; }
             node.topics[topic] = node.topics[topic] || {};
diff --git a/test/nodes/core/function/89-trigger_spec.js b/test/nodes/core/function/89-trigger_spec.js
index 063fec47c..582b47904 100644
--- a/test/nodes/core/function/89-trigger_spec.js
+++ b/test/nodes/core/function/89-trigger_spec.js
@@ -379,7 +379,7 @@ describe('trigger node', function() {
     });
 
     it('should handle multiple other properties individually if asked to do so', function(done) {
-        var flow = [{"id":"n1", "type":"trigger", "name":"triggerNode", bytopic:"topic", property:"foo", op1:"1", op2:"0", op1type:"num", op2type:"num", duration:"30", wires:[["n2"]] },
+        var flow = [{"id":"n1", "type":"trigger", "name":"triggerNode", bytopic:"topic", topic:"foo", op1:"1", op2:"0", op1type:"num", op2type:"num", duration:"30", wires:[["n2"]] },
             {id:"n2", type:"helper"} ];
         helper.load(triggerNode, flow, function() {
             var n1 = helper.getNode("n1");