diff --git a/Conditions.js b/Conditions.js
index 53c535088..4e77bac9f 100644
--- a/Conditions.js
+++ b/Conditions.js
@@ -68,8 +68,8 @@
 
             /* Stop listening to the necesary events. */
 
-            canvas.chartSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId);
-            canvas.chartSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId);
+            canvas.chartingSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId);
+            canvas.chartingSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId);
             canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId);
             thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId)
             marketFiles.eventHandler.stopListening(marketFilesUpdatedEventSubscriptionId);
@@ -117,8 +117,8 @@
 
             /* Listen to the necesary events. */
 
-            zoomChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged);
-            offsetChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged);
+            zoomChangedEventSubscriptionId = canvas.chartingSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged);
+            offsetChangedEventSubscriptionId = canvas.chartingSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged);
             dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished);
             marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated);
             dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated);
@@ -308,8 +308,8 @@
 
             let daysOnSides = getSideDays(timeFrame);
 
-            let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
-            let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
+            let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
+            let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
 
             let dateDiff = rightDate.valueOf() - leftDate.valueOf();
 
@@ -390,8 +390,8 @@
 
             let daysOnSides = getSideDays(timeFrame);
 
-            let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
-            let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
+            let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
+            let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
 
             let dateDiff = rightDate.valueOf() - leftDate.valueOf();
 
@@ -484,14 +484,14 @@
 
         if (currentRecord === undefined) { return; }
         if (currentRecord.conditionsNames === undefined) { return; }
-        if (canvas.designerSpace.workspace === undefined) { return; }
+        if (canvas.designSpace.workspace === undefined) { return; }
 
         /* We will get now the designer trading system */
         let designerTradingSystem
         let fileTradingSystem = currentRecord.conditionsNames;
 
-        for (let i = 0; i < canvas.designerSpace.workspace.workspaceNode.rootNodes.length; i++) {
-            let rootNode = canvas.designerSpace.workspace.workspaceNode.rootNodes[i]
+        for (let i = 0; i < canvas.designSpace.workspace.workspaceNode.rootNodes.length; i++) {
+            let rootNode = canvas.designSpace.workspace.workspaceNode.rootNodes[i]
             if (rootNode.type === 'Definition') {
                 if (rootNode.tradingSystem.id === fileTradingSystem.id) {
                     designerTradingSystem = rootNode.tradingSystem
diff --git a/SimulationExecution.js b/SimulationExecution.js
index e937af57d..2717579d5 100644
--- a/SimulationExecution.js
+++ b/SimulationExecution.js
@@ -54,7 +54,7 @@
 
             /* Stop listening to the necesary events. */
             thisObject.container.eventHandler.stopListening(onMouseOverEventSuscriptionId)
-            canvas.chartSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId);
+            canvas.chartingSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId);
             fileSequence.eventHandler.stopListening(filesUpdatedEventSubscriptionId);
             thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId)
 
@@ -90,7 +90,7 @@
             recalculate();
 
             filesUpdatedEventSubscriptionId = fileSequence.eventHandler.listenToEvent("Files Updated", onFilesUpdated); // Only the first sequence is supported right now.
-            offsetChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged);
+            offsetChangedEventSubscriptionId = canvas.chartingSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged);
             onMouseOverEventSuscriptionId = thisObject.container.eventHandler.listenToEvent('onMouseOver', onMouseOver)
 
             /* Ready for when dimmension changes. */
@@ -370,9 +370,9 @@
                     point = coordinateSystem.transformThisPoint(point);
                     point = transformThisPoint(point, thisObject.container);
 
-                    if (point.x < canvas.chartSpace.viewport.visibleArea.bottomLeft.x || point.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x) { continue; }
+                    if (point.x < canvas.chartingSpace.viewport.visibleArea.bottomLeft.x || point.x > canvas.chartingSpace.viewport.visibleArea.bottomRight.x) { continue; }
 
-                    point = canvas.chartSpace.viewport.fitIntoVisibleArea(point);
+                    point = canvas.chartingSpace.viewport.fitIntoVisibleArea(point);
                     point = thisObject.fitFunction(point);
 
                     let isCurrentRecord = false;
