diff --git a/stepmania/src/InputFilter.cpp b/stepmania/src/InputFilter.cpp
index c101052f33..5f33314e2e 100644
--- a/stepmania/src/InputFilter.cpp
+++ b/stepmania/src/InputFilter.cpp
@@ -120,7 +120,7 @@ void InputFilter::ButtonPressed( const DeviceInput &di, bool Down )
 	if( di.ts.IsZero() )
 		LOG->Warn( "InputFilter::ButtonPressed: zero timestamp is invalid" );
 
-	ASSERT_M( di.device < NUM_INPUT_DEVICES, ssprintf("%i", di.device) );
+	ASSERT_M( di.device < NUM_InputDevice, ssprintf("%i", di.device) );
 	ASSERT_M( di.button < NUM_DeviceButton, ssprintf("%i", di.button) );
 
 	ButtonState &bs = GetButtonState( di );
diff --git a/stepmania/src/RageInputDevice.cpp b/stepmania/src/RageInputDevice.cpp
index e30616b7d8..eb38457663 100644
--- a/stepmania/src/RageInputDevice.cpp
+++ b/stepmania/src/RageInputDevice.cpp
@@ -211,7 +211,7 @@ static const char *InputDeviceNames[] = {
 	"Pump2",
 	"Midi",
 };
-XToString( InputDevice, NUM_INPUT_DEVICES );
+XToString( InputDevice, NUM_InputDevice );
 StringToX( InputDevice );
 
 /* Return a reversible representation of a DeviceInput.  This is not affected by InputDrivers,
diff --git a/stepmania/src/RageInputDevice.h b/stepmania/src/RageInputDevice.h
index 78d8f65b19..ff186dd3c3 100644
--- a/stepmania/src/RageInputDevice.h
+++ b/stepmania/src/RageInputDevice.h
@@ -46,10 +46,10 @@ enum InputDevice
 	DEVICE_PUMP1,
 	DEVICE_PUMP2,
 	DEVICE_MIDI,
-	NUM_INPUT_DEVICES,	// leave this at the end
+	NUM_InputDevice,		// leave this at the end
 	DEVICE_NONE			// means this is NULL
 };
-#define FOREACH_InputDevice( i ) FOREACH_ENUM( InputDevice, NUM_INPUT_DEVICES, i )
+#define FOREACH_InputDevice( i ) FOREACH_ENUM( InputDevice, NUM_InputDevice, i )
 const RString& InputDeviceToString( InputDevice i );
 InputDevice StringToInputDevice( const RString& s );
 inline bool IsJoystick( InputDevice id ) { return DEVICE_JOY1 <= id && id < DEVICE_JOY1+NUM_JOYSTICKS; }