diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h
index 4abc9497c1..632f08b5af 100644
--- a/stepmania/src/GameConstantsAndTypes.h
+++ b/stepmania/src/GameConstantsAndTypes.h
@@ -68,6 +68,7 @@ enum StepsType
 	STEPS_TYPE_TECHNO_DOUBLE5,
 	STEPS_TYPE_POPN_FIVE,
 	STEPS_TYPE_POPN_NINE,
+	STEPS_TYPE_GUITAR_FIVE,
 	STEPS_TYPE_LIGHTS_CABINET,
 	NUM_StepsType,		// leave this at the end
 	StepsType_Invalid,
diff --git a/stepmania/src/GameInput.cpp b/stepmania/src/GameInput.cpp
index 451715db54..971246e685 100644
--- a/stepmania/src/GameInput.cpp
+++ b/stepmania/src/GameInput.cpp
@@ -16,7 +16,7 @@ StringToX( GameController );
 
 RString GameButtonToString( const InputScheme* pInputs, GameButton i )
 {
-	return pInputs->m_szButtonNames[i];
+	return pInputs->m_GameButtonInfo[i].m_szName;
 }
 
 RString GameButtonToLocalizedString( const InputScheme* pInputs, GameButton i )
diff --git a/stepmania/src/Style.cpp b/stepmania/src/Style.cpp
index 8604431f54..67f03d80e8 100644
--- a/stepmania/src/Style.cpp
+++ b/stepmania/src/Style.cpp
@@ -87,7 +87,7 @@ RString Style::ColToButtonName( int iCol ) const
 		return pzColumnName;
 
 	GameInput GI = StyleInputToGameInput( iCol, PLAYER_1 );
-	return INPUTMAPPER->GetInputScheme()->m_szButtonNames[GI.button];
+	return INPUTMAPPER->GetInputScheme()->m_GameButtonInfo[GI.button].m_szName;
 }
 
 // Lua bindings