diff --git a/fuchsia/connectivity_wlan/metrics.yaml b/fuchsia/connectivity_wlan/metrics.yaml
index c2d591d..abf350e 100644
--- a/fuchsia/connectivity_wlan/metrics.yaml
+++ b/fuchsia/connectivity_wlan/metrics.yaml
@@ -577,54 +577,6 @@
         privacy_level: NO_ADDED_PRIVACY
         system_profile_field: *default_system_profile_field
 
-# Setup for metrics that simply log and sum up fleetwide occurrence. This
-# metric is highly aggregatable, hence only one default report that has all
-# the system profiles is needed.
-- id: 902
-  metric_name: total_occurrence_counts_template
-  <<: &total_occurrence_counts_template
-    <<: &total_occurrence_counts_template__metric_portion
-      metric_type: OCCURRENCE
-      metric_semantics: [NETWORK_COMMUNICATION, USAGE_COUNTING]
-      <<: *ga_release_metadata
-    reports:
-      - &total_occurrence_counts_template__default_report_1
-        id: 1
-        report_name: fleetwide_occurrence_counts
-        report_type: FLEETWIDE_OCCURRENCE_COUNTS
-        privacy_level: NO_ADDED_PRIVACY
-        system_profile_field: *default_system_profile_field
-
-# Example of how to use above metric's smaller anchors together.
-# This is also a placeholder where additional compatible reports can be defined
-# and reused.
-- id: 903
-  metric_name: total_occurrence_counts_template__custom
-  <<: *total_occurrence_counts_template__metric_portion
-  reports:
-    - *total_occurrence_counts_template__default_report_1
-    - id: 101
-      report_name: fleetwide_occurrence_counts__exp
-      experiment_id: [12345678, 87654321]
-      <<: &total_occurrence_counts_template__report_1_with_exp
-        report_type: FLEETWIDE_OCCURRENCE_COUNTS
-        privacy_level: NO_ADDED_PRIVACY
-        system_profile_field: *default_system_profile_field_with_exp
-    - id: 102
-      report_name: device_daily_occurrence_histograms
-      <<: &total_occurrence_counts_template__report_device_daily_occurrence_histograms
-        report_type: UNIQUE_DEVICE_HISTOGRAMS
-        system_profile_selection: SELECT_LAST
-        local_aggregation_period: WINDOW_1_DAY
-        privacy_level: NO_ADDED_PRIVACY
-        system_profile_field: *default_system_profile_field
-      int_buckets:
-        linear:
-          floor: 0
-          num_buckets: 10
-          step_size: 1
-
-
 # Setup for metrics where a device computes a ratio per day and log that
 # ratio before the end of the day. Only daily reports can be generated
 # (no weekly or monthly reports) because those ratios are only computed
@@ -937,6 +889,13 @@
         local_aggregation_period: WINDOW_1_DAY
         privacy_level: NO_ADDED_PRIVACY
         system_profile_field: *default_system_profile_field
+    - report_name: fleetwide_occurrence_counts__ps_exp
+      id: 102
+      experiment_id: [12345678, 87654321]
+      <<: &occurrence_metric_template__report_fleetwide_occurrence_counts_with_exp
+        report_type: FLEETWIDE_OCCURRENCE_COUNTS
+        privacy_level: NO_ADDED_PRIVACY
+        system_profile_field: *default_system_profile_field
 
 ###############################################################################
 # integer_metric_template
@@ -1082,13 +1041,15 @@
 ################################################################################
 - id: 1002
   metric_name: total_disconnect_count
-  <<: *total_occurrence_counts_template__metric_portion
+  <<: *occurrence_metric_template__metric_portion
   reports:
-    - *total_occurrence_counts_template__default_report_1
-    - <<: *total_occurrence_counts_template__report_1_with_exp
-      id: 101
+    - id: 1
+      report_name: fleetwide_occurrence_counts
+      <<: *occurrence_metric_template__report_fleetwide_occurrence_counts
+    - id: 101
       report_name: fleetwide_occurrence_counts__ps_exp
       experiment_id: *ps_exp_ids
+      <<: *occurrence_metric_template__report_fleetwide_occurrence_counts_with_exp
 
 ################################################################################
 # Time with high RX packet drop
@@ -1177,13 +1138,15 @@
 ################################################################################
 - id: 1008
   metric_name: total_roaming_disconnect_count