@@ -410,17 +410,17 @@
 
                         point1 = coordinateSystem.transformThisPoint(point1);
                         point1 = transformThisPoint(point1, thisObject.container);
-                        point1 = canvas.chartSpace.viewport.fitIntoVisibleArea(point1);
+                        point1 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point1);
                         point1 = thisObject.fitFunction(point1);
 
                         point2 = coordinateSystem.transformThisPoint(point2);
                         point2 = transformThisPoint(point2, thisObject.container);
-                        point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
+                        point2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point2);
                         point2 = thisObject.fitFunction(point2);
 
                         point3 = coordinateSystem.transformThisPoint(point3);
                         point3 = transformThisPoint(point3, thisObject.container);
-                        point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
+                        point3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point3);
                         point3 = thisObject.fitFunction(point3);
 
                         let diff = point2.x - point3.x;
@@ -429,8 +429,8 @@
 
                         currentRecord.timeFrame = diff
 
-                        point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
-                        point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
+                        point2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point2);
+                        point3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point3);
                         point2 = thisObject.fitFunction(point2);
                         point3 = thisObject.fitFunction(point3);
 
@@ -485,17 +485,17 @@
 
                         point1 = coordinateSystem.transformThisPoint(point1);
                         point1 = transformThisPoint(point1, thisObject.container);
-                        point1 = canvas.chartSpace.viewport.fitIntoVisibleArea(point1);
+                        point1 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point1);
                         point1 = thisObject.fitFunction(point1);
 
                         point2 = coordinateSystem.transformThisPoint(point2);
                         point2 = transformThisPoint(point2, thisObject.container);
-                        point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
+                        point2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point2);
                         point2 = thisObject.fitFunction(point2);
 
                         point3 = coordinateSystem.transformThisPoint(point3);
                         point3 = transformThisPoint(point3, thisObject.container);
-                        point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
+                        point3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point3);
                         point3 = thisObject.fitFunction(point3);
 
                         let diff = point2.x - point3.x;
@@ -504,8 +504,8 @@
 
                         currentRecord.timeFrame = diff
 
-                        point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
-                        point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
+                        point2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point2);
+                        point3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point3);
                         point2 = thisObject.fitFunction(point2);
                         point3 = thisObject.fitFunction(point3);
 
@@ -558,17 +558,17 @@
 
                         point1 = coordinateSystem.transformThisPoint(point1);
                         point1 = transformThisPoint(point1, thisObject.container);
-                        point1 = canvas.chartSpace.viewport.fitIntoVisibleArea(point1);
+                        point1 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point1);
                         point1 = thisObject.fitFunction(point1);
 
                         point2 = coordinateSystem.transformThisPoint(point2);
                         point2 = transformThisPoint(point2, thisObject.container);
-                        point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
+                        point2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point2);
                         point2 = thisObject.fitFunction(point2);
 
                         point3 = coordinateSystem.transformThisPoint(point3);
                         point3 = transformThisPoint(point3, thisObject.container);
-                        point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
+                        point3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point3);
                         point3 = thisObject.fitFunction(point3);
 
                         let diff = point2.x - point3.x;
@@ -577,8 +577,8 @@
 
                         currentRecord.timeFrame = diff
 
-                        point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
-                        point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
+                        point2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point2);
+                        point3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point3);
                         point2 = thisObject.fitFunction(point2);
                         point3 = thisObject.fitFunction(point3);
 
@@ -632,17 +632,17 @@
 
                         point1 = coordinateSystem.transformThisPoint(point1);
                         point1 = transformThisPoint(point1, thisObject.container);
-                        point1 = canvas.chartSpace.viewport.fitIntoVisibleArea(point1);
+                        point1 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point1);
                         point1 = thisObject.fitFunction(point1);
 
                         point2 = coordinateSystem.transformThisPoint(point2);
                         point2 = transformThisPoint(point2, thisObject.container);
-                        point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
+                        point2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point2);
                         point2 = thisObject.fitFunction(point2);
 
                         point3 = coordinateSystem.transformThisPoint(point3);
                         point3 = transformThisPoint(point3, thisObject.container);
-                        point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
+                        point3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point3);
                         point3 = thisObject.fitFunction(point3);
 
                         let diff = point2.x - point3.x;
