diff --git a/stepmania/src/arch/Dialog/DialogDriver.h b/stepmania/src/arch/Dialog/DialogDriver.h
index e4c9c5a065..4ec4e93a3c 100644
--- a/stepmania/src/arch/Dialog/DialogDriver.h
+++ b/stepmania/src/arch/Dialog/DialogDriver.h
@@ -25,7 +25,7 @@ struct RegisterDialogDriver
 };
 #define REGISTER_DIALOG_DRIVER_CLASS( name ) \
 	static DialogDriver *Create##name() { return new DialogDriver_##name; } \
-	static RegisterDialogDriver register_##className( #name, Create##name )
+	static RegisterDialogDriver register_##name( #name, Create##name )
 
 
 #endif
diff --git a/stepmania/src/arch/InputHandler/InputHandler.h b/stepmania/src/arch/InputHandler/InputHandler.h
index a784bbcb6e..5fe1375618 100644
--- a/stepmania/src/arch/InputHandler/InputHandler.h
+++ b/stepmania/src/arch/InputHandler/InputHandler.h
@@ -76,7 +76,7 @@ struct RegisterInputHandler
 };
 #define REGISTER_INPUT_HANDLER_CLASS2( name, x ) \
 	static InputHandler *Create##name() { return new InputHandler_##x; } \
-	static RegisterInputHandler register_##className( #name, Create##name )
+	static RegisterInputHandler register_##name( #name, Create##name )
 #define REGISTER_INPUT_HANDLER_CLASS( name ) REGISTER_INPUT_HANDLER_CLASS2( name, name )