diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4cf8f8b0..618b08d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,7 +99,7 @@ endif()
 set(SOURCE_FILES src/main.cpp src/emulator.cpp src/io_file.cpp src/config.cpp
 				 src/core/CPU/cpu_dynarmic.cpp src/core/CPU/dynarmic_cycles.cpp
 				 src/core/memory.cpp src/renderer.cpp src/core/renderer_null/renderer_null.cpp
-				 src/httpserver.cpp src/stb_image_write.c src/core/cheats.cpp src/core/action_replay.cpp
+				 src/http_server.cpp src/stb_image_write.c src/core/cheats.cpp src/core/action_replay.cpp
 )
 set(CRYPTO_SOURCE_FILES src/core/crypto/aes_engine.cpp)
 set(KERNEL_SOURCE_FILES src/core/kernel/kernel.cpp src/core/kernel/resource_limits.cpp
@@ -154,7 +154,7 @@ set(HEADER_FILES include/emulator.hpp include/helpers.hpp include/termcolor.hpp
                  include/result/result_common.hpp include/result/result_fs.hpp include/result/result_fnd.hpp
                  include/result/result_gsp.hpp include/result/result_kernel.hpp include/result/result_os.hpp
                  include/crypto/aes_engine.hpp include/metaprogramming.hpp include/PICA/pica_vertex.hpp
-                 include/config.hpp include/services/ir_user.hpp include/httpserver.hpp include/cheats.hpp
+                 include/config.hpp include/services/ir_user.hpp include/http_server.hpp include/cheats.hpp
                  include/action_replay.hpp include/renderer_sw/renderer_sw.hpp include/compiler_builtins.hpp
 )
 
diff --git a/include/emulator.hpp b/include/emulator.hpp
index 0e03bbba..e34e93dc 100644
--- a/include/emulator.hpp
+++ b/include/emulator.hpp
@@ -15,7 +15,7 @@
 #include "memory.hpp"
 
 #ifdef PANDA3DS_ENABLE_HTTP_SERVER
-#include "httpserver.hpp"
+#include "http_server.hpp"
 #endif
 
 enum class ROMType {
diff --git a/include/httpserver.hpp b/include/http_server.hpp
similarity index 100%
rename from include/httpserver.hpp
rename to include/http_server.hpp
diff --git a/src/httpserver.cpp b/src/http_server.cpp
similarity index 99%
rename from src/httpserver.cpp
rename to src/http_server.cpp
index 714b2fee..f595a25c 100644
--- a/src/httpserver.cpp
+++ b/src/http_server.cpp
@@ -1,5 +1,5 @@
 #ifdef PANDA3DS_ENABLE_HTTP_SERVER
-#include "httpserver.hpp"
+#include "http_server.hpp"
 
 #include <fstream>
 #include <sstream>