diff --git a/openair2/COMMON/mac_messages_types.h b/openair2/COMMON/mac_messages_types.h
index f3eb7e4a0d97ee7e1d8aef4eae62ebb12c99212b..bb1bc1b37ed37f7fc325c404b9f23ab052b8df7d 100644
--- a/openair2/COMMON/mac_messages_types.h
+++ b/openair2/COMMON/mac_messages_types.h
@@ -30,46 +30,46 @@
 
 //-------------------------------------------------------------------------------------------//
 // Messages between RRC and MAC layers
-typedef struct {
+typedef struct RrcMacInSyncInd_s {
   uint32_t frame;
   uint16_t enb_index;
 } RrcMacInSyncInd;
 
 typedef RrcMacInSyncInd RrcMacOutOfSyncInd;
 
-typedef struct {
+typedef struct RrcMacBcchDataReq_s {
   uint32_t frame;
   uint32_t sdu_size;
   uint8_t sdu[BCCH_SDU_SIZE];
   uint8_t enb_index;
 } RrcMacBcchDataReq;
 
-typedef struct {
+typedef struct RrcMacBcchDataInd_s {
   uint32_t frame;
   uint32_t sdu_size;
   uint8_t sdu[BCCH_SDU_SIZE];
   uint8_t enb_index;
 } RrcMacBcchDataInd;
 
-typedef struct {
+typedef struct RrcMacCcchDataReq_s {
   uint32_t frame;
   uint32_t sdu_size;
   uint8_t sdu[CCCH_SDU_SIZE];
   uint8_t enb_index;
 } RrcMacCcchDataReq;
 
-typedef struct {
+typedef struct RrcMacCcchDataCnf_s {
   uint8_t enb_index;
 } RrcMacCcchDataCnf;
 
-typedef struct {
+typedef struct RrcMacCcchDataInd_s {
     uint32_t frame;
     uint32_t sdu_size;
     uint8_t sdu[CCCH_SDU_SIZE];
     uint8_t enb_index;
 } RrcMacCcchDataInd;
 
-typedef struct {
+typedef struct RrcMacMcchDataReq_s {
   uint32_t frame;
   uint32_t sdu_size;
   uint8_t sdu[MCCH_SDU_SIZE];
@@ -77,7 +77,7 @@ typedef struct {
   uint8_t mbsfn_sync_area;
 } RrcMacMcchDataReq;
 
-typedef struct {
+typedef struct RrcMacMcchDataInd_s {
   uint32_t frame;
   uint32_t sdu_size;
   uint8_t sdu[MCCH_SDU_SIZE];
diff --git a/openair2/COMMON/pdcp_messages_types.h b/openair2/COMMON/pdcp_messages_types.h
index f0a783e0a2768c88ab22ab5617085f5479b8e430..5bc4353d0c75a3c8505061b8ad4b6140ccba218a 100644
--- a/openair2/COMMON/pdcp_messages_types.h
+++ b/openair2/COMMON/pdcp_messages_types.h
@@ -15,7 +15,7 @@
 
 //-------------------------------------------------------------------------------------------//
 // Messages between RRC and PDCP layers
-typedef struct {
+typedef struct RrcDcchDataReq_s {
   uint32_t frame;
   uint8_t enb_flag;
   uint32_t rb_id;
@@ -26,7 +26,7 @@ typedef struct {
   uint8_t mode;
 } RrcDcchDataReq;
 
-typedef struct {
+typedef struct RrcDcchDataInd_s {
   uint32_t frame;
   uint8_t dcch_index;
   uint32_t sdu_size;