diff --git a/packages/node_modules/@node-red/runtime/lib/flows/Flow.js b/packages/node_modules/@node-red/runtime/lib/flows/Flow.js
index 3538a9d30..eaf122fd8 100644
--- a/packages/node_modules/@node-red/runtime/lib/flows/Flow.js
+++ b/packages/node_modules/@node-red/runtime/lib/flows/Flow.js
@@ -424,12 +424,12 @@ class Flow {
      */
     getGroupEnvSetting(node, group, name) {
         if (group) {
-            if (name === "GROUP_NAME") {
+            if (name === "NR_GROUP_NAME") {
                 return [{
                     val: group.name
                 }, null];
             }
-            if (name === "GROUP_ID") {
+            if (name === "NR_GROUP_ID") {
                 return [{
                     val: group.id
                 }, null];
@@ -510,10 +510,10 @@ class Flow {
      */
     getSetting(key) {
         const flow = this.flow;
-        if (key === "FLOW_NAME") {
+        if (key === "NR_FLOW_NAME") {
             return flow.label;
         }
-        if (key === "FLOW_ID") {
+        if (key === "NR_FLOW_ID") {
             return flow.id;
         }
         if (flow.credentials === undefined) {
diff --git a/packages/node_modules/@node-red/runtime/lib/flows/Subflow.js b/packages/node_modules/@node-red/runtime/lib/flows/Subflow.js
index 55f4a0727..993beace4 100644
--- a/packages/node_modules/@node-red/runtime/lib/flows/Subflow.js
+++ b/packages/node_modules/@node-red/runtime/lib/flows/Subflow.js
@@ -372,10 +372,10 @@ class Subflow extends Flow {
         }
         const node = this.subflowInstance;
         if (node) {
-            if (name === "NODE_NAME") {
+            if (name === "NR_NODE_NAME") {
                 return node.name;
             }
-            if (name === "NODE_ID") {
+            if (name === "NR_NODE_ID") {
                 return node.id;
             }
         }
diff --git a/packages/node_modules/@node-red/util/lib/util.js b/packages/node_modules/@node-red/util/lib/util.js
index 48d3f810e..e5ea0f3e5 100644
--- a/packages/node_modules/@node-red/util/lib/util.js
+++ b/packages/node_modules/@node-red/util/lib/util.js
@@ -523,10 +523,10 @@ function setObjectProperty(msg,prop,value,createMissing) {
  */
 function getSetting(node, name, flow_) {
     if (node) {
-        if (name === "NODE_NAME") {
+        if (name === "NR_NODE_NAME") {
             return node.name;
         }
-        if (name === "NODE_ID") {
+        if (name === "NR_NODE_ID") {
             return node.id;
         }
     }