diff --git a/stepmania/src/GameInput.cpp b/stepmania/src/GameInput.cpp
index 525592f1ab..d873bd8369 100644
--- a/stepmania/src/GameInput.cpp
+++ b/stepmania/src/GameInput.cpp
@@ -35,12 +35,12 @@ GameButton StringToGameButton( const Game* pGame, const RString& s )
 }
 
 
-RString GameInput::toString( const Game* pGame ) 
+RString GameInput::ToString( const Game* pGame ) const
 {
 	return GameControllerToString(controller) + RString("_") + GameButtonToString(pGame,button);
 }
 
-bool GameInput::fromString( const Game* pGame, RString s )
+bool GameInput::FromString( const Game* pGame, const RString &s )
 { 
 	char szController[32] = "";
 	char szButton[32] = "";
diff --git a/stepmania/src/GameInput.h b/stepmania/src/GameInput.h
index e894b10105..1fe72ae316 100644
--- a/stepmania/src/GameInput.h
+++ b/stepmania/src/GameInput.h
@@ -265,8 +265,8 @@ struct GameInput
 	inline bool IsValid() const { return controller != GAME_CONTROLLER_INVALID; };
 	inline void MakeInvalid() { controller = GAME_CONTROLLER_INVALID; button = GAME_BUTTON_INVALID; };
 
-	RString toString( const Game* pGame );
-	bool fromString( const Game* pGame, RString s );
+	RString ToString( const Game* pGame ) const;
+	bool FromString( const Game* pGame, const RString &s );
 };
 
 #endif
diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index 4a451e808e..ccbd6073d5 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -559,7 +559,7 @@ void InputMapper::ReadMappingsFromDisk()
 			const RString &value = i->second;
 
 			GameInput GameI;
-			GameI.fromString( pGame, name );
+			GameI.FromString( pGame, name );
 
 			vector<RString> sDeviceInputStrings;
 			split( value, DEVICE_INPUT_SEPARATOR, sDeviceInputStrings, false );
@@ -593,7 +593,7 @@ void InputMapper::SaveMappingsToDisk()
 		for( int j=0; j<pGame->m_iButtonsPerController; j++ )
 		{
 			GameInput GameI( i, (GameButton)j );
-			RString sNameString = GameI.toString( pGame );
+			RString sNameString = GameI.ToString( pGame );
 			
 			vector<RString> asValues;
 			for( int slot = 0; slot < NUM_USER_GAME_TO_DEVICE_SLOTS; ++slot )	// don't save data from the last (keyboard automap) slot