diff --git a/Projects/Algorithmic-Trading/UI/Function-Libraries/TradingSessionFunctions.js b/Projects/Algorithmic-Trading/UI/Function-Libraries/TradingSessionFunctions.js
index 1a3d66ec7..0ab17f9f4 100644
--- a/Projects/Algorithmic-Trading/UI/Function-Libraries/TradingSessionFunctions.js
+++ b/Projects/Algorithmic-Trading/UI/Function-Libraries/TradingSessionFunctions.js
@@ -105,6 +105,9 @@ function newAlgorithmicTradingFunctionLibraryTradingSessionFunctions() {
             'Managed Stop Loss->Managed Take Profit->' +
             'Phase->Formula->Next Phase Event->Move To Phase Event->Phase->' +
             'Situation->Condition->Javascript Code->' +
+            'Outgoing Signals->Incoming Signals->Signal Reference->' +
+            'Trigger On Signal->Trigger Off Signal->Take Position Signal->' +
+            'Create Order Signal->Cancel Order Signal->' +
             'Close Stage->' +
             'Initial Targets->Target Size In Base Asset->Target Size In Quoted Asset->Target Rate->Formula->' +
             'Open Execution->Close Execution->' +
diff --git a/Projects/Foundations/Schemas/App-Schema/take-position-event.json b/Projects/Foundations/Schemas/App-Schema/take-position-event.json
index 6d6c2472f..5a203b569 100644
--- a/Projects/Foundations/Schemas/App-Schema/take-position-event.json
+++ b/Projects/Foundations/Schemas/App-Schema/take-position-event.json
@@ -21,20 +21,20 @@
             "action": "Add UI Object",
             "actionProject": "Visual-Scripting",
             "disableIfPropertyIsDefined": true,
-            "propertyToCheckFor": "sendSignals",
+            "propertyToCheckFor": "outgoingSignals",
             "actionFunction": "payload.executeAction",
-            "label": "Add Send Signals",
-            "relatedUiObject": "Send Signals",
+            "label": "Add Outgoing Signals",
+            "relatedUiObject": "Outgoing Signals",
             "relatedUiObjectProject": "Trading-Signals"
         },
         {
             "action": "Add UI Object",
             "actionProject": "Visual-Scripting",
             "disableIfPropertyIsDefined": true,
-            "propertyToCheckFor": "receiveSignals",
+            "propertyToCheckFor": "incomingSignals",
             "actionFunction": "payload.executeAction",
-            "label": "Add Receive Signals",
-            "relatedUiObject": "Receive Signals",
+            "label": "Add Incoming Signals",
+            "relatedUiObject": "Incoming Signals",
             "relatedUiObjectProject": "Trading-Signals"
         },  
         {
@@ -67,15 +67,15 @@
             "project": "Social-Bots"
         },
         {
-            "name": "sendSignals",
+            "name": "outgoingSignals",
             "type": "node",
-            "childType": "Send Signals",
+            "childType": "Outgoing Signals",
             "project": "Trading-Signals"
         },
         {
-            "name": "receiveSignals",
+            "name": "incomingSignals",
             "type": "node",
-            "childType": "Receive Signals",
+            "childType": "Incoming Signals",
             "project": "Trading-Signals"
         }
     ],
diff --git a/Projects/Foundations/Schemas/App-Schema/trigger-off-event.json b/Projects/Foundations/Schemas/App-Schema/trigger-off-event.json
index 57977f828..65eec5f08 100644
--- a/Projects/Foundations/Schemas/App-Schema/trigger-off-event.json
+++ b/Projects/Foundations/Schemas/App-Schema/trigger-off-event.json
@@ -21,20 +21,20 @@
             "action": "Add UI Object",
             "actionProject": "Visual-Scripting",
             "disableIfPropertyIsDefined": true,
-            "propertyToCheckFor": "sendSignals",
+            "propertyToCheckFor": "outgoingSignals",
             "actionFunction": "payload.executeAction",
-            "label": "Add Send Signals",
-            "relatedUiObject": "Send Signals",
+            "label": "Add Outgoing Signals",
+            "relatedUiObject": "Outgoing Signals",
             "relatedUiObjectProject": "Trading-Signals"
         },
         {
             "action": "Add UI Object",
             "actionProject": "Visual-Scripting",
             "disableIfPropertyIsDefined": true,
-            "propertyToCheckFor": "receiveSignals",
+            "propertyToCheckFor": "incomingSignals",
             "actionFunction": "payload.executeAction",
-            "label": "Add Receive Signals",
-            "relatedUiObject": "Receive Signals",
+            "label": "Add Incoming Signals",
+            "relatedUiObject": "Incoming Signals",
             "relatedUiObjectProject": "Trading-Signals"
         },  
         {
@@ -67,15 +67,15 @@
             "project": "Social-Bots"
         },
         {
-            "name": "sendSignals",
+            "name": "outgoingSignals",
             "type": "node",
-            "childType": "Send Signals",
+            "childType": "Outgoing Signals",
             "project": "Trading-Signals"
         },
         {
-            "name": "receiveSignals",
+            "name": "incomingSignals",
             "type": "node",
-            "childType": "Receive Signals",
+            "childType": "Incoming Signals",
             "project": "Trading-Signals"
         }
     ],
diff --git a/Projects/Foundations/Schemas/App-Schema/trigger-on-event.json b/Projects/Foundations/Schemas/App-Schema/trigger-on-event.json
index 270ab9c48..2b7a7e9ab 100644
--- a/Projects/Foundations/Schemas/App-Schema/trigger-on-event.json
+++ b/Projects/Foundations/Schemas/App-Schema/trigger-on-event.json
@@ -21,20 +21,20 @@
             "action": "Add UI Object",
             "actionProject": "Visual-Scripting",
             "disableIfPropertyIsDefined": true,
