diff --git a/config/metrics/counts_all/20210216175623_projects_asana_active.yml b/config/metrics/counts_all/20210216175623_projects_asana_active.yml
index 3f334dc72f6d5fae99ad4f9d08d7e97a0efbb584..ea82b2730e3e0b84c76f90c9d8e95b3c3814fd58 100644
--- a/config/metrics/counts_all/20210216175623_projects_asana_active.yml
+++ b/config/metrics/counts_all/20210216175623_projects_asana_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_asana_active
 description: Count of projects with active integrations for Asana
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175628_instances_asana_active.yml b/config/metrics/counts_all/20210216175628_instances_asana_active.yml
index ad5d520f2398255be26db4683dc201f1c94e35d7..e6bd633b285421d6774b8697b1690045a6f58140 100644
--- a/config/metrics/counts_all/20210216175628_instances_asana_active.yml
+++ b/config/metrics/counts_all/20210216175628_instances_asana_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_asana_active
 description: Count of active instance-level integrations for Asana
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml b/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
index 992f8a021c806592a98a6d5ce997ecf78f34d245..ae706f7071766e58560fb2ebb368877fe6e90243 100644
--- a/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
+++ b/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_asana_active
 description: Count of active groups inheriting integrations for Asana
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml b/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
index de283cc42ea8aed0f28950ea77b572f659273e0e..28d161ec7f0971a33a815c2292deceb3ef43a11b 100644
--- a/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_bamboo_active
 description: Count of active instance-level integrations for Bamboo CI
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml b/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
index dae517f97117987913b89f3c4dd0689b18256ab6..5ab0124143956f318b523af0a5fb675f7aad10c0 100644
--- a/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_bamboo_active
 description: Count of active projects inheriting integrations for Bamboo CI
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml b/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
index 4ff1b059d681d78421ffeb7f46bb49284faaf4ab..b4485d761c78c3c2b147d2a03cc793e2461ebe9e 100644
--- a/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_bugzilla_active
 description: Count of projects with active integrations for Bugzilla
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
index dbf797cca736e35f3337e9b3ed6c7e28a2f9362e..28f63c63f313baa6c7716ad1da704156146887cb 100644
--- a/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_bugzilla_active
 description: Count of active service templates for Bugzilla
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml b/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
index b1991a2159c5a799a3a5d5a0e02cd0ee7b789734..a6dbbdd4a63c51af4711100042b8bcba1f234f92 100644
--- a/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_bugzilla_active
 description: Count of active groups inheriting integrations for Bugzilla
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml b/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
index f37202ab9914891c656b1aff6851595e8bbcdbff..855fe80508d90462ab687f10c7d9e4fa72d0d7d5 100644
--- a/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_buildkite_active
 description: Count of projects with active integrations for Buildkite
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml b/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
index ba1aae6eed09273b4d275d2ca4f5aa3d8835e7f9..27bc83eba4700d067b5c41ddc73db90ec43a0a9f 100644
--- a/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_buildkite_active
 description: Count of active projects inheriting integrations for Buildkite
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml b/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
index e8e6d44811e031eb1d6c36f4d12a6d5ec54da5f3..08d6bbcb1c163d12ab6204bb80c3b949ab5b9ed1 100644
--- a/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_confluence_active
 description: Count of active projects inheriting integrations for Confluence
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml
index 03ba2cc240c2a95a44bcb2067b71591823cb3092..7c4778d6d8bb81543099f05372013571a75dd064 100644
--- a/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_custom_issue_tracker_active
 description: Count of groups with active integrations for a Custom Issue Tracker
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml
index 8a15205ef737d021e2b75bbcb3ccb84d32e49c2e..fc7f5f0be135409dda5525c87dc668eebf52affc 100644
--- a/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_custom_issue_tracker_active
 description: Count of active instance-level integrations for a Custom Issue Tracker
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml b/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml
index 4a44bbb7e1ea149d3c41d0855ebd835e59333fe0..e2dd97475986a4624b79aea90ce9700111d930d8 100644
--- a/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_emails_on_push_active
 description: Count of active projects inheriting integrations for Emails on Push
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml b/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml
index ad37b6ade29adaaab2d1b033f156460ea7461093..34ccd1597aedceb02eb7a594dadd6d0889a805af 100644
--- a/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_external_wiki_active
 description: Count of active projects inheriting integrations for External Wiki
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml b/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml
index a9d28ca6d88f7b6c8c4b171b3cf86e21c46f2310..f2767535139815a9c402c521f88c71961506e78a 100644
--- a/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_external_wiki_active
 description: Count of active groups inheriting integrations for External Wiki
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
index d94b07a151d8048097fe942adb540b830028d425..f8a33cb45bbc7aef867b7c7888964b15c1e4f132 100644
--- a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_flowdock_active
 description: Count of active instance-level integrations for Flowdock
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: removed
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394
diff --git a/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml b/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
index 4d8b1f0f8a0032a3463b9cea8f751846ed20b43a..628cd61a00717c490639f483eadbc6741c56df51 100644
--- a/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_flowdock_active
 description: Count of active projects inheriting integrations for Flowdock
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: removed
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394
diff --git a/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml
index 8fa597c7dd5d6235560865ba78a1a5f3545ca640..40bddbc0fb739b3febf2280ef4ceef8697f92495 100644
--- a/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_hangouts_chat_active
 description: Count of active groups inheriting integrations for Hangouts Chat
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
index 9349ea24ecfa98238cfa744f069a570e81588997..46662dedbd7f1a8a5c5530ff1e66593907d18781 100644
--- a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_hipchat_active
 description: Count of active service templates for HipChat
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: removed
 milestone_removed: '13.11'
