diff --git a/editor/js/ui/clipboard.js b/editor/js/ui/clipboard.js
index e4350a464..74df8dce9 100644
--- a/editor/js/ui/clipboard.js
+++ b/editor/js/ui/clipboard.js
@@ -276,7 +276,7 @@ RED.clipboard = (function() {
         if (typeof value !== "string" ) {
             value = JSON.stringify(value, function(key,value) {
                 if (value !== null && typeof value === 'object') {
-                    if (value.__encoded__) {
+                    if (value.__enc__) {
                         if (value.hasOwnProperty('data') && value.hasOwnProperty('length')) {
                             truncated = value.data.length !== value.length;
                             return value.data;
diff --git a/editor/js/ui/utils.js b/editor/js/ui/utils.js
index 7da56ab78..81da08dd3 100644
--- a/editor/js/ui/utils.js
+++ b/editor/js/ui/utils.js
@@ -298,17 +298,17 @@ RED.utils = (function() {
 
         var isArray = Array.isArray(obj);
         var isArrayObject = false;
-        if (obj && typeof obj === 'object' && obj.hasOwnProperty('type') && obj.hasOwnProperty('data') && ((obj.__encoded__ && obj.type === 'array') || obj.type === 'Buffer')) {
+        if (obj && typeof obj === 'object' && obj.hasOwnProperty('type') && obj.hasOwnProperty('data') && ((obj.__enc__ && obj.type === 'array') || obj.type === 'Buffer')) {
             isArray = true;
             isArrayObject = true;
         }
         if (obj === null || obj === undefined) {
             $('<span class="debug-message-type-null">'+obj+'</span>').appendTo(entryObj);
-        } else if (obj.__encoded__ && obj.type === 'number') {
+        } else if (obj.__enc__ && obj.type === 'number') {
             e = $('<span class="debug-message-type-number debug-message-object-header"></span>').text(obj.data).appendTo(entryObj);
-        } else if (typeHint === "function" || (obj.__encoded__ && obj.type === 'function')) {
+        } else if (typeHint === "function" || (obj.__enc__ && obj.type === 'function')) {
             e = $('<span class="debug-message-type-meta debug-message-object-header"></span>').text("function").appendTo(entryObj);
-        } else if (typeHint === "internal" || (obj.__encoded__ && obj.type === 'internal')) {
+        } else if (typeHint === "internal" || (obj.__enc__ && obj.type === 'internal')) {
             e = $('<span class="debug-message-type-meta debug-message-object-header"></span>').text("[internal]").appendTo(entryObj);
         } else if (typeof obj === 'string') {
             if (/[\t\n\r]/.test(obj)) {
@@ -354,7 +354,7 @@ RED.utils = (function() {
                 if (originalLength === undefined) {
                     originalLength = data.length;
                 }
-                if (data.__encoded__) {
+                if (data.__enc__) {
                     data = data.data;
                 }
                 type = obj.type.toLowerCase();
diff --git a/red/runtime/util.js b/red/runtime/util.js
index a4cb5d694..2fc1b0681 100644
--- a/red/runtime/util.js
+++ b/red/runtime/util.js
@@ -494,7 +494,7 @@ function encodeObject(msg,opts) {
                 if (msg.msg.length > debuglength) {
                     // msg.msg = msg.msg.slice(0,debuglength);
                     msg.msg = {
-                        __encoded__: true,
+                        __enc__: true,
                         type: "array",
                         data: msg.msg.slice(0,debuglength),
                         length: msg.msg.length
@@ -505,14 +505,14 @@ function encodeObject(msg,opts) {
                 msg.msg = safeJSONStringify(msg.msg, function(key, value) {
                     if (key === '_req' || key === '_res') {
                         value = {
-                            __encoded__: true,
+                            __enc__: true,
                             type: "internal"
                         }
                     } else if (value instanceof Error) {
                         value = value.toString()
                     } else if (util.isArray(value) && value.length > debuglength) {
                         value = {
-                            __encoded__: true,
+                            __enc__: true,
                             type: "array",
                             data: value.slice(0,debuglength),
                             length: value.length
@@ -523,20 +523,20 @@ function encodeObject(msg,opts) {
                         }
                     } else if (typeof value === 'function') {
                         value = {
-                            __encoded__: true,
+                            __enc__: true,
                             type: "function"
                         }
                     } else if (typeof value === 'number') {
                         if (isNaN(value) || value === Infinity || value === -Infinity) {
                             value = {
-                                __encoded__: true,
+                                __enc__: true,
                                 type: "number",
                                 data: value.toString()
                             }
                         }
                     } else if (value && value.constructor) {
                         if (value.type === "Buffer") {
-                            value.__encoded__ = true;
+                            value.__enc__ = true;
                             value.length = value.data.length;
                             if (value.length > debuglength) {
                                 value.data = value.data.slice(0,debuglength);