-  <<: *total_occurrence_counts_template__metric_portion
+  <<: *occurrence_metric_template__metric_portion
   reports:
-    - *total_occurrence_counts_template__default_report_1
-    - <<: *total_occurrence_counts_template__report_1_with_exp
-      id: 101
+    - id: 1
+      report_name: fleetwide_occurrence_counts
+      <<: *occurrence_metric_template__report_fleetwide_occurrence_counts
+    - id: 101
       report_name: fleetwide_occurrence_counts__ps_exp
       experiment_id: *ps_exp_ids
+      <<: *occurrence_metric_template__report_fleetwide_occurrence_counts_with_exp
 
 ################################################################################
 # Total number of non-roaming disconnects
@@ -1194,13 +1157,15 @@
 ################################################################################
 - id: 1009
   metric_name: total_non_roaming_disconnect_count
-  <<: *total_occurrence_counts_template__metric_portion
+  <<: *occurrence_metric_template__metric_portion
   reports:
-    - *total_occurrence_counts_template__default_report_1
-    - <<: *total_occurrence_counts_template__report_1_with_exp
-      id: 101
+    - id: 1
+      report_name: fleetwide_occurrence_counts
+      <<: *occurrence_metric_template__report_fleetwide_occurrence_counts
+    - id: 101
       report_name: fleetwide_occurrence_counts__ps_exp
       experiment_id: *ps_exp_ids
+      <<: *occurrence_metric_template__report_fleetwide_occurrence_counts_with_exp
 
 #############################
 ### 2XXX - Monitoring metrics
@@ -2333,11 +2298,11 @@
 ################################################################################
 - id: 4040
   metric_name: client_connections_stop_and_start
-  <<: *total_occurrence_counts_template__metric_portion
+  <<: *occurrence_metric_template__metric_portion
   reports:
     - id: 1
       report_name: device_daily_occurrence_histograms
-      <<: *total_occurrence_counts_template__report_device_daily_occurrence_histograms
+      <<: *occurrence_metric_template__report_device_daily_occurrence_histograms
       int_buckets:
         linear:
           floor: 0
@@ -2355,11 +2320,11 @@
 ################################################################################
 - id: 4041
   metric_name: manual_network_change
-  <<: *total_occurrence_counts_template__metric_portion
+  <<: *occurrence_metric_template__metric_portion
   reports:
     - id: 1
       report_name: device_daily_occurrence_histograms
-      <<: *total_occurrence_counts_template__report_device_daily_occurrence_histograms
+      <<: *occurrence_metric_template__report_device_daily_occurrence_histograms
       int_buckets:
         linear:
           floor: 0
@@ -2421,7 +2386,7 @@
 ################################################################################
 - id: 4044
   metric_name: roam_to_insufficent_network_issue_counts
-  <<: *total_occurrence_counts_template__metric_portion
+  <<: *occurrence_metric_template__metric_portion
   metric_dimensions:
     - dimension: has_insufficient_signal
       event_codes: &yes_no
@@ -2434,14 +2399,16 @@
     - dimension: imminent_disconnect
       event_codes: *yes_no
   reports:
-    - *total_occurrence_counts_template__default_report_1
+    - id: 1
+      report_name: fleetwide_occurrence_counts
+      <<: *occurrence_metric_template__report_fleetwide_occurrence_counts
     # Counts per device can be used for a more detailed view when there is a
     # change in the total count report for a combination of dimensions (ie for
     # report 1). For example there could be a few devices heavily affected, or
     # many devices slightly affected.
     - id: 101
       report_name: device_daily_occurrence_histograms
-      <<: *total_occurrence_counts_template__report_device_daily_occurrence_histograms
+      <<: *occurrence_metric_template__report_device_daily_occurrence_histograms
       int_buckets:
         linear:
           floor: 0
@@ -2460,11 +2427,11 @@
 ################################################################################
 - id: 4045
   metric_name: interface_creation_failure
-  <<: *total_occurrence_counts_template__metric_portion
+  <<: *occurrence_metric_template__metric_portion
   reports:
     - id: 1
       report_name: device_daily_occurrence_histograms
-      <<: *total_occurrence_counts_template__report_device_daily_occurrence_histograms
+      <<: *occurrence_metric_template__report_device_daily_occurrence_histograms
       int_buckets:
         linear:
           floor: 0
