diff --git a/stepmania/src/arch/InputHandler/InputHandler.cpp b/stepmania/src/arch/InputHandler/InputHandler.cpp
index b2a45b1011..f5e42037ad 100644
--- a/stepmania/src/arch/InputHandler/InputHandler.cpp
+++ b/stepmania/src/arch/InputHandler/InputHandler.cpp
@@ -117,7 +117,7 @@ static LocalizedString BACKSLASH	( "DeviceButton", "Backslash" );
 
 RString InputHandler::GetDeviceSpecificInputString( const DeviceInput &di )
 {
-	if( di.device == DEVICE_NONE )
+	if( di.device == InputDevice_Invalid )
 		return RString();
 
 	if( di.device == DEVICE_KEYBOARD )
diff --git a/stepmania/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp b/stepmania/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp
index a1f7690482..1a54f27a0f 100644
--- a/stepmania/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp
+++ b/stepmania/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp
@@ -20,7 +20,7 @@ static BOOL CALLBACK DIJoystick_EnumDevObjectsProc(LPCDIDEVICEOBJECTINSTANCE dev
 DIDevice::DIDevice()
 {
 	buttons = axes = hats = 0;
-	dev = DEVICE_NONE;
+	dev = InputDevice_Invalid;
 	buffered = true;
 	memset(&JoystickInst, 0, sizeof(JoystickInst));
 	Device = NULL;