diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html
index 1d9c77a07ed2d673240d17fea3420672a755b9be..7b2d2517aa39ac5835229148d5eae9fa63f58972 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html
@@ -12,7 +12,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'ecdc/fragments/fragment_europe_navtabs.html' %}
+  {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
 {% block main_container_fluid %}
@@ -22,7 +22,7 @@
         {% if page_data.has_prev %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'ecdc.url_europe_continent_all', page=page_data.prev_num) }}">
+               href="{{ url_for( 'ecdc.url_ecdc_continent_all', page=page_data.prev_num) }}">
                 Previous
             </a>
         </li>
@@ -32,7 +32,7 @@
                 {% if page_num != page_data.page %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'ecdc.url_europe_continent_all', page=page_num) }}">
+                           href="{{ url_for( 'ecdc.url_ecdc_continent_all', page=page_num) }}">
                             {{ page_num }}
                         </a>
                     </li>
@@ -50,7 +50,7 @@
         {% if page_data.has_next %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'ecdc.url_europe_continent_all', page=page_data.next_num) }}">
+               href="{{ url_for( 'ecdc.url_ecdc_continent_all', page=page_data.next_num) }}">
                 Next
             </a>
         </li>
@@ -58,7 +58,7 @@
     </ul>
     {% endif %}
 
-    {% include 'ecdc/fragments/fragment_europe_table_continent.html' %}
+    {% include 'ecdc/fragments/fragment_ecdc_table_continent.html' %}
 
 {% endblock %}
 
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_germany.html b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_germany.html
index 2813571d10f79f1a5625e5489958e48e7f58a63d..07a8b5068b9ed6b8436e47fa553b543312492948 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_germany.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_germany.html
@@ -12,7 +12,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'ecdc/fragments/fragment_europe_navtabs.html' %}
+  {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
 {% block main_container_fluid %}
@@ -22,7 +22,7 @@
         {% if page_data.has_prev %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'ecdc.url_europe_continent', page=page_data.prev_num) }}">
+               href="{{ url_for( 'ecdc.url_ecdc_continent', page=page_data.prev_num) }}">
                 Previous
             </a>
         </li>
@@ -32,7 +32,7 @@
                 {% if page_num != page_data.page %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'ecdc.url_europe_continent', page=page_num) }}">
+                           href="{{ url_for( 'ecdc.url_ecdc_continent', page=page_num) }}">
                             {{ page_num }}
                         </a>
                     </li>
@@ -50,7 +50,7 @@
         {% if page_data.has_next %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'ecdc.url_europe_continent', page=page_data.next_num) }}">
+               href="{{ url_for( 'ecdc.url_ecdc_continent', page=page_data.next_num) }}">
                 Next
             </a>
         </li>
@@ -58,7 +58,7 @@
     </ul>
     {% endif %}
 
-    {% include 'ecdc/fragments/fragment_europe_table_country.html' %}
+    {% include 'ecdc/fragments/fragment_ecdc_table_country.html' %}
 
 {% endblock %}
 
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html
index 9ab50730a6e8ef34e36d0d343e5b670353d8f420..7b76e1e706ced2c78dec360764dddf99d9438914 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html
@@ -12,7 +12,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'ecdc/fragments/fragment_europe_navtabs.html' %}
+  {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
 {% block main_container_fluid %}
@@ -22,7 +22,7 @@
         {% if page_data.has_prev %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'ecdc.url_europe_continent_one', continent_id=continent.id, page=page_data.prev_num) }}">
+               href="{{ url_for( 'ecdc.url_ecdc_continent_one', continent_id=continent.id, page=page_data.prev_num) }}">
                 Previous
             </a>
         </li>
@@ -32,7 +32,7 @@
                 {% if page_num != page_data.page %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'ecdc.url_europe_continent_one', continent_id=continent.id, page=page_num) }}">
+                           href="{{ url_for( 'ecdc.url_ecdc_continent_one', continent_id=continent.id, page=page_num) }}">
                             {{ page_num }}
                         </a>
                     </li>
@@ -50,7 +50,7 @@
         {% if page_data.has_next %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'ecdc.url_europe_continent_one', continent_id=continent.id, page=page_data.next_num) }}">
