diff --git a/CMakeLists.txt b/CMakeLists.txt
index 082953e..1d48aea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -150,7 +150,7 @@ set( SOURCES
 	src/nodebuilder/nodebuild_utility.cpp
 	src/nodebuilder/nodebuild_classify_nosse2.cpp
 	src/lightmap/lightmap.cpp
-	src/lightmap/lightsurface.cpp
+	src/lightmap/surfacelight.cpp
 	src/lightmap/surfaces.cpp
 	src/lightmap/worker.cpp
 	src/lightmap/collision.cpp
@@ -180,7 +180,7 @@ set( HEADERS
 	src/framework/halffloat.h
 	src/framework/binfile.h
 	src/lightmap/lightmap.h
-	src/lightmap/lightsurface.h
+	src/lightmap/surfacelight.h
 	src/lightmap/surfaces.h
 	src/lightmap/worker.h
 	src/lightmap/collision.h
diff --git a/src/level/level.cpp b/src/level/level.cpp
index 7a7978b..6bec2d5 100644
--- a/src/level/level.cpp
+++ b/src/level/level.cpp
@@ -19,7 +19,6 @@
 */
 
 #include "level/level.h"
-#include "lightmap/lightsurface.h"
 //#include "rejectbuilder.h"
 #include <memory>
 
diff --git a/src/level/level_light.cpp b/src/level/level_light.cpp
index 522c2a6..9f75604 100644
--- a/src/level/level_light.cpp
+++ b/src/level/level_light.cpp
@@ -27,7 +27,6 @@
 
 #include "math/mathlib.h"
 #include "level/level.h"
-#include "lightmap/lightsurface.h"
 #include <algorithm>
 #include <memory>
 
diff --git a/src/lightmap/lightmap.cpp b/src/lightmap/lightmap.cpp
index fc71ab4..ad87f24 100644
--- a/src/lightmap/lightmap.cpp
+++ b/src/lightmap/lightmap.cpp
@@ -29,7 +29,7 @@
 #include "surfaces.h"
 #include "level/level.h"
 #include "lightmap.h"
-#include "lightsurface.h"
+#include "surfacelight.h"
 #include "worker.h"
 #include "framework/binfile.h"
 #include "framework/templates.h"
diff --git a/src/lightmap/lightsurface.cpp b/src/lightmap/surfacelight.cpp
similarity index 99%
rename from src/lightmap/lightsurface.cpp
rename to src/lightmap/surfacelight.cpp
index 6e4d109..7d3c58a 100644
--- a/src/lightmap/lightsurface.cpp
+++ b/src/lightmap/surfacelight.cpp
@@ -27,7 +27,7 @@
 
 #include "math/mathlib.h"
 #include "level/level.h"
-#include "lightsurface.h"
+#include "surfacelight.h"
 
 SurfaceLight::SurfaceLight(const SurfaceLightDef &surfaceLightDef, Surface *surface)
 {
diff --git a/src/lightmap/lightsurface.h b/src/lightmap/surfacelight.h
similarity index 100%
rename from src/lightmap/lightsurface.h
rename to src/lightmap/surfacelight.h