diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index d8617d05b..05e4d05c1 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -58,7 +58,7 @@ def init(configdir):
     """
     global instance, state, cmd_history
     logging.debug("Config init, configdir {}".format(configdir))
-    instance = Config(configdir, 'qutebrowser.conf')
+    instance = ConfigManager(configdir, 'qutebrowser.conf')
     state = ReadWriteConfigParser(configdir, 'state')
     cmd_history = LineConfigParser(configdir, 'cmd_history',
                                    ('general', 'cmd_histlen'))
@@ -83,7 +83,7 @@ class NoOptionError(configparser.NoOptionError):
     pass
 
 
-class Config(QObject):
+class ConfigManager(QObject):
 
     """Configuration manager for qutebrowser.