diff --git a/include/c11log/common_types.h b/include/c11log/common_types.h
index 9159ccec..85ea8ba0 100644
--- a/include/c11log/common_types.h
+++ b/include/c11log/common_types.h
@@ -29,9 +29,9 @@ inline const char* to_str(c11log::level::level_enum l)
 
 struct log_msg
 {
-    log_clock::time_point when;
-    bufpair_t msg_buf;
-    std::size_t header_size;
+	bufpair_t msg_buf;
+    log_clock::time_point msg_time;
+    std::size_t msg_header_size;
     level::level_enum msg_level;
 };
 
diff --git a/include/c11log/details/line_logger.h b/include/c11log/details/line_logger.h
index fae0131a..04fadec4 100644
--- a/include/c11log/details/line_logger.h
+++ b/include/c11log/details/line_logger.h
@@ -26,13 +26,13 @@ public:
     {
         if(enabled)
         {
-            _log_msg.when = log_clock::now();
+            _log_msg.msg_time = log_clock::now();
             _log_msg.msg_level = msg_level;
             callback_logger->_formatter->format_header(callback_logger->_logger_name,
                     _log_msg.msg_level,
-                    _log_msg.when,
+                    _log_msg.msg_time,
                     _oss);
-            _log_msg.header_size = _oss.size();
+            _log_msg.msg_header_size = _oss.size();
         }
     }