diff --git a/plinth/modules/firewall/firewall.py b/plinth/modules/firewall/firewall.py
index 7e1d7f3a2..6c9aa6b41 100644
--- a/plinth/modules/firewall/firewall.py
+++ b/plinth/modules/firewall/firewall.py
@@ -55,7 +55,7 @@ def index(request):
     return TemplateResponse(
         request, 'firewall.html',
         {'title': _('Firewall'),
-         'services': list(service_module.SERVICES.values()),
+         'services': list(service_module.services.values()),
          'internal_enabled_services': internal_enabled_services,
          'external_enabled_services': external_enabled_services})
 
@@ -94,7 +94,7 @@ def on_service_enabled(sender, service_id, enabled, **kwargs):
     external_enabled_services = get_enabled_services(zone='external')
 
     LOGGER.info('Service enabled - %s, %s', service_id, enabled)
-    service = service_module.SERVICES[service_id]
+    service = service_module.services[service_id]
     for port in service.ports:
         if enabled:
             if port not in internal_enabled_services:
@@ -110,7 +110,7 @@ def on_service_enabled(sender, service_id, enabled, **kwargs):
             if port in internal_enabled_services:
                 enabled_services_on_port = [
                     service_.is_enabled()
-                    for service_ in service_module.SERVICES.values()
+                    for service_ in service_module.services.values()
                     if port in service_.ports and
                     service_id != service_.service_id]
                 if not any(enabled_services_on_port):
@@ -119,7 +119,7 @@ def on_service_enabled(sender, service_id, enabled, **kwargs):
             if port in external_enabled_services:
                 enabled_services_on_port = [
                     service_.is_enabled()
-                    for service_ in service_module.SERVICES.values()
+                    for service_ in service_module.services.values()
                     if port in service_.ports and
                     service_id != service_.service_id and
                     service_.is_external]
diff --git a/plinth/modules/owncloud/owncloud.py b/plinth/modules/owncloud/owncloud.py
index 32364ba9d..a99bb893d 100644
--- a/plinth/modules/owncloud/owncloud.py
+++ b/plinth/modules/owncloud/owncloud.py
@@ -27,10 +27,10 @@ from gettext import gettext as _
 from plinth import actions
 from plinth import cfg
 from plinth import package
-from plinth import service
+from plinth import service as service_module
 
 
-SERVICE = None
+service = None
 
 
 class OwnCloudForm(forms.Form):  # pylint: disable-msg=W0232
@@ -46,15 +46,16 @@ def init():
 
     status = get_status()
 
-    global SERVICE  # pylint: disable-msg=W0603
-    SERVICE = service.Service('owncloud', _('ownCloud'), ['http', 'https'],
-                              is_external=True, enabled=status['enabled'])
+    global service  # pylint: disable-msg=W0603
+    service = service_module.Service(
+        'owncloud', _('ownCloud'), ['http', 'https'], is_external=True,
+        enabled=status['enabled'])
 
 
 def on_install():
     """Tasks to run after package install."""
     actions.superuser_run('owncloud-setup', ['enable'], async=True)
-    SERVICE.notify_enabled(None, True)
+    service.notify_enabled(None, True)
 
 
 @package.required(['postgresql', 'php5-pgsql', 'owncloud'],
@@ -103,4 +104,4 @@ def _apply_changes(request, old_status, new_status):
 
     # Send a signal to other modules that the service is
     # enabled/disabled
-    SERVICE.notify_enabled(None, new_status['enabled'])
+    service.notify_enabled(None, new_status['enabled'])
diff --git a/plinth/service.py b/plinth/service.py
index a9db56f27..dc41acf19 100644
--- a/plinth/service.py
+++ b/plinth/service.py
@@ -26,7 +26,7 @@ import collections
 from plinth.signals import service_enabled
 
 
-SERVICES = {}
+services = {}
 
 
 class Service(object):
@@ -48,7 +48,7 @@ class Service(object):
         self._enabled = enabled
 
         # Maintain a complete list of services
-        SERVICES[service_id] = self
+        services[service_id] = self
 
     def is_enabled(self):
         """Return whether the service is enabled."""