diff --git a/storm/Event.cpp b/storm/Event.cpp
index 6ce6970..12ef08d 100644
--- a/storm/Event.cpp
+++ b/storm/Event.cpp
@@ -1,4 +1,4 @@
-#include "Event.h"
+#include "Event.hpp"
 
 #include <cstdint>
 
diff --git a/storm/Event.h b/storm/Event.hpp
similarity index 100%
rename from storm/Event.h
rename to storm/Event.hpp
diff --git a/test/Event.cpp b/test/Event.cpp
index a5d374b..dbd34cb 100644
--- a/test/Event.cpp
+++ b/test/Event.cpp
@@ -1,4 +1,4 @@
-#include "EventTest.h"
+#include "EventTest.hpp"
 
 
 static void STORMAPI TestBreakEventHandlerSelf(void* data) {
diff --git a/test/EventTest.h b/test/EventTest.hpp
similarity index 94%
rename from test/EventTest.h
rename to test/EventTest.hpp
index 353e265..45b5069 100644
--- a/test/EventTest.h
+++ b/test/EventTest.hpp
@@ -1,5 +1,5 @@
 #include "test/Test.hpp"
-#include "storm/Event.h"
+#include "storm/Event.hpp"
 
 #include <deque>
 #include <sstream>