diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index 0a00834864..ff77574b6f 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -468,7 +468,7 @@ void InputMapper::ReadMappingsFromDisk()
 			for( unsigned i=0; i<sDeviceInputStrings.size() && i<unsigned(NUM_GAME_TO_DEVICE_SLOTS); i++ )
 			{
 				DeviceInput DeviceI;
-				DeviceI.fromString( sDeviceInputStrings[i] );
+				DeviceI.FromString( sDeviceInputStrings[i] );
 				if( DeviceI.IsValid() )
 					SetInputMap( DeviceI, GameI, i );
 			}
@@ -499,7 +499,7 @@ void InputMapper::SaveMappingsToDisk()
 			
 			vector<CString> asValues;
 			for( int slot = 0; slot < NUM_GAME_TO_DEVICE_SLOTS; ++slot )
-				asValues.push_back( m_GItoDI[i][j][slot].toString() );
+				asValues.push_back( m_GItoDI[i][j][slot].ToString() );
 		
 			while( asValues.size() && asValues.back() == "" )
 				asValues.erase( asValues.begin()+asValues.size()-1 );
diff --git a/stepmania/src/RageInput.cpp b/stepmania/src/RageInput.cpp
index cad99d3c5e..7f973e2c7e 100644
--- a/stepmania/src/RageInput.cpp
+++ b/stepmania/src/RageInput.cpp
@@ -65,7 +65,7 @@ CString RageInput::GetDeviceSpecificInputString( const DeviceInput &di )
 			return (*i)->GetDeviceSpecificInputString(di);
 	}
 
-	return di.toString();
+	return di.ToString();
 }
 
 InputDeviceState RageInput::GetInputDeviceState( InputDevice id )
diff --git a/stepmania/src/RageInputDevice.cpp b/stepmania/src/RageInputDevice.cpp
index ce7257857d..f1167a5a37 100644
--- a/stepmania/src/RageInputDevice.cpp
+++ b/stepmania/src/RageInputDevice.cpp
@@ -315,7 +315,7 @@ int GetNumDeviceButtons( InputDevice device )
 	}
 };
 
-CString DeviceInput::toString() const
+CString DeviceInput::ToString() const
 {
 	if( device == DEVICE_NONE )
 		return CString();
@@ -324,7 +324,7 @@ CString DeviceInput::toString() const
 	return s;
 }
 
-bool DeviceInput::fromString( const CString &s )
+bool DeviceInput::FromString( const CString &s )
 {
 	char szDevice[32] = "";
 	char szButton[32] = "";
diff --git a/stepmania/src/RageInputDevice.h b/stepmania/src/RageInputDevice.h
index fb51bf5d90..66ae07d35d 100644
--- a/stepmania/src/RageInputDevice.h
+++ b/stepmania/src/RageInputDevice.h
@@ -329,8 +329,8 @@ public:
 		return ! operator==( other );
 	}
 	
-	CString toString() const;
-	bool fromString( const CString &s );
+	CString ToString() const;
+	bool FromString( const CString &s );
 
 	bool IsValid() const { return device != DEVICE_NONE; };
 	void MakeInvalid() { device = DEVICE_NONE; };
diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp
index 9b0406c766..6412ed7015 100644
--- a/stepmania/src/ScreenMapControllers.cpp
+++ b/stepmania/src/ScreenMapControllers.cpp
@@ -344,7 +344,7 @@ void ScreenMapControllers::Refresh()
 				GameInput cur_gi( p, pKey->m_GameButton );
 				DeviceInput di;
 				if( INPUTMAPPER->GameToDevice( cur_gi, s, di ) )
-					pText->SetText( di.toString() );
+					pText->SetText( di.ToString() );
 				else
 					pText->SetText( "-----------" );
 				
diff --git a/stepmania/src/ScreenTestInput.cpp b/stepmania/src/ScreenTestInput.cpp
index 76f98c789c..fe8050d290 100644
--- a/stepmania/src/ScreenTestInput.cpp
+++ b/stepmania/src/ScreenTestInput.cpp
@@ -117,7 +117,7 @@ void ScreenTestInput::Update( float fDeltaTime )
 
 void ScreenTestInput::Input( const InputEventPlus &input )
 {
-	CString sMessage = input.DeviceI.toString();
+	CString sMessage = input.DeviceI.ToString();
 	switch( input.type )
 	{
 	case IET_FIRST_PRESS:
diff --git a/stepmania/src/arch/InputHandler/InputHandler.h b/stepmania/src/arch/InputHandler/InputHandler.h
index b10054de09..e8814a8a07 100644
--- a/stepmania/src/arch/InputHandler/InputHandler.h
+++ b/stepmania/src/arch/InputHandler/InputHandler.h
@@ -31,7 +31,7 @@ public:
 	virtual void GetDevicesAndDescriptions( vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut ) = 0;
 	
 	// Override to return a pretty string that's specific to the controller type.
-	virtual CString GetDeviceSpecificInputString( const DeviceInput &di ) { return di.toString(); }
+	virtual CString GetDeviceSpecificInputString( const DeviceInput &di ) { return di.ToString(); }
 
 	// Override to find out whether the controller is currently plugged in.
 	// Not all InputHandlers will support this.  Not applicable to all InputHandlers.