diff --git a/BACKLOG.md b/BACKLOG.md
index 9300748db1766226d7924f4fb49c9072a530bbe5..572fc5b206a808ba15009a14677c4ecf8a3dd271 100644
--- a/BACKLOG.md
+++ b/BACKLOG.md
@@ -138,23 +138,23 @@
 * Fixed #175 implement url_vaccination_task_update_facttable_incremental_only in vaccination_views.py
 * Fixed #176 implement url_vaccination_task_update_facttable_initial_only in vaccination_views.py
 * -------------------------------------
-* Fixed #91 implement VaccinationService.run_download_only
-* Fixed #92 implement VaccinationService.run_import_only
-* Fixed #93 implement VaccinationService.run_update_dimension_tables_only
-* Fixed #94 implement VaccinationService.run_update_fact_table_incremental_only
-* Fixed #95 implement VaccinationService.run_update_fact_table_initial_only
-* Fixed #96 implement VaccinationService.run_update_star_schema_incremental
-* Fixed #97 implement VaccinationService.run_update_star_schema_initial
-* Fixed #101 implement VaccinationServiceUpdate.update_dimension_tables_only
-* Fixed #102 implement VaccinationServiceUpdate.update_fact_table_incremental_only
-* Fixed #103 implement VaccinationServiceUpdate.update_fact_table_initial_only
-* Fixed #104 implement VaccinationServiceUpdate.update_star_schema_incremental
-* Fixed #105 implement VaccinationServiceUpdate.update_star_schema_initial
+* Fixed #91 implement RkiVaccinationService.run_download_only
+* Fixed #92 implement RkiVaccinationService.run_import_only
+* Fixed #93 implement RkiVaccinationService.run_update_dimension_tables_only
+* Fixed #94 implement RkiVaccinationService.run_update_fact_table_incremental_only
+* Fixed #95 implement RkiVaccinationService.run_update_fact_table_initial_only
+* Fixed #96 implement RkiVaccinationService.run_update_star_schema_incremental
+* Fixed #97 implement RkiVaccinationService.run_update_star_schema_initial
+* Fixed #101 implement RkiVaccinationServiceUpdate.update_dimension_tables_only
+* Fixed #102 implement RkiVaccinationServiceUpdate.update_fact_table_incremental_only
+* Fixed #103 implement RkiVaccinationServiceUpdate.update_fact_table_initial_only
+* Fixed #104 implement RkiVaccinationServiceUpdate.update_star_schema_incremental
+* Fixed #105 implement RkiVaccinationServiceUpdate.update_star_schema_initial
 * -------------------------------------
-* Fixed #90 refactor VaccinationService to new method scheme introduced 07.02.2021
-* Fixed #98 refactor VaccinationServiceDownload to new method scheme introduced 07.02.2021
-* Fixed #99 refactor VaccinationServiceImport to new method scheme introduced 07.02.2021
-* Fixed #100 refactor VaccinationServiceUpdate to new method scheme introduced 07.02.2021
+* Fixed #90 refactor RkiVaccinationService to new method scheme introduced 07.02.2021
+* Fixed #98 refactor RkiVaccinationServiceDownload to new method scheme introduced 07.02.2021
+* Fixed #99 refactor RkiVaccinationServiceImport to new method scheme introduced 07.02.2021
+* Fixed #100 refactor RkiVaccinationServiceUpdate to new method scheme introduced 07.02.2021
 * -------------------------------------
 * Fixed #87 change to: Vaccination.datum many to one VaccinationDateReported
 * Fixed #106 add Tasks and URLs for starting Tasks to vaccination_views
diff --git a/src/covid19/blueprints/common/application_services.py b/src/covid19/blueprints/common/application_services.py
index c20e74f02590f2167fae146bcfc08b1bee10384e..a0a3fa98a4a561839f71a094828ac27a2d9d2d93 100644
--- a/src/covid19/blueprints/common/application_services.py
+++ b/src/covid19/blueprints/common/application_services.py
@@ -5,7 +5,7 @@ from covid19.blueprints.common.application_service import ApplicationService
 from covid19.blueprints.ecdc.ecdc_service import EcdcService
 from covid19.blueprints.rki_bundeslaender.rki_service import RkiBundeslaenderService
 from covid19.blueprints.rki_landkreise.rki_service import RkiLandkreiseService
-from covid19.blueprints.rki_vaccination.rki_vaccination_service import VaccinationService
+from covid19.blueprints.rki_vaccination.rki_vaccination_service import RkiVaccinationService
 from covid19.blueprints.who.who_service import WhoService
 
 
@@ -18,6 +18,6 @@ application_service = ApplicationService(db)
 ecdc_service = EcdcService(db)
 rki_service_bundeslaender = RkiBundeslaenderService(db)
 rki_service_landkreise = RkiLandkreiseService(db)
-rki_vaccination_service = VaccinationService(db)
+rki_vaccination_service = RkiVaccinationService(db)
 who_service = WhoService(db)
 db.create_all()
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service.py
index cd5780974fbfa5234c46f755ac7be0685ff5a632..9b49b6722bbbaff9faa2842e9babcc97ed540fb2 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service.py
@@ -1,22 +1,22 @@
 from flask import flash
 
 from database import app
