diff --git a/config/metrics/counts_all/20210216175627_templates_asana_active.yml b/config/metrics/counts_all/20210216175627_templates_asana_active.yml
index 1011147e4a71049c0b4cab9f49392c48de9019b9..9d1be1531d98791a1cadbeab64b01ed433bfbc86 100644
--- a/config/metrics/counts_all/20210216175627_templates_asana_active.yml
+++ b/config/metrics/counts_all/20210216175627_templates_asana_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_asana_active
 description: Count of active service templates for Asana
 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/20210216175634_projects_assembla_active.yml b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
index 389f7c6008812b5c85a0db664a51b783cef6932a..004ddc3ea1181a8faa7bd6b80d3cfe35c85cd16d 100644
--- a/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_assembla_active
 description: Count of projects with active integrations for Assembla
 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/20210216175638_templates_assembla_active.yml b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
index d874954dc57b12a1798e6b7821da734a77a8b586..a98c4cc340a217ae3ddde67e92fc46e545099910 100644
--- a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_assembla_active
 description: Count of active service templates for Assembla
 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/20210216175642_projects_inheriting_assembla_active.yml b/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
index 6f5071302f5719e92e4a01c6aa743d35494e6119..1036cf6dbed3266d87b18364ea747d0bea383c5b 100644
--- a/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_assembla_active
 description: Count of active projects inheriting integrations for Assembla
 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/20210216175659_groups_bugzilla_active.yml b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
index de93b1c1b528e81c95278ad1d54a08b5f41ab7fc..2fda969c720c1e213c47c46b2b78ff15279233d4 100644
--- a/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_bugzilla_active
 description: Count of groups 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/20210216175710_groups_buildkite_active.yml b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
index b1b1d2dec23b43a7ab99d3b0895d93d7e13308c4..eadee50ba62e20019da2060b796fc95f62fb50fd 100644
--- a/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_buildkite_active
 description: Count of groups 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/20210216175723_templates_campfire_active.yml b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
index 755bbea11b5502da996ba5b91e72982a10b0f328..22911be6d474a2c516533da1dd36d28acdceac66 100644
--- a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_campfire_active
 description: Count of active service templates for Campfire
 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/20210216175733_groups_confluence_active.yml b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
index aecf743467be185c66c1006bddb519fc969adf53..20554f83dd2750a5bb99be12fe4b3e578b3f83a6 100644
--- a/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_confluence_active
 description: Count of groups with active 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/20210216175740_groups_inheriting_confluence_active.yml b/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
index 0c3f0d38dbe727cbd40d426f075c64a75cf3db92..c5c0b55e451fe05dcaf4c8a485960c3e6692d274 100644
--- a/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_confluence_active
 description: Count of active groups 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/20210216175811_projects_inheriting_drone_ci_active.yml b/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml
index ebe7a2d45cebaa78363aee54df2040b4b0bb55ed..91b37374beb3a0e34ffea9f0b7855668519b490b 100644
--- a/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_drone_ci_active
 description: Count of active projects inheriting integrations for Drone 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/20210216175818_templates_emails_on_push_active.yml b/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml
index 81a9ba24425fe90c277b9ba081a445393cff0163..81801ceb35f44e8f86ef32c9cf17ac1c3a556fad 100644
--- a/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_emails_on_push_active
 description: Count of active service templates for Emails on Push
 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/20210216175829_templates_external_wiki_active.yml b/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
index 0e6cd4a416907a556553e590ef23f669ace842ed..e2e115d56c91bc4c73cd185fba6ef03b3df8b5b9 100644
--- a/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_external_wiki_active
 description: Count of active service templates for External Wiki
 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/20210216175846_groups_inheriting_flowdock_active.yml b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
index b55b9132a4c28bd0c3851d055ba904ea09c30a54..b250b0fc8a452d243b7cb637c74863daff918b28 100644
--- a/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_flowdock_active
 description: Count of active groups 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/20210216175901_groups_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
