diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp
index 0213cc85bc..5b6e52d8cb 100644
--- a/stepmania/src/ScreenManager.cpp
+++ b/stepmania/src/ScreenManager.cpp
@@ -110,8 +110,8 @@ namespace ScreenManagerUtil
 	Actor                   *g_pSharedBGA;  // BGA object that's persistent between screens
 	vector<LoadedScreen>    g_ScreenStack;  // bottommost to topmost
 	vector<Screen*>         g_OverlayScreens;
-	set<RString>			g_setGroupedScreens;
-	set<RString>			g_setPersistantScreens;
+	set<RString>		g_setGroupedScreens;
+	set<RString>		g_setPersistantScreens;
 
 	vector<LoadedScreen>    g_vPreparedScreens;
 	vector<Actor*>          g_vPreparedBackgrounds;
diff --git a/stepmania/src/ScreenManager.h b/stepmania/src/ScreenManager.h
index 7e9f4e2d57..32d1a5e988 100644
--- a/stepmania/src/ScreenManager.h
+++ b/stepmania/src/ScreenManager.h
@@ -1,7 +1,7 @@
 /* ScreenManager - Manager/container for Screens. */
 
-#ifndef ScreenManager_H
-#define ScreenManager_H
+#ifndef SCREEN_MANAGER_H
+#define SCREEN_MANAGER_H
 
 #include "RageInputDevice.h"
 #include "ScreenMessage.h"