diff --git a/docs/blueprints/ecdc/uml_implementation/ecdc_use_cases.png b/docs/blueprints/ecdc/uml_implementation/ecdc_use_cases.png
index c97a68e608919506bcd5eb503b9f0e6669a78ed8..6ab5ab9b9d5ea3b99c51a00d563c37a1dc29f5d8 100644
Binary files a/docs/blueprints/ecdc/uml_implementation/ecdc_use_cases.png and b/docs/blueprints/ecdc/uml_implementation/ecdc_use_cases.png differ
diff --git a/docs/blueprints/ecdc/uml_implementation/ecdc_use_cases.txt b/docs/blueprints/ecdc/uml_implementation/ecdc_use_cases.txt
index 51b6b8c62de27362e21f2f7d0ee85f2d8aadab38..19f01cf862fb4761389af8b2c42acaa02affb514 100644
--- a/docs/blueprints/ecdc/uml_implementation/ecdc_use_cases.txt
+++ b/docs/blueprints/ecdc/uml_implementation/ecdc_use_cases.txt
@@ -1,73 +1,33 @@
 @startuml
 package covid19.blueprints.app_user {
 	actor AnonymousVisitor as vu
-	actor AppManager as ou
+	actor AppManager as au
 	actor SysAdmin as su
 	actor AppDevTester as du
 }
 package covid19.blueprints.app_user {
-	vu <|-- ou
+	vu <|-- au
 	vu <|-- su
 	su <|-- du
-	ou <|-- du
+	au <|-- du
 }
 left to right direction
