diff --git a/common/utils/itti_analyzer/filters.xml b/common/utils/itti_analyzer/filters.xml
index 5ac945ca45dc38a9f6c7daf057822f2732bc00a2..8535c98da7f6ba2568a9eaa683236098e169ad5f 100644
--- a/common/utils/itti_analyzer/filters.xml
+++ b/common/utils/itti_analyzer/filters.xml
@@ -54,42 +54,42 @@
<TASK_UNKNOWN enabled="1"/>
<TASK_TIMER enabled="1"/>
<TASK_L2L1 enabled="1"/>
- <TASK_PDCP_UE enabled="1"/>
- <TASK_PDCP_ENB enabled="1"/>
- <TASK_RLC_UE enabled="1"/>
- <TASK_RLC_ENB enabled="1"/>
- <TASK_MAC_UE enabled="1"/>
- <TASK_MAC_ENB enabled="1"/>
- <TASK_PHY_UE enabled="1"/>
+ <TASK_BM enabled="1"/>
<TASK_PHY_ENB enabled="1"/>
- <TASK_RRC_UE enabled="1"/>
+ <TASK_MAC_ENB enabled="1"/>
+ <TASK_RLC_ENB enabled="1"/>
+ <TASK_PDCP_ENB enabled="1"/>
<TASK_RRC_ENB enabled="1"/>
- <TASK_BM enabled="1"/>
- <TASK_NAS_UE enabled="1"/>
<TASK_S1AP enabled="1"/>
- <TASK_SCTP enabled="1"/>
<TASK_X2AP enabled="1"/>
+ <TASK_SCTP enabled="1"/>
<TASK_ENB_APP enabled="1"/>
+ <TASK_PHY_UE enabled="1"/>
+ <TASK_MAC_UE enabled="1"/>
+ <TASK_RLC_UE enabled="1"/>
+ <TASK_PDCP_UE enabled="1"/>
+ <TASK_RRC_UE enabled="1"/>
+ <TASK_NAS_UE enabled="1"/>
</origin_tasks>
<destination_tasks>
<TASK_UNKNOWN enabled="1"/>
<TASK_TIMER enabled="1"/>
<TASK_L2L1 enabled="1"/>
- <TASK_PDCP_UE enabled="1"/>
- <TASK_PDCP_ENB enabled="1"/>
- <TASK_RLC_UE enabled="1"/>
- <TASK_RLC_ENB enabled="1"/>
- <TASK_MAC_UE enabled="1"/>
- <TASK_MAC_ENB enabled="1"/>
- <TASK_PHY_UE enabled="1"/>
+ <TASK_BM enabled="1"/>
<TASK_PHY_ENB enabled="1"/>
- <TASK_RRC_UE enabled="1"/>
+ <TASK_MAC_ENB enabled="1"/>
+ <TASK_RLC_ENB enabled="1"/>
+ <TASK_PDCP_ENB enabled="1"/>
<TASK_RRC_ENB enabled="1"/>
- <TASK_BM enabled="1"/>
- <TASK_NAS_UE enabled="1"/>
<TASK_S1AP enabled="1"/>
- <TASK_SCTP enabled="1"/>
<TASK_X2AP enabled="1"/>
+ <TASK_SCTP enabled="1"/>
<TASK_ENB_APP enabled="1"/>
+ <TASK_PHY_UE enabled="1"/>
+ <TASK_MAC_UE enabled="1"/>
+ <TASK_RLC_UE enabled="1"/>
+ <TASK_PDCP_UE enabled="1"/>
+ <TASK_RRC_UE enabled="1"/>
+ <TASK_NAS_UE enabled="1"/>
</destination_tasks>
</filters>
diff --git a/openair2/COMMON/tasks_def.h b/openair2/COMMON/tasks_def.h
index 326be194f464f3c4416bc13ccbaba335ad5bd7c1..c2d1b290731bdbefeb30a60ec19b2a052960fc6b 100644
--- a/openair2/COMMON/tasks_def.h
+++ b/openair2/COMMON/tasks_def.h
@@ -1,42 +1,42 @@
// This task is mandatory and must always be placed in first position
-TASK_DEF(TASK_TIMER, TASK_PRIORITY_MAX, 10)
+ TASK_DEF(TASK_TIMER, TASK_PRIORITY_MAX, 10)
// Other possible tasks in the process
-/// Layer 2 and Layer 1 task supporting all the synchronous processing
-TASK_DEF(TASK_L2L1, TASK_PRIORITY_MAX_LEAST, 1000)
-//// Layer 2 and Layer 1 sub-tasks
-SUB_TASK_DEF(TASK_L2L1, TASK_PDCP_UE, 200)
-SUB_TASK_DEF(TASK_L2L1, TASK_PDCP_ENB, 200)
+// Common tasks:
+ /// Layer 2 and Layer 1 task supporting all the synchronous processing
+ TASK_DEF(TASK_L2L1, TASK_PRIORITY_MAX_LEAST, 200)
+
+ /// Bearers Manager task
+ TASK_DEF(TASK_BM, TASK_PRIORITY_MED, 200)
+
+// eNodeB tasks and sub-tasks:
+ //// Layer 2 and Layer 1 sub-tasks
+SUB_TASK_DEF(TASK_L2L1, TASK_PHY_ENB, 200)
+SUB_TASK_DEF(TASK_L2L1, TASK_MAC_ENB, 200)
+SUB_TASK_DEF(TASK_L2L1, TASK_RLC_ENB, 200)
+SUB_TASK_DEF(TASK_L2L1, TASK_PDCP_ENB, 200)
+
+ /// Radio Resource Control task
+ TASK_DEF(TASK_RRC_ENB, TASK_PRIORITY_MED, 200)
+ /// S1ap task
+ TASK_DEF(TASK_S1AP, TASK_PRIORITY_MED, 200)
+ /// X2ap task, acts as both source and target
+ TASK_DEF(TASK_X2AP, TASK_PRIORITY_MED, 200)
+ /// Sctp task (Used by both S1AP and X2AP)
+ TASK_DEF(TASK_SCTP, TASK_PRIORITY_MED, 200)
+ /// eNB APP task
+ TASK_DEF(TASK_ENB_APP, TASK_PRIORITY_MED, 200)
+
+// UE tasks and sub-tasks:
+ //// Layer 2 and Layer 1 sub-tasks
+SUB_TASK_DEF(TASK_L2L1, TASK_PHY_UE, 200)
+SUB_TASK_DEF(TASK_L2L1, TASK_MAC_UE, 200)
+SUB_TASK_DEF(TASK_L2L1, TASK_RLC_UE, 200)
+SUB_TASK_DEF(TASK_L2L1, TASK_PDCP_UE, 200)
+
+ /// Radio Resource Control task
+ TASK_DEF(TASK_RRC_UE, TASK_PRIORITY_MED, 200)
+ /// Non Access Stratum task
+ TASK_DEF(TASK_NAS_UE, TASK_PRIORITY_MED, 200)
-SUB_TASK_DEF(TASK_L2L1, TASK_RLC_UE, 200)
-SUB_TASK_DEF(TASK_L2L1, TASK_RLC_ENB, 200)
-
-SUB_TASK_DEF(TASK_L2L1, TASK_MAC_UE, 200)
-SUB_TASK_DEF(TASK_L2L1, TASK_MAC_ENB, 200)
-
-SUB_TASK_DEF(TASK_L2L1, TASK_PHY_UE, 200)
-SUB_TASK_DEF(TASK_L2L1, TASK_PHY_ENB, 200)
-
-/// Radio Resource Control task for UE
-TASK_DEF(TASK_RRC_UE, TASK_PRIORITY_MED, 200)
-/// Radio Resource Control task for eNodeB
-TASK_DEF(TASK_RRC_ENB, TASK_PRIORITY_MED, 200)
-
-/// Bearers Manager task
-TASK_DEF(TASK_BM, TASK_PRIORITY_MED, 200)
-
-/// Non Access Stratum task for UE
-TASK_DEF(TASK_NAS_UE, TASK_PRIORITY_MED, 200)
-
-/// S1ap task for eNodeB
-TASK_DEF(TASK_S1AP, TASK_PRIORITY_MED, 200)
-
-/// Sctp task for eNodeB (Used by both S1AP and X2AP)
-TASK_DEF(TASK_SCTP, TASK_PRIORITY_MED, 200)
-
-/// X2ap task for eNodeB, acts as both source and target
-TASK_DEF(TASK_X2AP, TASK_PRIORITY_MED, 200)
-
-/// eNB APP task
-TASK_DEF(TASK_ENB_APP, TASK_PRIORITY_MED, 200)
diff --git a/targets/itti_vcd_tasks.sav b/targets/itti_vcd_tasks.sav
index 261af183c06d4b5f6c95d8e0c0b3345d1ce57ae3..fea1b4b31e902b19a8da4156bf7cd3e3aacd4203 100644
--- a/targets/itti_vcd_tasks.sav
+++ b/targets/itti_vcd_tasks.sav
@@ -40,37 +40,37 @@ variables.itti_alloc_msg[63:0]
variables.itti_send_msg[63:0]
@28
[color] 2
-+{eNB app} (45)variables.itti_send_msg[63:0]
++{UE NAS} (45)variables.itti_send_msg[63:0]
[color] 2
-+{eNB X2AP} (46)variables.itti_send_msg[63:0]
++{UE RRC} (46)variables.itti_send_msg[63:0]
[color] 2
-+{eNB SCTP} (47)variables.itti_send_msg[63:0]
++{UE PDCP} (47)variables.itti_send_msg[63:0]
[color] 2
-+{eNB S1AP} (48)variables.itti_send_msg[63:0]
++{UE RLC} (48)variables.itti_send_msg[63:0]
[color] 2
-+{UE NAS} (49)variables.itti_send_msg[63:0]
++{UE MAC} (49)variables.itti_send_msg[63:0]
[color] 2
-+{BM} (50)variables.itti_send_msg[63:0]
++{UE PHY} (50)variables.itti_send_msg[63:0]
[color] 2
-+{eNB RRC} (51)variables.itti_send_msg[63:0]
++{eNB app} (51)variables.itti_send_msg[63:0]
[color] 2
-+{UE RRC} (52)variables.itti_send_msg[63:0]
++{eNB SCTP} (52)variables.itti_send_msg[63:0]
[color] 2
-+{eNB PHY} (53)variables.itti_send_msg[63:0]
++{eNB X2AP} (53)variables.itti_send_msg[63:0]
[color] 2
-+{UE PHY} (54)variables.itti_send_msg[63:0]
++{eNB S1AP} (54)variables.itti_send_msg[63:0]
[color] 2
-+{eNB MAC} (55)variables.itti_send_msg[63:0]
++{eNB RRC} (55)variables.itti_send_msg[63:0]
[color] 2
-+{UE MAC} (56)variables.itti_send_msg[63:0]
++{eNB PDCP} (56)variables.itti_send_msg[63:0]
[color] 2
+{eNB RLC} (57)variables.itti_send_msg[63:0]
[color] 2
-+{UE RLC} (58)variables.itti_send_msg[63:0]
++{eNB MAC} (58)variables.itti_send_msg[63:0]
[color] 2
-+{eNB PDCP} (59)variables.itti_send_msg[63:0]
++{eNB PHY} (59)variables.itti_send_msg[63:0]
[color] 2
-+{UE PDCP} (60)variables.itti_send_msg[63:0]
++{BM} (60)variables.itti_send_msg[63:0]
[color] 2
+{L2L1} (61)variables.itti_send_msg[63:0]
[color] 2
@@ -93,21 +93,21 @@ functions.itti_enqueue_message
variables.itti_poll_msg[63:0]
@28
[color] 6
-+{eNB PHY} (53)variables.itti_poll_msg[63:0]
++{UE PDCP} (47)variables.itti_poll_msg[63:0]
[color] 6
-+{UE PHY} (54)variables.itti_poll_msg[63:0]
++{UE RLC} (48)variables.itti_poll_msg[63:0]
[color] 6
-+{eNB MAC} (55)variables.itti_poll_msg[63:0]
++{UE MAC} (49)variables.itti_poll_msg[63:0]
[color] 6
-+{UE MAC} (56)variables.itti_poll_msg[63:0]
++{UE PHY} (50)variables.itti_poll_msg[63:0]
[color] 6
-+{eNB RLC} (57)variables.itti_poll_msg[63:0]
++{eNB PDCP} (56)variables.itti_poll_msg[63:0]
[color] 6
-+{UE RLC} (58)variables.itti_poll_msg[63:0]
++{eNB RLC} (57)variables.itti_poll_msg[63:0]
[color] 6
-+{eNB PDCP} (59)variables.itti_poll_msg[63:0]
++{eNB MAC} (58)variables.itti_poll_msg[63:0]
[color] 6
-+{UE PDCP} (60)variables.itti_poll_msg[63:0]
++{eNB PHY} (59)variables.itti_poll_msg[63:0]
[color] 6
+{L2L1} (61)variables.itti_poll_msg[63:0]
@1401200
@@ -117,21 +117,21 @@ variables.itti_poll_msg[63:0]
variables.itti_recv_msg[63:0]
@28
[color] 6
-+{eNB app} (45)variables.itti_recv_msg[63:0]
++{UE NAS} (45)variables.itti_recv_msg[63:0]
[color] 6
-+{eNB X2AP} (46)variables.itti_recv_msg[63:0]
++{UE RRC} (46)variables.itti_recv_msg[63:0]
[color] 6
-+{eNB SCTP} (47)variables.itti_recv_msg[63:0]
++{eNB app} (51)variables.itti_recv_msg[63:0]
[color] 6
-+{eNB S1AP} (48)variables.itti_recv_msg[63:0]
++{eNB SCTP} (52)variables.itti_recv_msg[63:0]
[color] 6
-+{UE NAS} (49)variables.itti_recv_msg[63:0]
++{eNB X2AP} (53)variables.itti_recv_msg[63:0]
[color] 6
-+{BM} (50)variables.itti_recv_msg[63:0]
++{eNB S1AP} (54)variables.itti_recv_msg[63:0]
[color] 6
-+{eNB RRC} (51)variables.itti_recv_msg[63:0]
++{eNB RRC} (55)variables.itti_recv_msg[63:0]
[color] 6
-+{UE RRC} (52)variables.itti_recv_msg[63:0]
++{BM} (60)variables.itti_recv_msg[63:0]
[color] 6
+{L2L1} (61)variables.itti_recv_msg[63:0]
@1401200