diff --git a/src/core/screen.c b/src/core/screen.c
index 72cc2c190..4010c7a71 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -200,7 +200,7 @@ meta_screen_class_init (MetaScreenClass *klass)
                   3,
                   G_TYPE_INT,
                   G_TYPE_INT,
-                  MUTTER_TYPE_MOTION_DIRECTION);
+                  META_TYPE_MOTION_DIRECTION);
 
   screen_signals[WINDOW_ENTERED_MONITOR] =
     g_signal_new ("window-entered-monitor",
diff --git a/src/core/window.c b/src/core/window.c
index bc56f2e04..aa735335d 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -411,7 +411,7 @@ meta_window_class_init (MetaWindowClass *klass)
                                    g_param_spec_enum ("window-type",
                                                       "Window Type",
                                                       "The type of the window",
-                                                      MUTTER_TYPE_WINDOW_TYPE,
+                                                      META_TYPE_WINDOW_TYPE,
                                                       META_WINDOW_NORMAL,
                                                       G_PARAM_READABLE));
 
diff --git a/src/mutter-enum-types.h.in b/src/mutter-enum-types.h.in
index ad45cf8c2..5be906662 100644
--- a/src/mutter-enum-types.h.in
+++ b/src/mutter-enum-types.h.in
@@ -20,7 +20,7 @@ G_END_DECLS
 
 /*** BEGIN value-header ***/
 GType @enum_name@_get_type (void) G_GNUC_CONST;
-#define MUTTER_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
+#define META_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
 
 /*** END value-header ***/