diff --git a/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js b/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js
index a0cf2214e..f0fcb516e 100644
--- a/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js
+++ b/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js
@@ -565,7 +565,7 @@ function newSuperalgosDocSpace() {
         disableCollapsibleContent()
 
         nodeAppDefinition = SCHEMAS_BY_PROJECT.get(objectBeingRendered.project).map.appSchema.get(objectBeingRendered.type)
-        nodeDocsDefinition = SCHEMAS_BY_PROJECT.get(objectBeingRendered.project).map.docSchema.get(objectBeingRendered.type)
+        nodeDocsDefinition = SCHEMAS_BY_PROJECT.get(objectBeingRendered.project).map.docsNodeSchema.get(objectBeingRendered.type)
 
         if (nodeDocsDefinition === undefined) {
             // Use the New Node Template
@@ -579,8 +579,8 @@ function newSuperalgosDocSpace() {
                     }
                 ]
             }
-            SCHEMAS_BY_PROJECT.get(objectBeingRendered.project).array.docSchema.push(template)
-            SCHEMAS_BY_PROJECT.get(objectBeingRendered.project).map.docSchema.set(objectBeingRendered.type, template)
+            SCHEMAS_BY_PROJECT.get(objectBeingRendered.project).array.docsNodeSchema.push(template)
+            SCHEMAS_BY_PROJECT.get(objectBeingRendered.project).map.docsNodeSchema.set(objectBeingRendered.type, template)
             nodeDocsDefinition = template
         }
         buildHtmlPage()