diff --git a/config/metrics/counts_all/20210216175923_groups_irker_active.yml b/config/metrics/counts_all/20210216175923_groups_irker_active.yml
index ca6cf2cb395d98b19eb378b590a2839fae1afb78..a7aac2417e82ad91e112e15cd1a244984252a780 100644
--- a/config/metrics/counts_all/20210216175923_groups_irker_active.yml
+++ b/config/metrics/counts_all/20210216175923_groups_irker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_irker_active
 description: Count of groups with active integrations for Irker
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175924_templates_irker_active.yml b/config/metrics/counts_all/20210216175924_templates_irker_active.yml
index 16a730af3fe96e0fe0fe413d6f5c28d449bde268..c21de58c6dab0895fabb731bb8212b26f2ad88f9 100644
--- a/config/metrics/counts_all/20210216175924_templates_irker_active.yml
+++ b/config/metrics/counts_all/20210216175924_templates_irker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_irker_active
 description: Count of active service templates for Irker
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml b/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
index c79f694bac90f3d4573c38243a476bea0a050b86..570a1706a9a6ae52bc21d6efa784d69db1949c3f 100644
--- a/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_jenkins_active
 description: Count of active instance-level integrations for Jenkins
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml
index e884e4627657951276101e94b2d79a1c30c036fa..d91342302e35ab2f8f7db5a0c6b946cbd89103e2 100644
--- a/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_mattermost_slash_commands_active
 description: Count of projects with active integrations for Mattermost (slash commands)
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
index 7cf2319dcb4b5b06f1be1d83b17769e80fe3fc52..fdecfa6db59afd150d70204713b3b0cc6e73773a 100644
--- a/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_microsoft_teams_active
 description: Count of active instance-level integrations for Microsoft Teams
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180032_instances_packagist_active.yml b/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
index 20e0e354d4365d26817f62d0347711226c733a48..f815db1c6ad098664ed3219001d391982f3d819c 100644
--- a/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_packagist_active
 description: Count of active instance-level integrations for Packagist
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml b/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
index ececb5c700353a685852e676e217904eb57ea8da..9d89f66dc7c0d98ffcab255202c7408a17a704f7 100644
--- a/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_pipelines_email_active
 description: Count of active service templates for Pipeline Emails
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
index 3eaa25f2ff381af3c383233696659f318a6d6dcf..baa92713b1d439de45eae074c5f2e986a64d7fb6 100644
--- a/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_pivotaltracker_active
 description: Count of groups with active integrations for Pivotal Tracker
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
index 731fefb4110c69b2274168d7e86a82d4c72066c7..060c3eedb17be5888b32abc727a9304f0fb2bf12 100644
--- a/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_pivotaltracker_active
 description: Count of active projects inheriting integrations for Pivotal Tracker
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180104_templates_pushover_active.yml b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
index a864846893b1f28d391473b8fbdc8a6a63e0a0a3..844f4fc19bf524f8380cb69b1a95614f6d63751c 100644
--- a/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_pushover_active
 description: Count of active service templates for Pushover
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180116_instances_redmine_active.yml b/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
index 446bab8c9f1d5c604500d0680309f903b1fc3b59..030fc8f4517c857114998b647f6564667e7250d3 100644
--- a/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_redmine_active
 description: Count of active instance-level integrations for Redmine
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml b/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
index 572568dce81afaace81f582bd3a7bc6e8b2bd42f..6fad6e7438fcc842c6408047ce8c56513be48e26 100644
--- a/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_redmine_active
 description: Count of active projects inheriting integrations for Redmine
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180126_templates_slack_active.yml b/config/metrics/counts_all/20210216180126_templates_slack_active.yml
index 46a50bd77c579fa074b0354fa8d9aeb9318d945e..6eb637381e01ba199801ce8b993bdbf20fffbce6 100644
--- a/config/metrics/counts_all/20210216180126_templates_slack_active.yml
+++ b/config/metrics/counts_all/20210216180126_templates_slack_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_slack_active
 description: Count of active service templates for Slack
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml b/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
index e4200e8c9adc0cda1f92a96030bf83dde4354413..c67ae1364bf1af980abd27c7ed2db96800e66fd7 100644
--- a/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
+++ b/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_slack_active
 description: Count of active groups inheriting integrations for Slack
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml
index becd19567c73513a562e849edd45399c54abf768..5b7dc14e0d5f458a7e0e619420691d22a218a800 100644
--- a/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_slack_slash_commands_active
 description: Count of active instance-level integrations for Slack (slash commands)
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml b/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
index 57e2b4f201daeb8369c21d9d72679ab9c4304def..c86c0fda1029c8738468644e26e4eff0ec9f515e 100644
--- a/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_webex_teams_active
 description: Count of projects with active integrations for Webex Teams
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
index 907eed3b822960defedb892d3c85449dbfd3a6c8..fb64c5071699e699b4e17877ff4c51416d99ac48 100644
--- a/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_jira_dvcs_cloud_active
 description: Count of active integrations with Jira Cloud (DVCS Connector)
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181126_projects_jira_active.yml b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
index 245719d8e4c64db8fd5295fa208554e898cfc960..1506e9febf9d4c79affbb96bb7da67d2cbbf1e08 100644
--- a/config/metrics/counts_all/20210216181126_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.plan.projects_jira_active
 description: Distinct count of creator_id from projects with an active Jira integration.
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml b/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
index 9f22ee3ebcc8f43c9b6b8e998720d4a5ba0e2514..725b48561a79d99ac68afa6599a7cba4870a6f7b 100644
--- a/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
+++ b/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
@@ -4,7 +4,7 @@ key_path: counts.jira_imports_projects_count
 description: Count of Projects that imported Issues from Jira
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
index 863a80f8c290885ecc9b2fe5b7ecb1fd0b9cba10..65ad3757701b93116abc2aeec97526e1a368cbb0 100644
--- a/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_datadog_active
 description: Count of active projects inheriting integrations for Datadog
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
index b071cc680cc52cd597001d1b5d6dd50ad8f75a4d..705f6ea327a4fe8c431cd6db7195693f394ee164 100644
--- a/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_mock_monitoring_active
 description: Count of active groups inheriting integrations for Mock Monitoring
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: removed
 milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml b/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml
index 9b03e64c72246d59547829b0bd53eefedf731222..dfc4a35c42469a6812082a4eb3f532d2a198c404 100644
--- a/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml
@@ -3,7 +3,7 @@ key_path: counts.projects_inheriting_zentao_active
 description: Count of projects that inherit active Zentao integrations
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml b/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml
index 469f34981dc697c453bc6613524c2cb3683d03da..3dc070e3db14cff1aa487abfd863a632d73034c4 100644
--- a/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml
@@ -3,7 +3,7 @@ key_path: counts.groups_inheriting_zentao_active
 description: Count of groups that inherit active Zentao integrations
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/config/metrics/counts_all/20220315180124_groups_harbor_active.yml b/config/metrics/counts_all/20220315180124_groups_harbor_active.yml
index 888b3bbd8a05c9748c91c81fa5b36f448546cc34..50ffc99e4ed16953fb73bbd0088b7fe5466067b1 100644
--- a/config/metrics/counts_all/20220315180124_groups_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180124_groups_harbor_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_harbor_active
 description: Count of groups with active integrations for Harbor
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20220607141129_slack_app_installations_gbp.yml b/config/metrics/counts_all/20220607141129_slack_app_installations_gbp.yml
index 70ac24bbe369e47032198f7dc943cce148bfd84e..54aa10ce4b4d136db61fa7a51cda3dd1940fadf0 100644
--- a/config/metrics/counts_all/20220607141129_slack_app_installations_gbp.yml
+++ b/config/metrics/counts_all/20220607141129_slack_app_installations_gbp.yml
@@ -3,7 +3,7 @@ key_path: counts.slack_app_installations_gbp
 description: Count of Slack app installations using the new GBP version
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "15.1"
diff --git a/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml b/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml
index 627d16438eabbd402d70e8369f031fe0526b741f..6854ef4d7a5651d116450c4213951ac6d2418cfd 100644
--- a/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml
+++ b/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml
@@ -3,7 +3,7 @@ key_path: counts.gitlab_for_jira_app_direct_installations
 description: Count active Jira Cloud direct installations
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20221209213642_groups_apple_app_store_active.yml b/config/metrics/counts_all/20221209213642_groups_apple_app_store_active.yml
index 055e7748e0d6fca15f08eac562a7b1a5d79cb017..32cb165ca954d3799d99dc11e65211839b3a0180 100644
--- a/config/metrics/counts_all/20221209213642_groups_apple_app_store_active.yml
+++ b/config/metrics/counts_all/20221209213642_groups_apple_app_store_active.yml
@@ -3,7 +3,7 @@ key_path: counts.groups_apple_app_store_active
 description: Count of active groups inheriting integrations for Apple App Store
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "15.8"
diff --git a/config/metrics/counts_all/20230222193011_instances_google_play_active.yml b/config/metrics/counts_all/20230222193011_instances_google_play_active.yml
index ae5a38597c16608f764904853bda51612c820e06..040d214bd8301d8dadd22ebbc2dcb36a050fc340 100644
--- a/config/metrics/counts_all/20230222193011_instances_google_play_active.yml
+++ b/config/metrics/counts_all/20230222193011_instances_google_play_active.yml
@@ -3,7 +3,7 @@ key_path: counts.instances_google_play_active
 description: Count of instances with active integrations for Google Play
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "15.10"
diff --git a/config/metrics/counts_all/20230607170538_projects_telegram_active.yml b/config/metrics/counts_all/20230607170538_projects_telegram_active.yml
index 0edc5dbde380922fa108ac8293aabca86b5af047..e0e843f47ec926f67c1e680fa28aa6d4a5dcd5f7 100644
--- a/config/metrics/counts_all/20230607170538_projects_telegram_active.yml
+++ b/config/metrics/counts_all/20230607170538_projects_telegram_active.yml
@@ -3,7 +3,7 @@ key_path: counts.projects_telegram_active
 description: Count of projects with active integrations for Telegram
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "16.1"
diff --git a/config/metrics/counts_all/20230607171414_groups_inheriting_telegram_active.yml b/config/metrics/counts_all/20230607171414_groups_inheriting_telegram_active.yml
index 787f88e7cf7f55a21424f5a35c5329c775571cdd..bc552b6485b3ce1f9651f3ba1adbef0951ab4983 100644
--- a/config/metrics/counts_all/20230607171414_groups_inheriting_telegram_active.yml
+++ b/config/metrics/counts_all/20230607171414_groups_inheriting_telegram_active.yml
@@ -3,7 +3,7 @@ key_path: counts.groups_inheriting_telegram_active
 description: Count of active groups inheriting integrations for Telegram
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "16.1"