diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_all.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/country/who_country_all.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_all_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/country/who_country_all_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_all_table.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_table.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/country/who_country_all_table.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_table.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_germany.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/country/who_country_germany.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_germany_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/country/who_country_germany_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_cases_cumulative.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_cases_cumulative.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_cases_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_cases_cumulative_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_cases_new.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_cases_new.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_cases_new_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_cases_new_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_deaths_cumulative.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_deaths_cumulative.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_deaths_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_deaths_cumulative_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_deaths_new.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_deaths_new.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_deaths_new_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_deaths_new_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_table.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_table.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_table.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_table.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_cases_new.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_cases_new.html
rename to src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_cases_new_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_cases_new_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_deaths_cumulative.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_deaths_cumulative.html
rename to src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_deaths_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_deaths_cumulative_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_deaths_new.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_new.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_deaths_new.html
rename to src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_new.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_table.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_table.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_table.html
rename to src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_table.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_who_imported_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_who_imported_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_who_imported_table.html b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_table.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_who_imported_table.html
rename to src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_table.html
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_who_table_global_data.html b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_table_global_data.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_who_table_global_data.html
rename to src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_table_global_data.html