diff --git a/docs/blueprints/ecdc/uml_requirements/ecdc_use_cases.txt b/docs/blueprints/ecdc/uml_requirements/ecdc_use_cases.txt
index 51b6b8c62de27362e21f2f7d0ee85f2d8aadab38..7fa71103d69f784ae95fac0831e2889d92f0c363 100644
--- a/docs/blueprints/ecdc/uml_requirements/ecdc_use_cases.txt
+++ b/docs/blueprints/ecdc/uml_requirements/ecdc_use_cases.txt
@@ -1,18 +1,18 @@
 @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 {
+package covid19.blueprints.ecdc.ecdc_views_frontend {
 	usecase url_ecdc_info as UC1
 	usecase url_ecdc_tasks as UC2
 	usecase url_ecdc_data_imported as UC3
@@ -26,7 +26,7 @@ package ecdc_views_frontend {
 	usecase url_ecdc_country_one as UC11
 	usecase url_ecdc_country_germany as UC12
 }
-package ecdc_views_for_tasks {
+package covid19.blueprints.ecdc.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
@@ -35,7 +35,7 @@ package ecdc_views_for_tasks {
 	usecase task_who_update_star_schema_initial as UC55
 	usecase task_who_update_star_schema_incremental as UC56
 }
-package ecdc_celery_tasks {
+package covid19.blueprints.ecdc.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
diff --git a/docs/blueprints/owid/uml_requirements/owid_use_cases.txt b/docs/blueprints/owid/uml_requirements/owid_use_cases.txt
index b4ca3c76216f115c20a308daa00aa31db2b1a319..ff705117426342c82b593b0a5813185bddb55a5e 100644
--- a/docs/blueprints/owid/uml_requirements/owid_use_cases.txt
+++ b/docs/blueprints/owid/uml_requirements/owid_use_cases.txt
@@ -1,18 +1,18 @@
 @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 owid_views_frontend {
+package covid19.blueprints.owid.owid_views_frontend {
 	usecase owid_info as UC1
 	usecase owid_imported as UC2
 	usecase owid_date_reported as UC3
@@ -21,7 +21,7 @@ package owid_views_frontend {
 	usecase owid_date_country_germany as UC6
 	usecase owid_date_reports as UC7
 }
-package owid_views_for_tasks {
+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
@@ -31,7 +31,7 @@ package owid_views_for_tasks {
 	usecase task_owid_update_star_schema_initial as UC55
 	usecase task_owid_update_star_schema_incremental as UC56
 }
-package owid_celery_tasks {
+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
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 19f01cf862fb4761389af8b2c42acaa02affb514..77a11af766fc8a231086af346242c17e8f1a2125 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
@@ -12,7 +12,7 @@ package covid19.blueprints.app_user {
 	au <|-- du
 }
 left to right direction
-package who_views_frontend {
+package covid19.blueprints.rki_cases.rki_cases_views_frontend {
 	usecase download_file as UC1
 	usecase import_file as UC2
 	usecase update_dimension_tables as UC3
diff --git a/docs/blueprints/who/uml_requirements/who_use_cases.txt b/docs/blueprints/who/uml_requirements/who_use_cases.txt
index 7e907d1d4a4d46c1d0d2bceb47673065a5b4d2ba..09e7ece9659e5d87b52e1c17bbd4de6ee0336ce3 100644
--- a/docs/blueprints/who/uml_requirements/who_use_cases.txt
+++ b/docs/blueprints/who/uml_requirements/who_use_cases.txt
@@ -11,7 +11,7 @@ package covid19.blueprints.app_user {
 	au <|-- du
 }
 left to right direction
-package ecdc_views_frontend {
+package covid19.blueprints.who.who_views_frontend {
 	usecase download_file as UC1
 	usecase import_file as UC2
 	usecase update_dimension_tables as UC3