diff --git a/src/display/Makefile.am b/src/display/Makefile.am
index 95c3cc12..2b4ba739 100644
--- a/src/display/Makefile.am
+++ b/src/display/Makefile.am
@@ -3,7 +3,7 @@ noinst_LIBRARIES = libsub_display.a
 libsub_display_a_SOURCES = \
 	canvas.cc \
 	canvas.h \
-	manager.cc \
-	manager.h
+	layers.cc \
+	layers.h
 
 INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)
diff --git a/src/display/manager.cc b/src/display/layers.cc
similarity index 82%
rename from src/display/manager.cc
rename to src/display/layers.cc
index 66747ddb..53d514f7 100644
--- a/src/display/manager.cc
+++ b/src/display/layers.cc
@@ -1,6 +1,6 @@
 #include "config.h"
 
-#include "manager.h"
+#include "layers.h"
 #include "canvas.h"
 
 #include <functional>
@@ -9,7 +9,7 @@
 namespace display {
 
 void
-Manager::do_update() {
+Layers::do_update() {
   std::for_each(rbegin(), rend(), std::mem_fun(&Canvas::refresh));
 
   Canvas::do_update();
diff --git a/src/display/manager.h b/src/display/layers.h
similarity index 79%
rename from src/display/manager.h
rename to src/display/layers.h
index fbcf97f1..77526ba6 100644
--- a/src/display/manager.h
+++ b/src/display/layers.h
@@ -1,5 +1,5 @@
-#ifndef RTORRENT_DISPLAY_MANAGER_H
-#define RTORRENT_DISPLAY_MANAGER_H
+#ifndef RTORRENT_DISPLAY_LAYERS_H
+#define RTORRENT_DISPLAY_LAYERS_H
 
 #include <list>
 
@@ -7,7 +7,7 @@ namespace display {
 
 class Canvas;
 
-class Manager : private std::list<Canvas*> {
+class Layers : private std::list<Canvas*> {
 public:
   typedef std::list<Canvas*> Base;
 
diff --git a/src/rtorrent.cc b/src/rtorrent.cc
index 7a5276ee..b4e833fb 100644
--- a/src/rtorrent.cc
+++ b/src/rtorrent.cc
@@ -1,15 +1,15 @@
 #include "display/canvas.h"
-#include "display/manager.h"
+#include "display/layers.h"
 
 int main(int argc, char** argv) {
   display::Canvas::init();
-  display::Manager manager;
+  display::Layers layers;
 
   display::Canvas canvas1(0, 0, 20, 0);
   display::Canvas canvas2(15, 5, 20, 10);
 
-  manager.push_front(&canvas1);
-  manager.push_front(&canvas2);
+  layers.push_front(&canvas1);
+  layers.push_front(&canvas2);
 
   canvas1.erase();
   canvas2.erase();
@@ -20,7 +20,7 @@ int main(int argc, char** argv) {
 
   canvas1.print(2, 5, "test %i %s", 42, "bar");
 
-  manager.do_update();
+  layers.do_update();
 
   while (true);