diff --git a/config/metrics/counts_all/20210216175402_projects_slack_slash_active.yml b/config/metrics/counts_all/20210216175402_projects_slack_slash_active.yml
index 4bbeabd7c87c215df3b0cac787250245d1271b6c..924138236268fb785cc47b652b94e2d689dcacf2 100644
--- a/config/metrics/counts_all/20210216175402_projects_slack_slash_active.yml
+++ b/config/metrics/counts_all/20210216175402_projects_slack_slash_active.yml
@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.projects_slack_slash_active
 description: Unique projects with Slack ‘/’ commands enabled
 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/20210216175621_web_hooks.yml b/config/metrics/counts_all/20210216175621_web_hooks.yml
index 19b165263a0dbbbfcc5d252661eccf22c2a9363d..7af11227e28af5616f1c24f6061df61bfb786b91 100644
--- a/config/metrics/counts_all/20210216175621_web_hooks.yml
+++ b/config/metrics/counts_all/20210216175621_web_hooks.yml
@@ -4,7 +4,7 @@ key_path: counts.web_hooks
 description: Count of web hooks
 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/20210216175625_groups_asana_active.yml b/config/metrics/counts_all/20210216175625_groups_asana_active.yml
index 0e88289e9b8a887edf39eb472f9088f7dc76cbcb..98081626ffbd4a286025436bdfcbe4de85e101c7 100644
--- a/config/metrics/counts_all/20210216175625_groups_asana_active.yml
+++ b/config/metrics/counts_all/20210216175625_groups_asana_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_asana_active
 description: Count of groups 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/20210216175630_projects_inheriting_asana_active.yml b/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
index 4bfbcbea97d30e71ebd9b3148b97204c45d079eb..39f3286fd73c1b547b952d4dc2822d9b199dbee9 100644
--- a/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
+++ b/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_asana_active
 description: Count of active projects 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/20210216175645_projects_bamboo_active.yml b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
index 218e56109c1943cb7ae9d9d9c54e54895e8938b4..ca87125ec15a9f8f66bc5978a21bc161835b5d75 100644
--- a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_bamboo_active
 description: Count of projects with active 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/20210216175655_groups_inheriting_bamboo_active.yml b/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
index 171d6defe0629cdd99b661d9838404872843c499..059d25365af12c855fac2151d8f2e512345990f6 100644
--- a/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_bamboo_active
 description: Count of active groups 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/20210216175721_groups_campfire_active.yml b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
index 74d0023e7be7da36fac4517064b531ca5c2b7b33..d2a2e51101b3e00704be06c71bbd2e6c9e033670 100644
--- a/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_campfire_active
 description: Count of groups with active integrations for Campfire
 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/20210216175734_templates_confluence_active.yml b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
index d5564464e7a02cf817e2f68cf86a93cfea9d7711..96c29680a2455cb921abf4728da90f694997ec87 100644
--- a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_confluence_active
 description: Count of active service templates for Confluence
 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/20210216175753_projects_discord_active.yml b/config/metrics/counts_all/20210216175753_projects_discord_active.yml
index 137608e391c11038242af1cb2eef56a13c0118e6..5a0cd1556bc9b0f514b9143b0f8a00093741f087 100644
--- a/config/metrics/counts_all/20210216175753_projects_discord_active.yml
+++ b/config/metrics/counts_all/20210216175753_projects_discord_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_discord_active
 description: Count of projects with active integrations for Discord
 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/20210216175802_groups_inheriting_discord_active.yml b/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
index 03f7cee6039ec56ef355190247e8d8bcee4d6565..1d744c4b16b7d56af083d81146c8b30cbb56c78a 100644
--- a/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
+++ b/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_discord_active
 description: Count of active groups inheriting integrations for Discord
 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/20210216175807_templates_drone_ci_active.yml b/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
index b8b9ab1aa084a68bb6539f7ab31a096acd29efeb..3d5cb8bee56be024d095d11e1156206a8862ca2a 100644
--- a/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_drone_ci_active
 description: Count of active service templates for Drone CI
 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/20210216175813_groups_inheriting_drone_ci_active.yml b/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml
index d21efb0213f738b68b77a9cd8cf74e6763a8b032..a289d51b2769b81ed0fa8accb85041124d4b3106 100644
--- a/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_drone_ci_active
 description: Count of active groups 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/20210216175824_groups_inheriting_emails_on_push_active.yml b/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml
