From ebbbe43b8ffb7fbfd97a210106c8e67008c9def2 Mon Sep 17 00:00:00 2001
From: Steven Vascellaro <S.Vascellaro@gmail.com>
Date: Tue, 7 Oct 2014 19:14:11 -0400
Subject: [PATCH] Rename m_names to m_banner_names

---
 Source/Core/DolphinWX/ISOFile.cpp | 12 ++++++------
 Source/Core/DolphinWX/ISOFile.h   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp
index f26414179cb2..5bbfaa7f4092 100644
--- a/Source/Core/DolphinWX/ISOFile.cpp
+++ b/Source/Core/DolphinWX/ISOFile.cpp
@@ -89,7 +89,7 @@ GameListItem::GameListItem(const std::string& _rFileName)
 					if (pBannerLoader->IsValid())
 					{
 						if (m_Platform != WII_WAD)
-							m_names = pBannerLoader->GetNames();
+							m_banner_names = pBannerLoader->GetNames();
 						m_company = pBannerLoader->GetCompany();
 						m_descriptions = pBannerLoader->GetDescriptions();
 
@@ -176,7 +176,7 @@ void GameListItem::DoState(PointerWrap &p)
 {
 	p.Do(m_volume_names);
 	p.Do(m_company);
-	p.Do(m_names);
+	p.Do(m_banner_names);
 	p.Do(m_descriptions);
 	p.Do(m_UniqueID);
 	p.Do(m_FileSize);
@@ -250,11 +250,11 @@ std::string GameListItem::GetBannerName(int _index) const
 {
 	u32 const index = _index;
 
-	if (index < m_names.size() && !m_names[index].empty())
-		return m_names[index];
+	if (index < m_banner_names.size() && !m_banner_names[index].empty())
+		return m_banner_names[index];
 
-	if (!m_names.empty())
-		return m_names[0];
+	if (!m_banner_names.empty())
+		return m_banner_names[0];
 
 	return "";
 }
diff --git a/Source/Core/DolphinWX/ISOFile.h b/Source/Core/DolphinWX/ISOFile.h
index 163f73569eb5..66d070d5e3c4 100644
--- a/Source/Core/DolphinWX/ISOFile.h
+++ b/Source/Core/DolphinWX/ISOFile.h
@@ -61,7 +61,7 @@ class GameListItem : NonCopyable
 
 	// Stuff from banner
 	std::string m_company;
-	std::vector<std::string> m_names;
+	std::vector<std::string> m_banner_names;
 	std::vector<std::string> m_descriptions;
 
 	std::string m_UniqueID;