+               href="{{ url_for( 'ecdc.url_ecdc_continent_one', continent_id=continent.id, page=page_data.next_num) }}">
                 Next
             </a>
         </li>
@@ -58,7 +58,7 @@
     </ul>
     {% endif %}
 
-    {% include 'ecdc/fragments/fragment_europe_table_country.html' %}
+    {% include 'ecdc/fragments/fragment_ecdc_table_country.html' %}
 
 {% endblock %}
 
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html
index d2380e314966f1bd83e01e26508ce36945a60748..e8fc730b75c2107c58d962d57639fab5a3559536 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html
@@ -12,7 +12,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'ecdc/fragments/fragment_europe_navtabs.html' %}
+  {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
 {% block main_container_fluid %}
@@ -22,7 +22,7 @@
         {% if page_data.has_prev %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'ecdc.url_europe_country_all', page=page_data.prev_num) }}">
+               href="{{ url_for( 'ecdc.url_ecdc_country_all', page=page_data.prev_num) }}">
                 Previous
             </a>
         </li>
@@ -32,7 +32,7 @@
                 {% if page_num != page_data.page %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'ecdc.url_europe_country_all', page=page_num) }}">
+                           href="{{ url_for( 'ecdc.url_ecdc_country_all', page=page_num) }}">
                             {{ page_num }}
                         </a>
                     </li>
@@ -50,7 +50,7 @@
         {% if page_data.has_next %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'ecdc.url_europe_country_all', page=page_data.next_num) }}">
+               href="{{ url_for( 'ecdc.url_ecdc_country_all', page=page_data.next_num) }}">
                 Next
             </a>
         </li>
@@ -58,7 +58,7 @@
     </ul>
     {% endif %}
 
-    {% include 'ecdc/fragments/fragment_europe_table_country.html' %}
+    {% include 'ecdc/fragments/fragment_ecdc_table_country.html' %}
 
 {% endblock %}
 
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany.html b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany.html
index d0891ed9f763176d542ff16044f3a888601b1542..d614b2c59face9a53ac81880b07b6c6abba3c0ee 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany.html
@@ -2,7 +2,7 @@
 
 {% block navigation_navtabs %}
     <!-- TODO: implement navigation_breadcrumb in .html -->
-  {% include 'ecdc/fragments/fragment_europe_navtabs.html' %}
+  {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
 {% block main_container_fluid %}
@@ -12,7 +12,7 @@
         {% if page_data.has_prev %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'ecdc.url_europe_country_germany', page=page_data.prev_num) }}">
+               href="{{ url_for( 'ecdc.url_ecdc_country_germany', page=page_data.prev_num) }}">
                 Previous
             </a>
         </li>
@@ -22,7 +22,7 @@
                 {% if page_num != page_data.page %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'ecdc.url_europe_country_germany', page=page_num) }}">
+                           href="{{ url_for( 'ecdc.url_ecdc_country_germany', page=page_num) }}">
                             {{ page_num }}
                         </a>
                     </li>
@@ -40,7 +40,7 @@
         {% if page_data.has_next %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'ecdc.url_europe_country_germany', page=page_data.next_num) }}">
+               href="{{ url_for( 'ecdc.url_ecdc_country_germany', page=page_data.next_num) }}">
                 Next
             </a>
         </li>
@@ -48,7 +48,7 @@
     </ul>
     {% endif %}
 
-    {% include 'ecdc/fragments/fragment_europe_table_data.html' %}
+    {% include 'ecdc/fragments/fragment_ecdc_table_data.html' %}
 
 {% endblock %}
 
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one.html b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one.html
index 87791f020a1c019c56060f92a95797aae2e0ec02..83a7bcd6624562afc79ad4524d770a2895a10f35 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one.html
@@ -2,7 +2,7 @@
 
 {% block navigation_navtabs %}
     <!-- TODO: implement navigation_breadcrumb in .html -->
-  {% include 'ecdc/fragments/fragment_europe_navtabs.html' %}
+  {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
 {% block main_container_fluid %}
@@ -12,7 +12,7 @@
         {% if page_data.has_prev %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'ecdc.url_europe_country_one',
+               href="{{ url_for( 'ecdc.url_ecdc_country_one',
                country_id=europe_country.id,
                page=page_data.prev_num) }}">
                 Previous