index cb11d7ff1a067050bbefdfd2f8f77212e56d405e..71e04afb535cdaa73bd25c4f9c5f53ca58213012 100644
--- a/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_hangouts_chat_active
 description: Count of groups with active 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/20210216175910_projects_hipchat_active.yml b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
index dbe69e2f99c136fa8a4fcba4b80827ed917a3e7a..b8e9c3c64e16434936fdfce6969e6cf5b307f129 100644
--- a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_hipchat_active
 description: Count of projects with active integrations 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/20210216175930_groups_inheriting_irker_active.yml b/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
index 03a1af03ce8f8f268ecc18c2ca3a6d71864efd1c..8630734309b666a6c2cd35914909d29dca4b9122 100644
--- a/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
+++ b/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_irker_active
 description: Count of active groups inheriting 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/20210216175941_groups_inheriting_jenkins_active.yml b/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
index 2766a6e1e3c82985e6dda3c34ed74d6409043bba..077ca4185fe3cfdd0f077fc21faed9b7ffb44657 100644
--- a/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_jenkins_active
 description: Count of active groups inheriting 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/20210216175950_projects_inheriting_jira_active.yml b/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
index 415b8665dc39c2d8a2f0d53e40772e81270d3547..d2d22e943619c3c06ccb167488b64629b19cfe2a 100644
--- a/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
+++ b/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_jira_active
 description: Count of active projects inheriting integrations for 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/20210216180010_instances_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml
index c17fe82c50012de9d55405cb87ba41e474a8eea3..01fc5cb68965576a7d8eec6a30dc9db6277a9b8e 100644
--- a/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_mattermost_slash_commands_active
 description: Count of active instance-level 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/20210216180018_groups_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
index 2a3fd51cd1d7520627d5fb7918df077e7e8c78ee..b7381d0b621ea3cdd00ed00e6032c3f615b4b8c6 100644
--- a/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_microsoft_teams_active
 description: Count of groups with active 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/20210216180045_projects_inheriting_pipelines_email_active.yml b/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml
index 705c4b77497cf8d80b1de5942c233a949185fc7b..95934a1ddcc61c349a359c3936b1ac5de8a02584 100644
--- a/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_pipelines_email_active
 description: Count of active projects inheriting integrations for Pipeline Emails
 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/20210216180049_projects_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
index 1bc23715ecf17de1e64a8aeedfeea27b7dcbcae4..e8811d4899312d3f4a1131b18f53a4ff840c6504 100644
--- a/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_pivotaltracker_active
 description: Count of projects 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/20210216180052_templates_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
index d78e1fd6694861413254d95414db58b5b401ed1a..70a3228ea06bf0e13b8018acd7f8e11cf2ddb293 100644
--- a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_pivotaltracker_active
 description: Count of active service templates for Pivotal Tracker
 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/20210216180105_instances_pushover_active.yml b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
index 8977c57d6a7b0afd3b1ad13fbd1119b30ddc107e..a0aabf1a93e978b878ad1ce8f9efe56924a9e4fb 100644
--- a/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_pushover_active
 description: Count of active instance-level integrations for Pushover
 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/20210216180107_projects_inheriting_pushover_active.yml b/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
index fd1a2041563a9b1d6ac3a6f028d0d0ff008bd12c..8c56b6ae6ec88ee5927ef0832c004f512814c847 100644
--- a/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_pushover_active
 description: Count of active projects inheriting integrations for Pushover
 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/20210216180113_groups_redmine_active.yml b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
index 6c5d5b3f0eabe8367316c1d3b22732d8b6849406..96b50fec06c018f21adcc60dc33f62749b5caece 100644
--- a/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_redmine_active
 description: Count of groups with active 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/20210216180140_projects_inheriting_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml
index 945d68d60170057b667ff97b875a8ba568233831..2e4e1dc9c71c645e8f93af8536af2d2b62df56ff 100644
--- a/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_slack_slash_commands_active
 description: Count of active projects inheriting 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/20210216180142_groups_inheriting_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml
