diff --git a/common/utils/itti/intertask_messages_def.h b/common/utils/itti/intertask_messages_def.h
index 7171764934bcde3b8b5617398eb995c10fa2ad2f..e2de4293ae785f40f180644db61e8c550ee3ca53 100644
--- a/common/utils/itti/intertask_messages_def.h
+++ b/common/utils/itti/intertask_messages_def.h
@@ -5,9 +5,9 @@ MESSAGE_DEF(TERMINATE_MESSAGE,  MESSAGE_PRIORITY_MAX, struct {}, terminate_messa
 MESSAGE_DEF(MESSAGE_TEST,       MESSAGE_PRIORITY_MED, struct {}, message_test)
 
 /* Error message  */
-MESSAGE_DEF(ERROR,              MESSAGE_PRIORITY_MAX, struct {}, error)
+MESSAGE_DEF(ERROR_LOG,          MESSAGE_PRIORITY_MAX, struct {}, error_log)
 /* Warning message  */
-MESSAGE_DEF(WARNING,            MESSAGE_PRIORITY_MAX, struct {}, warning)
+MESSAGE_DEF(WARNING_LOG,        MESSAGE_PRIORITY_MAX, struct {}, warning_log)
 
 /* Generic log message for text */
 MESSAGE_DEF(GENERIC_LOG,        MESSAGE_PRIORITY_MED, struct {}, generic_log)
diff --git a/openair2/UTIL/LOG/log.c b/openair2/UTIL/LOG/log.c
index 64d2c95f47683251eb09fd3f25b4ae88d2b73dd0..08ffd774352a2ba844efe035cb4c77fe427b6a7b 100755
--- a/openair2/UTIL/LOG/log.c
+++ b/openair2/UTIL/LOG/log.c
@@ -656,20 +656,20 @@ void logRecord_mt(const char *file, const char *func, int line, int comp,
 
         if (level <= LOG_ERR)
         {
-            messages_id = ERROR;
+            messages_id = ERROR_LOG;
         }
         else
         {
-            messages_id = WARNING;
+            messages_id = WARNING_LOG;
         }
         message_p = itti_alloc_new_message_sized(TASK_UNKNOWN, messages_id, message_string_size);
         if (level <= LOG_ERR)
         {
-            message_msg_p = (char *) &message_p->msg.error;
+            message_msg_p = (char *) &message_p->msg.error_log;
         }
         else
         {
-            message_msg_p = (char *) &message_p->msg.warning;
+            message_msg_p = (char *) &message_p->msg.warning_log;
         }
         memcpy(message_msg_p, log_start, message_string_size);