diff --git a/ChangeLog b/ChangeLog
index 264d38adc0..eca31e3819 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-08-31  Michael Natterer  <mitch@gimp.org>
+
+	* app/gui/sync-menu.[ch]: renamed...
+
+	* app/gui/gtk-macmenu.[ch]: ...to these to match new namespace.
+
+	* app/gui/Makefile.am
+	* app/gui/gui.c: changed accordingly.
+
 2007-08-31  Michael Natterer  <mitch@gimp.org>
 
 	* app/gui/sync-menu.[ch]: new versions with sane namespace and
diff --git a/app/gui/Makefile.am b/app/gui/Makefile.am
index ce03c47627..1c9216eed6 100644
--- a/app/gui/Makefile.am
+++ b/app/gui/Makefile.am
@@ -30,7 +30,7 @@ libappgui_a_SOURCES = \
 	splash.h		\
 	themes.c		\
 	themes.h		\
-	sync-menu.c		\
-	sync-menu.h
+	gtk-macmenu.c		\
+	gtk-macmenu.h
 
 EXTRA_DIST = makefile.msc
diff --git a/app/gui/sync-menu.c b/app/gui/gtk-macmenu.c
similarity index 99%
rename from app/gui/sync-menu.c
rename to app/gui/gtk-macmenu.c
index bf414a292e..ba871d2afa 100644
--- a/app/gui/sync-menu.c
+++ b/app/gui/gtk-macmenu.c
@@ -30,7 +30,7 @@
 
 #include <Carbon/Carbon.h>
 
-#include "sync-menu.h"
+#include "gtk-macmenu.h"
 
 
 /* TODO
diff --git a/app/gui/sync-menu.h b/app/gui/gtk-macmenu.h
similarity index 94%
rename from app/gui/sync-menu.h
rename to app/gui/gtk-macmenu.h
index d665b4259a..d33ee0fdb4 100644
--- a/app/gui/sync-menu.h
+++ b/app/gui/gtk-macmenu.h
@@ -21,8 +21,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef __SYNC_MENU_H__
-#define __SYNC_MENU_H__
+#ifndef __GTK_MACMENU_H__
+#define __GTK_MACMENU_H__
 
 #include <gtk/gtk.h>
 
@@ -38,4 +38,4 @@ void   gtk_macmenu_set_prefs_item (GtkMenuItem  *menu_item,
 
 G_END_DECLS
 
-#endif /* __SYNC_MENU_H__ */
+#endif /* __GTK_MACMENU_H__ */
diff --git a/app/gui/gui.c b/app/gui/gui.c
index f16847bff0..cd7954906f 100644
--- a/app/gui/gui.c
+++ b/app/gui/gui.c
@@ -85,7 +85,7 @@
 #include "splash.h"
 #include "themes.h"
 #ifdef HAVE_CARBON
-#include "sync-menu.h"
+#include "gtk-macmenu.h"
 #endif /* HAVE_CARBON */
 
 #include "gimp-intl.h"