@@ -651,8 +651,8 @@
 
                         currentRecord.timeFrame = diff
 
-                        point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
-                        point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
+                        point2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point2);
+                        point3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point3);
                         point2 = thisObject.fitFunction(point2);
                         point3 = thisObject.fitFunction(point3);
 
@@ -704,7 +704,7 @@
                         browserCanvasContext.arc(point.x, point.y, currentRadius, 0, Math.PI * 2, true);
                         browserCanvasContext.closePath();
 
-                        if (point.x < canvas.chartSpace.viewport.visibleArea.topLeft.x + 50 || point.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x - 50) {/*we leave this history without fill. */ } else {
+                        if (point.x < canvas.chartingSpace.viewport.visibleArea.topLeft.x + 50 || point.x > canvas.chartingSpace.viewport.visibleArea.bottomRight.x - 50) {/*we leave this history without fill. */ } else {
                             browserCanvasContext.fill();
                         }
 
@@ -724,7 +724,7 @@
                     browserCanvasContext.arc(point.x, point.y, radius, 0, Math.PI * 2, true);
                     browserCanvasContext.closePath();
 
-                    if (point.x < canvas.chartSpace.viewport.visibleArea.topLeft.x + 50 || point.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x - 50) {/*we leave this history without fill. */ } else {
+                    if (point.x < canvas.chartingSpace.viewport.visibleArea.topLeft.x + 50 || point.x > canvas.chartingSpace.viewport.visibleArea.bottomRight.x - 50) {/*we leave this history without fill. */ } else {
                         browserCanvasContext.fill();
                     }
 
@@ -755,12 +755,12 @@
 
                     point1 = coordinateSystem.transformThisPoint(point1);
                     point1 = transformThisPoint(point1, thisObject.container);
-                    point1 = canvas.chartSpace.viewport.fitIntoVisibleArea(point1);
+                    point1 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point1);
                     point1 = thisObject.fitFunction(point1);
 
                     point2 = coordinateSystem.transformThisPoint(point2);
                     point2 = transformThisPoint(point2, thisObject.container);
-                    point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
+                    point2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point2);
                     point2 = thisObject.fitFunction(point2);
 
                     browserCanvasContext.beginPath();
diff --git a/SimulationExecutionPanel.js b/SimulationExecutionPanel.js
index d809b2ef5..24ee27d23 100644
--- a/SimulationExecutionPanel.js
+++ b/SimulationExecutionPanel.js
@@ -40,8 +40,8 @@ function newAAMastersPlottersTradingSimulationSimulationExecutionSimulationExecu
         thisObject.container.frame.width = UI_PANEL.WIDTH.NORMAL;
         thisObject.container.frame.height = UI_PANEL.HEIGHT.NORMAL * 2.5;
 
-        thisObject.container.frame.position.x = canvas.chartSpace.viewport.visibleArea.topLeft.x + thisObject.container.frame.width * 4;
-        thisObject.container.frame.position.y = canvas.chartSpace.viewport.visibleArea.topRight.y;
+        thisObject.container.frame.position.x = canvas.chartingSpace.viewport.visibleArea.topLeft.x + thisObject.container.frame.width * 4;
+        thisObject.container.frame.position.y = canvas.chartingSpace.viewport.visibleArea.topRight.y;
 
         panelTabButton = newPanelTabButton()
         panelTabButton.parentContainer = thisObject.container
@@ -150,8 +150,8 @@ function newAAMastersPlottersTradingSimulationSimulationExecutionSimulationExecu
             point2.y = point2.y - diff;
             point3.y = point3.y - diff;
 
-            point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
-            point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
+            point2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point2);
+            point3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point3);
 
             browserCanvasContext.beginPath();
 
@@ -210,8 +210,8 @@ function newAAMastersPlottersTradingSimulationSimulationExecutionSimulationExecu
             point2.y = point2.y + diff;
             point3.y = point3.y + diff;
 
-            point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
-            point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
+            point2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point2);
+            point3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point3);
 
             browserCanvasContext.beginPath();
 
@@ -268,8 +268,8 @@ function newAAMastersPlottersTradingSimulationSimulationExecutionSimulationExecu
             point2.y = point2.y - diff;
             point3.y = point3.y - diff;
 
