diff --git a/core/include/blue/core/error.h b/core/include/blue/core/error.h
index a3c32ce..42b3fbc 100644
--- a/core/include/blue/core/error.h
+++ b/core/include/blue/core/error.h
@@ -1,5 +1,5 @@
-#ifndef BLUELIB_CORE_ERROR_H_
-#define BLUELIB_CORE_ERROR_H_
+#ifndef BLUE_CORE_ERROR_H_
+#define BLUE_CORE_ERROR_H_
 
 #include <blue/core/misc.h>
 #include <blue/core/queue.h>
@@ -210,19 +210,23 @@
 
 #define B_ERR_MSG(s)                                                           \
 	{                                                                      \
-		.msg_type = B_ERROR_MESSAGE_ERROR, .msg_content = (s),         \
+		.msg_type = B_ERROR_MESSAGE_ERROR,                             \
+		.msg_content = (s),                                            \
 	}
 #define B_ERR_MSG_WARN(s)                                                      \
 	{                                                                      \
-		.msg_type = B_ERROR_MESSAGE_WARN, .msg_content = (s),          \
+		.msg_type = B_ERROR_MESSAGE_WARN,                              \
+		.msg_content = (s),                                            \
 	}
 #define B_ERR_MSG_INFO(s)                                                      \
 	{                                                                      \
-		.msg_type = B_ERROR_MESSAGE_INFO, .msg_content = (s),          \
+		.msg_type = B_ERROR_MESSAGE_INFO,                              \
+		.msg_content = (s),                                            \
 	}
 #define B_ERR_MSG_END(s)                                                       \
 	{                                                                      \
-		.msg_type = B_ERROR_MESSAGE_NONE, .msg_content = NULL,         \
+		.msg_type = B_ERROR_MESSAGE_NONE,                              \
+		.msg_content = NULL,                                           \
 	}
 
 typedef enum b_error_submsg_type {