diff --git a/domain/src/main/kotlin/de/rpr/mycity/domain/city/DefaultCityService.kt b/domain/src/main/kotlin/de/rpr/mycity/domain/city/JpaCityService.kt
similarity index 92%
rename from domain/src/main/kotlin/de/rpr/mycity/domain/city/DefaultCityService.kt
rename to domain/src/main/kotlin/de/rpr/mycity/domain/city/JpaCityService.kt
index b40a0a0..cfb3d0f 100644
--- a/domain/src/main/kotlin/de/rpr/mycity/domain/city/DefaultCityService.kt
+++ b/domain/src/main/kotlin/de/rpr/mycity/domain/city/JpaCityService.kt
@@ -12,7 +12,7 @@ import javax.transaction.Transactional
 
 @Service
 @Transactional
-internal class DefaultCityService(val cityRepo: CityRepository, val log: Logger) : CityService {
+internal class JpaCityService(val cityRepo: CityRepository, val log: Logger) : CityService {
 
     override fun retrieveCity(cityId: String): CityDto? {
         log.debug("Retrieving city: {}", cityId)
diff --git a/domain/src/test/kotlin/de/rpr/mycity/domain/city/DefaultCityServiceTest.kt b/domain/src/test/kotlin/de/rpr/mycity/domain/city/JpaCityServiceTest.kt
similarity index 98%
rename from domain/src/test/kotlin/de/rpr/mycity/domain/city/DefaultCityServiceTest.kt
rename to domain/src/test/kotlin/de/rpr/mycity/domain/city/JpaCityServiceTest.kt
index 1e55754..fc916ed 100644
--- a/domain/src/test/kotlin/de/rpr/mycity/domain/city/DefaultCityServiceTest.kt
+++ b/domain/src/test/kotlin/de/rpr/mycity/domain/city/JpaCityServiceTest.kt
@@ -26,11 +26,11 @@ import javax.transaction.Transactional
 
 @RunWith(SpringRunner::class)
 @ContextConfiguration(classes = arrayOf(
-        DefaultCityServiceTest.Config::class,
+        JpaCityServiceTest.Config::class,
         CityConfig::class))
 @Transactional
 @DataJpaTest
-internal class DefaultCityServiceTest {
+internal class JpaCityServiceTest {
 
     class Config {