-            "propertyToCheckFor": "sendSignals",
+            "propertyToCheckFor": "outgoingSignals",
             "actionFunction": "payload.executeAction",
-            "label": "Add Send Signals",
-            "relatedUiObject": "Send Signals",
+            "label": "Add Outgoing Signals",
+            "relatedUiObject": "Outgoing Signals",
             "relatedUiObjectProject": "Trading-Signals"
         },
         {
             "action": "Add UI Object",
             "actionProject": "Visual-Scripting",
             "disableIfPropertyIsDefined": true,
-            "propertyToCheckFor": "receiveSignals",
+            "propertyToCheckFor": "incomingSignals",
             "actionFunction": "payload.executeAction",
-            "label": "Add Receive Signals",
-            "relatedUiObject": "Receive Signals",
+            "label": "Add Incoming Signals",
+            "relatedUiObject": "Incoming Signals",
             "relatedUiObjectProject": "Trading-Signals"
         },        
         {
@@ -67,15 +67,15 @@
             "project": "Social-Bots"
         },
         {
-            "name": "sendSignals",
+            "name": "outgoingSignals",
             "type": "node",
-            "childType": "Send Signals",
+            "childType": "Outgoing Signals",
             "project": "Trading-Signals"
         },
         {
-            "name": "receiveSignals",
+            "name": "incomingSignals",
             "type": "node",
-            "childType": "Receive Signals",
+            "childType": "Incoming Signals",
             "project": "Trading-Signals"
         }
     ],
diff --git a/Projects/Trading-Signals/Icons/receive-signals.png b/Projects/Trading-Signals/Icons/incoming-signals.png
similarity index 100%
rename from Projects/Trading-Signals/Icons/receive-signals.png
rename to Projects/Trading-Signals/Icons/incoming-signals.png
diff --git a/Projects/Trading-Signals/Icons/send-signals.png b/Projects/Trading-Signals/Icons/outgoing-signals.png
similarity index 100%
rename from Projects/Trading-Signals/Icons/send-signals.png
rename to Projects/Trading-Signals/Icons/outgoing-signals.png
diff --git a/Projects/Trading-Signals/Schemas/App-Schema/receive-signals.json b/Projects/Trading-Signals/Schemas/App-Schema/incoming-signals.json
similarity index 93%
rename from Projects/Trading-Signals/Schemas/App-Schema/receive-signals.json
rename to Projects/Trading-Signals/Schemas/App-Schema/incoming-signals.json
index 788124a5e..92cb341ee 100644
--- a/Projects/Trading-Signals/Schemas/App-Schema/receive-signals.json
+++ b/Projects/Trading-Signals/Schemas/App-Schema/incoming-signals.json
@@ -1,5 +1,5 @@
 {
-    "type": "Receive Signals",
+    "type": "Incoming Signals",
     "menuItems": [
         {
             "action": "Add UI Object",
@@ -33,5 +33,5 @@
             "autoAdd": false
         }
     ],
-    "propertyNameAtParent": "receiveSignals"
+    "propertyNameAtParent": "incomingSignals"
 }
\ No newline at end of file
diff --git a/Projects/Trading-Signals/Schemas/App-Schema/send-signals.json b/Projects/Trading-Signals/Schemas/App-Schema/outgoing-signals.json
similarity index 93%
rename from Projects/Trading-Signals/Schemas/App-Schema/send-signals.json
rename to Projects/Trading-Signals/Schemas/App-Schema/outgoing-signals.json
index 246f118d0..9ea63a012 100644
--- a/Projects/Trading-Signals/Schemas/App-Schema/send-signals.json
+++ b/Projects/Trading-Signals/Schemas/App-Schema/outgoing-signals.json
@@ -1,5 +1,5 @@
 {
-    "type": "Send Signals",
+    "type": "Outgoing Signals",
     "menuItems": [
         {
             "action": "Add UI Object",
@@ -33,5 +33,5 @@
             "autoAdd": false
         }
     ],
-    "propertyNameAtParent": "sendSignals"
+    "propertyNameAtParent": "outgoingSignals"
 }
\ No newline at end of file
diff --git a/Projects/Trading-Signals/TS/Bot-Modules/TradingSignals.js b/Projects/Trading-Signals/TS/Bot-Modules/TradingSignals.js
index b000feecb..1ca3f825a 100644
--- a/Projects/Trading-Signals/TS/Bot-Modules/TradingSignals.js
+++ b/Projects/Trading-Signals/TS/Bot-Modules/TradingSignals.js
@@ -18,6 +18,7 @@ exports.newTradingSignalsBotModulesTradingSignals = function (processIndex) {
         tradingEngine = TS.projects.foundations.globals.processVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).SIMULATION_STATE.tradingEngine
         sessionParameters = TS.projects.foundations.globals.processConstants.CONSTANTS_BY_PROCESS_INDEX_MAP.get(processIndex).SESSION_NODE.tradingParameters
 
+        
         taskParameters = {
             exchange: TS.projects.foundations.globals.taskConstants.TASK_NODE.parentNode.parentNode.parentNode.referenceParent.parentNode.parentNode.name,
             market: TS.projects.foundations.globals.taskConstants.TASK_NODE.parentNode.parentNode.parentNode.referenceParent.baseAsset.referenceParent.config.codeName +