diff --git a/testmaps/qbsp_q1_0125unit_faces.map b/testmaps/q1_0125unit_faces.map
similarity index 100%
rename from testmaps/qbsp_q1_0125unit_faces.map
rename to testmaps/q1_0125unit_faces.map
diff --git a/testmaps/qbsp_q1_clip_func_wall.map b/testmaps/q1_clip_func_wall.map
similarity index 100%
rename from testmaps/qbsp_q1_clip_func_wall.map
rename to testmaps/q1_clip_func_wall.map
diff --git a/testmaps/qbsp_q1_csg.map b/testmaps/q1_csg.map
similarity index 100%
rename from testmaps/qbsp_q1_csg.map
rename to testmaps/q1_csg.map
diff --git a/testmaps/qbsp_q1_cube.map b/testmaps/q1_cube.map
similarity index 100%
rename from testmaps/qbsp_q1_cube.map
rename to testmaps/q1_cube.map
diff --git a/testmaps/qbsp_q1_cubes.map b/testmaps/q1_cubes.map
similarity index 100%
rename from testmaps/qbsp_q1_cubes.map
rename to testmaps/q1_cubes.map
diff --git a/testmaps/qbsp_q1_mountain.map b/testmaps/q1_mountain.map
similarity index 100%
rename from testmaps/qbsp_q1_mountain.map
rename to testmaps/q1_mountain.map
diff --git a/testmaps/qbsp_q1_sealing.map b/testmaps/q1_sealing.map
similarity index 100%
rename from testmaps/qbsp_q1_sealing.map
rename to testmaps/q1_sealing.map
diff --git a/testmaps/qbsp_q2_areaportal.map b/testmaps/q2_areaportal.map
similarity index 100%
rename from testmaps/qbsp_q2_areaportal.map
rename to testmaps/q2_areaportal.map
diff --git a/testmaps/qbsp_q2_areaportal_with_detail.map b/testmaps/q2_areaportal_with_detail.map
similarity index 100%
rename from testmaps/qbsp_q2_areaportal_with_detail.map
rename to testmaps/q2_areaportal_with_detail.map
diff --git a/testmaps/qbsp_q2_bmodel_collision.map b/testmaps/q2_bmodel_collision.map
similarity index 100%
rename from testmaps/qbsp_q2_bmodel_collision.map
rename to testmaps/q2_bmodel_collision.map
diff --git a/testmaps/qbsp_q2_detail.map b/testmaps/q2_detail.map
similarity index 100%
rename from testmaps/qbsp_q2_detail.map
rename to testmaps/q2_detail.map
diff --git a/testmaps/qbsp_q2_detail_leak_test.map b/testmaps/q2_detail_leak_test.map
similarity index 100%
rename from testmaps/qbsp_q2_detail_leak_test.map
rename to testmaps/q2_detail_leak_test.map
diff --git a/testmaps/qbsp_q2_detail_seals.map b/testmaps/q2_detail_seals.map
similarity index 100%
rename from testmaps/qbsp_q2_detail_seals.map
rename to testmaps/q2_detail_seals.map
diff --git a/testmaps/qbsp_q2_lavaclip.map b/testmaps/q2_lavaclip.map
similarity index 100%
rename from testmaps/qbsp_q2_lavaclip.map
rename to testmaps/q2_lavaclip.map
diff --git a/testmaps/qbsp_q2_lavawater.map b/testmaps/q2_lavawater.map
similarity index 100%
rename from testmaps/qbsp_q2_lavawater.map
rename to testmaps/q2_lavawater.map
diff --git a/testmaps/qbsp_q2_mirrorinside.map b/testmaps/q2_mirrorinside.map
similarity index 100%
rename from testmaps/qbsp_q2_mirrorinside.map
rename to testmaps/q2_mirrorinside.map
diff --git a/testmaps/qbsp_q2_mist_clip.map b/testmaps/q2_mist_clip.map
similarity index 100%
rename from testmaps/qbsp_q2_mist_clip.map
rename to testmaps/q2_mist_clip.map
diff --git a/testmaps/qbsp_q2_nodraw_detail_light.map b/testmaps/q2_nodraw_detail_light.map
similarity index 100%
rename from testmaps/qbsp_q2_nodraw_detail_light.map
rename to testmaps/q2_nodraw_detail_light.map
diff --git a/testmaps/qbsp_q2_nodraw_light.map b/testmaps/q2_nodraw_light.map
similarity index 100%
rename from testmaps/qbsp_q2_nodraw_light.map
rename to testmaps/q2_nodraw_light.map
diff --git a/testmaps/qbsp_q2_playerclip.map b/testmaps/q2_playerclip.map
similarity index 100%
rename from testmaps/qbsp_q2_playerclip.map
rename to testmaps/q2_playerclip.map
diff --git a/testmaps/qbsp_q2_seal_empty_rooms.map b/testmaps/q2_seal_empty_rooms.map
similarity index 100%
rename from testmaps/qbsp_q2_seal_empty_rooms.map
rename to testmaps/q2_seal_empty_rooms.map
diff --git a/testmaps/qbsp_q2_skip.map b/testmaps/q2_skip.map
similarity index 100%
rename from testmaps/qbsp_q2_skip.map
rename to testmaps/q2_skip.map
diff --git a/tests/test_qbsp.cc b/tests/test_qbsp.cc
index ec49bb09..39e3e02e 100644
--- a/tests/test_qbsp.cc
+++ b/tests/test_qbsp.cc
@@ -1031,7 +1031,7 @@ TEST_CASE("simple" * doctest::test_suite("testmaps_q1"))
  */
 TEST_CASE("q1_cube")
 {
-    const auto [bsp, bspx, prt] = LoadTestmapQ1("qbsp_q1_cube.map");
+    const auto [bsp, bspx, prt] = LoadTestmapQ1("q1_cube.map");
 
     REQUIRE_FALSE(prt.has_value());
 
@@ -1080,7 +1080,7 @@ TEST_CASE("q1_cube")
  */
 TEST_CASE("q1_cubes" * doctest::test_suite("testmaps_q1"))
 {
-    const auto [bsp, bspx, prt] = LoadTestmapQ1("qbsp_q1_cubes.map");
+    const auto [bsp, bspx, prt] = LoadTestmapQ1("q1_cubes.map");
 
     // index 0 is reserved, and the first cube has 12 edges, the second can share one edge so only needs 11
     CHECK(bsp.dedges.size() == 24);
@@ -1091,7 +1091,7 @@ TEST_CASE("q1_cubes" * doctest::test_suite("testmaps_q1"))
  */
 TEST_CASE("q1_clip_func_wall" * doctest::test_suite("testmaps_q1"))
 {
-    const auto [bsp, bspx, prt] = LoadTestmapQ1("qbsp_q1_clip_func_wall.map");
+    const auto [bsp, bspx, prt] = LoadTestmapQ1("q1_clip_func_wall.map");
 
     REQUIRE(prt.has_value());
 
@@ -1211,9 +1211,9 @@ TEST_CASE("qbsp_sealing_point_entity_on_outside" * doctest::test_suite("testmaps
     REQUIRE(prt.has_value());
 }
 
-TEST_CASE("qbsp_q1_0125unit_faces" * doctest::test_suite("testmaps_q1") * doctest::may_fail())
+TEST_CASE("q1_0125unit_faces" * doctest::test_suite("testmaps_q1") * doctest::may_fail())
 {
-    const auto [bsp, bspx, prt] = LoadTestmapQ1("qbsp_q1_0125unit_faces.map");
+    const auto [bsp, bspx, prt] = LoadTestmapQ1("q1_0125unit_faces.map");
 
     CHECK(bsp.loadversion == &bspver_q1);
     CHECK(2 == bsp.dfaces.size());
@@ -1252,7 +1252,7 @@ TEST_CASE("chop" * doctest::test_suite("testmaps_q1") * doctest::skip())
 
 TEST_CASE("mountain" * doctest::test_suite("testmaps_q1") * doctest::skip() * doctest::may_fail())
 {
-    const auto [bsp, bspx, prt] = LoadTestmapQ1("qbsp_q1_mountain.map");
+    const auto [bsp, bspx, prt] = LoadTestmapQ1("q1_mountain.map");
 
     CHECK(GAME_QUAKE == bsp.loadversion->game->id);
     CHECK(prt);
@@ -1265,9 +1265,9 @@ TEST_CASE("mountain" * doctest::test_suite("testmaps_q1") * doctest::skip() * do
  * - hull1+ can't, because it would cause areas containing no entities but connected by a thin gap to the
  *   rest of the world to get sealed off as solid.
  **/
-TEST_CASE("qbsp_q1_sealing" * doctest::test_suite("testmaps_q1"))
+TEST_CASE("q1_sealing" * doctest::test_suite("testmaps_q1"))
 {
-    const auto [bsp, bspx, prt] = LoadTestmapQ1("qbsp_q1_sealing.map");
+    const auto [bsp, bspx, prt] = LoadTestmapQ1("q1_sealing.map");
 
     CHECK(GAME_QUAKE == bsp.loadversion->game->id);
 
@@ -1304,7 +1304,7 @@ TEST_CASE("qbsp_q1_sealing" * doctest::test_suite("testmaps_q1"))
 
 TEST_CASE("q1_csg" * doctest::test_suite("testmaps_q1"))
 {
-    auto &entity = LoadMapPath("qbsp_q1_csg.map");
+    auto &entity = LoadMapPath("q1_csg.map");
 
     REQUIRE(entity.mapbrushes.size() == 2);
 
diff --git a/tests/test_qbsp_q2.cc b/tests/test_qbsp_q2.cc
index 4ed8944a..b3a01faf 100644
--- a/tests/test_qbsp_q2.cc
+++ b/tests/test_qbsp_q2.cc
@@ -13,7 +13,7 @@
 
 TEST_CASE("detail" * doctest::test_suite("testmaps_q2"))
 {
-    const auto [bsp, bspx, prt] = LoadTestmapQ2("qbsp_q2_detail.map");
+    const auto [bsp, bspx, prt] = LoadTestmapQ2("q2_detail.map");
 
     CHECK(GAME_QUAKE_II == bsp.loadversion->game->id);
 
@@ -118,7 +118,7 @@ TEST_CASE("detail" * doctest::test_suite("testmaps_q2"))
 
 TEST_CASE("q2 detail with -nodetail" * doctest::test_suite("testmaps_q2"))
 {
-    const auto [bsp, bspx, prt] = LoadTestmapQ2("qbsp_q2_detail.map", {"-nodetail"});
+    const auto [bsp, bspx, prt] = LoadTestmapQ2("q2_detail.map", {"-nodetail"});
 
     const qvec3d inside_button{246, 436, 98};
     auto *inside_button_leaf = BSP_FindLeafAtPoint(&bsp, &bsp.dmodels[0], inside_button);
@@ -130,7 +130,7 @@ TEST_CASE("q2 detail with -nodetail" * doctest::test_suite("testmaps_q2"))
 
 TEST_CASE("q2 detail with -omitdetail" * doctest::test_suite("testmaps_q2"))
 {
-    const auto [bsp, bspx, prt] = LoadTestmapQ2("qbsp_q2_detail.map", {"-omitdetail"});
+    const auto [bsp, bspx, prt] = LoadTestmapQ2("q2_detail.map", {"-omitdetail"});
 
     CHECK(GAME_QUAKE_II == bsp.loadversion->game->id);
 
@@ -151,7 +151,7 @@ TEST_CASE("-omitdetail removing all brushes in a func" * doctest::test_suite("te
 
 TEST_CASE("playerclip" * doctest::test_suite("testmaps_q2"))
 {
-    const auto [bsp, bspx, prt] = LoadTestmapQ2("qbsp_q2_playerclip.map");
+    const auto [bsp, bspx, prt] = LoadTestmapQ2("q2_playerclip.map");
 
     CHECK(GAME_QUAKE_II == bsp.loadversion->game->id);
 
@@ -179,7 +179,7 @@ TEST_CASE("playerclip" * doctest::test_suite("testmaps_q2"))
 
 TEST_CASE("areaportal" * doctest::test_suite("testmaps_q2"))
 {
-    const auto [bsp, bspx, prt] = LoadTestmapQ2("qbsp_q2_areaportal.map");
+    const auto [bsp, bspx, prt] = LoadTestmapQ2("q2_areaportal.map");
 
     CHECK(GAME_QUAKE_II == bsp.loadversion->game->id);
 
@@ -240,7 +240,7 @@ TEST_CASE("areaportal" * doctest::test_suite("testmaps_q2"))
  */
 TEST_CASE("areaportal_with_detail" * doctest::test_suite("testmaps_q2"))
 {
-    const auto [bsp, bspx, prt] = LoadTestmapQ2("qbsp_q2_areaportal_with_detail.map");
+    const auto [bsp, bspx, prt] = LoadTestmapQ2("q2_areaportal_with_detail.map");
 
     CHECK(GAME_QUAKE_II == bsp.loadversion->game->id);
 
@@ -255,7 +255,7 @@ TEST_CASE("areaportal_with_detail" * doctest::test_suite("testmaps_q2"))
 
 TEST_CASE("nodraw_light" * doctest::test_suite("testmaps_q2"))
 {
-    const auto [bsp, bspx, prt] = LoadTestmapQ2("qbsp_q2_nodraw_light.map", {"-includeskip"});
+    const auto [bsp, bspx, prt] = LoadTestmapQ2("q2_nodraw_light.map", {"-includeskip"});
 
     CHECK(GAME_QUAKE_II == bsp.loadversion->game->id);
 
@@ -270,7 +270,7 @@ TEST_CASE("nodraw_light" * doctest::test_suite("testmaps_q2"))
 
 TEST_CASE("nodraw_detail_light" * doctest::test_suite("testmaps_q2"))
 {
-    const auto [bsp, bspx, prt] = LoadTestmapQ2("qbsp_q2_nodraw_detail_light.map", {"-includeskip"});
+    const auto [bsp, bspx, prt] = LoadTestmapQ2("q2_nodraw_detail_light.map", {"-includeskip"});
 
     CHECK(GAME_QUAKE_II == bsp.loadversion->game->id);
 
@@ -358,7 +358,7 @@ TEST_CASE("base1leak" * doctest::test_suite("testmaps_q2"))
  **/
 TEST_CASE("lavaclip" * doctest::test_suite("testmaps_q2"))
 {
-    const auto [bsp, bspx, prt] = LoadTestmapQ2("qbsp_q2_lavaclip.map");
+    const auto [bsp, bspx, prt] = LoadTestmapQ2("q2_lavaclip.map");
 
     CHECK(GAME_QUAKE_II == bsp.loadversion->game->id);
 
@@ -397,7 +397,7 @@ TEST_CASE("lavaclip" * doctest::test_suite("testmaps_q2"))
  **/
 TEST_CASE("mist_clip" * doctest::test_suite("testmaps_q2"))
 {
-    const auto [bsp, bspx, prt] = LoadTestmapQ2("qbsp_q2_mist_clip.map");
+    const auto [bsp, bspx, prt] = LoadTestmapQ2("q2_mist_clip.map");
 
     CHECK(GAME_QUAKE_II == bsp.loadversion->game->id);
 
@@ -410,7 +410,7 @@ TEST_CASE("mist_clip" * doctest::test_suite("testmaps_q2"))
  **/
 TEST_CASE("lavawater" * doctest::test_suite("testmaps_q2"))
 {
-    const auto [bsp, bspx, prt] = LoadTestmapQ2("qbsp_q2_lavawater.map");
+    const auto [bsp, bspx, prt] = LoadTestmapQ2("q2_lavawater.map");
 
     CHECK(GAME_QUAKE_II == bsp.loadversion->game->id);
 
@@ -424,9 +424,9 @@ TEST_CASE("lavawater" * doctest::test_suite("testmaps_q2"))
  * Weird mystery issue with a func_wall with broken collision
  * (ended up being a PLANE_X/Y/Z plane with negative facing normal, which is illegal - engine assumes they are positive)
  */
-TEST_CASE("qbsp_q2_bmodel_collision" * doctest::test_suite("testmaps_q2"))
+TEST_CASE("q2_bmodel_collision" * doctest::test_suite("testmaps_q2"))
 {
-    const auto [bsp, bspx, prt] = LoadTestmapQ2("qbsp_q2_bmodel_collision.map");
+    const auto [bsp, bspx, prt] = LoadTestmapQ2("q2_bmodel_collision.map");
 
     CHECK(GAME_QUAKE_II == bsp.loadversion->game->id);
 
@@ -483,9 +483,9 @@ TEST_CASE("q2_liquids" * doctest::test_suite("testmaps_q2"))
 /**
  * Empty rooms are sealed to solid in Q2
  **/
-TEST_CASE("qbsp_q2_seal_empty_rooms" * doctest::test_suite("testmaps_q2"))
+TEST_CASE("q2_seal_empty_rooms" * doctest::test_suite("testmaps_q2"))
 {
-    const auto [bsp, bspx, prt] = LoadTestmapQ2("qbsp_q2_seal_empty_rooms.map");
+    const auto [bsp, bspx, prt] = LoadTestmapQ2("q2_seal_empty_rooms.map");
 
     CHECK(GAME_QUAKE_II == bsp.loadversion->game->id);
 
@@ -503,9 +503,9 @@ TEST_CASE("qbsp_q2_seal_empty_rooms" * doctest::test_suite("testmaps_q2"))
 /**
  * Detail seals in Q2
  **/
-TEST_CASE("qbsp_q2_detail_seals" * doctest::test_suite("testmaps_q2"))
+TEST_CASE("q2_detail_seals" * doctest::test_suite("testmaps_q2"))
 {
-    const auto [bsp, bspx, prt] = LoadTestmapQ2("qbsp_q2_detail_seals.map");
+    const auto [bsp, bspx, prt] = LoadTestmapQ2("q2_detail_seals.map");
 
     CHECK(GAME_QUAKE_II == bsp.loadversion->game->id);
 
@@ -567,7 +567,7 @@ TEST_CASE("q2_door" * doctest::test_suite("testmaps_q2"))
 
 TEST_CASE("q2_mirrorinside" * doctest::test_suite("testmaps_q2"))
 {
-    const auto [bsp, bspx, prt] = LoadTestmapQ2("qbsp_q2_mirrorinside.map");
+    const auto [bsp, bspx, prt] = LoadTestmapQ2("q2_mirrorinside.map");
 
     {
         INFO("window is not two sided by default");
diff --git a/tests/test_vis.cc b/tests/test_vis.cc
index cc08d097..a504b93f 100644
--- a/tests/test_vis.cc
+++ b/tests/test_vis.cc
@@ -6,9 +6,9 @@
 #include "test_qbsp.hh"
 #include "testutils.hh"
 
-TEST_CASE("qbsp_q2_detail_leak_test.map" * doctest::may_fail())
+TEST_CASE("q2_detail_leak_test.map" * doctest::may_fail())
 {
-    auto [bsp, bspx] = QbspVisLight_Q2("qbsp_q2_detail_leak_test.map", {}, runvis_t::yes);
+    auto [bsp, bspx] = QbspVisLight_Q2("q2_detail_leak_test.map", {}, runvis_t::yes);
     const auto vis = DecompressAllVis(&bsp);
 
     auto leaf_sees = [&](const mleaf_t *a, const mleaf_t *b) -> bool {