diff --git a/red/runtime/nodes/context/localfilesystem.js b/red/runtime/nodes/context/localfilesystem.js
index 135cbae77..33ca11430 100644
--- a/red/runtime/nodes/context/localfilesystem.js
+++ b/red/runtime/nodes/context/localfilesystem.js
@@ -171,11 +171,11 @@ LocalFileSystem.prototype.get = function(scope, key, callback) {
         if(data){
             data = JSON.parse(data);
             if (!Array.isArray(key)) {
-                callback(null, util.getMessageProperty(data,key));
+                callback(null, util.getObjectProperty(data,key));
             } else {
                 var results = [undefined];
                 for (var i=0;i<key.length;i++) {
-                    results.push(util.getMessageProperty(data,key[i]))
+                    results.push(util.getObjectProperty(data,key[i]))
                 }
                 callback.apply(null,results);
             }
@@ -212,7 +212,7 @@ LocalFileSystem.prototype.set = function(scope, key, value, callback) {
                 if (i<value.length) {
                     v = value[i];
                 }
-                util.setMessageProperty(obj,key[i],v);
+                util.setObjectProperty(obj,key[i],v);
             }
             return fs.outputFile(storagePath + ".json", JSON.stringify(obj, undefined, 4), "utf8");
         }).then(function(){
diff --git a/red/runtime/nodes/context/memory.js b/red/runtime/nodes/context/memory.js
index 1100d323c..3e7f37ad1 100644
--- a/red/runtime/nodes/context/memory.js
+++ b/red/runtime/nodes/context/memory.js
@@ -32,7 +32,7 @@ Memory.prototype._getOne = function(scope, key) {
     var value;
     var error;
     if(this.data[scope]){
-        value = util.getMessageProperty(this.data[scope], key);
+        value = util.getObjectProperty(this.data[scope], key);
     }
     return value;
 }
@@ -95,7 +95,7 @@ Memory.prototype.set = function(scope, key, value, callback) {
             if (i < value.length) {
                 v = value[i];
             }
-            util.setMessageProperty(this.data[scope],key[i],v);
+            util.setObjectProperty(this.data[scope],key[i],v);
         }
     } catch(err) {
         if (callback) {