diff --git a/include/qbsp/csg4.hh b/include/qbsp/csg.hh
similarity index 100%
rename from include/qbsp/csg4.hh
rename to include/qbsp/csg.hh
diff --git a/qbsp/CMakeLists.txt b/qbsp/CMakeLists.txt
index 80ef501d..3d496d82 100644
--- a/qbsp/CMakeLists.txt
+++ b/qbsp/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(QBSP_INCLUDES
 	${CMAKE_SOURCE_DIR}/include/qbsp/qbsp.hh
 	${CMAKE_SOURCE_DIR}/include/qbsp/brush.hh
-	${CMAKE_SOURCE_DIR}/include/qbsp/csg4.hh
+	${CMAKE_SOURCE_DIR}/include/qbsp/csg.hh
 	${CMAKE_SOURCE_DIR}/include/qbsp/map.hh
 	${CMAKE_SOURCE_DIR}/include/qbsp/winding.hh
 	${CMAKE_SOURCE_DIR}/include/qbsp/merge.hh
@@ -15,7 +15,7 @@ set(QBSP_INCLUDES
 
 set(QBSP_SOURCES
 	${CMAKE_SOURCE_DIR}/qbsp/brush.cc
-	${CMAKE_SOURCE_DIR}/qbsp/csg4.cc
+	${CMAKE_SOURCE_DIR}/qbsp/csg.cc
 	${CMAKE_SOURCE_DIR}/qbsp/map.cc
 	${CMAKE_SOURCE_DIR}/qbsp/merge.cc
 	${CMAKE_SOURCE_DIR}/qbsp/outside.cc
diff --git a/qbsp/brush.cc b/qbsp/brush.cc
index 345369e1..6f5b8d50 100644
--- a/qbsp/brush.cc
+++ b/qbsp/brush.cc
@@ -24,7 +24,7 @@
 #include <list>
 
 #include <qbsp/brush.hh>
-#include <qbsp/csg4.hh>
+#include <qbsp/csg.hh>
 #include <qbsp/map.hh>
 #include <qbsp/qbsp.hh>
 
diff --git a/qbsp/brushbsp.cc b/qbsp/brushbsp.cc
index 4375ab8a..cb85f280 100644
--- a/qbsp/brushbsp.cc
+++ b/qbsp/brushbsp.cc
@@ -25,7 +25,7 @@
 
 #include <common/vectorutils.hh>
 #include <qbsp/brush.hh>
-#include <qbsp/csg4.hh>
+#include <qbsp/csg.hh>
 #include <qbsp/map.hh>
 #include <qbsp/portals.hh>
 #include <qbsp/qbsp.hh>
diff --git a/qbsp/csg4.cc b/qbsp/csg.cc
similarity index 99%
rename from qbsp/csg4.cc
rename to qbsp/csg.cc
index 979e9133..27b56211 100644
--- a/qbsp/csg4.cc
+++ b/qbsp/csg.cc
@@ -21,7 +21,7 @@
 // csg4.c
 
 #include <qbsp/brush.hh>
-#include <qbsp/csg4.hh>
+#include <qbsp/csg.hh>
 #include <qbsp/map.hh>
 #include <qbsp/brushbsp.hh>
 #include <qbsp/qbsp.hh>
diff --git a/qbsp/faces.cc b/qbsp/faces.cc
index 72bcf588..2f77aced 100644
--- a/qbsp/faces.cc
+++ b/qbsp/faces.cc
@@ -21,7 +21,7 @@
 
 #include <qbsp/brush.hh>
 #include <qbsp/portals.hh>
-#include <qbsp/csg4.hh>
+#include <qbsp/csg.hh>
 #include <qbsp/map.hh>
 #include <qbsp/merge.hh>
 #include <qbsp/brushbsp.hh>
diff --git a/qbsp/merge.cc b/qbsp/merge.cc
index b3aeb0bb..ad518cbc 100644
--- a/qbsp/merge.cc
+++ b/qbsp/merge.cc
@@ -23,7 +23,7 @@
 #include <qbsp/merge.hh>
 
 #include <qbsp/qbsp.hh>
-#include <qbsp/csg4.hh>
+#include <qbsp/csg.hh>
 #include <qbsp/map.hh>
 #include <qbsp/faces.hh>
 
diff --git a/qbsp/qbsp.cc b/qbsp/qbsp.cc
index fd793ba9..7dcdb741 100644
--- a/qbsp/qbsp.cc
+++ b/qbsp/qbsp.cc
@@ -30,7 +30,7 @@
 #include <common/settings.hh>
 
 #include <qbsp/brush.hh>
-#include <qbsp/csg4.hh>
+#include <qbsp/csg.hh>
 #include <qbsp/map.hh>
 #include <qbsp/merge.hh>
 #include <qbsp/portals.hh>