@@ -24,7 +24,7 @@
                 {% if page_num != page_data.page %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'ecdc.url_europe_country_one',
+                           href="{{ url_for( 'ecdc.url_ecdc_country_one',
                             country_id=europe_country.id,
                             page=page_num) }}">
                             {{ page_num }}
@@ -44,7 +44,7 @@
         {% if page_data.has_next %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'ecdc.url_europe_country_one',
+               href="{{ url_for( 'ecdc.url_ecdc_country_one',
                             country_id=europe_country.id, page=page_data.next_num) }}">
                 Next
             </a>
@@ -53,7 +53,7 @@
     </ul>
     {% endif %}
 
-    {% include 'ecdc/fragments/fragment_europe_table_data.html' %}
+    {% include 'ecdc/fragments/fragment_ecdc_table_data.html' %}
 
 {% endblock %}
 
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html
index 5ccca94262d11f73d6ce292c9a4ee2de891ecd8a..8d568432979d1b14f0dddc46e1787b09e951e17a 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html
@@ -1,4 +1,4 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
 
 {% block navigation_breadcrumb %}
     <!-- TODO: implement navigation_breadcrumb in .html -->
@@ -12,7 +12,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'europe/fragments/fragment_europe_navtabs.html' %}
+  {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
 {% block main_container_fluid %}
@@ -22,7 +22,7 @@
         {% if page_data.has_prev %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'europe.url_europe_date_reported_all', page=page_data.prev_num) }}">
+               href="{{ url_for( 'ecdc.url_ecdc_date_reported_all', page=page_data.prev_num) }}">
                 Previous
             </a>
         </li>
@@ -32,7 +32,7 @@
                 {% if page_num != page_data.page %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'europe.url_europe_date_reported_all', page=page_num) }}">
+                           href="{{ url_for( 'ecdc.url_ecdc_date_reported_all', page=page_num) }}">
                             {{ page_num }}
                         </a>
                     </li>
@@ -50,7 +50,7 @@
         {% if page_data.has_next %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'europe.url_europe_date_reported_all', page=page_data.next_num) }}">
+               href="{{ url_for( 'ecdc.url_ecdc_date_reported_all', page=page_data.next_num) }}">
                 Next
             </a>
         </li>
@@ -58,7 +58,7 @@
     </ul>
     {% endif %}
 
-    {% include 'europe/fragments/fragment_europe_table_date_reported.html' %}
+    {% include 'ecdc/fragments/fragment_ecdc_table_date_reported.html' %}
 
 {% endblock %}
 
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html
index 255f43aec5e8f1429c86cd2d64ea509d20ed05f2..eebf92a4a0448318225c50bcd150fb0e68718db0 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html
@@ -1,11 +1,11 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
 
 {% block navigation_breadcrumb %}
     <!-- TODO: implement navigation_breadcrumb in .html -->
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'europe/fragments/fragment_europe_navtabs.html' %}
+  {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
 {% block main_container_fluid %}
@@ -15,7 +15,7 @@
         {% if page_data.has_prev %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'europe.url_europe_date_reported_one',
+               href="{{ url_for( 'ecdc.url_ecdc_date_reported_one',
                europe_date_reported_id=europe_date_reported.id,
                page=page_data.prev_num) }}">
                 Previous
@@ -27,7 +27,7 @@
                 {% if page_num != page_data.page %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'europe.url_europe_date_reported_one',
+                           href="{{ url_for( 'ecdc.url_ecdc_date_reported_one',
                             europe_date_reported_id=europe_date_reported.id,
                             page=page_num) }}">
                             {{ page_num }}
@@ -47,7 +47,7 @@
         {% if page_data.has_next %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'europe.url_europe_date_reported_one',
+               href="{{ url_for( 'ecdc.url_ecdc_date_reported_one',
                             europe_date_reported_id=europe_date_reported.id, page=page_data.next_num) }}">
                 Next
             </a>
@@ -56,7 +56,7 @@
     </ul>
     {% endif %}
 
