diff --git a/stepmania/src/GameInput.h b/stepmania/src/GameInput.h
index fc3b8c0115..e894b10105 100644
--- a/stepmania/src/GameInput.h
+++ b/stepmania/src/GameInput.h
@@ -1,7 +1,7 @@
 /* GameInput - An input event specific to a Game definied by an instrument and a button space. */
 
-#ifndef GAMEINPUT_H
-#define GAMEINPUT_H
+#ifndef GAME_INPUT_H
+#define GAME_INPUT_H
 
 #include "EnumHelper.h"
 
@@ -245,7 +245,7 @@ struct GameInput
 	GameInput( GameController c, GameButton b ): controller(c), button(b) { }
 
 	GameController	controller;
-	GameButton		button;
+	GameButton	button;
 
 	bool operator==( const GameInput &other ) const { return controller == other.controller && button == other.button; };
 	bool operator<( const GameInput &other ) const
diff --git a/stepmania/src/InputFilter.h b/stepmania/src/InputFilter.h
index ccfe469a0c..1e692a0afd 100644
--- a/stepmania/src/InputFilter.h
+++ b/stepmania/src/InputFilter.h
@@ -1,7 +1,7 @@
 /* InputFilter - Checks RageInput and generates a list of InputEvents, representing button presses, releases, and repeats. */
 
-#ifndef INPUTFILTER_H
-#define INPUTFILTER_H
+#ifndef INPUT_FILTER_H
+#define INPUT_FILTER_H
 
 #include "RageInputDevice.h"
 
diff --git a/stepmania/src/InputMapper.h b/stepmania/src/InputMapper.h
index ff96eac926..904ce3bfbb 100644
--- a/stepmania/src/InputMapper.h
+++ b/stepmania/src/InputMapper.h
@@ -1,7 +1,7 @@
 /* InputMapper - Holds user-chosen input preferences and saves it between sessions. */
 
-#ifndef INPUTMAPPER_H
-#define INPUTMAPPER_H
+#ifndef INPUT_MAPPER_H
+#define INPUT_MAPPER_H
 
 #include "RageInputDevice.h"
 #include "GameInput.h"
diff --git a/stepmania/src/InputQueue.h b/stepmania/src/InputQueue.h
index 8c1cdf7368..80f99a8f8d 100644
--- a/stepmania/src/InputQueue.h
+++ b/stepmania/src/InputQueue.h
@@ -1,7 +1,7 @@
 /* InputQueue - Stores a list of the most recently pressed MenuInputs for each player. */
 
-#ifndef INPUTQUEUE_H
-#define INPUTQUEUE_H
+#ifndef INPUT_QUEUE_H
+#define INPUT_QUEUE_H
 
 #include "GameConstantsAndTypes.h"
 #include "GameInput.h"
diff --git a/stepmania/src/MenuInput.h b/stepmania/src/MenuInput.h
index 4fde8a1ff3..a23f0878dd 100644
--- a/stepmania/src/MenuInput.h
+++ b/stepmania/src/MenuInput.h
@@ -1,7 +1,7 @@
 /* MenuInput - An input event specific to a menu navigation.  This is generated based on a Game. */
 
-#ifndef MENUINPUT_H
-#define MENUINPUT_H
+#ifndef MENU_INPUT_H
+#define MENU_INPUT_H
 
 #include "PlayerNumber.h"
 
@@ -30,7 +30,7 @@ struct MenuInput
 	MenuInput( PlayerNumber pn, MenuButton b ) { player = pn; button = b; };
 
 	PlayerNumber	player;
-	MenuButton		button;
+	MenuButton	button;
 
 	bool operator==( const MenuInput &other ) const { return player == other.player && button == other.button; };
 	bool operator!=( const MenuInput &other ) const { return !operator==(other); };
diff --git a/stepmania/src/StepMania.h b/stepmania/src/StepMania.h
index eb45fc8afc..cf7ba70a49 100644
--- a/stepmania/src/StepMania.h
+++ b/stepmania/src/StepMania.h
@@ -1,5 +1,5 @@
-#ifndef STEPMANIA_H
-#define STEPMANIA_H
+#ifndef STEP_MANIA_H
+#define STEP_MANIA_H
 
 class Game;
 class RageTimer;
diff --git a/stepmania/src/StyleInput.h b/stepmania/src/StyleInput.h
index 69cd174c01..2eb95fa1f5 100644
--- a/stepmania/src/StyleInput.h
+++ b/stepmania/src/StyleInput.h
@@ -1,7 +1,7 @@
 /* StyleInput - An input event specific to a style that is defined by a player number and the player's note column. */
 
-#ifndef STYLEINPUT_H
-#define STYLEINPUT_H
+#ifndef STYLE_INPUT_H
+#define STYLE_INPUT_H
 
 #include "PlayerNumber.h"