diff --git a/nodes/core/logic/10-switch.html b/nodes/core/logic/10-switch.html
index 77062c7fa..a76553716 100644
--- a/nodes/core/logic/10-switch.html
+++ b/nodes/core/logic/10-switch.html
@@ -156,7 +156,7 @@
     <p>If <b>repair sequence (reconstruct parts property of outgoing messages)</b> checkbox is selected, <code>msg.parts</code> property are reconstructed for each port to make forks of valid sequences.  Otherwise, <code>msg.parts</code> property of incoming messages are passed through.</p>
 
     <h3>Note:</h3>
-    <p>This node internally keeps messages for its operation if <b>repair sequence</b> checkbox is ON.  In order to prevent unexpected memory usage, maximum number of messages kept can be specified by <code>switchMaxKeptMsgsCount</code> property in <b>settings.js</b>.</p>
+    <p>This node internally keeps messages for its operation if <b>repair sequence</b> checkbox is ON.  In order to prevent unexpected memory usage, maximum number of messages kept can be specified by <code>maxKeptMsgsCount</code> property in <b>settings.js</b>.</p>
 </script>
 
 <script type="text/javascript">
diff --git a/nodes/core/logic/10-switch.js b/nodes/core/logic/10-switch.js
index ca5e5292b..ea110a97d 100644
--- a/nodes/core/logic/10-switch.js
+++ b/nodes/core/logic/10-switch.js
@@ -53,7 +53,7 @@ module.exports = function(RED) {
     
     function max_kept_msgs_count(node) {
         if (_max_kept_msgs_count === undefined) {
-            var name = "switchMaxKeptMsgsCount";
+            var name = "maxKeptMsgsCount";
             if (RED.settings.hasOwnProperty(name)) {
                 _max_kept_msgs_count = RED.settings[name];
             }
diff --git a/nodes/core/logic/17-split.html b/nodes/core/logic/17-split.html
index 592516d38..1353d7276 100644
--- a/nodes/core/logic/17-split.html
+++ b/nodes/core/logic/17-split.html
@@ -353,7 +353,7 @@
     </p>
 
     <h4>Note:</h4>
-    <p>This node internally keeps messages for its operation.  In order to prevent unexpected memory usage, maximum number of messages kept can be specified by <code>joinMaxKeptMsgsCount</code> property in <b>settings.js</b>.</p>
+    <p>This node internally keeps messages for its operation.  In order to prevent unexpected memory usage, maximum number of messages kept can be specified by <code>maxKeptMsgsCount</code> property in <b>settings.js</b>.</p>
 </script>
 
 <script type="text/javascript">
diff --git a/nodes/core/logic/17-split.js b/nodes/core/logic/17-split.js
index 803131671..ad7d48cfd 100644
--- a/nodes/core/logic/17-split.js
+++ b/nodes/core/logic/17-split.js
@@ -236,7 +236,7 @@ module.exports = function(RED) {
     
     function max_kept_msgs_count(node) {
         if (_max_kept_msgs_count === undefined) {
-            var name = "joinMaxKeptMsgsCount";
+            var name = "maxKeptMsgsCount";
             if (RED.settings.hasOwnProperty(name)) {
                 _max_kept_msgs_count = RED.settings[name];
             }
diff --git a/nodes/core/logic/19-batch.html b/nodes/core/logic/19-batch.html
index 07fda4915..ae7d00588 100644
--- a/nodes/core/logic/19-batch.html
+++ b/nodes/core/logic/19-batch.html
@@ -80,7 +80,7 @@
     <p>Target and order of concatenated sequences are specified by <code>Topics</code> value.  Selection of concatenated message groups is based on arrival of first message of the group.</p>
     <p><b>Note:</b> This node internally keeps messages for its operation.  In order to prevent unexpected memory usage, maximum number of messages kept can be specified.  Default is no limit on number of messages.
         <ul>
-            <li><code>batchMaxKeptMsgsCount</code> property set in <b>settings.js</b>.</li>
+            <li><code>maxKeptMsgsCount</code> property set in <b>settings.js</b>.</li>
         </ul>
     </p>
 </script>
diff --git a/nodes/core/logic/19-batch.js b/nodes/core/logic/19-batch.js
index bdd5b5408..cae77ff85 100644
--- a/nodes/core/logic/19-batch.js
+++ b/nodes/core/logic/19-batch.js
@@ -21,7 +21,7 @@ module.exports = function(RED) {
 
     function max_kept_msgs_count(node) {
         if (_max_kept_msgs_count === undefined) {
-            var name = "batchMaxKeptMsgsCount";
+            var name = "maxKeptMsgsCount";
             if (RED.settings.hasOwnProperty(name)) {
                 _max_kept_msgs_count = RED.settings[name];
             }
diff --git a/test/nodes/core/logic/10-switch_spec.js b/test/nodes/core/logic/10-switch_spec.js
index a34f0947e..96b0a4616 100644
--- a/test/nodes/core/logic/10-switch_spec.js
+++ b/test/nodes/core/logic/10-switch_spec.js
@@ -29,7 +29,7 @@ describe('switch Node', function() {
     afterEach(function(done) {
         helper.unload();
         helper.stopServer(done);
-        RED.settings.switchMaxKeptMsgsCount = 0;
+        RED.settings.maxKeptMsgsCount = 0;
     });
 
     it('should be loaded with some defaults', function(done) {
@@ -692,7 +692,7 @@ describe('switch Node', function() {
                    ];
         helper.load(switchNode, flow, function() {
             var n1 = helper.getNode("n1");
-            RED.settings.switchMaxKeptMsgsCount = 2;
+            RED.settings.maxKeptMsgsCount = 2;
             setTimeout(function() {
                 var logEvents = helper.log().args.filter(function (evt) {
                     return evt[0].type == "switch";
diff --git a/test/nodes/core/logic/17-split_spec.js b/test/nodes/core/logic/17-split_spec.js
index e2c8aaa97..2de6fae06 100644
--- a/test/nodes/core/logic/17-split_spec.js
+++ b/test/nodes/core/logic/17-split_spec.js
@@ -270,7 +270,7 @@ describe('JOIN node', function() {
 
     afterEach(function() {
         helper.unload();
-        RED.settings.joinMaxKeptMsgsCount = 0;
+        RED.settings.maxKeptMsgsCount = 0;
     });
 
     it('should be loaded', function(done) {
@@ -1072,7 +1072,7 @@ describe('JOIN node', function() {
                     {id:"n2", type:"helper"}];
         helper.load(joinNode, flow, function() {
             var n1 = helper.getNode("n1");
-            RED.settings.joinMaxKeptMsgsCount = 2;
+            RED.settings.maxKeptMsgsCount = 2;
             setTimeout(function() {
                 var logEvents = helper.log().args.filter(function (evt) {
                     return evt[0].type == "join";
@@ -1101,7 +1101,7 @@ describe('JOIN node', function() {
                     {id:"n2", type:"helper"}];
         helper.load(joinNode, flow, function() {
             var n1 = helper.getNode("n1");
-            RED.settings.joinMaxKeptMsgsCount = 2;
+            RED.settings.maxKeptMsgsCount = 2;
             setTimeout(function() {
                 var logEvents = helper.log().args.filter(function (evt) {
                     return evt[0].type == "join";
diff --git a/test/nodes/core/logic/19-batch_spec.js b/test/nodes/core/logic/19-batch_spec.js
index aa806f5bf..dda49030a 100644
--- a/test/nodes/core/logic/19-batch_spec.js
+++ b/test/nodes/core/logic/19-batch_spec.js
@@ -28,7 +28,7 @@ describe('BATCH node', function() {
 
     afterEach(function() {
         helper.unload();
-        RED.settings.batchMaxKeptMsgsCount = 0;
+        RED.settings.maxKeptMsgsCount = 0;
     });
 
     it('should be loaded with defaults', function(done) {
@@ -172,7 +172,7 @@ describe('BATCH node', function() {
             helper.load(batchNode, flow, function() {
                 var n1 = helper.getNode("n1");
                 var n2 = helper.getNode("n2");
-                RED.settings.batchMaxKeptMsgsCount = 2;
+                RED.settings.maxKeptMsgsCount = 2;
                 setTimeout(function() {
                     var logEvents = helper.log().args.filter(function (evt) {
                         return evt[0].type == "batch";
@@ -239,7 +239,7 @@ describe('BATCH node', function() {
             helper.load(batchNode, flow, function() {
                 var n1 = helper.getNode("n1");
                 var n2 = helper.getNode("n2");
-                RED.settings.batchMaxKeptMsgsCount = 2;
+                RED.settings.maxKeptMsgsCount = 2;
                 setTimeout(function() {
                     var logEvents = helper.log().args.filter(function (evt) {
                         return evt[0].type == "batch";
@@ -312,7 +312,7 @@ describe('BATCH node', function() {
             helper.load(batchNode, flow, function() {
                 var n1 = helper.getNode("n1");
                 var n2 = helper.getNode("n2");
-                RED.settings.batchMaxKeptMsgsCount = 2;
+                RED.settings.maxKeptMsgsCount = 2;
                 setTimeout(function() {
                     var logEvents = helper.log().args.filter(function (evt) {
                         return evt[0].type == "batch";