diff --git a/src/flask_covid19/__init__.py b/src/flask_covid19/__init__.py
index cd420f1a862ecac0dd833d1323e7c03e3bebd858..3fc149dc2ee362d29e8de27476ee1739ba4de5c4 100644
--- a/src/flask_covid19/__init__.py
+++ b/src/flask_covid19/__init__.py
@@ -1,11 +1,11 @@
 from database import app, run_run_with_debug, port, db
 
-from flask_covid19.blueprints.app_web.all_services import app_user_service
-from flask_covid19.blueprints.app_web.application_service import ApplicationService
+from flask_covid19.blueprints.app_web.web_services import app_user_service
+from flask_covid19.blueprints.app_web.web_service import WebService
 
 
 def run_web():
-    application_service = ApplicationService(db, app_user_service)
+    application_service = WebService(db, app_user_service)
     application_service.prepare_run_web()
     app.run(debug=run_run_with_debug, port=port)
 
diff --git a/src/flask_covid19/blueprints/app_admin/app_admin_views.py b/src/flask_covid19/blueprints/app_admin/app_admin_views.py
index 914b04845b2416962723f641b33770771a2871b8..429f4690038a14d7379f88d3eb760614a0216492 100644
--- a/src/flask_covid19/blueprints/app_admin/app_admin_views.py
+++ b/src/flask_covid19/blueprints/app_admin/app_admin_views.py
@@ -3,7 +3,7 @@ from celery import states
 from celery.utils.log import get_task_logger
 
 from database import app
-from flask_covid19.blueprints.app_web.all_services import app_admin_service
+from flask_covid19.blueprints.app_web.web_services import app_admin_service
 from flask_covid19.blueprints.app_mq.application_workers import mq
 from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
 
diff --git a/src/flask_covid19/blueprints/app_all/all_views.py b/src/flask_covid19/blueprints/app_all/all_views.py
index 955038a7c8b91f7717d347e1e4da88173236679d..3b8e764e2405349024f2b81b7c924022665f7c8d 100644
--- a/src/flask_covid19/blueprints/app_all/all_views.py
+++ b/src/flask_covid19/blueprints/app_all/all_views.py
@@ -3,7 +3,7 @@ from celery import states
 from celery.utils.log import get_task_logger
 
 from database import app
-from flask_covid19.blueprints.app_web.all_services import app_admin_service, all_service
+from flask_covid19.blueprints.app_web.web_services import app_admin_service, all_service
 from flask_covid19.blueprints.app_mq.application_workers import mq
 from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
 
diff --git a/src/flask_covid19/blueprints/divi/divi_test_views.py b/src/flask_covid19/blueprints/divi/divi_test_views.py
index 3e7a1c9248e8d4d17e3d7bb4bd0d36e3d9b85a53..de24a7ef425275fb5f0fb74116e9d9e4bb488f66 100644
--- a/src/flask_covid19/blueprints/divi/divi_test_views.py
+++ b/src/flask_covid19/blueprints/divi/divi_test_views.py
@@ -10,7 +10,7 @@ from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
 from flask_covid19.blueprints.divi.divi_model_import import DiviImport
 from flask_covid19.blueprints.divi.divi_model import DiviData
 
-from flask_covid19.blueprints.app_web.all_services import divi_service
+from flask_covid19.blueprints.app_web.web_services import divi_service
 from flask_covid19.blueprints.divi.divi_test_service import DiviTestService
 
 divi_test_service = DiviTestService(db, divi_service)
diff --git a/src/flask_covid19/blueprints/divi/divi_views.py b/src/flask_covid19/blueprints/divi/divi_views.py
index 0267a287c16410ad44ff035c9859ea2995b74ae4..2cefb24f24669f608bc83060e4bb32dcdb19bfae 100644
--- a/src/flask_covid19/blueprints/divi/divi_views.py
+++ b/src/flask_covid19/blueprints/divi/divi_views.py
@@ -7,7 +7,7 @@ from flask_login import login_required
 
 from database import app, admin, db
 
