diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 9516739039..3645daadc9 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -1597,7 +1597,7 @@ void GameState::StoreRankingName( PlayerNumber pn, CString name )
 				}
 
 				line.MakeUpper();
-				if( !line.empty() && name.Find(line) != -1 )	// name contains a bad word
+				if( !line.empty() && name.find(line) != string::npos )	// name contains a bad word
 				{
 					LOG->Trace( "entered '%s' matches blacklisted item '%s'", name.c_str(), line.c_str() );
 					name = "";
diff --git a/stepmania/src/Sprite.cpp b/stepmania/src/Sprite.cpp
index 2eeb780f6a..6f77defc15 100644
--- a/stepmania/src/Sprite.cpp
+++ b/stepmania/src/Sprite.cpp
@@ -686,7 +686,7 @@ void Sprite::SetState( int iNewState )
 	if( iNewState != 0 && (iNewState < 0  ||  iNewState >= (int)m_States.size()) )
 	{
 		// Don't warn about number of states in "_blank".
-		if( !m_pTexture || m_pTexture->GetID().filename.Find("_blank") == -1 )
+		if( !m_pTexture || m_pTexture->GetID().filename.find("_blank") == string::npos )
 		{
 			CString sError;
 			if( m_pTexture )
@@ -842,7 +842,7 @@ void Sprite::ScaleToClipped( float fWidth, float fHeight )
 		}
 		SetZoom( 1 );
 	}
-	else if( m_pTexture->GetID().filename.find("(was rotated)") != m_pTexture->GetID().filename.npos && 
+	else if( m_pTexture->GetID().filename.find("(was rotated)") != string::npos && 
 			 fWidth != -1 && fHeight != -1 )
 	{
 		/* Dumb hack.  Normally, we crop all sprites except for diagonal banners,
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index 1db9ea8bfa..c506f43ba1 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -320,7 +320,7 @@ static bool ChangeAppPri()
 		{
 			INPUTMAN->GetDevicesAndDescriptions(vDevices,vDescriptions);
 			CString sInputDevices = join( ",", vDescriptions );
-			if( sInputDevices.Find("NTPAD") != -1 )
+			if( sInputDevices.find("NTPAD") != string::npos )
 			{
 				LOG->Trace( "Using NTPAD.  Don't boost priority." );
 				return false;