-            point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
-            point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
+            point2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point2);
+            point3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point3);
 
             browserCanvasContext.beginPath();
 
@@ -326,8 +326,8 @@ function newAAMastersPlottersTradingSimulationSimulationExecutionSimulationExecu
             point2.y = point2.y + diff;
             point3.y = point3.y + diff;
 
-            point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
-            point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
+            point2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point2);
+            point3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(point3);
 
             browserCanvasContext.beginPath();
 
@@ -366,7 +366,7 @@ function newAAMastersPlottersTradingSimulationSimulationExecutionSimulationExecu
             browserCanvasContext.arc(point.x, point.y, currentRadius, 0, Math.PI * 2, true);
             browserCanvasContext.closePath();
 
-            if (point.x < canvas.chartSpace.viewport.visibleArea.topLeft.x + 50 || point.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x - 50) {/*we leave this history without fill. */ } else {
+            if (point.x < canvas.chartingSpace.viewport.visibleArea.topLeft.x + 50 || point.x > canvas.chartingSpace.viewport.visibleArea.bottomRight.x - 50) {/*we leave this history without fill. */ } else {
                 browserCanvasContext.fill();
             }
             browserCanvasContext.setLineDash([0, 0])
@@ -384,7 +384,7 @@ function newAAMastersPlottersTradingSimulationSimulationExecutionSimulationExecu
         browserCanvasContext.arc(point.x, point.y, radius, 0, Math.PI * 2, true);
         browserCanvasContext.closePath();
 
-        if (point.x < canvas.chartSpace.viewport.visibleArea.topLeft.x + 50 || point.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x - 50) {/*we leave this history without fill. */ } else {
+        if (point.x < canvas.chartingSpace.viewport.visibleArea.topLeft.x + 50 || point.x > canvas.chartingSpace.viewport.visibleArea.bottomRight.x - 50) {/*we leave this history without fill. */ } else {
             browserCanvasContext.fill();
         }
         browserCanvasContext.setLineDash([0, 0])
diff --git a/Strategies.js b/Strategies.js
index 4da8a543c..be159d9de 100644
--- a/Strategies.js
+++ b/Strategies.js
@@ -71,8 +71,8 @@
 
             /* Stop listening to the necesary events. */
             thisObject.container.eventHandler.stopListening(onMouseOverEventSuscriptionId)
-            canvas.chartSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId);
-            canvas.chartSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId);
+            canvas.chartingSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId);
+            canvas.chartingSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId);
             canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId);
             thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId)
             marketFiles.eventHandler.stopListening(marketFilesUpdatedEventSubscriptionId);
@@ -128,8 +128,8 @@
 
             /* Listen to the necesary events. */
 
-            zoomChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged);
-            offsetChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged);
+            zoomChangedEventSubscriptionId = canvas.chartingSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged);
+            offsetChangedEventSubscriptionId = canvas.chartingSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged);
             dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished);
             marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated);
             dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated);
@@ -146,7 +146,7 @@
             })
 
             for (let i = 1; i < 15; i++) {
-                let strategyImage = canvas.designerSpace.iconByUiObjectType.get('Strategy');   
+                let strategyImage = canvas.designSpace.iconByUiObjectType.get('Strategy');   
                 strategyImages.push(strategyImage);
             }
 
@@ -344,8 +344,8 @@
 
             let daysOnSides = getSideDays(timeFrame);
 
-            let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
-            let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
+            let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
+            let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
 
             let dateDiff = rightDate.valueOf() - leftDate.valueOf();
 
@@ -427,8 +427,8 @@
 
             let daysOnSides = getSideDays(timeFrame);
 
-            let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
-            let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
+            let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
+            let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
 
             let dateDiff = rightDate.valueOf() - leftDate.valueOf();
 
@@ -521,17 +521,17 @@
                 recordPoint3 = transformThisPoint(recordPoint3, thisObject.container);
                 recordPoint4 = transformThisPoint(recordPoint4, thisObject.container);
 
