diff --git a/TaskServer/Globals.js b/TaskServer/Globals.js
index eda70b0f5..56974864d 100644
--- a/TaskServer/Globals.js
+++ b/TaskServer/Globals.js
@@ -195,7 +195,7 @@ exports.newGlobals = function newGlobals() {
                 if (startingNode === undefined) { return }
                 if (nodeFound !== undefined) { return }
 
-                let nodeDefinition = APP_SCHEMA_MAP.get(startingNode.type)
+                let nodeDefinition = global.APP_SCHEMA_MAP.get(startingNode.project + '-' + startingNode.type)
                 if (nodeDefinition === undefined) { return }
 
                 if (startingNode.type === nodeType) {
@@ -249,7 +249,7 @@ exports.newGlobals = function newGlobals() {
             function scanNodeMesh(startingNode) {
                 if (startingNode === undefined) { return }
 
-                let nodeDefinition = APP_SCHEMA_MAP.get(startingNode.type)
+                let nodeDefinition = global.APP_SCHEMA_MAP.get(startingNode.project + '-' + startingNode.type)
                 if (nodeDefinition === undefined) { return }
 
                 if (startingNode.id === nodeId) {
@@ -444,7 +444,7 @@ exports.newGlobals = function newGlobals() {
                     errorMessage: errorMessage
                 }
             }
-
+            let key = global.TASK_NODE.name + '-' + global.TASK_NODE.type + '-' + global.TASK_NODE.id
             global.EVENT_SERVER_CLIENT_MODULE.raiseEvent(key, 'Error', event)
         }
     }
diff --git a/TaskServer/Task.js b/TaskServer/Task.js
index 751e25d49..7b1902e7e 100644
--- a/TaskServer/Task.js
+++ b/TaskServer/Task.js
@@ -74,7 +74,7 @@ function preLoader() {
 
             for (let j = 0; j < project.schema.length; j++) {
                 let nodeDefinition = project.schema[j]
-                let key = project + '-' + nodeDefinition.type
+                let key = project.name + '-' + nodeDefinition.type
                 global.APP_SCHEMA_MAP.set(key, nodeDefinition)
             }
         }