@@ -1716,12 +1716,12 @@ function newSuperalgosDocSpace() {
 
             for (let j = 0; j < PROJECTS_ARRAY.length; j++) {
                 let project = PROJECTS_ARRAY[j]
-                definitionNode = SCHEMAS_BY_PROJECT.get(project).map.docSchema.get(type)
+                definitionNode = SCHEMAS_BY_PROJECT.get(project).map.docsNodeSchema.get(type)
                 if (definitionNode !== undefined) {
                     found = true
                     break
                 }
-                definitionNode = SCHEMAS_BY_PROJECT.get(project).map.conceptSchema.get(type)
+                definitionNode = SCHEMAS_BY_PROJECT.get(project).map.docsConceptSchema.get(type)
                 if (definitionNode !== undefined) {
                     found = true
                     break
@@ -1773,8 +1773,8 @@ function newSuperalgosDocSpace() {
             for (let j = 0; j < PROJECTS_ARRAY.length; j++) {
                 let project = PROJECTS_ARRAY[j]
 
-                /* Search in docSchema */
-                if (SCHEMAS_BY_PROJECT.get(project).map.docSchema.get(cleanPhrase4) !== undefined) {
+                /* Search in docsNodeSchema */
+                if (SCHEMAS_BY_PROJECT.get(project).map.docsNodeSchema.get(cleanPhrase4) !== undefined) {
                     if (cleanPhrase4 !== excludeNodesAndConceptTypes) {
                         taggedText = taggedText + phrase4.replace(cleanPhrase4, '->' + 'Node' + '|' + cleanPhrase4 + '|' + project + '->') + ' '
                     } else {
@@ -1784,7 +1784,7 @@ function newSuperalgosDocSpace() {
                     found = true
                     break
                 }
-                if (SCHEMAS_BY_PROJECT.get(project).map.docSchema.get(cleanPhrase3) !== undefined) {
+                if (SCHEMAS_BY_PROJECT.get(project).map.docsNodeSchema.get(cleanPhrase3) !== undefined) {
                     if (cleanPhrase3 !== excludeNodesAndConceptTypes) {
                         taggedText = taggedText + phrase3.replace(cleanPhrase3, '->' + 'Node' + '|' + cleanPhrase3 + '|' + project + '->') + ' '
                     } else {
@@ -1794,7 +1794,7 @@ function newSuperalgosDocSpace() {
                     found = true
                     break
                 }
-                if (SCHEMAS_BY_PROJECT.get(project).map.docSchema.get(cleanPhrase2) !== undefined) {
+                if (SCHEMAS_BY_PROJECT.get(project).map.docsNodeSchema.get(cleanPhrase2) !== undefined) {
                     if (cleanPhrase2 !== excludeNodesAndConceptTypes) {
                         taggedText = taggedText + phrase2.replace(cleanPhrase2, '->' + 'Node' + '|' + cleanPhrase2 + '|' + project + '->') + ' '
                     } else {
@@ -1804,7 +1804,7 @@ function newSuperalgosDocSpace() {
                     found = true
                     break
                 }
-                if (SCHEMAS_BY_PROJECT.get(project).map.docSchema.get(cleanPhrase1) !== undefined) {
+                if (SCHEMAS_BY_PROJECT.get(project).map.docsNodeSchema.get(cleanPhrase1) !== undefined) {
                     if (cleanPhrase1 !== excludeNodesAndConceptTypes) {
                         taggedText = taggedText + phrase1.replace(cleanPhrase1, '->' + 'Node' + '|' + cleanPhrase1 + '|' + project + '->') + ' '
                     } else {
@@ -1814,8 +1814,8 @@ function newSuperalgosDocSpace() {
                     break
                 }
 
-                /* Search in conceptSchema */
-                if (SCHEMAS_BY_PROJECT.get(project).map.conceptSchema.get(cleanPhrase4) !== undefined) {
+                /* Search in docsConceptSchema */
+                if (SCHEMAS_BY_PROJECT.get(project).map.docsConceptSchema.get(cleanPhrase4) !== undefined) {
                     if (cleanPhrase4 !== excludeNodesAndConceptTypes) {
                         taggedText = taggedText + phrase4.replace(cleanPhrase4, '->' + 'Concept' + '|' + cleanPhrase4 + '|' + project + '->') + ' '
                     } else {
@@ -1825,7 +1825,7 @@ function newSuperalgosDocSpace() {
                     found = true
                     break
                 }
-                if (SCHEMAS_BY_PROJECT.get(project).map.conceptSchema.get(cleanPhrase3) !== undefined) {
+                if (SCHEMAS_BY_PROJECT.get(project).map.docsConceptSchema.get(cleanPhrase3) !== undefined) {
                     if (cleanPhrase3 !== excludeNodesAndConceptTypes) {
                         taggedText = taggedText + phrase3.replace(cleanPhrase3, '->' + 'Concept' + '|' + cleanPhrase3 + '|' + project + '->') + ' '
                     } else {
@@ -1835,7 +1835,7 @@ function newSuperalgosDocSpace() {
                     found = true
                     break
                 }
-                if (SCHEMAS_BY_PROJECT.get(project).map.conceptSchema.get(cleanPhrase2) !== undefined) {
+                if (SCHEMAS_BY_PROJECT.get(project).map.docsConceptSchema.get(cleanPhrase2) !== undefined) {
                     if (cleanPhrase2 !== excludeNodesAndConceptTypes) {
                         taggedText = taggedText + phrase2.replace(cleanPhrase2, '->' + 'Concept' + '|' + cleanPhrase2 + '|' + project + '->') + ' '
                     } else {
@@ -1845,7 +1845,7 @@ function newSuperalgosDocSpace() {
                     found = true
                     break
                 }
-                if (SCHEMAS_BY_PROJECT.get(project).map.conceptSchema.get(cleanPhrase1) !== undefined) {
+                if (SCHEMAS_BY_PROJECT.get(project).map.docsConceptSchema.get(cleanPhrase1) !== undefined) {
                     if (cleanPhrase1 !== excludeNodesAndConceptTypes) {
                         taggedText = taggedText + phrase1.replace(cleanPhrase1, '->' + 'Concept' + '|' + cleanPhrase1 + '|' + project + '->') + ' '
                     } else {
diff --git a/Projects/Superalgos/UI/Spaces/Tutorial-Space/TutorialSpace.js b/Projects/Superalgos/UI/Spaces/Tutorial-Space/TutorialSpace.js
index f6e305baf..1e5487618 100644
--- a/Projects/Superalgos/UI/Spaces/Tutorial-Space/TutorialSpace.js
+++ b/Projects/Superalgos/UI/Spaces/Tutorial-Space/TutorialSpace.js
@@ -1203,9 +1203,9 @@ function newSuperalgosTutorialSpace() {
                     project = 'Superalgos'
                     type =  splittedNodeType[0]
                 }
-                let definitionNode = SCHEMAS_BY_PROJECT.get(project).map.docSchema.get(type)
+                let definitionNode = SCHEMAS_BY_PROJECT.get(project).map.docsNodeSchema.get(type)
                 if (definitionNode === undefined) {
-                    definitionNode = SCHEMAS_BY_PROJECT.get(project).map.conceptSchema.get(type)
+                    definitionNode = SCHEMAS_BY_PROJECT.get(project).map.docsConceptSchema.get(type)
                     if (definitionNode === undefined) {
                         currentNode.payload.uiObject.setErrorMessage(type + ' not found at Doc Schema or Concept Schema.')
                         return
diff --git a/UI/AppPostLoader.js b/UI/AppPostLoader.js
index 03c379edf..8d66ba891 100644
--- a/UI/AppPostLoader.js
+++ b/UI/AppPostLoader.js
@@ -40,13 +40,13 @@ function newAppPostLoader() {
                     let schemas = {
                         array: {
                             appSchema: [],
-                            docSchema: [],
-                            conceptSchema: []
+                            docsNodeSchema: [],
+                            docsConceptSchema: []
                         },
                         map: {
                             appSchema: new Map(),
-                            docSchema: new Map(),
-                            conceptSchema: new Map()
+                            docsNodeSchema: new Map(),
+                            docsConceptSchema: new Map()
                         }
                     }
                     SCHEMAS_BY_PROJECT.set(project, schemas)
@@ -76,12 +76,12 @@ function newAppPostLoader() {
 
                     function onResponseDocSchema(err, schema) {
                         try {
-                            schemas.array.docSchema = JSON.parse(schema)
+                            schemas.array.docsNodeSchema = JSON.parse(schema)
 
-                            for (let j = 0; j < schemas.array.docSchema.length; j++) {
-                                let nodeDefinition = schemas.array.docSchema[j]
+                            for (let j = 0; j < schemas.array.docsNodeSchema.length; j++) {
+                                let nodeDefinition = schemas.array.docsNodeSchema[j]
                                 let key = nodeDefinition.type
-                                schemas.map.docSchema.set(key, nodeDefinition)
+                                schemas.map.docsNodeSchema.set(key, nodeDefinition)
                             }
                         } catch (err) {
                             console.log(err.stack)
@@ -96,12 +96,12 @@ function newAppPostLoader() {
 
                     function onResponseConceptSchema(err, schema) {
                         try {
-                            schemas.array.conceptSchema = JSON.parse(schema)
+                            schemas.array.docsConceptSchema = JSON.parse(schema)
 
-                            for (let j = 0; j < schemas.array.conceptSchema.length; j++) {
-                                let nodeDefinition = schemas.array.conceptSchema[j]
+                            for (let j = 0; j < schemas.array.docsConceptSchema.length; j++) {
+                                let nodeDefinition = schemas.array.docsConceptSchema[j]
                                 let key = nodeDefinition.type
-                                schemas.map.conceptSchema.set(key, nodeDefinition)
+                                schemas.map.docsConceptSchema.set(key, nodeDefinition)
                             }
                         } catch (err) {
                             console.log(err.stack)