diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp
index 2345586002..139800dec6 100644
--- a/stepmania/src/NoteDataUtil.cpp
+++ b/stepmania/src/NoteDataUtil.cpp
@@ -1952,7 +1952,7 @@ void NoteDataUtil::AddTapAttacks( NoteData &nd, Song* pSong )
 		int iTrack = iBeat % nd.GetNumTracks();	// deterministically calculates track
 		TapNote tn(
 			TapNote::attack,
-			TapNote::SubType_invalid,
+			TapNote::SubType_INVALID,
 			TapNote::original, 
 			szAttacks[RandomInt(ARRAYLEN(szAttacks))],
 			15.0f, 
diff --git a/stepmania/src/NoteDataWithScoring.cpp b/stepmania/src/NoteDataWithScoring.cpp
index ee9fdbc1b3..d99019b245 100644
--- a/stepmania/src/NoteDataWithScoring.cpp
+++ b/stepmania/src/NoteDataWithScoring.cpp
@@ -39,7 +39,7 @@ int GetNumNWithScore( const NoteData &in, TapNoteScore tns, int MinTaps, int iSt
 
 int GetNumHoldNotesWithScore( const NoteData &in, TapNote::SubType subType, HoldNoteScore hns )
 {
-	ASSERT( subType != TapNote::SubType_invalid );
+	ASSERT( subType != TapNote::SubType_INVALID );
 
 	int iNumSuccessfulHolds = 0;
 	for( int t=0; t<in.GetNumTracks(); ++t )
diff --git a/stepmania/src/NoteTypes.cpp b/stepmania/src/NoteTypes.cpp
index bbd6ccbf2c..ca8ee26932 100644
--- a/stepmania/src/NoteTypes.cpp
+++ b/stepmania/src/NoteTypes.cpp
@@ -5,16 +5,16 @@
 #include "XmlFile.h"
 #include "LocalizedString.h"
 
-TapNote TAP_EMPTY			( TapNote::empty,	TapNote::SubType_invalid,	TapNote::original, "", 0, -1 );
-TapNote TAP_ORIGINAL_TAP		( TapNote::tap,		TapNote::SubType_invalid,	TapNote::original, "", 0, -1 );
-TapNote TAP_ORIGINAL_LIFT		( TapNote::lift,	TapNote::SubType_invalid,	TapNote::original, "", 0, -1 );
+TapNote TAP_EMPTY			( TapNote::empty,	TapNote::SubType_INVALID,	TapNote::original, "", 0, -1 );
+TapNote TAP_ORIGINAL_TAP		( TapNote::tap,		TapNote::SubType_INVALID,	TapNote::original, "", 0, -1 );
+TapNote TAP_ORIGINAL_LIFT		( TapNote::lift,	TapNote::SubType_INVALID,	TapNote::original, "", 0, -1 );
 TapNote TAP_ORIGINAL_HOLD_HEAD		( TapNote::hold_head,	TapNote::hold_head_hold,	TapNote::original, "", 0, -1 );
 TapNote TAP_ORIGINAL_ROLL_HEAD		( TapNote::hold_head,	TapNote::hold_head_roll,	TapNote::original, "", 0, -1 );
-TapNote TAP_ORIGINAL_MINE		( TapNote::mine,	TapNote::SubType_invalid,	TapNote::original, "", 0, -1 );
-TapNote TAP_ORIGINAL_ATTACK		( TapNote::attack,	TapNote::SubType_invalid,	TapNote::original, "", 0, -1 );
-TapNote TAP_ORIGINAL_AUTO_KEYSOUND	( TapNote::autoKeysound,TapNote::SubType_invalid,	TapNote::original, "", 0, -1 );
-TapNote TAP_ADDITION_TAP		( TapNote::tap,		TapNote::SubType_invalid,	TapNote::addition, "", 0, -1 );
-TapNote TAP_ADDITION_MINE		( TapNote::mine,	TapNote::SubType_invalid,	TapNote::addition, "", 0, -1 );
+TapNote TAP_ORIGINAL_MINE		( TapNote::mine,	TapNote::SubType_INVALID,	TapNote::original, "", 0, -1 );
+TapNote TAP_ORIGINAL_ATTACK		( TapNote::attack,	TapNote::SubType_INVALID,	TapNote::original, "", 0, -1 );
+TapNote TAP_ORIGINAL_AUTO_KEYSOUND	( TapNote::autoKeysound,TapNote::SubType_INVALID,	TapNote::original, "", 0, -1 );
+TapNote TAP_ADDITION_TAP		( TapNote::tap,		TapNote::SubType_INVALID,	TapNote::addition, "", 0, -1 );
+TapNote TAP_ADDITION_MINE		( TapNote::mine,	TapNote::SubType_INVALID,	TapNote::addition, "", 0, -1 );
 
 static const char *NoteTypeNames[] = {
 	"4th",
diff --git a/stepmania/src/NoteTypes.h b/stepmania/src/NoteTypes.h
index bbac22924f..3686429c21 100644
--- a/stepmania/src/NoteTypes.h
+++ b/stepmania/src/NoteTypes.h
@@ -71,7 +71,8 @@ struct TapNote
 	{
 		hold_head_hold,
 		hold_head_roll,
-		SubType_invalid
+		NUM_SubType,
+		SubType_INVALID
 	};
 	enum Source
 	{
@@ -101,7 +102,7 @@ struct TapNote
 	XNode* CreateNode() const;
 	void LoadFromNode( const XNode* pNode );
 
-	TapNote() : type(empty), subType(SubType_invalid), source(original), pn(PLAYER_INVALID), bHopoPossible(false),
+	TapNote() : type(empty), subType(SubType_INVALID), source(original), pn(PLAYER_INVALID), bHopoPossible(false),
 		fAttackDurationSeconds(0.f), iKeysoundIndex(-1), iDuration(0)  { }
 	TapNote( 
 		Type type_,
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 0b59071104..a2629db69d 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -2487,7 +2487,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
 		
 		TapNote tn(
 			TapNote::attack, 
-			TapNote::SubType_invalid,
+			TapNote::SubType_INVALID,
 			TapNote::original, 
 			sMods,
 			g_fLastInsertAttackDurationSeconds,