@@ -2483,11 +2450,11 @@
 ################################################################################
 - id: 4046
   metric_name: interface_destruction_failure
-  <<: *total_occurrence_counts_template__metric_portion
+  <<: *occurrence_metric_template__metric_portion
   reports:
     - id: 1
       report_name: device_daily_occurrence_histograms
-      <<: *total_occurrence_counts_template__report_device_daily_occurrence_histograms
+      <<: *occurrence_metric_template__report_device_daily_occurrence_histograms
       int_buckets:
         linear:
           floor: 0
@@ -2504,11 +2471,11 @@
 ################################################################################
 - id: 4047
   metric_name: ap_start_failure
-  <<: *total_occurrence_counts_template__metric_portion
+  <<: *occurrence_metric_template__metric_portion
   reports:
     - id: 1
       report_name: device_daily_occurrence_histograms
-      <<: *total_occurrence_counts_template__report_device_daily_occurrence_histograms
+      <<: *occurrence_metric_template__report_device_daily_occurrence_histograms
       int_buckets:
         linear:
           floor: 0
@@ -2528,11 +2495,11 @@
 ################################################################################
 - id: 4048
   metric_name: client_scan_failure
-  <<: *total_occurrence_counts_template__metric_portion
+  <<: *occurrence_metric_template__metric_portion
   reports:
     - id: 1
       report_name: device_daily_occurrence_histograms
-      <<: *total_occurrence_counts_template__report_device_daily_occurrence_histograms
+      <<: *occurrence_metric_template__report_device_daily_occurrence_histograms
       int_buckets:
         linear:
           floor: 0
@@ -2548,11 +2515,11 @@
 ################################################################################
 - id: 4049
   metric_name: aborted_scan
-  <<: *total_occurrence_counts_template__metric_portion
+  <<: *occurrence_metric_template__metric_portion
   reports:
     - id: 1
       report_name: device_daily_occurrence_histograms
-      <<: *total_occurrence_counts_template__report_device_daily_occurrence_histograms
+      <<: *occurrence_metric_template__report_device_daily_occurrence_histograms
       int_buckets:
         linear:
           floor: 0
@@ -2572,11 +2539,11 @@
 ################################################################################
 - id: 4050
   metric_name: empty_scan_results
-  <<: *total_occurrence_counts_template__metric_portion
+  <<: *occurrence_metric_template__metric_portion
   reports:
     - id: 1
       report_name: device_daily_occurrence_histograms
-      <<: *total_occurrence_counts_template__report_device_daily_occurrence_histograms
+      <<: *occurrence_metric_template__report_device_daily_occurrence_histograms
       int_buckets:
         linear:
           floor: 0
@@ -2596,11 +2563,11 @@
 ################################################################################
 - id: 4051
   metric_name: connection_failures
-  <<: *total_occurrence_counts_template__metric_portion
+  <<: *occurrence_metric_template__metric_portion
   reports:
     - id: 1
       report_name: device_daily_occurrence_histograms
-      <<: *total_occurrence_counts_template__report_device_daily_occurrence_histograms
+      <<: *occurrence_metric_template__report_device_daily_occurrence_histograms
       int_buckets:
         linear:
           floor: 0
@@ -3325,4 +3292,4 @@
         *connection_score_delta_int_buckets
 
 # Deleted metric IDs that must not be reused.
-deleted_metric_ids: [2,3,4,5,6,7,8,9,10,11,12,13,14,15,100,101,102,103,110,111,112,113,114,116,117,120,121,130,131,132,134,140,141,142,143,144,150,151,160,161,170,171,172,173,174,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,230,231,232,233,240,241,242,243,244,245,250,251,260,261,262,263,300,301,302,303,304,305,306,307,308,310,311,312,313,314,315,316,317,318,319,320,400,401,914,915,4016,4017,5010]
+deleted_metric_ids: [2,3,4,5,6,7,8,9,10,11,12,13,14,15,100,101,102,103,110,111,112,113,114,116,117,120,121,130,131,132,134,140,141,142,143,144,150,151,160,161,170,171,172,173,174,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,230,231,232,233,240,241,242,243,244,245,250,251,260,261,262,263,300,301,302,303,304,305,306,307,308,310,311,312,313,314,315,316,317,318,319,320,400,401,902,903,914,915,4016,4017,5010]