diff --git a/include/qbsp/solidbsp.hh b/include/qbsp/brushbsp.hh
similarity index 100%
rename from include/qbsp/solidbsp.hh
rename to include/qbsp/brushbsp.hh
diff --git a/qbsp/CMakeLists.txt b/qbsp/CMakeLists.txt
index a5a0fb89..59e31932 100644
--- a/qbsp/CMakeLists.txt
+++ b/qbsp/CMakeLists.txt
@@ -9,7 +9,7 @@ set(QBSP_INCLUDES
 	${CMAKE_SOURCE_DIR}/include/qbsp/outside.hh
 	${CMAKE_SOURCE_DIR}/include/qbsp/portals.hh
 	${CMAKE_SOURCE_DIR}/include/qbsp/prtfile.hh
-	${CMAKE_SOURCE_DIR}/include/qbsp/solidbsp.hh
+	${CMAKE_SOURCE_DIR}/include/qbsp/brushbsp.hh
 	${CMAKE_SOURCE_DIR}/include/qbsp/surfaces.hh
 	${CMAKE_SOURCE_DIR}/include/qbsp/writebsp.hh)
 
@@ -22,7 +22,7 @@ set(QBSP_SOURCES
 	${CMAKE_SOURCE_DIR}/qbsp/portals.cc
 	${CMAKE_SOURCE_DIR}/qbsp/prtfile.cc
 	${CMAKE_SOURCE_DIR}/qbsp/qbsp.cc
-	${CMAKE_SOURCE_DIR}/qbsp/solidbsp.cc
+	${CMAKE_SOURCE_DIR}/qbsp/brushbsp.cc
 	${CMAKE_SOURCE_DIR}/qbsp/surfaces.cc
 	${CMAKE_SOURCE_DIR}/qbsp/tjunc.cc
 	${CMAKE_SOURCE_DIR}/qbsp/wad.cc
diff --git a/qbsp/solidbsp.cc b/qbsp/brushbsp.cc
similarity index 99%
rename from qbsp/solidbsp.cc
rename to qbsp/brushbsp.cc
index c4f20748..7bd9d805 100644
--- a/qbsp/solidbsp.cc
+++ b/qbsp/brushbsp.cc
@@ -19,7 +19,7 @@
     See file, 'COPYING', for details.
 */
 
-#include <qbsp/solidbsp.hh>
+#include <qbsp/brushbsp.hh>
 
 #include <climits>
 
diff --git a/qbsp/csg4.cc b/qbsp/csg4.cc
index 6e09688a..7c488878 100644
--- a/qbsp/csg4.cc
+++ b/qbsp/csg4.cc
@@ -23,7 +23,7 @@
 #include <qbsp/brush.hh>
 #include <qbsp/csg4.hh>
 #include <qbsp/map.hh>
-#include <qbsp/solidbsp.hh>
+#include <qbsp/brushbsp.hh>
 #include <qbsp/qbsp.hh>
 
 #include <atomic>
diff --git a/qbsp/portals.cc b/qbsp/portals.cc
index db5e142e..501d74d3 100644
--- a/qbsp/portals.cc
+++ b/qbsp/portals.cc
@@ -24,7 +24,7 @@
 #include <qbsp/portals.hh>
 
 #include <qbsp/map.hh>
-#include <qbsp/solidbsp.hh>
+#include <qbsp/brushbsp.hh>
 #include <qbsp/qbsp.hh>
 
 #include <atomic>
diff --git a/qbsp/qbsp.cc b/qbsp/qbsp.cc
index 8b0cfc4c..b142c34f 100644
--- a/qbsp/qbsp.cc
+++ b/qbsp/qbsp.cc
@@ -35,7 +35,7 @@
 #include <qbsp/merge.hh>
 #include <qbsp/portals.hh>
 #include <qbsp/prtfile.hh>
-#include <qbsp/solidbsp.hh>
+#include <qbsp/brushbsp.hh>
 #include <qbsp/surfaces.hh>
 #include <qbsp/qbsp.hh>
 #include <qbsp/wad.hh>
diff --git a/qbsp/surfaces.cc b/qbsp/surfaces.cc
index ee50b3fe..5aa7255f 100644
--- a/qbsp/surfaces.cc
+++ b/qbsp/surfaces.cc
@@ -24,7 +24,7 @@
 #include <qbsp/csg4.hh>
 #include <qbsp/map.hh>
 #include <qbsp/merge.hh>
-#include <qbsp/solidbsp.hh>
+#include <qbsp/brushbsp.hh>
 #include <qbsp/qbsp.hh>
 #include <qbsp/writebsp.hh>