-                if (recordPoint2.x < canvas.chartSpace.viewport.visibleArea.bottomLeft.x || recordPoint1.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x) {
+                if (recordPoint2.x < canvas.chartingSpace.viewport.visibleArea.bottomLeft.x || recordPoint1.x > canvas.chartingSpace.viewport.visibleArea.bottomRight.x) {
                     continue;
                 }
 
                 recordPoint3.y = recordPoint1.y + 2000;
                 recordPoint4.y = recordPoint1.y + 2000;
 
-                recordPoint1 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint1);
-                recordPoint2 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint2);
-                recordPoint3 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint3);
-                recordPoint4 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint4);
+                recordPoint1 = canvas.chartingSpace.viewport.fitIntoVisibleArea(recordPoint1);
+                recordPoint2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(recordPoint2);
+                recordPoint3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(recordPoint3);
+                recordPoint4 = canvas.chartingSpace.viewport.fitIntoVisibleArea(recordPoint4);
 
                 recordPoint1 = thisObject.fitFunction(recordPoint1, undefined, 30);
                 recordPoint2 = thisObject.fitFunction(recordPoint2, undefined, 30);
diff --git a/Trades.js b/Trades.js
index cf8d612ce..d5bdcb9a1 100644
--- a/Trades.js
+++ b/Trades.js
@@ -71,8 +71,8 @@
 
             /* Stop listening to the necesary events. */
             thisObject.container.eventHandler.stopListening(onMouseOverEventSuscriptionId)
-            canvas.chartSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId);
-            canvas.chartSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId);
+            canvas.chartingSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId);
+            canvas.chartingSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId);
             canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId);
             thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId)
             marketFiles.eventHandler.stopListening(marketFilesUpdatedEventSubscriptionId);
@@ -126,8 +126,8 @@
 
             /* Listen to the necesary events. */
 
-            zoomChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged);
-            offsetChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged);
+            zoomChangedEventSubscriptionId = canvas.chartingSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged);
+            offsetChangedEventSubscriptionId = canvas.chartingSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged);
             dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished);
             marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated);
             dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated);
@@ -337,8 +337,8 @@
 
             let daysOnSides = getSideDays(timeFrame);
 
-            let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
-            let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
+            let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
+            let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
 
             let dateDiff = rightDate.valueOf() - leftDate.valueOf();
 
@@ -414,8 +414,8 @@
 
             let daysOnSides = getSideDays(timeFrame);
 
-            let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
-            let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
+            let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
+            let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
 
             let dateDiff = rightDate.valueOf() - leftDate.valueOf();
 
@@ -504,13 +504,13 @@
                 recordPoint2 = transformThisPoint(recordPoint2, thisObject.container);
                 recordPoint3 = transformThisPoint(recordPoint3, thisObject.container);
 
-                if (recordPoint2.x < canvas.chartSpace.viewport.visibleArea.bottomLeft.x || recordPoint1.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x) {
+                if (recordPoint2.x < canvas.chartingSpace.viewport.visibleArea.bottomLeft.x || recordPoint1.x > canvas.chartingSpace.viewport.visibleArea.bottomRight.x) {
                     continue;
                 }
 
-                recordPoint1 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint1);
-                recordPoint2 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint2);
-                recordPoint3 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint3);
+                recordPoint1 = canvas.chartingSpace.viewport.fitIntoVisibleArea(recordPoint1);
+                recordPoint2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(recordPoint2);
+                recordPoint3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(recordPoint3);
 
                 recordPoint1 = thisObject.fitFunction(recordPoint1);
                 recordPoint2 = thisObject.fitFunction(recordPoint2);
@@ -580,17 +580,17 @@
                     point.y = recordPoint3.y - 100
                 }
 