-    {% include 'europe/fragments/fragment_europe_table_data.html' %}
+    {% include 'ecdc/fragments/fragment_ecdc_table_data.html' %}
 
 {% endblock %}
 
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html
index 351ee3a14a723c8a1f3ffa10d32d7e7105f577a5..c6dea641d0fba29eb07faef92ad04740f183c73b 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html
@@ -1,11 +1,11 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
 
 {% block navigation_breadcrumb %}
     <!-- TODO: implement navigation_breadcrumb in .html -->
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'europe/fragments/fragment_europe_navtabs.html' %}
+  {% include 'europe/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
 {% block main_container_fluid %}
@@ -15,7 +15,7 @@
         {% if page_data.has_prev %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'europe.url_europe_date_reported_one_cases_weekly',
+               href="{{ url_for( 'europe.url_ecdc_date_reported_one_cases_weekly',
                europe_date_reported_id=europe_date_reported.id,
                page=page_data.prev_num) }}">
                 Previous
@@ -27,7 +27,7 @@
                 {% if page_num != page_data.page %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'europe.url_europe_date_reported_one_cases_weekly',
+                           href="{{ url_for( 'europe.url_ecdc_date_reported_one_cases_weekly',
                             europe_date_reported_id=europe_date_reported.id,
                             page=page_num) }}">
                             {{ page_num }}
@@ -47,7 +47,7 @@
         {% if page_data.has_next %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'europe.url_europe_date_reported_one_cases_weekly',
+               href="{{ url_for( 'europe.url_ecdc_date_reported_one_cases_weekly',
                             europe_date_reported_id=europe_date_reported.id, page=page_data.next_num) }}">
                 Next
             </a>
@@ -56,7 +56,7 @@
     </ul>
     {% endif %}
 
-    {% include 'europe/fragments/fragment_europe_table_data.html' %}
+    {% include 'europe/fragments/fragment_ecdc_table_data.html' %}
 
 {% endblock %}
 
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html
index 326dc849cf3dbd5eac04a8b3d54c3ffb440f908e..3c626d4e7549aa1edfca2fda8bf2a733a7960021 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html
@@ -1,11 +1,11 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
 
 {% block navigation_breadcrumb %}
     <!-- TODO: implement navigation_breadcrumb in .html -->
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'europe/fragments/fragment_europe_navtabs.html' %}
+  {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
 {% block main_container_fluid %}
@@ -15,7 +15,7 @@
         {% if page_data.has_prev %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'europe.url_europe_date_reported_one_deaths_weekly',
+               href="{{ url_for( 'ecdc.url_ecdc_date_reported_one_deaths_weekly',
                europe_date_reported_id=europe_date_reported.id,
                page=page_data.prev_num) }}">
                 Previous
@@ -27,7 +27,7 @@
                 {% if page_num != page_data.page %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'europe.url_europe_date_reported_one_deaths_weekly',
+                           href="{{ url_for( 'ecdc.url_ecdc_date_reported_one_deaths_weekly',
                             europe_date_reported_id=europe_date_reported.id,
                             page=page_num) }}">
                             {{ page_num }}
@@ -47,7 +47,7 @@
         {% if page_data.has_next %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'europe.url_europe_date_reported_one_deaths_weekly',
+               href="{{ url_for( 'ecdc.url_ecdc_date_reported_one_deaths_weekly',
                             europe_date_reported_id=europe_date_reported.id, page=page_data.next_num) }}">
                 Next
             </a>
@@ -56,7 +56,7 @@
     </ul>
     {% endif %}
 
-    {% include 'europe/fragments/fragment_europe_table_data.html' %}
+    {% include 'ecdc/fragments/fragment_ecdc_table_data.html' %}
 
 {% endblock %}
 
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html
index 46731348092cd7c7c2dacd704b14b925491e1745..29fc133de767123181b1508b709547a7d764819d 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html
@@ -1,11 +1,11 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
 
 {% block navigation_breadcrumb %}
     <!-- TODO: implement navigation_breadcrumb in .html -->
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'europe/fragments/fragment_europe_navtabs.html' %}
+  {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
 {% block main_container_fluid %}
@@ -15,7 +15,7 @@
         {% if page_data.has_prev %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'europe.url_europe_date_reported_one_notification_rate',
+               href="{{ url_for( 'ecdc.url_ecdc_date_reported_one_notification_rate',
                europe_date_reported_id=europe_date_reported.id,
                page=page_data.prev_num) }}">
                 Previous
