diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp
index 81a4b05292..8433a9c56f 100644
--- a/stepmania/src/NoteDataUtil.cpp
+++ b/stepmania/src/NoteDataUtil.cpp
@@ -15,7 +15,7 @@ NoteType NoteDataUtil::GetSmallestNoteTypeForMeasure( const NoteData &n, int iMe
 
 	// probe to find the smallest note type
 	NoteType nt;
-	for( nt=(NoteType)0; nt<NUM_NOTE_TYPES; nt=NoteType(nt+1) )		// for each NoteType, largest to largest
+	for( nt=(NoteType)0; nt<NUM_NoteType; nt=NoteType(nt+1) )		// for each NoteType, largest to largest
 	{
 		float fBeatSpacing = NoteTypeToBeat( nt );
 		int iRowSpacing = int(roundf( fBeatSpacing * ROWS_PER_BEAT ));
@@ -40,7 +40,7 @@ NoteType NoteDataUtil::GetSmallestNoteTypeForMeasure( const NoteData &n, int iMe
 			break;	// stop searching.  We found the smallest NoteType
 	}
 
-	if( nt == NUM_NOTE_TYPES )	// we didn't find one
+	if( nt == NUM_NoteType )	// we didn't find one
 		return NOTE_TYPE_INVALID;	// well-formed notes created in the editor should never get here
 	else
 		return nt;
diff --git a/stepmania/src/NoteTypes.cpp b/stepmania/src/NoteTypes.cpp
index 8474ac43cb..b77b137814 100644
--- a/stepmania/src/NoteTypes.cpp
+++ b/stepmania/src/NoteTypes.cpp
@@ -26,9 +26,9 @@ static const char *NoteTypeNames[] = {
 	"64th",
 	"192nd",
 };
-XToString( NoteType, NUM_NOTE_TYPES );
+XToString( NoteType, NUM_NoteType );
 LuaXToString( NoteType )
-LuaXType( NoteType, NUM_NOTE_TYPES , "NOTE_TYPE_", true )
+LuaXType( NoteType, NUM_NoteType, "NOTE_TYPE_", true )
 
 float NoteTypeToBeat( NoteType nt )
 {
diff --git a/stepmania/src/NoteTypes.h b/stepmania/src/NoteTypes.h
index 9d5fa404a2..920e5558c8 100644
--- a/stepmania/src/NoteTypes.h
+++ b/stepmania/src/NoteTypes.h
@@ -193,7 +193,7 @@ enum NoteType
 	NOTE_TYPE_48TH, // forty-eighth note
 	NOTE_TYPE_64TH,	// sixty-fourth note
 	NOTE_TYPE_192ND,
-	NUM_NOTE_TYPES,
+	NUM_NoteType,
 	NOTE_TYPE_INVALID
 };
 const RString& NoteTypeToString( NoteType nt );