diff --git a/rtv/__main__.py b/rtv/__main__.py
index 6d94366..074f255 100644
--- a/rtv/__main__.py
+++ b/rtv/__main__.py
@@ -16,7 +16,7 @@ from .config import Config, copy_default_config, copy_default_mailcap
 from .oauth import OAuthHelper
 from .terminal import Terminal
 from .objects import curses_session, Color
-from .subreddit import SubredditPage
+from .subreddit_page import SubredditPage
 from .exceptions import ConfigError
 from .__version__ import __version__
 
diff --git a/rtv/submission.py b/rtv/submission_page.py
similarity index 100%
rename from rtv/submission.py
rename to rtv/submission_page.py
diff --git a/rtv/subreddit.py b/rtv/subreddit_page.py
similarity index 99%
rename from rtv/subreddit.py
rename to rtv/subreddit_page.py
index 9a2d76e..e112661 100644
--- a/rtv/subreddit.py
+++ b/rtv/subreddit_page.py
@@ -8,8 +8,8 @@ from . import docs
 from .content import SubredditContent
 from .page import Page, PageController, logged_in
 from .objects import Navigator, Color, Command
-from .submission import SubmissionPage
-from .subscription import SubscriptionPage
+from .submission_page import SubmissionPage
+from .subscription_page import SubscriptionPage
 from .exceptions import TemporaryFileError
 
 
diff --git a/rtv/subscription.py b/rtv/subscription_page.py
similarity index 100%
rename from rtv/subscription.py
rename to rtv/subscription_page.py
diff --git a/tests/conftest.py b/tests/conftest.py
index 9c297c1..96233a5 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -16,9 +16,9 @@ from six.moves.BaseHTTPServer import HTTPServer
 from rtv.oauth import OAuthHelper, OAuthHandler
 from rtv.config import Config
 from rtv.terminal import Terminal
-from rtv.subreddit import SubredditPage
-from rtv.submission import SubmissionPage
-from rtv.subscription import SubscriptionPage
+from rtv.subreddit_page import SubredditPage
+from rtv.submission_page import SubmissionPage
+from rtv.subscription_page import SubscriptionPage
 
 try:
     from unittest import mock
diff --git a/tests/test_submission.py b/tests/test_submission.py
index 2334e44..2c721c9 100644
--- a/tests/test_submission.py
+++ b/tests/test_submission.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 
 import curses
 
-from rtv.submission import SubmissionPage
+from rtv.submission_page import SubmissionPage
 
 try:
     from unittest import mock
diff --git a/tests/test_subreddit.py b/tests/test_subreddit.py
index 6a73048..59ae476 100644
--- a/tests/test_subreddit.py
+++ b/tests/test_subreddit.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from rtv.subreddit import SubredditPage
+from rtv.subreddit_page import SubredditPage
 
 try:
     from unittest import mock
diff --git a/tests/test_subscription.py b/tests/test_subscription.py
index cca25ef..7d0483b 100644
--- a/tests/test_subscription.py
+++ b/tests/test_subscription.py
@@ -6,7 +6,7 @@ import curses
 import praw
 import pytest
 
-from rtv.subscription import SubscriptionPage
+from rtv.subscription_page import SubscriptionPage
 
 try:
     from unittest import mock