diff --git a/src/Makefile.am b/src/Makefile.am
index d9d824229..0af758288 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -141,10 +141,10 @@ libmutter_wayland_la_SOURCES =			\
 	core/meta-idle-monitor-native.c		\
 	core/meta-idle-monitor-native.h		\
 	core/meta-xrandr-shared.h		\
-	core/monitor.c				\
-	core/monitor-private.h			\
 	core/meta-monitor-config.c		\
 	core/meta-monitor-config.h		\
+	core/meta-monitor-manager.c		\
+	core/meta-monitor-manager.h		\
 	core/meta-monitor-manager-dummy.c	\
 	core/meta-monitor-manager-dummy.h	\
 	core/meta-monitor-manager-kms.c		\
diff --git a/src/compositor/meta-plugin.c b/src/compositor/meta-plugin.c
index f9f6b3df0..d7c4f11d4 100644
--- a/src/compositor/meta-plugin.c
+++ b/src/compositor/meta-plugin.c
@@ -40,7 +40,7 @@
 
 #include "compositor-private.h"
 #include "meta-window-actor-private.h"
-#include "monitor-private.h"
+#include "meta-monitor-manager.h"
 
 G_DEFINE_ABSTRACT_TYPE (MetaPlugin, meta_plugin, G_TYPE_OBJECT);
 
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index 39fa7db8b..f7f32a0e5 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -27,7 +27,7 @@
 #include "meta-window-actor-private.h"
 #include "meta-texture-rectangle.h"
 #include "region-utils.h"
-#include "monitor-private.h"
+#include "meta-monitor-manager.h"
 #include "meta-cullable.h"
 
 #include "meta-surface-actor.h"
diff --git a/src/core/meta-cursor-tracker.c b/src/core/meta-cursor-tracker.c
index 098b2511c..28a6af2fc 100644
--- a/src/core/meta-cursor-tracker.c
+++ b/src/core/meta-cursor-tracker.c
@@ -44,7 +44,7 @@
 #include "meta-cursor-private.h"
 #include "meta-cursor-tracker-private.h"
 #include "screen-private.h"
-#include "monitor-private.h"
+#include "meta-monitor-manager.h"
 
 #include "wayland/meta-wayland-private.h"
 
diff --git a/src/core/meta-monitor-config.c b/src/core/meta-monitor-config.c
index bf57796a1..8150c091f 100644
--- a/src/core/meta-monitor-config.c
+++ b/src/core/meta-monitor-config.c
@@ -42,7 +42,6 @@
 
 #include <meta/main.h>
 #include <meta/errors.h>