@@ -27,7 +27,7 @@
                 {% if page_num != page_data.page %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'europe.url_europe_date_reported_one_notification_rate',
+                           href="{{ url_for( 'ecdc.url_ecdc_date_reported_one_notification_rate',
                             europe_date_reported_id=europe_date_reported.id,
                             page=page_num) }}">
                             {{ page_num }}
@@ -47,7 +47,7 @@
         {% if page_data.has_next %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'europe.url_europe_date_reported_one_notification_rate',
+               href="{{ url_for( 'ecdc.url_ecdc_date_reported_one_notification_rate',
                             europe_date_reported_id=europe_date_reported.id, page=page_data.next_num) }}">
                 Next
             </a>
@@ -56,7 +56,7 @@
     </ul>
     {% endif %}
 
-    {% include 'europe/fragments/fragment_europe_table_data.html' %}
+    {% include 'ecdc/fragments/fragment_ecdc_table_data.html' %}
 
 {% endblock %}
 
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data.html b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data.html
index 6dc687530c61bdca5e3fd6de3a8272e4f868ca1b..822ac5071224d5ff01d54357acd98aa556f2cf1f 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data.html
@@ -12,7 +12,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'ecdc/fragments/fragment_europe_navtabs.html' %}
+  {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
 {% block main_container_fluid %}
@@ -22,7 +22,7 @@
         {% if page_data.has_prev %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'ecdc.url_europe_data', page=page_data.prev_num) }}">
+               href="{{ url_for( 'ecdc.url_ecdc_data', page=page_data.prev_num) }}">
                 Previous
             </a>
         </li>
@@ -32,7 +32,7 @@
                 {% if page_num != page_data.page %}
                     <li class="page-item">
                         <a class="page-link"
-                           href="{{ url_for( 'ecdc.url_europe_data', page=page_num) }}">
+                           href="{{ url_for( 'ecdc.url_ecdc_data', page=page_num) }}">
                             {{ page_num }}
                         </a>
                     </li>
@@ -50,7 +50,7 @@
         {% if page_data.has_next %}
         <li class="page-item">
             <a class="page-link"
-               href="{{ url_for( 'ecdc.url_europe_data', page=page_data.next_num) }}">
+               href="{{ url_for( 'ecdc.url_ecdc_data', page=page_data.next_num) }}">
                 Next
             </a>
         </li>
@@ -58,7 +58,7 @@
     </ul>
     {% endif %}
 
-    {% include 'ecdc/fragments/fragment_europe_table_data.html' %}
+    {% include 'ecdc/fragments/fragment_ecdc_table_data.html' %}
 
 {% endblock %}
 
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html
index cb4154bfa2742258435d4a3e5974c7a0b59532fd..ac2ccead6687eaffcc2c50f4de07576e8b578164 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html
@@ -13,7 +13,7 @@
 
 
 {% block navigation_navtabs %}
-  {% include 'ecdc/fragments/fragment_europe_navtabs.html' %}
+  {% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
 
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_info.html b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_info.html
index b6972a703cbc2d958561adb207aae9e3ed0e782a..77b42e0dc3963e1d691e5354bf39db103118de48 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_info.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_info.html
@@ -13,7 +13,7 @@
 
 
 {% block navigation_navtabs %}
-  {% include 'europe/fragments/fragment_europe_navtabs.html' %}
+  {% include 'europe/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}
 
 
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_tasks.html b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_tasks.html
index 70916072de18d2a91d6927314920511fff57e866..0d4ae107fb06c3390d0629c4086ba451ae574ef8 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_tasks.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_tasks.html
@@ -12,7 +12,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'europe/fragments/fragment_europe_navtabs.html' %}
+  {% include 'europe/fragments/fragment_ecdc_navtabs.html' %}
 {% endblock %}