index dcc4de87d47bdd3ef77c9132da1cb7aa024c03d8..ca56ffcec939af62dc2f91000fc7212823e00cde 100644
--- a/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_slack_slash_commands_active
 description: Count of active groups inheriting 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/20210216180144_projects_teamcity_active.yml b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
index 6d4935fafed5594881b0ea9ccbc1608a422d74b7..3eec9d788f14bce9473c7c1ecb22a5b40a3c0ef0 100644
--- a/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_teamcity_active
 description: Count of projects with active integrations for Teamcity 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/20210216180151_projects_inheriting_teamcity_active.yml b/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
index 56ca14fecc2474cecc107ac13b6c62f77cf3dcb4..349142e34c114499cc63c1f5dbe4b69757efe8a9 100644
--- a/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_teamcity_active
 description: Count of active projects inheriting integrations for Teamcity 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/20210216180155_projects_unify_circuit_active.yml b/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
index 82f3d56b1a5de9c92e2583e33408e95f9b8287c1..c706822136efe3f565b999ee0627840afbf86395 100644
--- a/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_unify_circuit_active
 description: Count of projects with active integrations for Unifiy Circuit
 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/20210216180201_instances_unify_circuit_active.yml b/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
index daa8f332c4686589d3fc9e710ea217d0f62c0c88..2d6cbfa1fc8cbb05cb2ca910d05ce263f0ec8950 100644
--- a/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_unify_circuit_active
 description: Count of active instance-level integrations for Unifiy Circuit
 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/20210216180203_projects_inheriting_unify_circuit_active.yml b/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml
index c6fa0cf0feaf0f792e1d2bd5b185dccd5417cad1..45d0b2182ec4624ced7d02ff03ed71ff2e033f60 100644
--- a/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_unify_circuit_active
 description: Count of active projects inheriting integrations for Unifiy Circuit
 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/20210216180215_groups_inheriting_webex_teams_active.yml b/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml
index 7627e2986a62b6fed489311dd931454e658dfc55..efba1d075f24c04808ef79f1097d9ae4110b09df 100644
--- a/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_webex_teams_active
 description: Count of active groups inheriting 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/20210216182547_projects_datadog_active.yml b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
index 46e6776597c7128236d0f87865341301a44a6baa..09dd5c6f1b297b66767e303dd8c5480be975d4a3 100644
--- a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_datadog_active
 description: Count of projects with active 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/20210216182551_templates_datadog_active.yml b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
index f45b4a93270c90fe456ea018da8ba50f97278f78..64d3500e7d9d4188748fdf7c461aa1e9d0ac0cdc 100644
--- a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_datadog_active
 description: Count of active service templates for Datadog
 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/20210216182620_instances_ewm_active.yml b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
index 3c85cba0764f7440515d4208cb19b68fdec9f315..bc61c719289527ed1276232baacd1383e66c33b4 100644
--- a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_ewm_active
 description: Count of active instance-level integrations for EWM
 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/20210216182730_projects_inheriting_mock_ci_active.yml b/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
index 0b84bac064ceb804a1e0d2232ae8b6fb46965eb2..b000b51faa8c70122e4b5e66096295ed481c9bfe 100644
--- a/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_mock_ci_active
 description: Count of active projects inheriting integrations for Mock CI
 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/20210216182732_groups_inheriting_mock_ci_active.yml b/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
index 89fb814fc946e81229770927e4ab6f5e5ddb5aab..d5477bf37527378babf9ed3f1afbcb12b1d14942 100644
--- a/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_mock_ci_active
 description: Count of active groups inheriting integrations for Mock CI
 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/20210216182738_templates_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
index 375abe3cd5a56c3b81f16ba573a8c365ce7d0ec4..246d0cba32c2d0ca449ce840c8166e4af0422a35 100644
--- a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_mock_monitoring_active
 description: Count of active service templates 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/20210216182741_projects_inheriting_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