-#include "monitor-private.h"
 
 /* These structures represent the intended/persistent configuration,
    as stored in the monitors.xml file.
diff --git a/src/core/meta-monitor-config.h b/src/core/meta-monitor-config.h
index caf4abf52..840156925 100644
--- a/src/core/meta-monitor-config.h
+++ b/src/core/meta-monitor-config.h
@@ -23,7 +23,7 @@
 #ifndef META_MONITOR_CONFIG_H
 #define META_MONITOR_CONFIG_H
 
-#include "monitor-private.h"
+#include "meta-monitor-manager.h"
 
 #define META_TYPE_MONITOR_CONFIG            (meta_monitor_config_get_type ())
 #define META_MONITOR_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_CONFIG, MetaMonitorConfig))
diff --git a/src/core/meta-monitor-manager-dummy.h b/src/core/meta-monitor-manager-dummy.h
index 896838cbb..4f1fb349c 100644
--- a/src/core/meta-monitor-manager-dummy.h
+++ b/src/core/meta-monitor-manager-dummy.h
@@ -23,7 +23,7 @@
 #ifndef META_MONITOR_MANAGER_DUMMY_H
 #define META_MONITOR_MANAGER_DUMMY_H
 
-#include "monitor-private.h"
+#include "meta-monitor-manager.h"
 
 #define META_TYPE_MONITOR_MANAGER_DUMMY            (meta_monitor_manager_dummy_get_type ())
 #define META_MONITOR_MANAGER_DUMMY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_DUMMY, MetaMonitorManagerDummy))
diff --git a/src/core/meta-monitor-manager-kms.h b/src/core/meta-monitor-manager-kms.h
index ef75dd60c..4794e313d 100644
--- a/src/core/meta-monitor-manager-kms.h
+++ b/src/core/meta-monitor-manager-kms.h
@@ -23,7 +23,7 @@
 #ifndef META_MONITOR_MANAGER_KMS_H
 #define META_MONITOR_MANAGER_KMS_H
 
-#include "monitor-private.h"
+#include "meta-monitor-manager.h"
 
 #define META_TYPE_MONITOR_MANAGER_KMS            (meta_monitor_manager_kms_get_type ())
 #define META_MONITOR_MANAGER_KMS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_KMS, MetaMonitorManagerKms))
diff --git a/src/core/meta-monitor-manager-xrandr.h b/src/core/meta-monitor-manager-xrandr.h
index 15268e1c1..245a42e43 100644
--- a/src/core/meta-monitor-manager-xrandr.h
+++ b/src/core/meta-monitor-manager-xrandr.h
@@ -23,7 +23,7 @@
 #ifndef META_MONITOR_MANAGER_XRANDR_H
 #define META_MONITOR_MANAGER_XRANDR_H
 
-#include "monitor-private.h"
+#include "meta-monitor-manager.h"
 
 #define META_TYPE_MONITOR_MANAGER_XRANDR            (meta_monitor_manager_xrandr_get_type ())
 #define META_MONITOR_MANAGER_XRANDR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_XRANDR, MetaMonitorManagerXrandr))
diff --git a/src/core/monitor.c b/src/core/meta-monitor-manager.c
similarity index 99%
rename from src/core/monitor.c
rename to src/core/meta-monitor-manager.c
index 95f83c81d..aaf318eb0 100644
--- a/src/core/monitor.c
+++ b/src/core/meta-monitor-manager.c
@@ -25,6 +25,8 @@
 
 #include "config.h"
 
+#include "meta-monitor-manager.h"
+
 #include <string.h>
 #include <math.h>
 #include <stdlib.h>
@@ -33,7 +35,6 @@
 #include <meta/main.h>
 #include "util-private.h"
 #include <meta/errors.h>
-#include "monitor-private.h"
 #include "meta-monitor-config.h"
 #include "meta-monitor-manager-kms.h"
 #include "meta-monitor-manager-xrandr.h"
diff --git a/src/core/monitor-private.h b/src/core/meta-monitor-manager.h
similarity index 99%
rename from src/core/monitor-private.h
rename to src/core/meta-monitor-manager.h
index 8fc0c57f7..2a553c9de 100644
--- a/src/core/monitor-private.h
+++ b/src/core/meta-monitor-manager.h
@@ -227,8 +227,6 @@ struct _MetaMonitorManager
      CRTCs refer to stuff that can drive outputs
      (like encoders, but less tied to the HW),
      while monitor_infos refer to logical ones.
-
-     See also the comment in monitor-private.h
   */
   MetaOutput *outputs;
   unsigned int n_outputs;
diff --git a/src/core/screen-private.h b/src/core/screen-private.h
index 78a1f9a5b..ef279e580 100644
--- a/src/core/screen-private.h
+++ b/src/core/screen-private.h
@@ -36,7 +36,7 @@
 #include <X11/Xutil.h>
 #include "stack-tracker.h"
 #include "ui.h"
-#include "monitor-private.h"
+#include "meta-monitor-manager.h"
 
 typedef void (* MetaScreenWindowFunc) (MetaScreen *screen, MetaWindow *window,
                                        gpointer user_data);
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index 77ea2e563..2eb32ecb5 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -55,7 +55,6 @@
 #include <meta/types.h>
 #include <meta/main.h>
 #include "frame.h"
-#include "monitor-private.h"
 
 #include "meta-surface-actor.h"
 #include "meta-surface-actor-wayland.h"
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index 6a4a0ce4c..d27ea8d1e 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -52,7 +52,7 @@
 #include <meta/main.h>
 #include "frame.h"
 #include "meta-weston-launch.h"
-#include "monitor-private.h"
+#include "meta-monitor-manager.h"
 
 static MetaWaylandCompositor _meta_wayland_compositor;