diff --git a/stepmania/src/MessageManager.cpp b/stepmania/src/MessageManager.cpp
index 6fff7fedb5..aca1af7d1b 100644
--- a/stepmania/src/MessageManager.cpp
+++ b/stepmania/src/MessageManager.cpp
@@ -35,9 +35,9 @@ static const char *MessageNames[] = {
 	"GoalCompleteP1",
 	"GoalCompleteP2",
 	"NoteCrossed",
-	"NoteWillCrossIn500Ms",
-	"NoteWillCrossIn1000Ms",
-	"NoteWillCrossIn1500Ms",
+	"NoteWillCrossIn400Ms",
+	"NoteWillCrossIn800Ms",
+	"NoteWillCrossIn1200Ms",
 	"CardRemovedP1",
 	"CardRemovedP2",
 	"BeatCrossed",
diff --git a/stepmania/src/MessageManager.h b/stepmania/src/MessageManager.h
index 0a1e377b9f..eb058a3ba5 100644
--- a/stepmania/src/MessageManager.h
+++ b/stepmania/src/MessageManager.h
@@ -30,9 +30,9 @@ enum Message
 	Message_GoalCompleteP1,
 	Message_GoalCompleteP2,
 	Message_NoteCrossed,
-	Message_NoteWillCrossIn500Ms,
-	Message_NoteWillCrossIn1000Ms,
-	Message_NoteWillCrossIn1500Ms,
+	Message_NoteWillCrossIn400Ms,
+	Message_NoteWillCrossIn800Ms,
+	Message_NoteWillCrossIn1200Ms,
 	Message_CardRemovedP1,
 	Message_CardRemovedP2,
 	Message_BeatCrossed,
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 5d87fd0e1e..771f4989b5 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -2013,7 +2013,7 @@ void ScreenGameplay::SendCrossedMessages()
 
 	{
 		const int NUM_MESSAGES_TO_SEND = 4;
-		const float MESSAGE_SPACING_SECONDS = 0.5f;
+		const float MESSAGE_SPACING_SECONDS = 0.4f;
 
 		PlayerNumber pn = PLAYER_INVALID;
 		FOREACH_EnabledPlayerNumberInfo( m_vPlayerInfo, pi )