index 5f9a23600341f2c31371624b7e35f08cf77b814c..8914590bde5f1e16fc71149e42e8cafe7ba1dda3 100644
--- a/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_mock_monitoring_active
 description: Count of active projects 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/20210730011802_groups_zentao_active.yml b/config/metrics/counts_all/20210730011802_groups_zentao_active.yml
index 8dbcab96fb2a17e793861919b4be7b1495c05d92..ee5d3a76d0268e3983fa157a3a5a7c03681a3eca 100644
--- a/config/metrics/counts_all/20210730011802_groups_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011802_groups_zentao_active.yml
@@ -3,7 +3,7 @@ key_path: counts.groups_zentao_active
 description: Count of groups with 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/20210916100524_groups_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml
index aa9fe865b5f9ff7fa272ee81a3be42e27f4b1875..c4491bd20fbbcd3642aeb94257d86d68c8b93230 100644
--- a/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml
@@ -3,7 +3,7 @@ key_path: counts.groups_gitlab_slack_application_active
 description: Count groups with active slack application
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml
index 96da8a57bd49a1b59338b2f869549cd10bda1097..a0ce4270c33718fb40bbdae6de4b28de5caa9da8 100644
--- a/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml
@@ -3,7 +3,7 @@ key_path: counts.projects_inheriting_gitlab_slack_application_active
 description: Count projects inheriting active slack application
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_all/20211028210002_groups_shimo_active.yml b/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
index 95e2e7bbe922b5304787c1ab81c49583bae9f1a3..22fce7c4c9d2443ea48d9d42fd034d15d081a351 100644
--- a/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
@@ -3,7 +3,7 @@ key_path: counts.groups_shimo_active
 description: Count of groups with active Shimo integrations
 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/136143
diff --git a/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml b/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
index e973871ed22d2fa361a612aac58ab130f42d23ea..bd859d0839f20d4453c735e2316ec00cd7d9afde 100644
--- a/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
@@ -3,7 +3,7 @@ key_path: counts.groups_inheriting_shimo_active
 description: Count of groups that inherit active Shimo integrations
 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/136143
diff --git a/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml b/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml
index df546f533b792763a8c6b6ba3f63ede8f78473a0..223369ddba7be7e49bbe48430e21d8bcbfd33926 100644
--- a/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_pumble_active
 description: Count of active groups inheriting integrations for Pumble
 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/20230303132352_projects_squash_tm_active.yml b/config/metrics/counts_all/20230303132352_projects_squash_tm_active.yml
index c349bf05dae985bf9e03ac07dac179bc8bd0d553..2849e24cf42a3b59a6b9254d46f477964690c48f 100644
--- a/config/metrics/counts_all/20230303132352_projects_squash_tm_active.yml
+++ b/config/metrics/counts_all/20230303132352_projects_squash_tm_active.yml
@@ -3,7 +3,7 @@ key_path: counts.projects_squash_tm_active
 description: Count of projects with active integrations for Squash TM
 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/20230515153810_groups_clickup_active.yml b/config/metrics/counts_all/20230515153810_groups_clickup_active.yml
index b5d999e76fd3856a100d22ebc7adc968dc2577bf..e771091c91cc0135533747307178c251ccf38407 100644
--- a/config/metrics/counts_all/20230515153810_groups_clickup_active.yml
+++ b/config/metrics/counts_all/20230515153810_groups_clickup_active.yml
@@ -3,7 +3,7 @@ key_path: counts.groups_clickup_active
 description: Count of groups with active integrations for ClickUp
 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/20230515153829_projects_clickup_active.yml b/config/metrics/counts_all/20230515153829_projects_clickup_active.yml
index 4f7c8775614a1bc4523595a02dc7c4ff6563c1b7..e7a9158c0a00295ee4877204af8d49bc6cf64f38 100644
--- a/config/metrics/counts_all/20230515153829_projects_clickup_active.yml
+++ b/config/metrics/counts_all/20230515153829_projects_clickup_active.yml
@@ -3,7 +3,7 @@ key_path: counts.projects_clickup_active
 description: Count of projects with active integrations for ClickUp
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "16.1"