diff --git a/stepmania/src/arch/Dialog/Dialog.cpp b/stepmania/src/arch/Dialog/Dialog.cpp
index 8feca7bb97..0d087347aa 100644
--- a/stepmania/src/arch/Dialog/Dialog.cpp
+++ b/stepmania/src/arch/Dialog/Dialog.cpp
@@ -17,7 +17,7 @@
 #endif
 
 static DialogDriver *g_pImpl = NULL;
-static DialogDriverNull g_pNullDriver;
+static DialogDriver_Null g_pNullDriver;
 static bool g_bWindowed = false;
 static bool g_bIsShowingDialog = false;
 
@@ -44,7 +44,7 @@ void Dialog::Init()
 #if defined(HAVE_DIALOG_COCOA)
 			if( !DriversToTry[i].CompareNoCase("Cocoa") ) g_pImpl = new DialogDriver_Cocoa;
 #endif
-			if( !DriversToTry[i].CompareNoCase("Null") ) g_pImpl = new DialogDriverNull;
+			if( !DriversToTry[i].CompareNoCase("Null") ) g_pImpl = new DialogDriver_Null;
 		}
 		catch( const RageException &e )
 		{
@@ -53,7 +53,7 @@ void Dialog::Init()
 		}
 	}
 
-	/* DialogDriverNull should have worked, at least. */
+	/* DialogDriver_Null should have worked, at least. */
 	ASSERT( g_pImpl != NULL );
 }
 
diff --git a/stepmania/src/arch/Dialog/DialogDriver.h b/stepmania/src/arch/Dialog/DialogDriver.h
index ac6d89fc34..8d920f0087 100644
--- a/stepmania/src/arch/Dialog/DialogDriver.h
+++ b/stepmania/src/arch/Dialog/DialogDriver.h
@@ -14,7 +14,7 @@ public:
 	virtual ~DialogDriver() { }
 };
 
-class DialogDriverNull: public DialogDriver { };
+class DialogDriver_Null: public DialogDriver { };
 
 #endif