-from covid19.blueprints.rki_vaccination.vaccination_service_download import VaccinationServiceDownload
-from covid19.blueprints.rki_vaccination.vaccination_service_import import VaccinationServiceImport
-from covid19.blueprints.rki_vaccination.vaccination_service_config import VaccinationServiceConfig
-from covid19.blueprints.rki_vaccination.vaccination_service_update import VaccinationServiceUpdate
+from covid19.blueprints.rki_vaccination.rki_vaccination_service_download import RkiVaccinationServiceDownload
+from covid19.blueprints.rki_vaccination.rki_vaccination_service_import import RkiVaccinationServiceImport
+from covid19.blueprints.rki_vaccination.rki_vaccination_service_config import RkiVaccinationServiceConfig
+from covid19.blueprints.rki_vaccination.rki_vaccination_service_update import RkiVaccinationServiceUpdate
 
 
-class VaccinationService:
+class RkiVaccinationService:
     def __init__(self, database):
         app.logger.debug("------------------------------------------------------------")
         app.logger.debug(" Vaccination Service [init]")
         app.logger.debug("------------------------------------------------------------")
         self.__database = database
-        self.cfg = VaccinationServiceConfig()
-        self.vaccination_service_download = VaccinationServiceDownload(database)
-        self.vaccination_service_import = VaccinationServiceImport(database)
-        self.vaccination_service_udpate = VaccinationServiceUpdate(database)
+        self.cfg = RkiVaccinationServiceConfig()
+        self.vaccination_service_download = RkiVaccinationServiceDownload(database)
+        self.vaccination_service_import = RkiVaccinationServiceImport(database)
+        self.vaccination_service_udpate = RkiVaccinationServiceUpdate(database)
         app.logger.debug("------------------------------------------------------------")
         app.logger.info(" Vaccination Service [ready]")
 
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_config.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_config.py
index 86f321b4841cf0e120d232fa47ab8c340ddf0d0a..a1b70bb88f5e925e0473d19b55b16b642fbe4d31 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_config.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_config.py
@@ -1,7 +1,7 @@
 import os
 
 
-class VaccinationServiceConfig:
+class RkiVaccinationServiceConfig:
     def __init__(self):
         self.limit_nr = 20
         self.data_path = ".."+os.sep+".."+os.sep+"data"
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_download.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_download.py
index 7700beee9fc551696064597e27f03c56717d2b0b..263ea064773e74c4b8fa1189d136bec124e05359 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_download.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_download.py
@@ -2,16 +2,16 @@ import os
 import wget
 from flask import flash
 from database import app
-from covid19.blueprints.rki_vaccination.vaccination_service_config import VaccinationServiceConfig
+from covid19.blueprints.rki_vaccination.rki_vaccination_service_config import RkiVaccinationServiceConfig
 
 
-class VaccinationServiceDownload:
+class RkiVaccinationServiceDownload:
     def __init__(self, database):
         app.logger.debug("------------------------------------------------------------")
         app.logger.debug(" Vaccination Service Download [init]")
         app.logger.debug("------------------------------------------------------------")
         self.__database = database
-        self.cfg = VaccinationServiceConfig()
+        self.cfg = RkiVaccinationServiceConfig()
         app.logger.debug("------------------------------------------------------------")
         app.logger.debug(" Vaccination Service Download [ready]")
 
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
index 6a5be585f938a45ef7f0fbe895072ee5ab86655b..76dd3bc6da9586cf652f44f4e7f38726f69a6c38 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
@@ -3,17 +3,17 @@ import csv
 import psycopg2
 
 from database import db, app
-from covid19.blueprints.rki_vaccination.vaccination_model_import import VaccinationImport
-from covid19.blueprints.rki_vaccination.vaccination_service_config import VaccinationServiceConfig
+from covid19.blueprints.rki_vaccination.rki_vaccination_model_import import VaccinationImport
+from covid19.blueprints.rki_vaccination.rki_vaccination_service_config import RkiVaccinationServiceConfig
 
 
-class VaccinationServiceImport:
+class RkiVaccinationServiceImport:
     def __init__(self, database):
         app.logger.debug("------------------------------------------------------------")
         app.logger.debug(" Vaccination Service Import [init]")
         app.logger.debug("------------------------------------------------------------")
         self.__database = database
-        self.cfg = VaccinationServiceConfig()
+        self.cfg = RkiVaccinationServiceConfig()
         app.logger.debug("------------------------------------------------------------")
         app.logger.debug(" Vaccination Service Import [ready]")
 
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
index c5005fc4156f8485b2cbd48a9a7466d5ec169827..263425e5c7fe3fbf78db6334121b806df127c07d 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
@@ -1,17 +1,17 @@
 from database import db, app
 
-from covid19.blueprints.rki_vaccination.vaccination_service_config import VaccinationServiceConfig
-from covid19.blueprints.rki_vaccination.vaccination_model_import import VaccinationImport
-from covid19.blueprints.rki_vaccination.vaccination_model import VaccinationDateReported, VaccinationData
+from covid19.blueprints.rki_vaccination.rki_vaccination_service_config import RkiVaccinationServiceConfig
+from covid19.blueprints.rki_vaccination.rki_vaccination_model_import import VaccinationImport
+from covid19.blueprints.rki_vaccination.rki_vaccination_model import VaccinationDateReported, VaccinationData
 
 
-class VaccinationServiceUpdate:
+class RkiVaccinationServiceUpdate:
     def __init__(self, database):
         app.logger.debug("------------------------------------------------------------")
         app.logger.debug(" Europe Service Update [init]")
         app.logger.debug("------------------------------------------------------------")
         self.__database = database
-        self.cfg = VaccinationServiceConfig()
+        self.cfg = RkiVaccinationServiceConfig()
         app.logger.debug("------------------------------------------------------------")
         app.logger.debug(" Europe Service Update [ready] ")