6 files changed, 14 insertions, 14 deletions

diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp
index 6fc4b2fc1d..c05a2bc57b 100644
--- a/engines/sci/engine/kmisc.cpp
+++ b/engines/sci/engine/kmisc.cpp
@@ -300,9 +300,9 @@ reg_t kIconBar(EngineState *s, int argc, reg_t *argv) {
 
 	if (argv[0].toUint16() == 4 && argv[1].toUint16() == 0) {
 		for (int i = 0; i < argv[2].toUint16(); i++)
-			g_sci->_macIconBar->addIcon(argv[i + 3]);
+			g_sci->_gfxMacIconBar->addIcon(argv[i + 3]);
 
-		g_sci->_macIconBar->drawIcons();		
+		g_sci->_gfxMacIconBar->drawIcons();		
 	}
 
 	// Other calls seem to handle selecting/deselecting them
diff --git a/engines/sci/graphics/maciconbar.cpp b/engines/sci/graphics/maciconbar.cpp
index b2a0b0677d..2904bda22b 100644
--- a/engines/sci/graphics/maciconbar.cpp
+++ b/engines/sci/graphics/maciconbar.cpp
@@ -36,11 +36,11 @@
 
 namespace Sci {
 
-void MacIconBar::addIcon(reg_t obj) {
+void GfxMacIconBar::addIcon(reg_t obj) {
 	_iconBarObjects.push_back(obj);
 }
 
-void MacIconBar::drawIcons() {
+void GfxMacIconBar::drawIcons() {
 	// Draw the icons to the bottom of the screen
 
 	byte *pal = new byte[256 * 4];
@@ -69,7 +69,7 @@ void MacIconBar::drawIcons() {
 	delete[] pal;
 }
 
-void MacIconBar::remapColors(Graphics::Surface *surf, byte *palette) {
+void GfxMacIconBar::remapColors(Graphics::Surface *surf, byte *palette) {
 	byte *pixels = (byte *)surf->pixels;
 
 	// Remap to the screen palette
diff --git a/engines/sci/graphics/maciconbar.h b/engines/sci/graphics/maciconbar.h
index a9f1fe0243..71e65fcb40 100644
--- a/engines/sci/graphics/maciconbar.h
+++ b/engines/sci/graphics/maciconbar.h
@@ -36,10 +36,10 @@ namespace Graphics {
 
 namespace Sci {
 
-class MacIconBar {
+class GfxMacIconBar {
 public:
-	MacIconBar() {}
-	~MacIconBar() {}
+	GfxMacIconBar() {}
+	~GfxMacIconBar() {}
 
 	void addIcon(reg_t obj);
 	void drawIcons();
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index 841202abce..ab96856674 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -314,8 +314,8 @@ void GfxPalette::setOnScreen() {
 	_screen->setPalette(&_sysPalette);
 
 	// Redraw the Mac SCI1.1 Icon bar every palette change
-	if (g_sci->_macIconBar)
-		g_sci->_macIconBar->drawIcons();
+	if (g_sci->_gfxMacIconBar)
+		g_sci->_gfxMacIconBar->drawIcons();
 }
 
 bool GfxPalette::kernelSetFromResource(GuiResourceId resourceId, bool force) {
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 84747a2545..fc70dc7758 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -98,7 +98,7 @@ SciEngine::SciEngine(OSystem *syst, const ADGameDescription *desc)
 	DebugMan.addDebugChannel(kDebugLevelOnStartup, "OnStartup", "Enter debugger at start of game");
 
 	_gamestate = 0;
-	_macIconBar = 0;
+	_gfxMacIconBar = 0;
 
 	const Common::FSNode gameDataDir(ConfMan.get("path"));
 
@@ -174,7 +174,7 @@ Common::Error SciEngine::run() {
 		screen = new GfxScreen(_resMan, 320, 200, upscaledHires);
 
 	if (_resMan->isSci11Mac() && getSciVersion() == SCI_VERSION_1_1)
-		_macIconBar = new MacIconBar();
+		_gfxMacIconBar = new GfxMacIconBar();
 
 	GfxPalette *palette = new GfxPalette(_resMan, screen);
 	GfxCache *cache = new GfxCache(_resMan, screen, palette);
diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index b785b256d7..685f05e685 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -65,7 +65,7 @@ class GfxPalette;
 class GfxPorts;
 class GfxScreen;
 class SciGui;
-class MacIconBar;
+class GfxMacIconBar;
 
 #ifdef ENABLE_SCI32
 class SciGui32;
@@ -206,7 +206,7 @@ public:
 	GfxPorts *_gfxPorts; // Port managment for 16-bit gfx
 	GfxScreen *_gfxScreen;
 	SciGui *_gui; /* Currently active Gui */
-	MacIconBar *_macIconBar; // Mac Icon Bar manager
+	GfxMacIconBar *_gfxMacIconBar; // Mac Icon Bar manager
 
 #ifdef ENABLE_SCI32
 	SciGui32 *_gui32; // GUI for SCI32 games