diff --git a/CanvasApp/DesignSpace/Workspace/FunctionLibraries/ChartingSpaceFunctions.js b/CanvasApp/DesignSpace/Workspace/FunctionLibraries/ChartingSpaceFunctions.js
index f2394e699..d9889b7f8 100644
--- a/CanvasApp/DesignSpace/Workspace/FunctionLibraries/ChartingSpaceFunctions.js
+++ b/CanvasApp/DesignSpace/Workspace/FunctionLibraries/ChartingSpaceFunctions.js
@@ -77,7 +77,7 @@ function newChartingSpaceFunctions() {
             if (networkNode === undefined) { return }
 
             let backtestingSessionsArray = nodeBranchToArray(networkNode, 'Backtesting Session')
-            let fordwardTestingSessionsArray = nodeBranchToArray(networkNode, 'Fordward Testing Session')
+            let fordwardTestingSessionsArray = nodeBranchToArray(networkNode, 'Forward Testing Session')
             let paperTradingSessionsArray = nodeBranchToArray(networkNode, 'Paper Trading Session')
             let liveTradingSessionsArray = nodeBranchToArray(networkNode, 'Live Trading Session')
 
@@ -93,7 +93,7 @@ function newChartingSpaceFunctions() {
                         let mineProducts
                         let timeMachine = functionLibraryUiObjectsFromNodes.addUIObject(node, 'Time Machine')
                         timeMachine.payload.referenceParent = session
-                        timeMachine.name = session.name
+                        timeMachine.name = session.name + ' ' + session.type
                         timeMachine.payload.floatingObject.collapseToggle()
 
                         /*
diff --git a/CanvasApp/DesignSpace/Workspace/FunctionLibraries/DataStorageFunctions.js b/CanvasApp/DesignSpace/Workspace/FunctionLibraries/DataStorageFunctions.js
index 29f5dafd9..bc0ea8a7d 100644
--- a/CanvasApp/DesignSpace/Workspace/FunctionLibraries/DataStorageFunctions.js
+++ b/CanvasApp/DesignSpace/Workspace/FunctionLibraries/DataStorageFunctions.js
@@ -87,7 +87,7 @@ function newDataStorageFunctions() {
         if (networkNode === undefined) { return }
 
         let backtestingSessionsArray = nodeBranchToArray(networkNode, 'Backtesting Session')
-        let fordwardTestingSessionsArray = nodeBranchToArray(networkNode, 'Fordward Testing Session')
+        let fordwardTestingSessionsArray = nodeBranchToArray(networkNode, 'Forward Testing Session')
         let paperTradingSessionsArray = nodeBranchToArray(networkNode, 'Paper Trading Session')
         let liveTradingSessionsArray = nodeBranchToArray(networkNode, 'Live Trading Session')
 
diff --git a/CanvasApp/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js b/CanvasApp/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js
index a80f00fcb..7a92aa824 100644
--- a/CanvasApp/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js
+++ b/CanvasApp/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js
@@ -86,7 +86,7 @@ function newSessionFunctions() {
         let tradingEngine = functionLibraryProtocolNode.getProtocolNode(node.tradingEngineReference.payload.referenceParent, false, true, true, false, false, lightingPath)
 
         lightingPath = '' +
-            'Backtesting Session->Paper Trading Session->Fordward Testing Session->Live Trading Session->' +
+            'Backtesting Session->Paper Trading Session->Forward Testing Session->Live Trading Session->' +
             'Parameters->' +
             'Session Base Asset->Session Quoted Asset->Time Range->Time Frame->Slippage->Fee Structure->Snapshots->Heartbeats->User Defined Parameters->' +
             'Exchange Account Asset->Asset->' +
diff --git a/CanvasApp/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js b/CanvasApp/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js
index 8267b6f3a..89a39afc2 100644
--- a/CanvasApp/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js
+++ b/CanvasApp/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js
@@ -62,7 +62,7 @@ function newTaskFunctions() {
             'Exchange Data Tasks->Exchange Trading Tasks->' +
             'Market->Exchange Markets->Crypto Exchange->' +
             'Market Base Asset->Market Quoted Asset->Asset->' +
-            'Backtesting Session->Live Trading Session->Paper Trading Session->Fordward Testing Session->' +
+            'Backtesting Session->Live Trading Session->Paper Trading Session->Forward Testing Session->' +
             'Process Definition->' +
             'Process Output->' +
             'Output Dataset Folder->Output Dataset Folder->Output Dataset Folder->Output Dataset Folder->Output Dataset Folder->' +
diff --git a/CanvasApp/DesignSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js b/CanvasApp/DesignSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js
index 417c88a7e..2a7e86a28 100644
--- a/CanvasApp/DesignSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js
+++ b/CanvasApp/DesignSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js
@@ -696,7 +696,7 @@ function newUiObjectsFromNodes() {
 
         /* Check if there are sessions to run */
         if (userAddingNew === false && node.savedPayload !== undefined) {
-            if (uiObjectType === 'Live Trading Session' || uiObjectType === 'Fordward Testing Session' || uiObjectType === 'Backtesting Session' || uiObjectType === 'Paper Trading Session') {
+            if (uiObjectType === 'Live Trading Session' || uiObjectType === 'Forward Testing Session' || uiObjectType === 'Backtesting Session' || uiObjectType === 'Paper Trading Session') {
                 if (node.savedPayload.uiObject.isRunning === true) {
                     if (node.payload.parentNode !== undefined) {
                         if (sessionsToRun !== undefined) { // it might be undefined when you are spawning a session that was running while backed up
diff --git a/CanvasApp/Panels/Layer.js b/CanvasApp/Panels/Layer.js
index f791c5658..fb78668a3 100644
--- a/CanvasApp/Panels/Layer.js
+++ b/CanvasApp/Panels/Layer.js
@@ -165,7 +165,7 @@ function newLayer() {
                 'Single Market Data->Single Market Trading Data->Exchange Data Products->' +
                 'Session Reference->Session Independent Data->Session Based Data->Exchange Sessions->Session Based Data->Data Storage->Network Node->' +
                 'Data Storage->Network Node->' +
-                'Backtesting Session->Paper Trading Session->Fordward Testing Session->Live Trading Session->' +
+                'Backtesting Session->Paper Trading Session->Forward Testing Session->Live Trading Session->' +
                 'Trading System Reference->Trading Engine Reference->Trading System->Trading Engine->' +
                 'Market->Market Base Asset->Asset->' +
                 'Market Quoted Asset->Asset->' +