-                point = canvas.chartSpace.viewport.fitIntoVisibleArea(point);
+                point = canvas.chartingSpace.viewport.fitIntoVisibleArea(point);
                 point = thisObject.fitFunction(point, undefined, 50);
 
                 if (
-                    recordPoint3.x < canvas.chartSpace.viewport.visibleArea.topLeft.x + 250
+                    recordPoint3.x < canvas.chartingSpace.viewport.visibleArea.topLeft.x + 250
                     ||
-                    recordPoint3.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x - 250
+                    recordPoint3.x > canvas.chartingSpace.viewport.visibleArea.bottomRight.x - 250
                     ||
-                    recordPoint3.y > canvas.chartSpace.viewport.visibleArea.bottomRight.y - 150
+                    recordPoint3.y > canvas.chartingSpace.viewport.visibleArea.bottomRight.y - 150
                     ||
-                    recordPoint3.y < canvas.chartSpace.viewport.visibleArea.topLeft.y + 150
+                    recordPoint3.y < canvas.chartingSpace.viewport.visibleArea.topLeft.y + 150
                 ) {
                     // we do not write any text
                 } else {
diff --git a/TradingSimulation.js b/TradingSimulation.js
index 3e0604399..b82eae6b0 100644
--- a/TradingSimulation.js
+++ b/TradingSimulation.js
@@ -71,8 +71,8 @@
 
             /* Stop listening to the necesary events. */
             thisObject.container.eventHandler.stopListening(onMouseOverEventSuscriptionId)
-            canvas.chartSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId);
-            canvas.chartSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId);
+            canvas.chartingSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId);
+            canvas.chartingSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId);
             canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId);
             thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId)
             marketFiles.eventHandler.stopListening(marketFilesUpdatedEventSubscriptionId);
@@ -130,8 +130,8 @@
 
             /* Listen to the necesary events. */
 
-            zoomChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged);
-            offsetChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged);
+            zoomChangedEventSubscriptionId = canvas.chartingSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged);
+            offsetChangedEventSubscriptionId = canvas.chartingSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged);
             dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished);
             marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated);
             dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated);
@@ -149,9 +149,9 @@
 
             /* Loading a few icons */
 
-            imageStopLossPhase = canvas.designerSpace.iconByUiObjectType.get('Stop');
-            imageTakeProfitPhase = canvas.designerSpace.iconByUiObjectType.get('Phase');
-            imageRecord = canvas.designerSpace.iconByUiObjectType.get('Trading System');
+            imageStopLossPhase = canvas.designSpace.iconByUiObjectType.get('Stop');
+            imageTakeProfitPhase = canvas.designSpace.iconByUiObjectType.get('Phase');
+            imageRecord = canvas.designSpace.iconByUiObjectType.get('Trading System');
 
             callBackFunction();
 
@@ -327,8 +327,8 @@
 
             let daysOnSides = getSideDays(timeFrame);
 
-            let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
-            let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
+            let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
+            let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
 
             let dateDiff = rightDate.valueOf() - leftDate.valueOf();
 
@@ -428,8 +428,8 @@
 
             let daysOnSides = getSideDays(timeFrame);
 
-            let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
-            let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
+            let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
+            let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
 
             let dateDiff = rightDate.valueOf() - leftDate.valueOf();
 
@@ -627,16 +627,16 @@
                 recordPoint9 = transformThisPoint(recordPoint9, thisObject.container);
                 recordPoint10 = transformThisPoint(recordPoint10, thisObject.container);
 
-                recordPoint1 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint1);
-                recordPoint2 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint2);
-                recordPoint3 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint3);
-                recordPoint4 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint4);
-                recordPoint5 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint5);
-                recordPoint6 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint6);
-                recordPoint7 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint7);
-                recordPoint8 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint8);
-                recordPoint9 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint9);
-                recordPoint10 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint10);
+                recordPoint1 = canvas.chartingSpace.viewport.fitIntoVisibleArea(recordPoint1);
+                recordPoint2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(recordPoint2);
+                recordPoint3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(recordPoint3);
+                recordPoint4 = canvas.chartingSpace.viewport.fitIntoVisibleArea(recordPoint4);
+                recordPoint5 = canvas.chartingSpace.viewport.fitIntoVisibleArea(recordPoint5);
+                recordPoint6 = canvas.chartingSpace.viewport.fitIntoVisibleArea(recordPoint6);
+                recordPoint7 = canvas.chartingSpace.viewport.fitIntoVisibleArea(recordPoint7);
+                recordPoint8 = canvas.chartingSpace.viewport.fitIntoVisibleArea(recordPoint8);
+                recordPoint9 = canvas.chartingSpace.viewport.fitIntoVisibleArea(recordPoint9);
+                recordPoint10 = canvas.chartingSpace.viewport.fitIntoVisibleArea(recordPoint10);
 
                 recordPoint1 = thisObject.fitFunction(recordPoint1);
                 recordPoint2 = thisObject.fitFunction(recordPoint2);
