diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h
index b03b60012a..af1f3b3699 100644
--- a/stepmania/src/GameConstantsAndTypes.h
+++ b/stepmania/src/GameConstantsAndTypes.h
@@ -411,9 +411,9 @@ GoalType StringToGoalType( const CString& s );
 
 enum EditMode
 {
-	EDIT_MODE_PRACTICE,	// subset of EDIT_MODE_HOME
-	EDIT_MODE_HOME,		// subset of EDIT_MODE_FULL
-	EDIT_MODE_FULL,		// complete
+	EDIT_MODE_PRACTICE,
+	EDIT_MODE_HOME,
+	EDIT_MODE_FULL,
 	NUM_EDIT_MODES,
 	EDIT_MODE_INVALID,
 };
diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp
index 00a0f6eea7..0ee66be404 100644
--- a/stepmania/src/OptionRow.cpp
+++ b/stepmania/src/OptionRow.cpp
@@ -51,7 +51,7 @@ CString OptionRow::OptionTitle( CString s ) const
 	bool bTheme = false;
 	
 	// HACK: Always theme the NEXT_ROW and EXIT items, even if metrics says not to theme.
-	if( m_RowDef.m_bAllowThemeTitles )
+	if( m_RowDef.m_bAllowThemeTitle )
 		bTheme = true;
 
 	return bTheme ? THEME->GetMetric("OptionTitles",s) : s;
diff --git a/stepmania/src/OptionRow.h b/stepmania/src/OptionRow.h
index 6141123083..a4fa246b67 100644
--- a/stepmania/src/OptionRow.h
+++ b/stepmania/src/OptionRow.h
@@ -43,8 +43,8 @@ struct OptionRowDefinition
 	vector<CString> m_vsChoices;
 	set<PlayerNumber> m_vEnabledForPlayers;	// only players in this set may change focus to this row
 	bool	m_bExportOnChange;
-	bool	m_bAllowThemeItems;	// if false, ignores ScreenOptions::THEME_ITEMS.  Should be true for dynamic strings.
-	bool	m_bAllowThemeTitles;	// if false, ignores ScreenOptions::THEME_TITLES.  Should be true for dynamic strings.
+	bool	m_bAllowThemeItems;	// Should be true for dynamic strings.
+	bool	m_bAllowThemeTitle;	// Should be true for dynamic strings.
 	bool	m_bAllowExplanation;	// if false, ignores ScreenOptions::SHOW_EXPLANATIONS.  Should be true for dynamic strings.
 	bool	m_bShowChoicesListOnSelect;
 
@@ -66,7 +66,7 @@ struct OptionRowDefinition
 			m_vEnabledForPlayers.insert( pn );
 		m_bExportOnChange = false;
 		m_bAllowThemeItems = true;
-		m_bAllowThemeTitles = true;
+		m_bAllowThemeTitle = true;
 		m_bAllowExplanation = true;
 		m_bShowChoicesListOnSelect = false;
 	}
diff --git a/stepmania/src/ScreenOptionsEditProfile.cpp b/stepmania/src/ScreenOptionsEditProfile.cpp
index 7cbe137ffc..3473c27510 100644
--- a/stepmania/src/ScreenOptionsEditProfile.cpp
+++ b/stepmania/src/ScreenOptionsEditProfile.cpp
@@ -39,7 +39,7 @@ void ScreenOptionsEditProfile::BeginScreen()
 	def.m_layoutType = LAYOUT_SHOW_ONE_IN_ROW;
 	def.m_bOneChoiceForAllPlayers = true;
 	def.m_bAllowThemeItems = false;
-	def.m_bAllowThemeTitles = false;
+	def.m_bAllowThemeTitle = false;
 	def.m_bAllowExplanation = false;
 	def.m_bExportOnChange = true;
 	
diff --git a/stepmania/src/ScreenOptionsManageProfiles.cpp b/stepmania/src/ScreenOptionsManageProfiles.cpp
index 7bcc9a5151..81e6dba026 100644
--- a/stepmania/src/ScreenOptionsManageProfiles.cpp
+++ b/stepmania/src/ScreenOptionsManageProfiles.cpp
@@ -137,7 +137,7 @@ void ScreenOptionsManageProfiles::BeginScreen()
 
 	OptionRowDefinition def;
 	def.m_layoutType = LAYOUT_SHOW_ALL_IN_ROW;
-	def.m_bAllowThemeTitles = false;
+	def.m_bAllowThemeTitle = false;
 	def.m_bAllowThemeItems = false;
 
 	int iIndex = 0;