-from flask_covid19.blueprints.app_web.all_services import divi_service
+from flask_covid19.blueprints.app_web.web_services import divi_service
 from flask_covid19.blueprints.app_mq.application_workers import mq
 from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
 
diff --git a/src/flask_covid19/blueprints/ecdc/ecdc_test_views.py b/src/flask_covid19/blueprints/ecdc/ecdc_test_views.py
index 5a3f81aafd0ff284d13aefc6a6c2b74064d4f6ba..7b7d70bc546500b62ed5e7717db66ee20367ff43 100644
--- a/src/flask_covid19/blueprints/ecdc/ecdc_test_views.py
+++ b/src/flask_covid19/blueprints/ecdc/ecdc_test_views.py
@@ -4,7 +4,7 @@ from celery.utils.log import get_task_logger
 from flask_login import login_required
 
 from database import app, db
-from flask_covid19.blueprints.app_web.all_services import ecdc_service
+from flask_covid19.blueprints.app_web.web_services import ecdc_service
 from flask_covid19.blueprints.app_mq.application_workers import mq
 from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
 
diff --git a/src/flask_covid19/blueprints/ecdc/ecdc_views.py b/src/flask_covid19/blueprints/ecdc/ecdc_views.py
index 51c5aa28fb54297b05ed50c28913573a859a6627..7d343f74ef45f5abded9055009313272f940871e 100644
--- a/src/flask_covid19/blueprints/ecdc/ecdc_views.py
+++ b/src/flask_covid19/blueprints/ecdc/ecdc_views.py
@@ -4,7 +4,7 @@ from celery.utils.log import get_task_logger
 from flask_admin.contrib.sqla import ModelView
 
 from database import admin, db
-from flask_covid19.blueprints.app_web.all_services import ecdc_service
+from flask_covid19.blueprints.app_web.web_services import ecdc_service
 from flask_covid19.blueprints.app_mq.application_workers import mq
 
 from flask_covid19.blueprints.ecdc.ecdc_model_import import EcdcImport
diff --git a/src/flask_covid19/blueprints/owid/owid_test_views.py b/src/flask_covid19/blueprints/owid/owid_test_views.py
index f2dcb65bab58bc19e848d9c9e7717687e11a02c6..9a72cf77b8e930a94db49eefbcb2879425a9da63 100644
--- a/src/flask_covid19/blueprints/owid/owid_test_views.py
+++ b/src/flask_covid19/blueprints/owid/owid_test_views.py
@@ -4,7 +4,7 @@ from celery.utils.log import get_task_logger
 from flask_login import login_required
 
 from database import app, db
-from flask_covid19.blueprints.app_web.all_services import owid_service
+from flask_covid19.blueprints.app_web.web_services import owid_service
 from flask_covid19.blueprints.app_mq.application_workers import mq
 from flask_covid19.blueprints.owid.owid_model import OwidData
 from flask_covid19.blueprints.owid.owid_model_import import OwidImport
diff --git a/src/flask_covid19/blueprints/owid/owid_views.py b/src/flask_covid19/blueprints/owid/owid_views.py
index 9ce0bac6d3ca43912f036ee3f82b3f88160a36a8..e3b1d02dad3f7991d409b7eeec74cc1420113980 100644
--- a/src/flask_covid19/blueprints/owid/owid_views.py
+++ b/src/flask_covid19/blueprints/owid/owid_views.py
@@ -5,7 +5,7 @@ from celery.utils.log import get_task_logger
 from flask_admin.contrib.sqla import ModelView
 
 from database import app, admin, db
-from flask_covid19.blueprints.app_web.all_services import owid_service
+from flask_covid19.blueprints.app_web.web_services import owid_service
 from flask_covid19.blueprints.app_mq.application_workers import mq
 from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
 from flask_covid19.blueprints.owid.owid_model import OwidDateReported, OwidData, OwidContinent, OwidCountry
