diff --git a/app/views/content_items/detailed_guide.html.erb b/app/views/content_items/detailed_guide.html.erb
index a7cc522b3..c77b38648 100644
--- a/app/views/content_items/detailed_guide.html.erb
+++ b/app/views/content_items/detailed_guide.html.erb
@@ -86,12 +86,12 @@
         margin_bottom: 6,
         data_attributes: {
           module: "ga4-event-tracker",
-          ga4: {
+          ga4_event: {
             event_name: 'print_page',
-            type: 'Print this page',
+            type: 'print page',
             index: 1,
             index_total: 2,
-            section: 'Contents',
+            section: 'Content',
           },
         },
       } %>
@@ -109,9 +109,9 @@
         margin_bottom: 6,
         data_attributes: {
           module: "ga4-event-tracker",
-          ga4: {
+          ga4_event: {
             event_name: 'print_page',
-            type: 'Print this page',
+            type: 'print page',
             index: 2,
             index_total: 2,
             section: 'Footer',
diff --git a/app/views/content_items/guide.html+print.erb b/app/views/content_items/guide.html+print.erb
index d7b0b1255..172f81cde 100644
--- a/app/views/content_items/guide.html+print.erb
+++ b/app/views/content_items/guide.html+print.erb
@@ -25,12 +25,12 @@
         "track-category": "printButton",
         "track-action": "clicked",
         "track-label": t("components.print_link.text"),
-        ga4: {
+        ga4_event: {
           event_name: 'print_page',
-          type: 'Print this page',
+          type: 'print page',
           index: 1,
           index_total: 2,
-          section: 'Contents',
+          section: 'Content',
         },
       },
       margin_bottom: 8,
@@ -56,9 +56,9 @@
         "track-category": "printButton",
         "track-action": "clicked",
         "track-label": t("components.print_link.text"),
-        ga4: {
+        ga4_event: {
           event_name: 'print_page',
-          type: 'Print this page',
+          type: 'print page',
           index: 2,
           index_total: 2,
           section: 'Footer',
diff --git a/app/views/content_items/hmrc_manual.html.erb b/app/views/content_items/hmrc_manual.html.erb
index 1b1368b0c..54c68275c 100644
--- a/app/views/content_items/hmrc_manual.html.erb
+++ b/app/views/content_items/hmrc_manual.html.erb
@@ -27,9 +27,9 @@
   <%= render 'govuk_publishing_components/components/print_link', {
     data_attributes: {
       module: "ga4-event-tracker",
-      ga4: {
+      ga4_event: {
         event_name: 'print_page',
-        type: 'Print this page',
+        type: 'print page',
         index: 1,
         index_total: 1,
         section: 'Footer',
diff --git a/app/views/content_items/hmrc_manual_section.html.erb b/app/views/content_items/hmrc_manual_section.html.erb
index 390625ca6..6f83fd0d3 100644
--- a/app/views/content_items/hmrc_manual_section.html.erb
+++ b/app/views/content_items/hmrc_manual_section.html.erb
@@ -48,9 +48,9 @@
   <%= render 'govuk_publishing_components/components/print_link', {
     data_attributes: {
       module: "ga4-event-tracker",
-      ga4: {
+      ga4_event: {
         event_name: 'print_page',
-        type: 'Print this page',
+        type: 'print page',
         index: 1,
         index_total: 1,
         section: 'Footer',
diff --git a/app/views/content_items/html_publication.html.erb b/app/views/content_items/html_publication.html.erb
index 9ac484472..bf88e8aa7 100644
--- a/app/views/content_items/html_publication.html.erb
+++ b/app/views/content_items/html_publication.html.erb
@@ -60,12 +60,12 @@
           margin_bottom: 6,
           data_attributes: {
             module: "ga4-event-tracker",
-            ga4: {
+            ga4_event: {
               event_name: 'print_page',
-              type: 'Print this page',
+              type: 'print page',
               index: 1,
               index_total: 1,
-              section: 'Contents',
+              section: 'Content',
             },
           },
         } %>
diff --git a/app/views/content_items/manual.html.erb b/app/views/content_items/manual.html.erb
index b514cef96..03d93db86 100644
--- a/app/views/content_items/manual.html.erb
+++ b/app/views/content_items/manual.html.erb
@@ -36,9 +36,9 @@
   <%= render 'govuk_publishing_components/components/print_link', {
     data_attributes: {
       module: "ga4-event-tracker",
-      ga4: {
+      ga4_event: {
         event_name: 'print_page',
-        type: 'Print this page',
+        type: 'print page',
         index: 1,
         index_total: 1,
         section: 'Footer',
diff --git a/app/views/content_items/manual_section.html.erb b/app/views/content_items/manual_section.html.erb
index dd3e0031d..bc9a416e5 100644
--- a/app/views/content_items/manual_section.html.erb
+++ b/app/views/content_items/manual_section.html.erb
@@ -61,7 +61,7 @@
 
                   {
                     data_attributes: {
-                      ga4: {
+                      ga4_event: {
                         event_name: "select_content",
                         type: "accordion",
                         text: item[:heading][:text],
@@ -77,21 +77,8 @@
                 end
               %>
 
-              <%
-                ga4_attributes = {
-                  event_name: "select_content",
-                  type: "accordion",
-                  index: 0,
-                  index_total: @content_item.main.length,
-                }
-              %>
               <%= render "govuk_publishing_components/components/accordion", {
-                data_attributes_show_all: {
-                  "ga4": ga4_attributes.to_json
-                },
-                data_attributes: {
-                  module: "ga4-event-tracker",
-                },
+                ga4_tracking: true,
                 anchor_navigation: true,
                 items: items,
               } %>
@@ -105,9 +92,9 @@
   <%= render 'govuk_publishing_components/components/print_link', {
     data_attributes: {
       module: "ga4-event-tracker",
-      ga4: {
+      ga4_event: {
         event_name: 'print_page',
-        type: 'Print this page',
+        type: 'print page',
         index: 1,
         index_total: 1,
         section: 'Footer',
diff --git a/app/views/content_items/manuals/_updates.html.erb b/app/views/content_items/manuals/_updates.html.erb
index 5183d99d0..c24f1e928 100644
--- a/app/views/content_items/manuals/_updates.html.erb
+++ b/app/views/content_items/manuals/_updates.html.erb
@@ -18,22 +18,9 @@
             font_size: "l"
           } %>
 
-          <%
-            show_all_attributes = {
-              event_name: "select_content",
-              type: "accordion",
-              index: 0,
-              index_total: updates_by_year.length,
-            }
-          %>
           <%= render "govuk_publishing_components/components/accordion", {
             heading_level: 3,
-            data_attributes: {
-              module: "ga4-event-tracker",
-            },
-            data_attributes_show_all: {
-              "ga4": show_all_attributes.to_json
-            },
+            ga4_tracking: true,
             items: updates_by_year.each.with_index(1).map do |updated_documents, index|
               accordion_content = capture do %>
                 <% change_notes = updated_documents.last %>
@@ -49,7 +36,7 @@
               <% end
               {
                 data_attributes: {
-                  ga4: {
+                  ga4_event: {
                     event_name: 'select_content',
                     type: 'accordion',
                     text: sanitize_manual_update_title(updated_documents.first),
@@ -75,9 +62,9 @@
 <%= render 'govuk_publishing_components/components/print_link', {
   data_attributes: {
     module: "ga4-event-tracker",
-    ga4: {
+    ga4_event: {
       event_name: 'print_page',
-      type: 'Print this page',
+      type: 'print page',
       index: 1,
       index_total: 1,
       section: 'Footer',
diff --git a/app/views/content_items/travel_advice.html+print.erb b/app/views/content_items/travel_advice.html+print.erb
index e0f3ab0ba..8d5c50be7 100644
--- a/app/views/content_items/travel_advice.html+print.erb
+++ b/app/views/content_items/travel_advice.html+print.erb
@@ -24,12 +24,12 @@
         "track-category": "printButton",
         "track-action": "clicked",
         "track-label": t("components.print_link.text"),
-        ga4: {
+        ga4_event: {
           event_name: 'print_page',
-          type: 'Print this page',
+          type: 'print page',
           index: 1,
           index_total: 2,
-          section: 'Contents',
+          section: 'Content',
         },
       },
       margin_bottom: 8,
@@ -56,9 +56,9 @@
         "track-category": "printButton",
         "track-action": "clicked",
         "track-label": t("components.print_link.text"),
-        ga4: {
+        ga4_event: {
           event_name: 'print_page',
-          type: 'Print this page',
+          type: 'print page',
           index: 2,
           index_total: 2,
           section: 'Footer',