@@ -671,7 +671,7 @@
                     y: 0
                 }
 
-                imagePosition = canvas.chartSpace.viewport.fitIntoVisibleArea(imagePosition)
+                imagePosition = canvas.chartingSpace.viewport.fitIntoVisibleArea(imagePosition)
                 imagePosition = thisObject.fitFunction(imagePosition, undefined, 0, 0, imageSize)
 
                 if (imageRecord.canDrawIcon === true) {
@@ -683,7 +683,7 @@
                     browserCanvasContext.restore();
                 }
 
-                if (recordPoint5.x < canvas.chartSpace.viewport.visibleArea.bottomLeft.x || recordPoint5.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x) {
+                if (recordPoint5.x < canvas.chartingSpace.viewport.visibleArea.bottomLeft.x || recordPoint5.x > canvas.chartingSpace.viewport.visibleArea.bottomRight.x) {
                     continue;
                 }
 
@@ -748,14 +748,14 @@
                     y: recordPoint6.y - imageSize * 1.25 + yOffset
                 }
 
-                imagePosition = canvas.chartSpace.viewport.fitIntoVisibleArea(imagePosition)
+                imagePosition = canvas.chartingSpace.viewport.fitIntoVisibleArea(imagePosition)
                 imagePosition = thisObject.fitFunction(imagePosition, undefined, 0, 0, imageSize)
 
                 let labelPosition = {
                     x: recordPoint6.x - imageSize / 2 - 3,
                     y: recordPoint6.y - imageSize * 1.5 + yOffset * 2
                 }
-                labelPosition = canvas.chartSpace.viewport.fitIntoVisibleArea(labelPosition)
+                labelPosition = canvas.chartingSpace.viewport.fitIntoVisibleArea(labelPosition)
                 labelPosition = thisObject.fitFunction(labelPosition, undefined, 30)
 
                 if (imageStopLossPhase.canDrawIcon === true && stopLossPhase > -1) {
@@ -789,14 +789,14 @@
                     x: recordPoint10.x - imageSize * 2 / 3,
                     y: recordPoint10.y + imageSize / 4 - yOffset
                 }
-                imagePosition = canvas.chartSpace.viewport.fitIntoVisibleArea(imagePosition)
+                imagePosition = canvas.chartingSpace.viewport.fitIntoVisibleArea(imagePosition)
                 imagePosition = thisObject.fitFunction(imagePosition, undefined, 0, 0, imageSize)
 
                 labelPosition = {
                     x: recordPoint10.x - imageSize * 1 / 3,
                     y: recordPoint10.y + imageSize * 1.9 - yOffset * 2
                 }
-                labelPosition = canvas.chartSpace.viewport.fitIntoVisibleArea(labelPosition)
+                labelPosition = canvas.chartingSpace.viewport.fitIntoVisibleArea(labelPosition)
                 labelPosition = thisObject.fitFunction(labelPosition, undefined, 30)
 
                 if (imageTakeProfitPhase.canDrawIcon === true && takeProfitPhase > -1) {
diff --git a/TradingSimulationPanel.js b/TradingSimulationPanel.js
index 048de40a3..5781fa645 100644
--- a/TradingSimulationPanel.js
+++ b/TradingSimulationPanel.js
@@ -31,8 +31,8 @@ function newAAMastersPlottersTradingSimulationTradingSimulationTradingSimulation
         thisObject.container.frame.width = UI_PANEL.WIDTH.NORMAL * 1;
         thisObject.container.frame.height = UI_PANEL.HEIGHT.NORMAL * 2.5;
 
-        thisObject.container.frame.position.x = canvas.chartSpace.viewport.visibleArea.topRight.x - thisObject.container.frame.width * 1;
-        thisObject.container.frame.position.y = canvas.chartSpace.viewport.visibleArea.topRight.y;
+        thisObject.container.frame.position.x = canvas.chartingSpace.viewport.visibleArea.topRight.x - thisObject.container.frame.width * 1;
+        thisObject.container.frame.position.y = canvas.chartingSpace.viewport.visibleArea.topRight.y;
 
         panelTabButton = newPanelTabButton()
         panelTabButton.parentContainer = thisObject.container