diff --git a/CockpitSpace/RestartSimulation.js b/CockpitSpace/RestartSimulation.js
index 927f82c75..15fbf7fa8 100644
--- a/CockpitSpace/RestartSimulation.js
+++ b/CockpitSpace/RestartSimulation.js
@@ -196,7 +196,7 @@ function newRestartSimulation () {
   }
 
   function executionFocusPhysics () {
-    if (canvas.strategySpace.workspace.tradingSystem !== undefined) {
+    if (canvas.strategySpace.workspace.definition !== undefined) {
       executionFocusExists = true
     } else {
       executionFocusExists = false
diff --git a/FloatingSpace/StrategyPart.js b/FloatingSpace/StrategyPart.js
index ba474fdd6..e8653f1ad 100644
--- a/FloatingSpace/StrategyPart.js
+++ b/FloatingSpace/StrategyPart.js
@@ -481,8 +481,8 @@ function newStrategyPart () {
   }
 
   function runningPhisycs () {
-    if (canvas.strategySpace.workspace.tradingSystem !== undefined) {
-      if (canvas.strategySpace.workspace.tradingSystem.id !== thisObject.payload.node.id) {
+    if (canvas.strategySpace.workspace.definition !== undefined) {
+      if (canvas.strategySpace.workspace.definition.id !== thisObject.payload.node.id) {
         runningCounter--
       }
     }
@@ -499,13 +499,13 @@ function newStrategyPart () {
   }
 
   function setRunningStatus () {
-    canvas.strategySpace.workspace.tradingSystem = thisObject.payload.node
+    canvas.strategySpace.workspace.definition = thisObject.payload.node
     thisObject.isRunning = true
     runningCounter = 30
   }
 
   function setNotRunningStatus () {
-    canvas.strategySpace.workspace.tradingSystem = undefined
+    canvas.strategySpace.workspace.definition = undefined
     thisObject.isRunning = false
   }
 
diff --git a/FloatingSpace/StrategyPartConstructor.js b/FloatingSpace/StrategyPartConstructor.js
index 1d237c102..a8bef3871 100644
--- a/FloatingSpace/StrategyPartConstructor.js
+++ b/FloatingSpace/StrategyPartConstructor.js
@@ -70,7 +70,7 @@ function newStrategyPartConstructor () {
     if (payload.node.savedPayload !== undefined) {
       if (payload.node.savedPayload.uiObject.isRunning === true) {
         strategyPart.setRunningStatus()
-        canvas.strategySpace.workspace.tradingSystem = payload.node
+        canvas.strategySpace.workspace.definition = payload.node
       }
     }
 
diff --git a/StrategySpace/Workspace/Workspace.js b/StrategySpace/Workspace/Workspace.js
index 0c1e74d87..d850e3093 100644
--- a/StrategySpace/Workspace/Workspace.js
+++ b/StrategySpace/Workspace/Workspace.js
@@ -47,7 +47,7 @@ function newWorkspace () {
   return thisObject
 
   function finalize () {
-    thisObject.tradingSystem = undefined
+    thisObject.definition = undefined
     thisObject.container.finalize()
     thisObject.container = undefined
   }
@@ -82,16 +82,16 @@ function newWorkspace () {
   async function initializeLoadingFromStrategizer () {
     let result = await canvas.strategySpace.strategizerGateway.loadFromStrategyzer()
     if (result === true) {
-      thisObject.tradingSystem = canvas.strategySpace.strategizerGateway.strategizerData
-      workspaceNode.rootNodes.push(thisObject.tradingSystem)
-      functionLibraryPartsFromNodes.createPartFromNode(thisObject.tradingSystem, undefined, undefined)
-      thisObject.tradingSystem.payload.uiObject.setRunningStatus()
+      thisObject.definition = canvas.strategySpace.strategizerGateway.strategizerData
+      workspaceNode.rootNodes.push(thisObject.definition)
+      functionLibraryPartsFromNodes.createPartFromNode(thisObject.definition, undefined, undefined)
+      thisObject.definition.payload.uiObject.setRunningStatus()
       thisObject.enabled = true
     }
   }
 
   function getProtocolTradingSystem () {
-    return functionLibraryProtocolNode.getProtocolNode(thisObject.tradingSystem)
+    return functionLibraryProtocolNode.getProtocolNode(thisObject.definition)
   }
 
   function detachNode (node) {