diff --git a/bspinfo/main.cc b/bspinfo/main.cc
index bb289189..b25df50b 100644
--- a/bspinfo/main.cc
+++ b/bspinfo/main.cc
@@ -86,7 +86,7 @@ static void FindInfiniteChains(const mbsp_t &bsp)
 }
 
 // TODO
-settings::common_settings options;
+settings::common_settings bspinfo_options;
 
 int main(int argc, char **argv)
 {
@@ -104,7 +104,7 @@ int main(int argc, char **argv)
         bspdata_t bsp;
         LoadBSPFile(source, &bsp);
 
-        bsp.version->game->init_filesystem(source, options);
+        bsp.version->game->init_filesystem(source, bspinfo_options);
 
         PrintBSPFileSizes(&bsp);
 
diff --git a/bsputil/bsputil.cc b/bsputil/bsputil.cc
index 30b29b11..014b9fd4 100644
--- a/bsputil/bsputil.cc
+++ b/bsputil/bsputil.cc
@@ -458,7 +458,7 @@ static void FindFaces(const mbsp_t *bsp, const qvec3d &pos, const qvec3d &normal
 }
 
 // TODO
-settings::common_settings options;
+settings::common_settings bsputil_options;
 
 int main(int argc, char **argv)
 {
@@ -480,7 +480,7 @@ int main(int argc, char **argv)
 
     LoadBSPFile(source, &bspdata);
 
-    bspdata.version->game->init_filesystem(source, options);
+    bspdata.version->game->init_filesystem(source, bsputil_options);
 
     ConvertBSPFormat(&bspdata, &bspver_generic);