diff --git a/common/stderr_log.hpp b/common/stderr_log.hpp
index 43d1b41c2..e2492d3af 100644
--- a/common/stderr_log.hpp
+++ b/common/stderr_log.hpp
@@ -9,10 +9,10 @@ class StderrLogBackend : public LogBackend {
 public:
     inline ~StderrLogBackend() = default;
 
-    void record(EventSeverityClass severity, EventClass event, const std::string &msg);
-    void record(EventSeverityClass severity, EventClass event, const char* format, ...);
-    void record(EventSeverityClass severity, EventClass event, int64_t code);
-    void record(EventSeverityClass severity, EventClass event, int64_t code, const std::string &msg);
+    void record(EventSeverity severity, Event event, const std::string &msg);
+    void record(EventSeverity severity, Event event, const char* format, ...);
+    void record(EventSeverity severity, Event event, int64_t code);
+    void record(EventSeverity severity, Event event, int64_t code, const std::string &msg);
 };
 
 
diff --git a/test/enums.cpp b/test/enums.cpp
index 3df711dd8..3a5ddc9b0 100644
--- a/test/enums.cpp
+++ b/test/enums.cpp
@@ -15,7 +15,7 @@ TEST(Enums, StyleLayerType) {
     ASSERT_EQ(StyleLayerType::Line, StyleLayerTypeClass("line"));
     ASSERT_EQ(StyleLayerType::Icon, StyleLayerTypeClass("icon"));
     ASSERT_EQ(StyleLayerType::Text, StyleLayerTypeClass("text"));
-    ASSERT_EQ(StyleLayerType::Raster, StyleLayerTypeClass("rastr"));
+    ASSERT_EQ(StyleLayerType::Raster, StyleLayerTypeClass("raster"));
     ASSERT_EQ(StyleLayerType::Composite, StyleLayerTypeClass("composite"));
     ASSERT_EQ(StyleLayerType::Background, StyleLayerTypeClass("background"));