diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index 98289e274..bfb555385 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -56,7 +56,7 @@ import qutebrowser.keyinput.modes as modes
 import qutebrowser.utils.message as message
 from qutebrowser.widgets.mainwindow import MainWindow
 from qutebrowser.widgets.crash import CrashDialog
-from qutebrowser.keyinput.commandmode import CommandKeyParser
+from qutebrowser.keyinput.normalmode import CommandKeyParser
 from qutebrowser.keyinput.insertmode import InsertKeyParser
 from qutebrowser.commands.parsers import CommandParser, SearchParser
 from qutebrowser.browser.hints import HintKeyParser
diff --git a/qutebrowser/keyinput/commandmode.py b/qutebrowser/keyinput/normalmode.py
similarity index 100%
rename from qutebrowser/keyinput/commandmode.py
rename to qutebrowser/keyinput/normalmode.py
diff --git a/qutebrowser/widgets/statusbar.py b/qutebrowser/widgets/statusbar.py
index 03ac8d7d3..91479f7e9 100644
--- a/qutebrowser/widgets/statusbar.py
+++ b/qutebrowser/widgets/statusbar.py
@@ -24,7 +24,7 @@ from PyQt5.QtWidgets import (QWidget, QLineEdit, QProgressBar, QLabel,
 from PyQt5.QtGui import QPainter, QKeySequence, QValidator
 
 import qutebrowser.keyinput.modes as modes
-from qutebrowser.keyinput.commandmode import STARTCHARS
+from qutebrowser.keyinput.normalmode import STARTCHARS
 from qutebrowser.config.style import set_register_stylesheet, get_stylesheet
 from qutebrowser.utils.url import urlstring
 from qutebrowser.commands.parsers import split_cmdline