diff --git a/doc/source/api/remoteappmanager.rst b/doc/source/api/remoteappmanager.rst
index 8db8b7de2..4fc61bd24 100644
--- a/doc/source/api/remoteappmanager.rst
+++ b/doc/source/api/remoteappmanager.rst
@@ -74,10 +74,10 @@ remoteappmanager.paths module
     :undoc-members:
     :show-inheritance:
 
-remoteappmanager.spawner module
--------------------------------
+remoteappmanager.spawners module
+--------------------------------
 
-.. automodule:: remoteappmanager.spawner
+.. automodule:: remoteappmanager.spawners
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index e0bb8889d..93eeeb2db 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -10,13 +10,13 @@ The jupyterhub configuration is documented in the `jupyterhub documentation
 <https://jupyterhub.readthedocs.io/en/latest/getting-started.html>`_. The
 important difference is the spawner to use, which is configured as::
 
-    c.JupyterHub.spawner_class = 'remoteappmanager.spawner.Spawner'
+    c.JupyterHub.spawner_class = 'remoteappmanager.spawners.SystemUserSpawner'
     # or
-    # c.JupyterHub.spawner_class = 'remoteappmanager.spawner.VirtualUserSpawner'
+    # c.JupyterHub.spawner_class = 'remoteappmanager.spawners.VirtualUserSpawner'
 
 in the `jupyterhub_config.py` file.
 
-Please refer to :py:mod:`remoteappmanager.spawner` for the available spawners
+Please refer to :py:mod:`remoteappmanager.spawners` for the available spawners
 in this project.
 
 
@@ -51,7 +51,7 @@ docker setup.
    config file.  The path of the config file should be specified in the
    spawner in `jupyterhub_config.py`::
 
-     c.Spawner.config_file_path = "/path/to/config.py"
+     c.SystemUserSpawner.config_file_path = "/path/to/config.py"
 
    Please refer to :py:class:`remoteappmanager.file_config.FileConfig` for
    the configurable parameters.  Note that this config file will be used
diff --git a/jupyterhub/jupyterhub_config.py b/jupyterhub/jupyterhub_config.py
index 13b686986..d65831e51 100644
--- a/jupyterhub/jupyterhub_config.py
+++ b/jupyterhub/jupyterhub_config.py
@@ -12,7 +12,7 @@
 setting_mode = ('system_user', 'virtual_user')[1]
 
 if setting_mode == 'virtual_user':
-    c.JupyterHub.spawner_class = 'remoteappmanager.spawner.VirtualUserSpawner'
+    c.JupyterHub.spawner_class = 'remoteappmanager.spawners.VirtualUserSpawner'
 
     # Parent directory in which temporary directory is created for
     # each virtual user
@@ -25,4 +25,4 @@
         'remoteappmanager.auth.WorldAuthenticator')
 
 elif setting_mode == 'system_user':
-    c.JupyterHub.spawner_class = 'remoteappmanager.spawner.Spawner'
+    c.JupyterHub.spawner_class = 'remoteappmanager.spawners.SystemUserSpawner'
diff --git a/remoteappmanager/spawner.py b/remoteappmanager/spawners.py
similarity index 99%
rename from remoteappmanager/spawner.py
rename to remoteappmanager/spawners.py
index bdd149131..85e0bf6d7 100644
--- a/remoteappmanager/spawner.py
+++ b/remoteappmanager/spawners.py
@@ -14,7 +14,7 @@
 # of not updating one of them.
 
 
-class Spawner(LocalProcessSpawner):
+class SystemUserSpawner(LocalProcessSpawner):
     ''' Start remoteappmanager as a local process for a system user.
 
     The user identifier of the process is set to be the system user.
diff --git a/remoteappmanager/tests/test_spawner.py b/remoteappmanager/tests/test_spawners.py
similarity index 97%
rename from remoteappmanager/tests/test_spawner.py
rename to remoteappmanager/tests/test_spawners.py
index ec682415a..b19b413f4 100644
--- a/remoteappmanager/tests/test_spawner.py
+++ b/remoteappmanager/tests/test_spawners.py
@@ -9,7 +9,7 @@
 from tornado import testing
 from jupyterhub import orm
 
-from remoteappmanager.spawner import Spawner, VirtualUserSpawner
+from remoteappmanager.spawners import SystemUserSpawner, VirtualUserSpawner
 from remoteappmanager.tests import fixtures
 from remoteappmanager.tests.temp_mixin import TempMixin
 
@@ -72,10 +72,10 @@ def new_spawner(spawner_class):
     return spawner_class(db=db, user=user, hub=hub)
 
 
-class TestSpawner(TempMixin, testing.AsyncTestCase):
+class TestSystemUserSpawner(TempMixin, testing.AsyncTestCase):
     def setUp(self):
         super().setUp()
-        self.spawner = new_spawner(Spawner)
+        self.spawner = new_spawner(SystemUserSpawner)
 
     def test_args(self):
         path = fixtures.get("remoteappmanager_config.py")
@@ -149,7 +149,7 @@ def test_spawner_start_and_stop_without_config_file(self):
         self.assertEqual(status, 1)
 
 
-class TestVirtualUserSpawner(TestSpawner):
+class TestVirtualUserSpawner(TestSystemUserSpawner):
     def setUp(self):
         super().setUp()
         self.spawner = new_spawner(VirtualUserSpawner)