diff --git a/templates/overrides/navigation/oe-corporate-blocks-eu-footer.html.twig b/templates/overrides/navigation/oe-corporate-blocks-eu-footer.html.twig
index 4fc2a8450b49c8a5e02bdff27425e5af3daeac05..306936548d6be8679a6b8d7502696d00e1b30ad0 100644
--- a/templates/overrides/navigation/oe-corporate-blocks-eu-footer.html.twig
+++ b/templates/overrides/navigation/oe-corporate-blocks-eu-footer.html.twig
@@ -31,7 +31,7 @@
         'items': [
         {
           'type': 'content',
-          'content': bcl_block('whitelabel_eu_logo_block'),
+          'content': drupal_block('whitelabel_eu_logo_block'),
         },
       ],
       },
@@ -40,7 +40,7 @@
         'items': [
         {
           'type': 'content',
-          'content': bcl_title(corporate_footer.contact_title, 'fw-bold border-bottom pb-2 mb-2'),
+          'content':  _self.bcl_title(corporate_footer.contact_title, 'fw-bold border-bottom pb-2 mb-2'),
         },
         {
           'type': 'links',
@@ -48,7 +48,7 @@
         },
         {
           'type': 'content',
-          'content': bcl_title(corporate_footer.social_media_title, 'fw-bold border-bottom pb-2 pt-3 mb-2'),
+          'content':  _self.bcl_title(corporate_footer.social_media_title, 'fw-bold border-bottom pb-2 pt-3 mb-2'),
         },
         {
           'type': 'links',
@@ -56,7 +56,7 @@
         },
         {
           'type': 'content',
-          'content': bcl_title(corporate_footer.legal_links_title, 'fw-bold border-bottom pb-2 pt-3 mb-2'),
+          'content':  _self.bcl_title(corporate_footer.legal_links_title, 'fw-bold border-bottom pb-2 pt-3 mb-2'),
         },
         {
           'type': 'links',
@@ -69,7 +69,7 @@
         'items': [
         {
           'type': 'content',
-          'content': bcl_title(corporate_footer.institution_links_title, 'fw-bold border-bottom pb-2 mb-2'),
+          'content':  _self.bcl_title(corporate_footer.institution_links_title, 'fw-bold border-bottom pb-2 mb-2'),
         },
         {
           'type': 'links',
diff --git a/templates/overrides/navigation/oe-corporate-blocks-neutral-footer.html.twig b/templates/overrides/navigation/oe-corporate-blocks-neutral-footer.html.twig
index 8769827ad472d40479fac36eba5de54bad2534f8..324a7cfa18c3f37d5ff5ef40a66dd04b3f6079ae 100644
--- a/templates/overrides/navigation/oe-corporate-blocks-neutral-footer.html.twig
+++ b/templates/overrides/navigation/oe-corporate-blocks-neutral-footer.html.twig
@@ -5,6 +5,10 @@
  */
 #}
 
+{% macro bcl_title(title, classes) %}
+  <p class="{{ classes }}">{{ title }}</p>
+{% endmacro %}
+
 {% set _section_2 = [] %}
 {% set _section_3 = [] %}
 {# First we parse the other_links, we make a simple grid. #}
@@ -13,7 +17,7 @@
     {% set _section_2 = _section_2|merge([
       {
         'type': 'content',
-        'content': bcl_title(section.label,'fw-bold border-bottom pb-2 mb-2 mt-3'),
+        'content':  _self.bcl_title(section.label,'fw-bold border-bottom pb-2 mb-2 mt-3'),
       },
       {
         'type': 'links',
@@ -24,7 +28,7 @@
     {% set _section_3 = _section_3|merge([
       {
         'type': 'content',
-        'content': bcl_title(section.label,'fw-bold border-bottom pb-2 mb-2 mt-3'),
+        'content':  _self.bcl_title(section.label,'fw-bold border-bottom pb-2 mb-2 mt-3'),
       },
       {
         'type': 'links',
@@ -55,7 +59,7 @@
   {% set _section_2 = _section_2|merge([
     {
       'type': 'content',
-      'content': bcl_title('Follow us on social media', 'fw-bold border-bottom pb-2 mb-2 mt-3'),
+      'content':  _self.bcl_title('Follow us on social media', 'fw-bold border-bottom pb-2 mb-2 mt-3'),
     },
     {
       'type': 'links',