diff --git a/src/clp_ffi_js/ir/LogViewerEvent.hpp b/src/clp_ffi_js/ir/LogEventWithLevel.hpp
similarity index 72%
rename from src/clp_ffi_js/ir/LogViewerEvent.hpp
rename to src/clp_ffi_js/ir/LogEventWithLevel.hpp
index 1eefe002..23913870 100644
--- a/src/clp_ffi_js/ir/LogViewerEvent.hpp
+++ b/src/clp_ffi_js/ir/LogEventWithLevel.hpp
@@ -1,5 +1,5 @@
-#ifndef CLP_FFI_JS_IR_LOG_VIEWER_EVENT_HPP
-#define CLP_FFI_JS_IR_LOG_VIEWER_EVENT_HPP
+#ifndef CLP_FFI_JS_IR_LOG_EVENT_WITH_LEVEL_HPP
+#define CLP_FFI_JS_IR_LOG_EVENT_WITH_LEVEL_HPP
 
 #include <clp/ir/LogEvent.hpp>
 #include <utility>
@@ -11,10 +11,10 @@ namespace clp_ffi_js::ir {
  * @tparam encoded_variable_t The type of encoded variables in the event
  */
 template <typename encoded_variable_t>
-class LogViewerEvent : public clp::ir::LogEvent<encoded_variable_t> {
+class LogEventWithLevel : public clp::ir::LogEvent<encoded_variable_t> {
 public:
     // Constructors
-    LogViewerEvent(
+    LogEventWithLevel(
             clp::ir::epoch_time_ms_t timestamp,
             clp::UtcOffset utc_offset,
             clp::ir::EncodedTextAst<encoded_variable_t> message,
@@ -31,9 +31,9 @@ class LogViewerEvent : public clp::ir::LogEvent<encoded_variable_t> {
 };
 
 template <typename encoded_variable_t>
-auto LogViewerEvent<encoded_variable_t>::get_log_level() const -> size_t {
+auto LogEventWithLevel<encoded_variable_t>::get_log_level() const -> size_t {
     return m_log_level;
 }
 }  // namespace clp_ffi_js::ir
 
-#endif   // CLP_FFI_JS_IR_LOG_VIEWER_EVENT_HPP
+#endif   // CLP_FFI_JS_IR_LOG_EVENT_WITH_LEVEL_HPP
diff --git a/src/clp_ffi_js/ir/StreamReader.cpp b/src/clp_ffi_js/ir/StreamReader.cpp
index 439654b7..11348409 100644
--- a/src/clp_ffi_js/ir/StreamReader.cpp
+++ b/src/clp_ffi_js/ir/StreamReader.cpp
@@ -26,7 +26,7 @@
 
 #include <clp_ffi_js/ClpFfiJsException.hpp>
 #include <clp_ffi_js/constants.hpp>
-#include <clp_ffi_js/ir/LogViewerEvent.hpp>
+#include <clp_ffi_js/ir/LogEventWithLevel.hpp>
 #include <clp_ffi_js/ir/StreamReaderDataContext.hpp>
 
 using namespace std::literals::string_literals;
@@ -144,7 +144,7 @@ auto StreamReader::build() -> size_t {
                     log_level = std::distance(cLogLevelNames.begin(), log_level_name_it);
                 }
 
-                const auto log_viewer_event = LogViewerEvent<four_byte_encoded_variable_t>(
+                const auto log_viewer_event = LogEventWithLevel<four_byte_encoded_variable_t>(
                     log_event.get_timestamp(),
                     log_event.get_utc_offset(),
                     message,