-package ecdc_views_frontend {
-	usecase url_ecdc_info as UC1
-	usecase url_ecdc_tasks as UC2
-	usecase url_ecdc_data_imported as UC3
-	usecase url_ecdc_date_reported_all as UC4
-	usecase url_ecdc_date_reported_one_notification_rate as UC5
-	usecase url_ecdc_date_reported_one_deaths_weekly as UC6
-	usecase url_ecdc_date_reported_one_cases_weekly as UC7
-	usecase url_ecdc_continent_all as UC8
-	usecase url_ecdc_continent_one as UC9
-	usecase url_ecdc_country_all as UC10
-	usecase url_ecdc_country_one as UC11
-	usecase url_ecdc_country_germany as UC12
+package who_views_frontend {
+	usecase download_file as UC1
+	usecase import_file as UC2
+	usecase update_dimension_tables as UC3
+	usecase update_fact_table as UC4
+	usecase update_star_schema as UC5
+	usecase full_update_dimension_tables as UC6
+	usecase full_update_fact_table as UC7
+	usecase full_update_star_schema as UC8
 }
-package ecdc_views_for_tasks {
-	usecase task_ecdc_download_only as UC50
-	usecase task_who_import_only as UC51
-	usecase task_who_update_dimension_tables_only as UC52
-	usecase task_who_update_fact_table_initial_only as UC53
-	usecase task_who_update_fact_table_incremental_only as UC54
-	usecase task_who_update_star_schema_initial as UC55
-	usecase task_who_update_star_schema_incremental as UC56
-}
-package ecdc_celery_tasks {
-	usecase task_ecdc_download_only as UC100
-	usecase task_ecdc_import_only as UC101
-	usecase task_ecdc_update_dimension_tables_only as UC102
-	usecase task_ecdc_update_fact_table_incremental_only as UC103
-	usecase task_ecdc_update_fact_table_incremental_only as UC104
-	usecase task_ecdc_update_fact_table_initial_only as UC105
-	usecase task_ecdc_update_star_schema_incremental as UC106
-}
-vu --> UC1
-vu --> UC2
-vu --> UC3
-vu --> UC4
-vu --> UC5
-vu --> UC6
-vu --> UC7
-vu --> UC8
-vu --> UC9
-vu --> UC10
-vu --> UC11
-vu --> UC12
-au --> UC50
-au --> UC51
-au --> UC52
-au --> UC53
-au --> UC54
-au --> UC55
-au --> UC56
-UC50 --> UC100
-UC51 --> UC101
-UC52 --> UC102
-UC53 --> UC103
-UC54 --> UC104
-UC55 --> UC105
-UC56 --> UC106
+au --> UC1
+au --> UC2
+au --> UC3
+au --> UC4
+au --> UC5
+au --> UC6
+au --> UC7
+au --> UC8
 @enduml
\ No newline at end of file
diff --git a/docs/blueprints/rki_cases/uml_requirements/rki_cases_use_cases.txt b/docs/blueprints/rki_cases/uml_requirements/rki_cases_use_cases.txt
index 248da3a59bb8542cfb2d7a0d0fc69b2fda3622ad..19f01cf862fb4761389af8b2c42acaa02affb514 100644
--- a/docs/blueprints/rki_cases/uml_requirements/rki_cases_use_cases.txt
+++ b/docs/blueprints/rki_cases/uml_requirements/rki_cases_use_cases.txt
@@ -1,65 +1,33 @@
 @startuml
 package covid19.blueprints.app_user {
 	actor AnonymousVisitor as vu
-	actor AppManager as ou
+	actor AppManager as au
 	actor SysAdmin as su
 	actor AppDevTester as du
 }
 package covid19.blueprints.app_user {
-	vu <|-- ou
+	vu <|-- au
 	vu <|-- su
 	su <|-- du
-	ou <|-- du
+	au <|-- du
 }
 left to right direction
-package covid19.blueprints.owid.owid_views_frontend {
-	usecase owid_info as UC1
-	usecase owid_imported as UC2
-	usecase owid_date_reported as UC3
-	usecase owid_date_continent as UC4
-	usecase owid_date_country as UC5
-	usecase owid_date_country_germany as UC6
-	usecase owid_date_reports as UC7
+package who_views_frontend {
+	usecase download_file as UC1
+	usecase import_file as UC2
+	usecase update_dimension_tables as UC3
+	usecase update_fact_table as UC4
+	usecase update_star_schema as UC5
+	usecase full_update_dimension_tables as UC6
+	usecase full_update_fact_table as UC7
+	usecase full_update_star_schema as UC8
 }
-package covid19.blueprints.owid.owid_views_for_tasks {
-	usecase owid_tasks as UC57
-	usecase task_owid_download_only as UC50
-	usecase task_owid_import_only as UC51
-	usecase task_owid_update_dimension_tables_only as UC52
-	usecase task_owid_update_fact_table_initial_only as UC53
-	usecase task_owid_update_fact_table_incremental_only as UC54
-	usecase task_owid_update_star_schema_initial as UC55
-	usecase task_owid_update_star_schema_incremental as UC56
-}
-package covid19.blueprints.owid.owid_celery_tasks {
-	usecase owid_task_download_only as UC100
-	usecase owid_task_import_only as UC101
-	usecase owid_task_update_dimensiontables_only as UC102
-	usecase owid_task_update_facttable_incremental_only as UC103
-	usecase owid_task_update_facttable_initial_only as UC104
-	usecase owid_task_update_starschema_initial as UC105
-	usecase owid_task_update_starschema_incremental as UC106
-}
-vu --> UC1
-vu --> UC2
-vu --> UC3
-vu --> UC4
-vu --> UC5
-vu --> UC6
-vu --> UC7
-au --> UC50
-au --> UC51
-au --> UC52
-au --> UC53
-au --> UC54
-au --> UC55
-au --> UC56
-au --> UC57
-UC50 --> UC100
-UC51 --> UC101
-UC52 --> UC102
-UC53 --> UC103
-UC54 --> UC104
-UC55 --> UC105
-UC56 --> UC106
+au --> UC1
+au --> UC2
+au --> UC3
+au --> UC4
+au --> UC5
+au --> UC6
+au --> UC7
+au --> UC8
 @enduml
\ No newline at end of file
diff --git a/docs/blueprints/rki_vaccination/uml_requirements/rki_vaccination_use_cases.txt b/docs/blueprints/rki_vaccination/uml_requirements/rki_vaccination_use_cases.txt
index 6717fc5a78fd7de078b086c36d9d88ab7d364694..19f01cf862fb4761389af8b2c42acaa02affb514 100644
--- a/docs/blueprints/rki_vaccination/uml_requirements/rki_vaccination_use_cases.txt
+++ b/docs/blueprints/rki_vaccination/uml_requirements/rki_vaccination_use_cases.txt
@@ -1,57 +1,33 @@
 @startuml
 package covid19.blueprints.app_user {
 	actor AnonymousVisitor as vu
-	actor AppManager as ou
+	actor AppManager as au
 	actor SysAdmin as su
 	actor AppDevTester as du
 }
 package covid19.blueprints.app_user {
-	vu <|-- ou
+	vu <|-- au
 	vu <|-- su
 	su <|-- du
-	ou <|-- du
+	au <|-- du
 }
 left to right direction
-package rki_views_frontend {
-	usecase url_vaccination_info as UC1
-	usecase url_vaccination_tasks as UC2
-	usecase url_vaccination_imported as UC3
-	usecase url_vaccination_data as UC4
+package who_views_frontend {
+	usecase download_file as UC1
+	usecase import_file as UC2
+	usecase update_dimension_tables as UC3
+	usecase update_fact_table as UC4
+	usecase update_star_schema as UC5
+	usecase full_update_dimension_tables as UC6
+	usecase full_update_fact_table as UC7
+	usecase full_update_star_schema as UC8
 }
-package rki_vaccination_views_for_tasks {
-	usecase task_who_download_only as UC50
-	usecase task_who_import_only as UC51
-	usecase task_who_update_dimension_tables_only as UC52
-	usecase task_who_update_fact_table_initial_only as UC53
-	usecase task_who_update_fact_table_incremental_only as UC54
-	usecase task_who_update_star_schema_initial as UC55
-	usecase task_who_update_star_schema_incremental as UC56
-}
-package rki_vaccination_celery_tasks {
-	usecase url_vaccination_task_download_only as UC100
-	usecase url_vaccination_task_import_only as UC101
-	usecase url_vaccination_task_update_dimensiontables_only as UC102
-	usecase url_vaccination_task_update_facttable_incremental_only as UC103
-	usecase url_vaccination_task_update_facttable_initial_only as UC104
-	usecase url_vaccination_task_update_starschema_initial as UC105
-	usecase url_vaccination_task_update_starschema_incremental as UC106
-}
-vu --> UC1
-vu --> UC2
-vu --> UC3
-vu --> UC4
-ou --> UC50
-ou --> UC51
-ou --> UC52
-ou --> UC53
-ou --> UC54
-ou --> UC55
-ou --> UC56
-UC50 --> UC100
-UC51 --> UC101
-UC52 --> UC102
-UC53 --> UC103
-UC54 --> UC104
-UC55 --> UC105
-UC56 --> UC106
+au --> UC1
+au --> UC2
+au --> UC3
+au --> UC4
+au --> UC5
+au --> UC6
+au --> UC7
+au --> UC8
 @enduml
\ No newline at end of file
diff --git a/docs/blueprints/who/uml_requirements/who_use_cases.txt b/docs/blueprints/who/uml_requirements/who_use_cases.txt
index 4f4a53bfca63e95a2b2507d696c66cc369c37fef..7e907d1d4a4d46c1d0d2bceb47673065a5b4d2ba 100644
--- a/docs/blueprints/who/uml_requirements/who_use_cases.txt
+++ b/docs/blueprints/who/uml_requirements/who_use_cases.txt
@@ -1,89 +1,31 @@
-@startuml
 package covid19.blueprints.app_user {
 	actor AnonymousVisitor as vu
-	actor AppManager as ou
+	actor AppManager as au
 	actor SysAdmin as su
 	actor AppDevTester as du
 }
 package covid19.blueprints.app_user {
-	vu <|-- ou
+	vu <|-- au
 	vu <|-- su
 	su <|-- du
-	ou <|-- du
+	au <|-- du
 }
 left to right direction
-package who_views_frontend {
-  usecase url_who_info as UC1
-  usecase url_who_tasks as UC2
-  usecase url_who_imported as UC3
-  usecase url_who_date_reported_all as UC4
-  usecase url_who_date_reported as UC5
-  usecase url_who_date_reported_cases_new as UC6
-  usecase url_who_date_reported_cases_cumulative as UC7
-  usecase url_who_date_reported_deaths_new as UC8
-  usecase url_who_date_reported_deaths_cumulative as UC9
-  usecase url_who_region_all as UC10
-  usecase url_who_region as UC11
-  usecase url_who_country_all as UC12
-  usecase url_who_country as UC13
-  usecase url_who_country_cases_new as UC14
-  usecase url_who_country_cases_cumulative as UC15
-  usecase url_who_country_deaths_new as UC16
-  usecase url_who_country_deaths_cumulative as UC17
-  usecase url_who_germany as UC18
-  usecase url_who_region_all as UC19
-  usecase url_who_region_all as UC20
+package ecdc_views_frontend {
+	usecase download_file as UC1
+	usecase import_file as UC2
+	usecase update_dimension_tables as UC3
+	usecase update_fact_table as UC4
+	usecase update_star_schema as UC5
+	usecase full_update_dimension_tables as UC6
+	usecase full_update_fact_table as UC7
+	usecase full_update_star_schema as UC8
 }
-package who_views_for_tasks {
-	usecase url_task_who_download_only as UC50
-	usecase url_task_who_import_only as UC51
-	usecase url_task_who_update_dimension_tables_only as UC52
-	usecase url_task_who_update_fact_table_initial_only as UC53
-	usecase url_task_who_update_fact_table_incremental_only as UC54
-	usecase url_task_who_update_star_schema_initial as UC55
-	usecase url_task_who_update_star_schema_incremental as UC56
-}
-package who_celery_tasks {
-  usecase task_who_download_only as UC100
-  usecase task_who_import_only as UC101
-  usecase task_who_update_dimension_tables_only as UC102
-  usecase task_who_update_fact_table_initial_only as UC103
-  usecase task_who_update_fact_table_incremental_only as UC104
-  usecase task_who_update_star_schema_initial as UC105
-  usecase task_who_update_star_schema_incremental as UC106
-}
-vu --> UC1
-vu --> UC2
-vu --> UC3
-vu --> UC4
-vu --> UC5
-vu --> UC6
-vu --> UC7
-vu --> UC8
-vu --> UC9
-vu --> UC10
-vu --> UC11
-vu --> UC12
-vu --> UC13
-vu --> UC14
-vu --> UC15
-vu --> UC16
-vu --> UC17
-vu --> UC18
-vu --> UC19
-vu --> UC20
-ou --> UC50
-ou --> UC51
-ou --> UC52
-ou --> UC53
-ou --> UC54
-ou --> UC55
-ou --> UC56
-UC50 --> UC100
-UC51 --> UC101
-UC52 --> UC102
-UC53 --> UC103
-UC54 --> UC104
-UC55 --> UC105
-UC56 --> UC106
-@enduml
\ No newline at end of file
+au --> UC1
+au --> UC2
+au --> UC3
+au --> UC4
+au --> UC5
+au --> UC6
+au --> UC7
+au --> UC8
\ No newline at end of file