diff --git a/server/src/uds/REST/methods/meta_service_pools.py b/server/src/uds/REST/methods/meta_service_pools.py
index 24898914..939d7033 100644
--- a/server/src/uds/REST/methods/meta_service_pools.py
+++ b/server/src/uds/REST/methods/meta_service_pools.py
@@ -35,7 +35,7 @@ import logging
 from django.utils.translation import ugettext as _
 
 from uds.models.meta_pool import MetaPool, MetaPoolMember
-from uds.models.ServicesPool import ServicePool
+from uds.models.service_pool import ServicePool
 from uds.models.user_service import UserService
 from uds.models.user import User
 
diff --git a/server/src/uds/models/ServicesPoolPublication.py b/server/src/uds/models/ServicesPoolPublication.py
index 6286fa4b..4599d506 100644
--- a/server/src/uds/models/ServicesPoolPublication.py
+++ b/server/src/uds/models/ServicesPoolPublication.py
@@ -40,7 +40,7 @@ from uds.core.util.State import State
 from uds.core.environment import Environment
 from uds.core.util import log
 
-from uds.models.ServicesPool import DeployedService
+from uds.models.service_pool import DeployedService
 from uds.models.util import getSqlDatetime
 from uds.models.uuid_model import UUIDModel
 
@@ -202,4 +202,3 @@ class DeployedServicePublication(UUIDModel):
 signals.pre_delete.connect(DeployedServicePublication.beforeDelete, sender=DeployedServicePublication)
 
 ServicePoolPublication = DeployedServicePublication
-
diff --git a/server/src/uds/models/__init__.py b/server/src/uds/models/__init__.py
index f9eddd0a..75e8d7c4 100644
--- a/server/src/uds/models/__init__.py
+++ b/server/src/uds/models/__init__.py
@@ -58,8 +58,8 @@ from .user_preference import UserPreference
 from .group import Group
 
 # Provisioned services
-from .ServicesPool import DeployedService  # Old name, will continue here for a while already
-from .ServicesPool import ServicePool  # New name
+from .service_pool import DeployedService  # Old name, will continue here for a while already
+from .service_pool import ServicePool  # New name
 from .meta_pool import MetaPool
 from .ServicesPoolGroup import ServicesPoolGroup
 from .ServicesPoolPublication import DeployedServicePublication
diff --git a/server/src/uds/models/calendar_access.py b/server/src/uds/models/calendar_access.py
index 9bc637e5..c33b5179 100644
--- a/server/src/uds/models/calendar_access.py
+++ b/server/src/uds/models/calendar_access.py
@@ -39,7 +39,7 @@ from uds.core.util import states
 
 from .uuid_model import UUIDModel
 from .calendar import Calendar
-from .ServicesPool import ServicePool
+from .service_pool import ServicePool
 from .meta_pool import MetaPool
 
 
diff --git a/server/src/uds/models/calendar_action.py b/server/src/uds/models/calendar_action.py
index 79a1f355..beb4fc57 100644
--- a/server/src/uds/models/calendar_action.py
+++ b/server/src/uds/models/calendar_action.py
@@ -45,7 +45,7 @@ from uds.core.util import (calendar, log)
 from .calendar import Calendar
 from .uuid_model import UUIDModel
 from .util import getSqlDatetime
-from .ServicesPool import ServicePool
+from .service_pool import ServicePool
 from .transport import Transport
 from .authenticator import Authenticator
 # from django.utils.translation import ugettext_lazy as _, ugettext
diff --git a/server/src/uds/models/meta_pool.py b/server/src/uds/models/meta_pool.py
index 9c16000d..7e053a86 100644
--- a/server/src/uds/models/meta_pool.py
+++ b/server/src/uds/models/meta_pool.py
@@ -46,7 +46,7 @@ from uds.core.util.calendar import CalendarChecker
 
 from uds.models.image import Image
 from uds.models.ServicesPoolGroup import ServicesPoolGroup
-from uds.models.ServicesPool import ServicePool
+from uds.models.service_pool import ServicePool
 from uds.models.group import Group
 from uds.models.calendar import Calendar
 
diff --git a/server/src/uds/models/ServicesPool.py b/server/src/uds/models/service_pool.py
similarity index 100%
rename from server/src/uds/models/ServicesPool.py
rename to server/src/uds/models/service_pool.py
diff --git a/server/src/uds/models/user_service.py b/server/src/uds/models/user_service.py
index 5cd08827..668c81eb 100644
--- a/server/src/uds/models/user_service.py
+++ b/server/src/uds/models/user_service.py
@@ -42,7 +42,7 @@ from uds.core.util import unique
 from uds.core.util.State import State
 from uds.models.uuid_model import UUIDModel
 
-from uds.models.ServicesPool import DeployedService
+from uds.models.service_pool import DeployedService
 from uds.models.ServicesPoolPublication import DeployedServicePublication
 
 from uds.models.user import User