diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index e8fc3195cd..9d26452c3d 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -1030,7 +1030,7 @@ void GameState::GetDefaultPlayerOptions( PlayerOptions &po )
 	po.FromString( PREFSMAN->m_sDefaultModifiers );
 	po.FromString( CommonMetrics::DEFAULT_MODIFIERS );
 	if( po.m_sNoteSkin.empty() )
-		po.m_sNoteSkin = "default";
+		po.m_sNoteSkin = NOTESKIN->GAME_BASE_NOTESKIN_NAME;
 }
 
 void GameState::GetDefaultSongOptions( SongOptions &so )
diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp
index 4468621e82..ec784d8fb5 100644
--- a/stepmania/src/PlayerOptions.cpp
+++ b/stepmania/src/PlayerOptions.cpp
@@ -194,8 +194,7 @@ void PlayerOptions::GetMods( vector<RString> &AddTo ) const
 	}
 
 	// Don't display a string if using the default NoteSkin.
-	// TODO: The default NoteSkin is not necessarily called "default".
-	if( !m_sNoteSkin.empty() && m_sNoteSkin != "default" )
+	if( !m_sNoteSkin.empty() && m_sNoteSkin != NOTESKIN->GAME_BASE_NOTESKIN_NAME.GetValue() )
 	{
 		RString s = m_sNoteSkin;
 		Capitalize( s );
@@ -337,7 +336,7 @@ void PlayerOptions::FromString( const RString &sOptions, bool bWarnOnInvalid )
 		else if( sBit == "hallway" )		{ m_bSetTiltOrSkew = true; m_fSkew = 0;		m_fPerspectiveTilt = -level;	m_SpeedfSkew = m_SpeedfPerspectiveTilt = speed; }
 		else if( sBit == "distant" )		{ m_bSetTiltOrSkew = true; m_fSkew = 0;		m_fPerspectiveTilt = +level;	m_SpeedfSkew = m_SpeedfPerspectiveTilt = speed; }
 		else if( NOTESKIN && NOTESKIN->DoesNoteSkinExist(sBit) )	m_sNoteSkin = sBit;
-		else if( sBit == "noteskin" && !on ) /* "no noteskin" */	m_sNoteSkin = "default";	// TODO: The default NoteSkin isn't necessarily "default"
+		else if( sBit == "noteskin" && !on ) /* "no noteskin" */	m_sNoteSkin = NOTESKIN->GAME_BASE_NOTESKIN_NAME;
 		else if( sBit == "randomspeed" ) 	SET_FLOAT( fRandomSpeed )
 		else if( sBit == "addscore" )		m_ScoreDisplay = SCORING_ADD;
 		else if( sBit == "subtractscore" )	m_ScoreDisplay = SCORING_SUBTRACT;