index f718316d2b1aa45739729f2462a5978391947e89..88049aeb27590e4eb38eab2b5f596db1c68d8c0b 100644
--- a/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_emails_on_push_active
 description: Count of active groups 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/20210216175828_groups_external_wiki_active.yml b/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
index 2a1f9c976ea35cbf5960641a2961575f94489dae..7ab78a70b927ea68e2240c3c6248d323ec2c546b 100644
--- a/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_external_wiki_active
 description: Count of groups with active 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/20210216175904_instances_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
index d0e42de50863acc72e35a9877dbb6e0c3ac92008..4d1067d018ff7ec4219104a70f891d0a8c7817ce 100644
--- a/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_hangouts_chat_active
 description: Count of active instance-level 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/20210216175906_projects_inheriting_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml
index 0c67c33eeb2b5baf4b731d9809bd6bef16479a35..bed4a51303e29589ee05de7af0f450e75866ca89 100644
--- a/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_hangouts_chat_active
 description: Count of active projects 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/20210216175915_instances_hipchat_active.yml b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
index c160b7a45d8947f18224959899c09e0b15eb1b0b..a3b6dce0d5bf3a929390e008bc754d316ab88b87 100644
--- a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_hipchat_active
 description: Count of active instance-level 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/20210216175932_projects_jenkins_active.yml b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
index 88c8b518cfd8d2eb17c55e92e450742e9fca6c9c..b9baf0c4f3036c14c96f57fff541accd7dd66799 100644
--- a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_jenkins_active
 description: Count of projects with active 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/20210216175943_projects_jira_active.yml b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
index 248ec9c32ce37c3cd932dd98b75ac0887195546a..e13f35c22b4b703ea3f4f07550469017772e30ab 100644
--- a/config/metrics/counts_all/20210216175943_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_jira_active
 description: Count of projects with active 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/20210216175948_instances_jira_active.yml b/config/metrics/counts_all/20210216175948_instances_jira_active.yml
index 7c1561e72d728d76261fe4663e040a12053e0cef..30400d45c8fa7e4784ed48a2b6da1296839fd170 100644
--- a/config/metrics/counts_all/20210216175948_instances_jira_active.yml
+++ b/config/metrics/counts_all/20210216175948_instances_jira_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_jira_active
 description: Count of active instance-level 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/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml
index 02f684972b74cb62974b4e5e88a71246d9da9ab7..02b1df30873e3286134a2708b65a528b780a3b92 100644
--- a/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml
@@ -5,7 +5,7 @@ description: Count of active projects inheriting integrations for Mattermost (sl
   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/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml
index 21d4aae8a0ad99bbf077ec7599fb3bcb06a910b7..1610a4fedea7e3110b812628e849829d5c161b26 100644
--- a/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml
@@ -5,7 +5,7 @@ description: Count of active groups inheriting integrations for Mattermost (slas
   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/20210216180029_groups_packagist_active.yml b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
index f5c014370cc55d46ba35eb6a4289033333dd9341..89042f997e50d11d1f3ba4a1e0bfd7d0beb39c42 100644
--- a/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_packagist_active
 description: Count of groups with active 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/20210216180030_templates_packagist_active.yml b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
index a6419bd2c6b173d6cb93fe05d6a2fde015566460..9d40214eef83b4b1cde03920496f9cfee806c9b1 100644
--- a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_packagist_active
 description: Count of active service templates for Packagist
 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/20210216180040_groups_pipelines_email_active.yml b/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
index 5be9cf45186825f6332b1ca9d06affbabf904585..eb9b1ea7a2e6ac1333d87d860db3b8bcc19597b5 100644
--- a/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_pipelines_email_active
 description: Count of groups with active 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/20210216180043_instances_pipelines_email_active.yml b/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
index 83aa8997e860b4d1763ed2d961e0128dcc4630ba..9b4eee076a959825357d21ee0a277ab2b7505061 100644
--- a/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_pipelines_email_active
 description: Count of active instance-level 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/20210216180047_groups_inheriting_pipelines_email_active.yml b/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml
index 5b3d48d2a58aaa09e275b1c50f35e4ad7e3175d0..fb86591e0d1c477387dca529d0ea1d17d4ac8c3e 100644
--- a/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_pipelines_email_active
 description: Count of active groups 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/20210216180058_groups_inheriting_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
index 4a8b3083608b3d2cf066677e02f87fad3513da59..c4fd9d7ced144ad9fafbddaf27bb71fd871f78ba 100644
--- a/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_pivotaltracker_active
 description: Count of active groups 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/20210216180111_projects_redmine_active.yml b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
index 8fd63c933167fc42b5573298bbaef0069a2a5e48..3dd807a5c71d35fc77b34dceeb6e8192b7aa6232 100644
--- a/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_redmine_active
 description: Count of projects 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/20210216180124_groups_slack_active.yml b/config/metrics/counts_all/20210216180124_groups_slack_active.yml
index e75fcb1d15525abb2c329d96a91c27472f1356de..268cfcb7dd2092cbe9728e6dd24611fd72808e80 100644
--- a/config/metrics/counts_all/20210216180124_groups_slack_active.yml
+++ b/config/metrics/counts_all/20210216180124_groups_slack_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_slack_active
 description: Count of groups with active 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/20210216180129_projects_inheriting_slack_active.yml b/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
index 95dd89a1b6dde3a966147aa56841099750933d15..59c08f378b1979524f948af683da24423dee066a 100644
--- a/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
+++ b/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_slack_active
 description: Count of active projects 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/20210216180135_groups_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml
index e0a2ad4160edf3d6cd512e62b87a53965a0c29d3..10186c3a1bfd5881c47d167dccd0a2cd1aa0f121 100644
--- a/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_slack_slash_commands_active
 description: Count of groups with active 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/20210216180148_templates_teamcity_active.yml b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
index d41f1c2cb7355b0651060eb494026e7ffb8409ed..22aa65903b65e7617944a5204299fa23b3ae9478 100644
--- a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_teamcity_active
 description: Count of active service templates for Teamcity CI
 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/20210216180214_projects_inheriting_webex_teams_active.yml b/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml
index 38e29e7f5f928ad98054d84ed764cbbc7e974849..77f98bd841a623aec161a066c956699fdc9fbf28 100644
--- a/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_webex_teams_active
 description: Count of active projects 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/20210216180225_projects_inheriting_youtrack_active.yml b/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
index 17d262de18b0014ac1e85a4b862f9d3d0261cc3a..1772a4f61f7403fab06d51fd527b1a2b09e23a23 100644
--- a/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_youtrack_active
 description: Count of active projects inheriting integrations for YouTrack
 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/20210216180228_projects_jira_server_active.yml b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
index feda686d1831cbb97f45fc490505908fb052e168..87caaa8078027a0470d5718e9a959e11cd0e7511 100644
--- a/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
+++ b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_jira_server_active
 description: Count of active integrations with Jira Software (server)
 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/20210216181258_jira_imports_total_imported_count.yml b/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
index 5812515da44d3a594a44074cb3f80ea8fb5609b0..5529893b8b2899c2e6702b55f6d850d465e19b9b 100644
--- a/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
+++ b/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
@@ -4,7 +4,7 @@ key_path: counts.jira_imports_total_imported_count
 description: Count of Jira imports completed
 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/20210216182616_groups_ewm_active.yml b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
index 180ab4b61b4256885d2d97f575ed094a9a90ff5c..6120bf2682cbcbe3795dd79012470b8509265307 100644
--- a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_ewm_active
 description: Count of groups with active 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/20210216182622_projects_inheriting_ewm_active.yml b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
index da3998960875f0e22d204d405d1f140b587951be..21500c85833229e6f2709fc22c97c5c6a42b86fe 100644
--- a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_ewm_active
 description: Count of active projects inheriting 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/20210216182722_projects_mock_ci_active.yml b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
index f19e8a6526d53c644063b838eb7e49348a745ec0..380a094f6850387a4892dfb11a8851320ecb6d54 100644
--- a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_mock_ci_active
 description: Count of projects with active 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/20210216182734_projects_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
index 21d025e3d153c507eb5139d885cb7bc8f93e827a..4b4d6d7bceed9cafa7e2029da1ed014e92a65e6d 100644
--- a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_mock_monitoring_active
 description: Count of projects with active 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/20210730011801_projects_zentao_active.yml b/config/metrics/counts_all/20210730011801_projects_zentao_active.yml
index e85df2176c26d627f4ace5bf736356829638c47f..5000ecab3c65f09c926409a0c17c5d79478451a9 100644
--- a/config/metrics/counts_all/20210730011801_projects_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011801_projects_zentao_active.yml
@@ -3,7 +3,7 @@ key_path: counts.projects_zentao_active
 description: Count of projects 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/20220802141715_instances_pumble_active.yml b/config/metrics/counts_all/20220802141715_instances_pumble_active.yml
index e237ea87ea4b07256dd12fc6187bada06c07fb5c..db75a094cd38f136705fe50ac3a14473399ab404 100644
--- a/config/metrics/counts_all/20220802141715_instances_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_instances_pumble_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_pumble_active
 description: Count of active instance-level 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/20220802141715_projects_inheriting_pumble_active.yml b/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml
index f90acd3755fd61e0c71a606b58264c480888b38e..58ab9ae1cd92aa9a217b2b4c18df3ebc7726d6f5 100644
--- a/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_pumble_active
 description: Count of active projects 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/20230222193151_groups_inheriting_google_play_active.yml b/config/metrics/counts_all/20230222193151_groups_inheriting_google_play_active.yml
index 015e0941ffe40227c4e9e2e89d56bbe26eb2d97a..aa738102160a4ee8a26e478ac7cdb033c254a3be 100644
--- a/config/metrics/counts_all/20230222193151_groups_inheriting_google_play_active.yml
+++ b/config/metrics/counts_all/20230222193151_groups_inheriting_google_play_active.yml
@@ -3,7 +3,7 @@ key_path: counts.groups_inheriting_google_play_active
 description: Count of active groups inheriting 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/20230303132041_instances_squash_tm_active.yml b/config/metrics/counts_all/20230303132041_instances_squash_tm_active.yml
index ec88fbb94c0c1b08790bf9d6a052336f5ccf2df1..08bd783d310584a0cbb8b91c1ed32683b5654c19 100644
--- a/config/metrics/counts_all/20230303132041_instances_squash_tm_active.yml
+++ b/config/metrics/counts_all/20230303132041_instances_squash_tm_active.yml
@@ -3,7 +3,7 @@ key_path: counts.instances_squash_tm_active
 description: Count of instance-level 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/20230515153827_instances_clickup_active.yml b/config/metrics/counts_all/20230515153827_instances_clickup_active.yml
index de631475e5d5fa145394edc864f9d5e49c86b0c8..1e3ec3eb799bb77b7de2ee77e46ad0735adb585a 100644
--- a/config/metrics/counts_all/20230515153827_instances_clickup_active.yml
+++ b/config/metrics/counts_all/20230515153827_instances_clickup_active.yml
@@ -3,7 +3,7 @@ key_path: counts.instances_clickup_active
 description: Count of active instance-level 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/20230607171201_instances_telegram_active.yml b/config/metrics/counts_all/20230607171201_instances_telegram_active.yml
index e76b28d7882635d13758595c1194e825d4d88aa8..3cef0cf7578b53a83dc1b94380c96fed0b550966 100644
--- a/config/metrics/counts_all/20230607171201_instances_telegram_active.yml
+++ b/config/metrics/counts_all/20230607171201_instances_telegram_active.yml
@@ -3,7 +3,7 @@ key_path: counts.instances_telegram_active
 description: Count of active instance-level 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/20231205140200_groups_diffblue_cover_active.yml b/config/metrics/counts_all/20231205140200_groups_diffblue_cover_active.yml
index 90662895b464715d24435ea9feea82477c5a0aa0..c1aa946aa70ab0010c7c25d0ca22c8f47c8802f0 100644
--- a/config/metrics/counts_all/20231205140200_groups_diffblue_cover_active.yml
+++ b/config/metrics/counts_all/20231205140200_groups_diffblue_cover_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_diffblue_cover_active
 description: Count of groups with active integrations for Diffblue Cover
 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/20231205140200_projects_diffblue_cover_active.yml b/config/metrics/counts_all/20231205140200_projects_diffblue_cover_active.yml
index b421aef816b8e23b4e6e75a9b9eeadd0e1e243d3..bd4506b777b4ed7a01d8c2ce71aabbe37461d037 100644
--- a/config/metrics/counts_all/20231205140200_projects_diffblue_cover_active.yml
+++ b/config/metrics/counts_all/20231205140200_projects_diffblue_cover_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_diffblue_cover_active
 description: Count of projects with active integrations for Diffblue Cover
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all