diff --git a/src/flask_covid19/blueprints/rki_cases/rki_test_views.py b/src/flask_covid19/blueprints/rki_cases/rki_test_views.py
index 48756ace7560466f9e4ed64b58d093d3140999ed..79892ee749d53e758cc4abb81daa2c13070e0a4c 100644
--- a/src/flask_covid19/blueprints/rki_cases/rki_test_views.py
+++ b/src/flask_covid19/blueprints/rki_cases/rki_test_views.py
@@ -5,7 +5,7 @@ from flask_login import login_required
 
 from database import app, db
 
-from flask_covid19.blueprints.app_web.all_services import rki_service
+from flask_covid19.blueprints.app_web.web_services import rki_service
 from flask_covid19.blueprints.app_mq.application_workers import mq
 from flask_covid19.blueprints.rki_cases.rki_model import RkiData
 from flask_covid19.blueprints.rki_cases.rki_model_import import RkiImport
diff --git a/src/flask_covid19/blueprints/rki_cases/rki_views.py b/src/flask_covid19/blueprints/rki_cases/rki_views.py
index 404c627890efbc1afd71dbd4762d9d9c558188c2..62f32e064de1a9bacc3b80d83b136c4e527d10a6 100644
--- a/src/flask_covid19/blueprints/rki_cases/rki_views.py
+++ b/src/flask_covid19/blueprints/rki_cases/rki_views.py
@@ -5,7 +5,7 @@ from celery import states
 
 from database import app, admin, db
 from flask_covid19.blueprints.app_mq.application_workers import mq
-from flask_covid19.blueprints.app_web.all_services import rki_service
+from flask_covid19.blueprints.app_web.web_services import rki_service
 from flask_covid19.blueprints.rki_cases.rki_model import RkiData, RkiMeldedatum
 from flask_covid19.blueprints.rki_cases.rki_model_import import RkiImport
 from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
diff --git a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py
index eebda1e0fd442a4b56bfa2e2020f3787b1b84b37..a62352ab9ba99655fa00f1cfdf868cbaebc63a23 100644
--- a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py
+++ b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py
@@ -4,7 +4,7 @@ from celery.utils.log import get_task_logger
 from flask_admin.contrib.sqla import ModelView
 
 from database import admin, db
-from flask_covid19.blueprints.app_web.all_services import rki_vaccination_service
+from flask_covid19.blueprints.app_web.web_services import rki_vaccination_service
 from flask_covid19.blueprints.app_mq.application_workers import mq
 
 from flask_covid19.blueprints.rki_vaccination.rki_vaccination_model import RkiVaccinationData
diff --git a/src/flask_covid19/blueprints/who/who_test_views.py b/src/flask_covid19/blueprints/who/who_test_views.py
index aae378279354c40125d25979fd7de327a4a6f68a..fc843bc62c49aca8d7c953250fa119e40b8a25f4 100644
--- a/src/flask_covid19/blueprints/who/who_test_views.py
+++ b/src/flask_covid19/blueprints/who/who_test_views.py
@@ -4,7 +4,7 @@ from celery.utils.log import get_task_logger
 from flask_login import login_required
 
 from database import app, db
-from flask_covid19.blueprints.app_web.all_services import who_service
+from flask_covid19.blueprints.app_web.web_services import who_service
 from flask_covid19.blueprints.app_mq.application_workers import mq
 from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
 
diff --git a/src/flask_covid19/blueprints/who/who_views.py b/src/flask_covid19/blueprints/who/who_views.py
index 1bc63abcc20b879391b8c2e0dc12dc798df46c68..e3afe04eccd23f15c609e78c67a3a50de95936ac 100644
--- a/src/flask_covid19/blueprints/who/who_views.py
+++ b/src/flask_covid19/blueprints/who/who_views.py
@@ -6,7 +6,7 @@ from flask_admin.contrib.sqla import ModelView
 from flask_login import login_required
 
 from database import app, admin, db
-from flask_covid19.blueprints.app_web.all_services import who_service
+from flask_covid19.blueprints.app_web.web_services import who_service
 from flask_covid19.blueprints.app_mq.application_workers import mq
 from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent