diff --git a/Conditions.js b/Conditions.js
index 41aa6df7e..8f75cc453 100644
--- a/Conditions.js
+++ b/Conditions.js
@@ -505,7 +505,7 @@
                         formulaValues: conditionRecord.formulaValues
                     };
 
-                    sendRecordInfoToStrategySpace(currentRecord)
+                    sendRecordInfoToDesignerSpace(currentRecord)
                 }
             }
 
@@ -515,18 +515,18 @@
         }
     }
 
-    function sendRecordInfoToStrategySpace(currentRecord) {
+    function sendRecordInfoToDesignerSpace(currentRecord) {
 
         if (currentRecord === undefined) { return; }
         if (currentRecord.conditionsNames === undefined) { return; }
-        if (canvas.strategySpace.workspace === undefined) { return; }
+        if (canvas.designerSpace.workspace === undefined) { return; }
 
         /* We will get now the designer trading system */
         let designerTradingSystem
         let fileTradingSystem = currentRecord.conditionsNames;
 
-        for (let i = 0; i < canvas.strategySpace.workspace.workspaceNode.rootNodes.length; i++) {
-            let rootNode = canvas.strategySpace.workspace.workspaceNode.rootNodes[i]
+        for (let i = 0; i < canvas.designerSpace.workspace.workspaceNode.rootNodes.length; i++) {
+            let rootNode = canvas.designerSpace.workspace.workspaceNode.rootNodes[i]
             if (rootNode.type === 'Definition') {
                 if (rootNode.tradingSystem.id === fileTradingSystem.id) {
                     designerTradingSystem = rootNode.tradingSystem
@@ -960,7 +960,7 @@
             browserCanvasContext.fill();
 
         } catch (err) {
-            if (ERROR_LOG === true) { logger.write("[ERROR] sendRecordInfoToStrategySpace -> err = " + err.stack); }
+            if (ERROR_LOG === true) { logger.write("[ERROR] sendRecordInfoToDesignerSpace -> err = " + err.stack); }
         }
     }
 
diff --git a/TradingSimulation.js b/TradingSimulation.js
index f8f5ba370..8313fdefb 100644
--- a/TradingSimulation.js
+++ b/TradingSimulation.js
@@ -141,9 +141,9 @@
 
             /* Loading a few icons */
 
-            imageStopLossPhase = canvas.strategySpace.iconByPartType.get('Stop');
-            imageTakeProfitPhase = canvas.strategySpace.iconByPartType.get('Phase');
-            imageRecord = canvas.strategySpace.iconByPartType.get('Trading System');
+            imageStopLossPhase = canvas.designerSpace.iconByUiObjectType.get('Stop');
+            imageTakeProfitPhase = canvas.designerSpace.iconByUiObjectType.get('Phase');
+            imageRecord = canvas.designerSpace.iconByUiObjectType.get('Trading System');
 
             callBackFunction();