diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp
index ee9820d7df..6ef88047c3 100644
--- a/stepmania/src/GameConstantsAndTypes.cpp
+++ b/stepmania/src/GameConstantsAndTypes.cpp
@@ -298,7 +298,7 @@ static const char *StyleTypeNames[] = {
 	"OnePlayerTwoSides",
 	"TwoPlayersSharedSides",
 };
-XToString( StyleType, NUM_STYLE_TYPES );
+XToString( StyleType, NUM_StyleType );
 StringToX( StyleType );
 
 
diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h
index a4e7614f5c..a7585ab7e8 100644
--- a/stepmania/src/GameConstantsAndTypes.h
+++ b/stepmania/src/GameConstantsAndTypes.h
@@ -391,8 +391,8 @@ enum StyleType
 	TWO_PLAYERS_TWO_SIDES,	// e.g. versus
 	ONE_PLAYER_TWO_SIDES,	// e.g. double
 	TWO_PLAYERS_SHARED_SIDES, // e.g. routine
-	NUM_STYLE_TYPES,
-	STYLE_TYPE_INVALID
+	NUM_StyleType,
+	StyleType_Invalid
 };
 const RString& StyleTypeToString( StyleType s );
 StyleType StringToStyleType( const RString& s );