From c0668ba7c93b3a0a7a8c8536de539aa516f6e6d2 Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Wed, 12 Aug 2020 16:29:57 -0700
Subject: [PATCH 01/24] Initial pass at updating client routes, variables
 names, code comments, and UI copy

---
 x-pack/plugins/ingest_manager/README.md       |   2 +-
 .../ingest_manager/common/constants/agent.ts  |   4 +-
 .../common/constants/agent_config.ts          |  14 +-
 .../common/constants/package_config.ts        |   2 +-
 .../ingest_manager/common/constants/routes.ts |  38 +-
 x-pack/plugins/ingest_manager/common/mocks.ts |  10 +-
 .../common/openapi/spec_oas3.json             | 116 ++---
 .../common/services/config_to_yaml.ts         |  12 +-
 .../ingest_manager/common/services/index.ts   |   8 +-
 .../common/services/limited_package.ts        |  14 +-
 .../package_configs_to_agent_inputs.test.ts   |  36 +-
 .../package_configs_to_agent_inputs.ts        |  32 +-
 .../common/services/package_to_config.test.ts |  46 +-
 .../common/services/package_to_config.ts      |  64 +--
 .../ingest_manager/common/services/routes.ts  |  52 +--
 .../ingest_manager/common/types/index.ts      |   4 +-
 .../common/types/models/agent_config.ts       |  26 +-
 .../common/types/models/package_config.ts     |  40 +-
 .../common/types/rest_spec/agent_config.ts    |  56 +--
 .../common/types/rest_spec/package_config.ts  |  36 +-
 .../ingest_manager/dev_docs/definitions.md    |  16 +-
 .../fleet_agents_interactions_detailed.md     |   6 +-
 .../dev_docs/schema/agent_checkin.mml         |   4 +-
 .../dev_docs/schema/saved_objects.mml         |   2 +-
 .../tutorial_directory_notice.tsx             |   2 +-
 .../tutorial_module_notice.tsx                |   2 +-
 .../components/settings_flyout.tsx            |   4 +-
 .../ingest_manager/constants/index.ts         |   4 +-
 .../ingest_manager/constants/page_paths.ts    |  38 +-
 .../ingest_manager/hooks/use_breadcrumbs.tsx  |  48 +--
 .../hooks/use_request/agent_config.ts         |  94 ++--
 .../hooks/use_request/package_config.ts       |  54 +--
 .../applications/ingest_manager/index.tsx     |   6 +-
 .../ingest_manager/layouts/default.tsx        |   9 +-
 .../agent_config/components/actions_menu.tsx  |  44 +-
 .../components/config_copy_provider.tsx       |  94 ++--
 .../components/config_delete_provider.tsx     |  82 ++--
 .../agent_config/components/config_form.tsx   | 126 +++---
 .../components/config_yaml_flyout.tsx         |  34 +-
 .../components/confirm_deploy_modal.tsx       |  24 +-
 .../sections/agent_config/components/index.ts |   8 +-
 .../components/linked_agent_count.tsx         |   8 +-
 .../package_config_delete_provider.tsx        |  82 ++--
 .../components/custom_package_config.tsx      |  38 +-
 .../components/index.ts                       |   8 +-
 .../components/layout.tsx                     |  42 +-
 .../package_config_input_config.tsx           |  42 +-
 .../components/package_config_input_panel.tsx |  82 ++--
 .../package_config_input_stream.tsx           |  42 +-
 .../package_config_input_var_field.tsx        |   4 +-
 .../create_package_config_page/index.tsx      | 218 +++++-----
 .../services/has_invalid_but_required_var.ts  |  14 +-
 .../services/index.ts                         |  10 +-
 .../services/validate_package_config.ts       |  74 ++--
 .../validate_package_config.ts.test.ts        |  54 +--
 .../step_configure_package.tsx                |  50 +--
 .../step_define_package_config.tsx            |  84 ++--
 .../step_select_config.tsx                    | 186 ++++----
 .../step_select_package.tsx                   |  58 +--
 .../create_package_config_page/types.ts       |   4 +-
 .../details_page/components/index.ts          |   4 +-
 .../components/package_configs/index.tsx      |  18 +-
 .../package_configs/no_package_configs.tsx    |  12 +-
 .../package_configs/package_configs_table.tsx | 112 ++---
 .../components/settings/index.tsx             |  70 +--
 .../details_page/hooks/use_agent_status.tsx   |   4 +-
 .../agent_config/details_page/index.tsx       | 126 +++---
 .../edit_package_config_page/index.tsx        | 204 ++++-----
 .../sections/agent_config/index.tsx           |  26 +-
 .../list_page/components/create_config.tsx    |  64 +--
 .../list_page/components/index.ts             |   2 +-
 .../sections/agent_config/list_page/index.tsx | 148 ++++---
 .../sections/data_stream/list_page/index.tsx  |   2 +-
 .../ingest_manager/sections/epm/index.tsx     |   6 +-
 .../detail/confirm_package_uninstall.tsx      |   2 +-
 .../sections/epm/screens/detail/content.tsx   |   4 +-
 .../sections/epm/screens/detail/index.tsx     |   4 +-
 .../screens/detail/package_configs_panel.tsx  |   4 +-
 .../epm/screens/detail/settings_panel.tsx     |  14 +-
 .../epm/screens/detail/side_nav_links.tsx     |   2 +-
 .../components/actions_menu.tsx               |   2 +-
 .../components/agent_details.tsx              |  16 +-
 .../components/type_labels.tsx                |   2 +-
 .../fleet/agent_details_page/index.tsx        |  38 +-
 .../sections/fleet/agent_list_page/index.tsx  | 108 ++---
 .../agent_config_package_badges.tsx           |  32 +-
 .../config_selection.tsx                      |  70 +--
 .../agent_enrollment_flyout/index.tsx         |  10 +-
 .../managed_instructions.tsx                  |  10 +-
 .../standalone_instructions.tsx               |  48 +--
 .../agent_enrollment_flyout/steps.tsx         |  24 +-
 .../agent_reassign_config_flyout/index.tsx    |  56 +--
 .../sections/fleet/components/list_layout.tsx |  10 +-
 .../components/new_enrollment_key_flyout.tsx  |  27 +-
 .../enrollment_token_list_page/index.tsx      |  18 +-
 .../sections/fleet/setup_page/index.tsx       |   4 +-
 .../ingest_manager/sections/index.tsx         |   2 +-
 .../overview/components/agent_section.tsx     |   2 +-
 .../components/configuration_section.tsx      |  36 +-
 .../components/integration_section.tsx        |   2 +-
 .../sections/overview/index.tsx               |  14 +-
 .../ingest_manager/services/index.ts          |  12 +-
 .../ingest_manager/types/index.ts             |  56 +--
 .../types/intra_app_route_state.ts            |  24 +-
 x-pack/plugins/ingest_manager/public/index.ts |   8 +-
 .../plugins/ingest_manager/public/plugin.ts   |   6 +-
 .../server/collectors/package_collectors.ts   |  20 +-
 .../ingest_manager/server/constants/index.ts  |  14 +-
 x-pack/plugins/ingest_manager/server/index.ts |   6 +-
 .../server/integration_tests/router.test.ts   |  20 +-
 x-pack/plugins/ingest_manager/server/mocks.ts |   8 +-
 .../plugins/ingest_manager/server/plugin.ts   |  30 +-
 .../server/routes/agent_config/handlers.ts    | 172 ++++----
 .../server/routes/agent_config/index.ts       |  84 ++--
 .../ingest_manager/server/routes/index.ts     |   4 +-
 .../routes/package_config/handlers.test.ts    |  44 +-
 .../server/routes/package_config/handlers.ts  |  90 ++--
 .../server/routes/package_config/index.ts     |  52 +--
 .../server/saved_objects/index.ts             |  12 +-
 .../server/services/agent_config.test.ts      |  10 +-
 .../server/services/agent_config.ts           | 252 +++++------
 .../server/services/agent_config_update.ts    |   2 +-
 .../server/services/agents/acks.ts            |   8 +-
 .../agents/checkin/state_new_actions.ts       |  38 +-
 .../server/services/agents/reassign.ts        |   6 +-
 .../services/api_keys/enrollment_api_key.ts   |   8 +-
 .../ingest_manager/server/services/config.ts  |   2 +-
 .../server/services/epm/agent/agent.ts        |   6 +-
 .../server/services/epm/packages/get.ts       |   2 +-
 .../server/services/epm/packages/remove.ts    |  10 +-
 .../ingest_manager/server/services/index.ts   |   4 +-
 .../server/services/package_config.test.ts    |  20 +-
 .../server/services/package_config.ts         | 204 ++++-----
 .../ingest_manager/server/services/setup.ts   |  42 +-
 .../ingest_manager/server/types/index.tsx     |  28 +-
 .../server/types/models/agent_config.ts       |  20 +-
 .../server/types/models/package_config.ts     |  14 +-
 .../server/types/rest_spec/agent_config.ts    |  30 +-
 .../server/types/rest_spec/package_config.ts  |  22 +-
 .../common/endpoint/generate_data.ts          |  16 +-
 .../common/endpoint/types.ts                  |   8 +-
 .../use_navigate_to_app_event_handler.ts      |   4 +-
 .../mock/endpoint/dependencies_start_mock.ts  |   4 +-
 .../pages/endpoint_hosts/store/middleware.ts  |  24 +-
 .../store/mock_endpoint_result_list.ts        |  24 +-
 .../view/details/endpoint_details.tsx         |   4 +-
 .../pages/endpoint_hosts/view/index.test.tsx  |  12 +-
 .../pages/endpoint_hosts/view/index.tsx       |  10 +-
 .../policy/store/policy_details/middleware.ts |  20 +-
 .../policy/store/policy_details/selectors.ts  |   2 +-
 .../pages/policy/store/policy_list/action.ts  |   2 +-
 .../policy/store/policy_list/index.test.ts    |  14 +-
 .../policy/store/policy_list/middleware.ts    |  22 +-
 .../store/policy_list/services/ingest.test.ts |  22 +-
 .../store/policy_list/services/ingest.ts      |  66 +--
 .../store/policy_list/test_mock_utils.ts      |   2 +-
 .../public/management/pages/policy/types.ts   |  16 +-
 .../configure_package_config.tsx              |  36 +-
 .../pages/policy/view/policy_details.test.tsx |  18 +-
 .../pages/policy/view/policy_details.tsx      |   2 +-
 .../pages/policy/view/policy_list.test.tsx    |   2 +-
 .../pages/policy/view/policy_list.tsx         |  22 +-
 .../security_solution/public/plugin.tsx       |   6 +-
 .../endpoint/endpoint_app_context_services.ts |   6 +-
 .../endpoint/ingest_integration.test.ts       |  20 +-
 .../server/endpoint/ingest_integration.ts     |  30 +-
 .../server/endpoint/lib/artifacts/mocks.ts    |  20 +-
 .../server/endpoint/lib/artifacts/task.ts     |   2 +-
 .../server/endpoint/mocks.ts                  |   4 +-
 .../manifest_manager/manifest_manager.mock.ts |  26 +-
 .../manifest_manager/manifest_manager.test.ts |  20 +-
 .../manifest_manager/manifest_manager.ts      |  30 +-
 .../security_solution/server/plugin.ts        |   2 +-
 .../translations/translations/ja-JP.json      | 408 +++++++++---------
 .../translations/translations/zh-CN.json      | 408 +++++++++---------
 .../apps/endpoint/policy_details.ts           |  10 +-
 .../apps/endpoint/policy_list.ts              |  26 +-
 .../page_objects/index.ts                     |   4 +-
 ...gest_manager_create_package_config_page.ts |  20 +-
 .../page_objects/policy_page.ts               |   4 +-
 .../services/endpoint_policy.ts               |  64 +--
 181 files changed, 3315 insertions(+), 3309 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/README.md b/x-pack/plugins/ingest_manager/README.md
index 9fd23e3d41ddec..a95a2582f1f600 100644
--- a/x-pack/plugins/ingest_manager/README.md
+++ b/x-pack/plugins/ingest_manager/README.md
@@ -3,7 +3,7 @@
 ## Plugin
 
 - The plugin is enabled by default. See the TypeScript type for the [the available plugin configuration options](https://github.com/elastic/kibana/blob/master/x-pack/plugins/ingest_manager/common/types/index.ts#L9-L27)
-- Adding `xpack.ingestManager.enabled=false` will disable the plugin including the EPM and Fleet features. It will also remove the `PACKAGE_CONFIG_API_ROUTES` and `AGENT_CONFIG_API_ROUTES` values in [`common/constants/routes.ts`](./common/constants/routes.ts)
+- Adding `xpack.ingestManager.enabled=false` will disable the plugin including the EPM and Fleet features. It will also remove the `PACKAGE_POLICY_API_ROUTES` and `AGENT_POLICY_API_ROUTES` values in [`common/constants/routes.ts`](./common/constants/routes.ts)
 - Adding `--xpack.ingestManager.fleet.enabled=false` will disable the Fleet API & UI
   - [code for adding the routes](https://github.com/elastic/kibana/blob/1f27d349533b1c2865c10c45b2cf705d7416fb36/x-pack/plugins/ingest_manager/server/plugin.ts#L115-L133)
   - [Integration tests](server/integration_tests/router.test.ts)
diff --git a/x-pack/plugins/ingest_manager/common/constants/agent.ts b/x-pack/plugins/ingest_manager/common/constants/agent.ts
index 7652c6ac87bced..fc3fda552242cd 100644
--- a/x-pack/plugins/ingest_manager/common/constants/agent.ts
+++ b/x-pack/plugins/ingest_manager/common/constants/agent.ts
@@ -17,5 +17,5 @@ export const AGENT_POLLING_INTERVAL = 1000;
 export const AGENT_UPDATE_LAST_CHECKIN_INTERVAL_MS = 30000;
 export const AGENT_UPDATE_ACTIONS_INTERVAL_MS = 5000;
 
-export const AGENT_CONFIG_ROLLUP_RATE_LIMIT_INTERVAL_MS = 5000;
-export const AGENT_CONFIG_ROLLUP_RATE_LIMIT_REQUEST_PER_INTERVAL = 60;
+export const AGENT_POLICY_ROLLUP_RATE_LIMIT_INTERVAL_MS = 5000;
+export const AGENT_POLICY_ROLLUP_RATE_LIMIT_REQUEST_PER_INTERVAL = 60;
diff --git a/x-pack/plugins/ingest_manager/common/constants/agent_config.ts b/x-pack/plugins/ingest_manager/common/constants/agent_config.ts
index aa6399b73f14ed..d998ef761a8cf8 100644
--- a/x-pack/plugins/ingest_manager/common/constants/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/common/constants/agent_config.ts
@@ -3,18 +3,18 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { AgentConfigStatus, DefaultPackages } from '../types';
+import { AgentPolicyStatus, DefaultPackages } from '../types';
 
-export const AGENT_CONFIG_SAVED_OBJECT_TYPE = 'ingest-agent-policies';
+export const AGENT_POLICY_SAVED_OBJECT_TYPE = 'ingest-agent-policies';
 
-export const DEFAULT_AGENT_CONFIG = {
-  name: 'Default config',
+export const DEFAULT_AGENT_POLICY = {
+  name: 'Default policy',
   namespace: 'default',
-  description: 'Default agent configuration created by Kibana',
-  status: AgentConfigStatus.Active,
+  description: 'Default agent policy created by Kibana',
+  status: AgentPolicyStatus.Active,
   package_configs: [],
   is_default: true,
   monitoring_enabled: ['logs', 'metrics'] as Array<'logs' | 'metrics'>,
 };
 
-export const DEFAULT_AGENT_CONFIGS_PACKAGES = [DefaultPackages.system];
+export const DEFAULT_AGENT_POLICIES_PACKAGES = [DefaultPackages.system];
diff --git a/x-pack/plugins/ingest_manager/common/constants/package_config.ts b/x-pack/plugins/ingest_manager/common/constants/package_config.ts
index 48fee967a3d3d6..27814e6baafb16 100644
--- a/x-pack/plugins/ingest_manager/common/constants/package_config.ts
+++ b/x-pack/plugins/ingest_manager/common/constants/package_config.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export const PACKAGE_CONFIG_SAVED_OBJECT_TYPE = 'ingest-package-policies';
+export const PACKAGE_POLICY_SAVED_OBJECT_TYPE = 'ingest-package-policies';
diff --git a/x-pack/plugins/ingest_manager/common/constants/routes.ts b/x-pack/plugins/ingest_manager/common/constants/routes.ts
index 94265c3920922c..35c974f619523c 100644
--- a/x-pack/plugins/ingest_manager/common/constants/routes.ts
+++ b/x-pack/plugins/ingest_manager/common/constants/routes.ts
@@ -7,8 +7,8 @@
 export const API_ROOT = `/api/ingest_manager`;
 export const EPM_API_ROOT = `${API_ROOT}/epm`;
 export const DATA_STREAM_API_ROOT = `${API_ROOT}/data_streams`;
-export const PACKAGE_CONFIG_API_ROOT = `${API_ROOT}/package_configs`;
-export const AGENT_CONFIG_API_ROOT = `${API_ROOT}/agent_configs`;
+export const PACKAGE_POLICY_API_ROOT = `${API_ROOT}/package_configs`;
+export const AGENT_POLICY_API_ROOT = `${API_ROOT}/agent_configs`;
 export const FLEET_API_ROOT = `${API_ROOT}/fleet`;
 
 export const LIMITED_CONCURRENCY_ROUTE_TAG = 'ingest:limited-concurrency';
@@ -32,25 +32,25 @@ export const DATA_STREAM_API_ROUTES = {
   LIST_PATTERN: `${DATA_STREAM_API_ROOT}`,
 };
 
-// Package config API routes
-export const PACKAGE_CONFIG_API_ROUTES = {
-  LIST_PATTERN: `${PACKAGE_CONFIG_API_ROOT}`,
-  INFO_PATTERN: `${PACKAGE_CONFIG_API_ROOT}/{packageConfigId}`,
-  CREATE_PATTERN: `${PACKAGE_CONFIG_API_ROOT}`,
-  UPDATE_PATTERN: `${PACKAGE_CONFIG_API_ROOT}/{packageConfigId}`,
-  DELETE_PATTERN: `${PACKAGE_CONFIG_API_ROOT}/delete`,
+// Package policy API routes
+export const PACKAGE_POLICY_API_ROUTES = {
+  LIST_PATTERN: `${PACKAGE_POLICY_API_ROOT}`,
+  INFO_PATTERN: `${PACKAGE_POLICY_API_ROOT}/{packagePolicyId}`,
+  CREATE_PATTERN: `${PACKAGE_POLICY_API_ROOT}`,
+  UPDATE_PATTERN: `${PACKAGE_POLICY_API_ROOT}/{packagePolicyId}`,
+  DELETE_PATTERN: `${PACKAGE_POLICY_API_ROOT}/delete`,
 };
 
-// Agent config API routes
-export const AGENT_CONFIG_API_ROUTES = {
-  LIST_PATTERN: `${AGENT_CONFIG_API_ROOT}`,
-  INFO_PATTERN: `${AGENT_CONFIG_API_ROOT}/{agentConfigId}`,
-  CREATE_PATTERN: `${AGENT_CONFIG_API_ROOT}`,
-  UPDATE_PATTERN: `${AGENT_CONFIG_API_ROOT}/{agentConfigId}`,
-  COPY_PATTERN: `${AGENT_CONFIG_API_ROOT}/{agentConfigId}/copy`,
-  DELETE_PATTERN: `${AGENT_CONFIG_API_ROOT}/delete`,
-  FULL_INFO_PATTERN: `${AGENT_CONFIG_API_ROOT}/{agentConfigId}/full`,
-  FULL_INFO_DOWNLOAD_PATTERN: `${AGENT_CONFIG_API_ROOT}/{agentConfigId}/download`,
+// Agent policy API routes
+export const AGENT_POLICY_API_ROUTES = {
+  LIST_PATTERN: `${AGENT_POLICY_API_ROOT}`,
+  INFO_PATTERN: `${AGENT_POLICY_API_ROOT}/{agentPolicyId}`,
+  CREATE_PATTERN: `${AGENT_POLICY_API_ROOT}`,
+  UPDATE_PATTERN: `${AGENT_POLICY_API_ROOT}/{agentPolicyId}`,
+  COPY_PATTERN: `${AGENT_POLICY_API_ROOT}/{agentPolicyId}/copy`,
+  DELETE_PATTERN: `${AGENT_POLICY_API_ROOT}/delete`,
+  FULL_INFO_PATTERN: `${AGENT_POLICY_API_ROOT}/{agentPolicyId}/full`,
+  FULL_INFO_DOWNLOAD_PATTERN: `${AGENT_POLICY_API_ROOT}/{agentPolicyId}/download`,
 };
 
 // Output API routes
diff --git a/x-pack/plugins/ingest_manager/common/mocks.ts b/x-pack/plugins/ingest_manager/common/mocks.ts
index e85364f2bb672b..eb52df1ba2a8af 100644
--- a/x-pack/plugins/ingest_manager/common/mocks.ts
+++ b/x-pack/plugins/ingest_manager/common/mocks.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { NewPackageConfig, PackageConfig } from './types/models/package_config';
+import { NewPackagePolicy, PackagePolicy } from './types/models/package_config';
 
-export const createNewPackageConfigMock = (): NewPackageConfig => {
+export const createNewPackagePolicyMock = (): NewPackagePolicy => {
   return {
     name: 'endpoint-1',
     description: '',
@@ -23,10 +23,10 @@ export const createNewPackageConfigMock = (): NewPackageConfig => {
   };
 };
 
-export const createPackageConfigMock = (): PackageConfig => {
-  const newPackageConfig = createNewPackageConfigMock();
+export const createPackagePolicyMock = (): PackagePolicy => {
+  const newPackagePolicy = createNewPackagePolicyMock();
   return {
-    ...newPackageConfig,
+    ...newPackagePolicy,
     id: 'c6d16e42-c32d-4dce-8a88-113cfe276ad1',
     version: 'abcd',
     revision: 1,
diff --git a/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json b/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
index cfae2c450c824e..1c741b43491cf3 100644
--- a/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
+++ b/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
@@ -19,7 +19,7 @@
   "paths": {
     "/agent_configs": {
       "get": {
-        "summary": "Agent Config - List",
+        "summary": "Agent policy - List",
         "tags": [],
         "responses": {
           "200": {
@@ -32,7 +32,7 @@
                     "items": {
                       "type": "array",
                       "items": {
-                        "$ref": "#/components/schemas/AgentConfig"
+                        "$ref": "#/components/schemas/AgentPolicy"
                       }
                     },
                     "total": {
@@ -56,11 +56,11 @@
                       "items": [
                         {
                           "id": "82da1fc0-8fbf-11ea-b2ce-01c4a6127154",
-                          "name": "Default config",
+                          "name": "Default policy",
                           "namespace": "default",
-                          "description": "Default agent configuration created by Kibana",
+                          "description": "Default agent policy created by Kibana",
                           "status": "active",
-                          "packageConfigs": ["8a5679b0-8fbf-11ea-b2ce-01c4a6127154"],
+                          "packagePolicies": ["8a5679b0-8fbf-11ea-b2ce-01c4a6127154"],
                           "is_default": true,
                           "monitoring_enabled": ["logs", "metrics"],
                           "revision": 2,
@@ -95,7 +95,7 @@
         "description": ""
       },
       "post": {
-        "summary": "Agent Config - Create",
+        "summary": "Agent policy - Create",
         "tags": [],
         "responses": {
           "200": {
@@ -106,7 +106,7 @@
                   "type": "object",
                   "properties": {
                     "item": {
-                      "$ref": "#/components/schemas/AgentConfig"
+                      "$ref": "#/components/schemas/AgentPolicy"
                     },
                     "success": {
                       "type": "boolean"
@@ -122,7 +122,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/NewAgentConfig"
+                "$ref": "#/components/schemas/NewAgentPolicy"
               }
             }
           }
@@ -135,19 +135,19 @@
         ]
       }
     },
-    "/agent_configs/{agentConfigId}": {
+    "/agent_configs/{agentPolicyId}": {
       "parameters": [
         {
           "schema": {
             "type": "string"
           },
-          "name": "agentConfigId",
+          "name": "agentPolicyId",
           "in": "path",
           "required": true
         }
       ],
       "get": {
-        "summary": "Agent Config - Info",
+        "summary": "Agent policy - Info",
         "tags": [],
         "responses": {
           "200": {
@@ -158,7 +158,7 @@
                   "type": "object",
                   "properties": {
                     "item": {
-                      "$ref": "#/components/schemas/AgentConfig"
+                      "$ref": "#/components/schemas/AgentPolicy"
                     },
                     "success": {
                       "type": "boolean"
@@ -173,9 +173,9 @@
                         "id": "82da1fc0-8fbf-11ea-b2ce-01c4a6127154",
                         "name": "Default config",
                         "namespace": "default",
-                        "description": "Default agent configuration created by Kibana",
+                        "description": "Default agent policy created by Kibana",
                         "status": "active",
-                        "packageConfigs": [
+                        "packagePolicies": [
                           {
                             "id": "8a5679b0-8fbf-11ea-b2ce-01c4a6127154",
                             "name": "system-1",
@@ -717,11 +717,11 @@
           }
         },
         "operationId": "agent-config-info",
-        "description": "Get one agent config",
+        "description": "Get one agent policy",
         "parameters": []
       },
       "put": {
-        "summary": "Agent Config - Update",
+        "summary": "Agent policy - Update",
         "tags": [],
         "responses": {
           "200": {
@@ -732,7 +732,7 @@
                   "type": "object",
                   "properties": {
                     "item": {
-                      "$ref": "#/components/schemas/AgentConfig"
+                      "$ref": "#/components/schemas/AgentPolicy"
                     },
                     "success": {
                       "type": "boolean"
@@ -750,7 +750,7 @@
                         "namespace": "UPDATED namespace",
                         "updated_on": "Fri Feb 28 2020 16:22:31 GMT-0500 (Eastern Standard Time)",
                         "updated_by": "elastic",
-                        "packageConfigs": []
+                        "packagePolicies": []
                       },
                       "success": true
                     }
@@ -760,12 +760,12 @@
             }
           }
         },
-        "operationId": "put-agent_configs-agentConfigId",
+        "operationId": "put-agent_configs-agentPolicyId",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/NewAgentConfig"
+                "$ref": "#/components/schemas/NewAgentPolicy"
               },
               "examples": {
                 "example-1": {
@@ -786,19 +786,19 @@
         ]
       }
     },
-    "/agent_configs/{agentConfigId}/copy": {
+    "/agent_configs/{agentPolicyId}/copy": {
       "parameters": [
         {
           "schema": {
             "type": "string"
           },
-          "name": "agentConfigId",
+          "name": "agentPolicyId",
           "in": "path",
           "required": true
         }
       ],
       "post": {
-        "summary": "Agent config - copy one config",
+        "summary": "Agent policy - copy one config",
         "operationId": "agent-config-copy",
         "responses": {
           "200": {
@@ -809,7 +809,7 @@
                   "type": "object",
                   "properties": {
                     "item": {
-                      "$ref": "#/components/schemas/AgentConfig"
+                      "$ref": "#/components/schemas/AgentPolicy"
                     },
                     "success": {
                       "type": "boolean"
@@ -841,12 +841,12 @@
           },
           "description": ""
         },
-        "description": "Copies one agent config"
+        "description": "Copies one agent policy"
       }
     },
     "/agent_configs/delete": {
       "post": {
-        "summary": "Agent Config - Delete",
+        "summary": "Agent policy - Delete",
         "operationId": "post-agent_config-delete",
         "responses": {
           "200": {
@@ -896,7 +896,7 @@
               "schema": {
                 "type": "object",
                 "properties": {
-                  "agentConfigIds": {
+                  "agentPolicyIds": {
                     "type": "array",
                     "items": {
                       "type": "string"
@@ -907,7 +907,7 @@
               "examples": {
                 "example-1": {
                   "value": {
-                    "agentConfigIds": ["df7d2540-5a47-11ea-80da-89b5a66da347"]
+                    "agentPolicyIds": ["df7d2540-5a47-11ea-80da-89b5a66da347"]
                   }
                 }
               }
@@ -924,7 +924,7 @@
     },
     "/package_configs": {
       "get": {
-        "summary": "PackageConfigs - List",
+        "summary": "PackagePolicies - List",
         "tags": [],
         "responses": {
           "200": {
@@ -937,7 +937,7 @@
                     "items": {
                       "type": "array",
                       "items": {
-                        "$ref": "#/components/schemas/PackageConfig"
+                        "$ref": "#/components/schemas/PackagePolicy"
                       }
                     },
                     "total": {
@@ -1166,14 +1166,14 @@
             }
           }
         },
-        "operationId": "get-packageConfigs",
+        "operationId": "get-packagePolicies",
         "security": [],
         "parameters": []
       },
       "parameters": [],
       "post": {
-        "summary": "PackageConfigs - Create",
-        "operationId": "post-packageConfigs",
+        "summary": "PackagePolicies - Create",
+        "operationId": "post-packagePolicies",
         "responses": {
           "200": {
             "description": "OK"
@@ -1183,7 +1183,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/NewPackageConfig"
+                "$ref": "#/components/schemas/NewPackagePolicy"
               },
               "examples": {
                 "example-1": {
@@ -1237,9 +1237,9 @@
         ]
       }
     },
-    "/package_configs/{packageConfigId}": {
+    "/package_configs/{packagePolicyId}": {
       "get": {
-        "summary": "PackageConfigs - Info",
+        "summary": "PackagePolicies - Info",
         "tags": [],
         "responses": {
           "200": {
@@ -1250,7 +1250,7 @@
                   "type": "object",
                   "properties": {
                     "item": {
-                      "$ref": "#/components/schemas/PackageConfig"
+                      "$ref": "#/components/schemas/PackagePolicy"
                     },
                     "success": {
                       "type": "boolean"
@@ -1262,21 +1262,21 @@
             }
           }
         },
-        "operationId": "get-packageConfigs-packageConfigId"
+        "operationId": "get-packagePolicies-packagePolicyId"
       },
       "parameters": [
         {
           "schema": {
             "type": "string"
           },
-          "name": "packageConfigId",
+          "name": "packagePolicyId",
           "in": "path",
           "required": true
         }
       ],
       "put": {
-        "summary": "PackageConfigs - Update",
-        "operationId": "put-packageConfigs-packageConfigId",
+        "summary": "PackagePolicies - Update",
+        "operationId": "put-packagePolicies-packagePolicyId",
         "responses": {
           "200": {
             "description": "OK",
@@ -1286,7 +1286,7 @@
                   "type": "object",
                   "properties": {
                     "item": {
-                      "$ref": "#/components/schemas/PackageConfig"
+                      "$ref": "#/components/schemas/PackagePolicy"
                     },
                     "sucess": {
                       "type": "boolean"
@@ -1824,10 +1824,10 @@
                             "path": "telemetry"
                           }
                         ],
-                        "packageConfigs": [
+                        "packagePolicies": [
                           {
                             "name": "endpoint",
-                            "title": "Endpoint package config",
+                            "title": "Endpoint package policy",
                             "description": "Interact with the endpoint.",
                             "inputs": null,
                             "multiple": false
@@ -2119,7 +2119,7 @@
                           }
                         },
                         {
-                          "description": "The log package should be used to create package configs for all type of logs for which an package doesn't exist yet.\n",
+                          "description": "The log package should be used to create package policies for all type of logs for which an package doesn't exist yet.\n",
                           "download": "/epr/log/log-0.9.0.tar.gz",
                           "icons": [
                             {
@@ -2780,7 +2780,7 @@
                           },
                           "actions": [
                             {
-                              "data": "{\"config\":{\"id\":\"ae556400-5e39-11ea-8b49-f9747e466f7b\",\"outputs\":{\"default\":{\"type\":\"elasticsearch\",\"hosts\":[\"http://localhost:9200\"],\"api_key\":\"\",\"api_token\":\"6ckkp3ABz7e_XRqr3LM8:gQuDfUNSRgmY0iziYqP9Hw\"}},\"packageConfigs\":[]}}",
+                              "data": "{\"config\":{\"id\":\"ae556400-5e39-11ea-8b49-f9747e466f7b\",\"outputs\":{\"default\":{\"type\":\"elasticsearch\",\"hosts\":[\"http://localhost:9200\"],\"api_key\":\"\",\"api_token\":\"6ckkp3ABz7e_XRqr3LM8:gQuDfUNSRgmY0iziYqP9Hw\"}},\"packagePolicies\":[]}}",
                               "created_at": "2020-03-04T20:02:56.149Z",
                               "id": "6a95c00a-d76d-4931-97c3-0bf935272d7d",
                               "type": "CONFIG_CHANGE"
@@ -2965,7 +2965,7 @@
                                   "api_key": "Z-XkgHIBvwtjzIKtSCTh:AejRqdKpQx6z-6dqSI1LHg"
                                 }
                               },
-                              "packageConfigs": [
+                              "packagePolicies": [
                                 {
                                   "id": "33d6bd70-a5e0-11ea-a587-5f886c8a849f",
                                   "name": "system-1",
@@ -3702,10 +3702,10 @@
   },
   "components": {
     "schemas": {
-      "AgentConfig": {
+      "AgentPolicy": {
         "allOf": [
           {
-            "$ref": "#/components/schemas/NewAgentConfig"
+            "$ref": "#/components/schemas/NewAgentPolicy"
           },
           {
             "type": "object",
@@ -3717,7 +3717,7 @@
                 "type": "string",
                 "enum": ["active", "inactive"]
               },
-              "packageConfigs": {
+              "packagePolicies": {
                 "oneOf": [
                   {
                     "items": {
@@ -3726,7 +3726,7 @@
                   },
                   {
                     "items": {
-                      "$ref": "#/components/schemas/PackageConfig"
+                      "$ref": "#/components/schemas/PackagePolicy"
                     }
                   }
                 ],
@@ -3750,8 +3750,8 @@
           }
         ]
       },
-      "PackageConfig": {
-        "title": "PackageConfig",
+      "PackagePolicy": {
+        "title": "PackagePolicy",
         "allOf": [
           {
             "type": "object",
@@ -3770,15 +3770,15 @@
             "required": ["id", "revision"]
           },
           {
-            "$ref": "#/components/schemas/NewPackageConfig"
+            "$ref": "#/components/schemas/NewPackagePolicy"
           }
         ],
         "x-examples": {
           "example-1": {}
         }
       },
-      "NewAgentConfig": {
-        "title": "NewAgentConfig",
+      "NewAgentPolicy": {
+        "title": "NewAgentPolicy",
         "type": "object",
         "properties": {
           "name": {
@@ -3792,8 +3792,8 @@
           }
         }
       },
-      "NewPackageConfig": {
-        "title": "NewPackageConfig",
+      "NewPackagePolicy": {
+        "title": "NewPackagePolicy",
         "type": "object",
         "x-examples": {
           "example-1": {
diff --git a/x-pack/plugins/ingest_manager/common/services/config_to_yaml.ts b/x-pack/plugins/ingest_manager/common/services/config_to_yaml.ts
index e2e6393738d1f2..6e8b7d5adaf900 100644
--- a/x-pack/plugins/ingest_manager/common/services/config_to_yaml.ts
+++ b/x-pack/plugins/ingest_manager/common/services/config_to_yaml.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { safeDump } from 'js-yaml';
-import { FullAgentConfig } from '../types';
+import { FullAgentPolicy } from '../types';
 
-const CONFIG_KEYS_ORDER = [
+const POLICY_KEYS_ORDER = [
   'id',
   'name',
   'revision',
@@ -21,12 +21,12 @@ const CONFIG_KEYS_ORDER = [
   'input',
 ];
 
-export const configToYaml = (config: FullAgentConfig): string => {
-  return safeDump(config, {
+export const policyToYaml = (policy: FullAgentPolicy): string => {
+  return safeDump(policy, {
     skipInvalid: true,
     sortKeys: (keyA: string, keyB: string) => {
-      const indexA = CONFIG_KEYS_ORDER.indexOf(keyA);
-      const indexB = CONFIG_KEYS_ORDER.indexOf(keyB);
+      const indexA = POLICY_KEYS_ORDER.indexOf(keyA);
+      const indexB = POLICY_KEYS_ORDER.indexOf(keyB);
       if (indexA >= 0 && indexB < 0) {
         return -1;
       }
diff --git a/x-pack/plugins/ingest_manager/common/services/index.ts b/x-pack/plugins/ingest_manager/common/services/index.ts
index 0c91dbbe103545..49822989ce044c 100644
--- a/x-pack/plugins/ingest_manager/common/services/index.ts
+++ b/x-pack/plugins/ingest_manager/common/services/index.ts
@@ -5,8 +5,8 @@
  */
 export * from './routes';
 export * as AgentStatusKueryHelper from './agent_status';
-export { packageToPackageConfigInputs, packageToPackageConfig } from './package_to_config';
-export { storedPackageConfigsToAgentInputs } from './package_configs_to_agent_inputs';
-export { configToYaml } from './config_to_yaml';
-export { isPackageLimited, doesAgentConfigAlreadyIncludePackage } from './limited_package';
+export { packageToPackagePolicyInputs, packageToPackagePolicy } from './package_to_config';
+export { storedPackagePoliciesToAgentInputs } from './package_configs_to_agent_inputs';
+export { policyToYaml } from './config_to_yaml';
+export { isPackageLimited, doesAgentPolicyAlreadyIncludePackage } from './limited_package';
 export { decodeCloudId } from './decode_cloud_id';
diff --git a/x-pack/plugins/ingest_manager/common/services/limited_package.ts b/x-pack/plugins/ingest_manager/common/services/limited_package.ts
index 7ef445d55063c0..311ce359c81fbd 100644
--- a/x-pack/plugins/ingest_manager/common/services/limited_package.ts
+++ b/x-pack/plugins/ingest_manager/common/services/limited_package.ts
@@ -3,21 +3,21 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { PackageInfo, AgentConfig, PackageConfig } from '../types';
+import { PackageInfo, AgentPolicy, PackagePolicy } from '../types';
 
 // Assume packages only ever include 1 config template for now
 export const isPackageLimited = (packageInfo: PackageInfo): boolean => {
   return packageInfo.config_templates?.[0]?.multiple === false;
 };
 
-export const doesAgentConfigAlreadyIncludePackage = (
-  agentConfig: AgentConfig,
+export const doesAgentPolicyAlreadyIncludePackage = (
+  agentPolicy: AgentPolicy,
   packageName: string
 ): boolean => {
-  if (agentConfig.package_configs.length && typeof agentConfig.package_configs[0] === 'string') {
-    throw new Error('Unable to read full package config information');
+  if (agentPolicy.package_configs.length && typeof agentPolicy.package_configs[0] === 'string') {
+    throw new Error('Unable to read full package policy information');
   }
-  return (agentConfig.package_configs as PackageConfig[])
-    .map((packageConfig) => packageConfig.package?.name || '')
+  return (agentPolicy.package_configs as PackagePolicy[])
+    .map((packagePolicy) => packagePolicy.package?.name || '')
     .includes(packageName);
 };
diff --git a/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.test.ts b/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.test.ts
index d6c09f058ab85b..23caee82b754b3 100644
--- a/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.test.ts
+++ b/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.test.ts
@@ -3,13 +3,13 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { PackageConfig, PackageConfigInput } from '../types';
-import { storedPackageConfigsToAgentInputs } from './package_configs_to_agent_inputs';
+import { PackagePolicy, PackagePolicyInput } from '../types';
+import { storedPackagePoliciesToAgentInputs } from './package_configs_to_agent_inputs';
 
-describe('Ingest Manager - storedPackageConfigsToAgentInputs', () => {
-  const mockPackageConfig: PackageConfig = {
+describe('Ingest Manager - storedPackagePoliciesToAgentInputs', () => {
+  const mockPackagePolicy: PackagePolicy = {
     id: 'some-uuid',
-    name: 'mock-package-config',
+    name: 'mock-package-policy',
     description: '',
     created_at: '',
     created_by: '',
@@ -23,7 +23,7 @@ describe('Ingest Manager - storedPackageConfigsToAgentInputs', () => {
     revision: 1,
   };
 
-  const mockInput: PackageConfigInput = {
+  const mockInput: PackagePolicyInput = {
     type: 'test-logs',
     enabled: true,
     vars: {
@@ -74,13 +74,13 @@ describe('Ingest Manager - storedPackageConfigsToAgentInputs', () => {
     ],
   };
 
-  it('returns no inputs for package config with no inputs, or only disabled inputs', () => {
-    expect(storedPackageConfigsToAgentInputs([mockPackageConfig])).toEqual([]);
+  it('returns no inputs for package policy with no inputs, or only disabled inputs', () => {
+    expect(storedPackagePoliciesToAgentInputs([mockPackagePolicy])).toEqual([]);
 
     expect(
-      storedPackageConfigsToAgentInputs([
+      storedPackagePoliciesToAgentInputs([
         {
-          ...mockPackageConfig,
+          ...mockPackagePolicy,
           package: {
             name: 'mock-package',
             title: 'Mock package',
@@ -91,9 +91,9 @@ describe('Ingest Manager - storedPackageConfigsToAgentInputs', () => {
     ).toEqual([]);
 
     expect(
-      storedPackageConfigsToAgentInputs([
+      storedPackagePoliciesToAgentInputs([
         {
-          ...mockPackageConfig,
+          ...mockPackagePolicy,
           inputs: [{ ...mockInput, enabled: false }],
         },
       ])
@@ -102,9 +102,9 @@ describe('Ingest Manager - storedPackageConfigsToAgentInputs', () => {
 
   it('returns agent inputs', () => {
     expect(
-      storedPackageConfigsToAgentInputs([
+      storedPackagePoliciesToAgentInputs([
         {
-          ...mockPackageConfig,
+          ...mockPackagePolicy,
           package: {
             name: 'mock-package',
             title: 'Mock package',
@@ -116,7 +116,7 @@ describe('Ingest Manager - storedPackageConfigsToAgentInputs', () => {
     ).toEqual([
       {
         id: 'some-uuid',
-        name: 'mock-package-config',
+        name: 'mock-package-policy',
         type: 'test-logs',
         data_stream: { namespace: 'default' },
         use_output: 'default',
@@ -144,9 +144,9 @@ describe('Ingest Manager - storedPackageConfigsToAgentInputs', () => {
 
   it('returns agent inputs without disabled streams', () => {
     expect(
-      storedPackageConfigsToAgentInputs([
+      storedPackagePoliciesToAgentInputs([
         {
-          ...mockPackageConfig,
+          ...mockPackagePolicy,
           inputs: [
             {
               ...mockInput,
@@ -158,7 +158,7 @@ describe('Ingest Manager - storedPackageConfigsToAgentInputs', () => {
     ).toEqual([
       {
         id: 'some-uuid',
-        name: 'mock-package-config',
+        name: 'mock-package-policy',
         type: 'test-logs',
         data_stream: { namespace: 'default' },
         use_output: 'default',
diff --git a/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.ts b/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.ts
index b94fc39e0567cc..639f20eb088281 100644
--- a/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.ts
+++ b/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.ts
@@ -3,29 +3,29 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { PackageConfig, FullAgentConfigInput, FullAgentConfigInputStream } from '../types';
+import { PackagePolicy, FullAgentPolicyInput, FullAgentPolicyInputStream } from '../types';
 import { DEFAULT_OUTPUT } from '../constants';
 
-export const storedPackageConfigsToAgentInputs = (
-  packageConfigs: PackageConfig[]
-): FullAgentConfigInput[] => {
-  const fullInputs: FullAgentConfigInput[] = [];
+export const storedPackagePoliciesToAgentInputs = (
+  packagePolicies: PackagePolicy[]
+): FullAgentPolicyInput[] => {
+  const fullInputs: FullAgentPolicyInput[] = [];
 
-  packageConfigs.forEach((packageConfig) => {
-    if (!packageConfig.enabled || !packageConfig.inputs || !packageConfig.inputs.length) {
+  packagePolicies.forEach((packagePolicy) => {
+    if (!packagePolicy.enabled || !packagePolicy.inputs || !packagePolicy.inputs.length) {
       return;
     }
-    packageConfig.inputs.forEach((input) => {
+    packagePolicy.inputs.forEach((input) => {
       if (!input.enabled) {
         return;
       }
 
-      const fullInput: FullAgentConfigInput = {
-        id: packageConfig.id || packageConfig.name,
-        name: packageConfig.name,
+      const fullInput: FullAgentPolicyInput = {
+        id: packagePolicy.id || packagePolicy.name,
+        name: packagePolicy.name,
         type: input.type,
         data_stream: {
-          namespace: packageConfig.namespace || 'default',
+          namespace: packagePolicy.namespace || 'default',
         },
         use_output: DEFAULT_OUTPUT.name,
         ...Object.entries(input.config || {}).reduce((acc, [key, { value }]) => {
@@ -35,7 +35,7 @@ export const storedPackageConfigsToAgentInputs = (
         streams: input.streams
           .filter((stream) => stream.enabled)
           .map((stream) => {
-            const fullStream: FullAgentConfigInputStream = {
+            const fullStream: FullAgentPolicyInputStream = {
               id: stream.id,
               data_stream: stream.data_stream,
               ...stream.compiled_stream,
@@ -48,11 +48,11 @@ export const storedPackageConfigsToAgentInputs = (
           }),
       };
 
-      if (packageConfig.package) {
+      if (packagePolicy.package) {
         fullInput.meta = {
           package: {
-            name: packageConfig.package.name,
-            version: packageConfig.package.version,
+            name: packagePolicy.package.name,
+            version: packagePolicy.package.version,
           },
         };
       }
diff --git a/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts b/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts
index 1f4cd43247be17..21196644ea23c2 100644
--- a/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts
+++ b/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { PackageInfo, InstallationStatus } from '../types';
-import { packageToPackageConfig, packageToPackageConfigInputs } from './package_to_config';
+import { packageToPackagePolicy, packageToPackagePolicyInputs } from './package_to_config';
 
 describe('Ingest Manager - packageToConfig', () => {
   const mockPackage: PackageInfo = {
@@ -31,15 +31,15 @@ describe('Ingest Manager - packageToConfig', () => {
     status: InstallationStatus.notInstalled,
   };
 
-  describe('packageToPackageConfigInputs', () => {
+  describe('packageToPackagePolicyInputs', () => {
     it('returns empty array for packages with no config templates', () => {
-      expect(packageToPackageConfigInputs(mockPackage)).toEqual([]);
-      expect(packageToPackageConfigInputs({ ...mockPackage, config_templates: [] })).toEqual([]);
+      expect(packageToPackagePolicyInputs(mockPackage)).toEqual([]);
+      expect(packageToPackagePolicyInputs({ ...mockPackage, config_templates: [] })).toEqual([]);
     });
 
     it('returns empty array for packages with a config template but no inputs', () => {
       expect(
-        packageToPackageConfigInputs(({
+        packageToPackagePolicyInputs(({
           ...mockPackage,
           config_templates: [{ inputs: [] }],
         } as unknown) as PackageInfo)
@@ -48,13 +48,13 @@ describe('Ingest Manager - packageToConfig', () => {
 
     it('returns inputs with no streams for packages with no streams', () => {
       expect(
-        packageToPackageConfigInputs(({
+        packageToPackagePolicyInputs(({
           ...mockPackage,
           config_templates: [{ inputs: [{ type: 'foo' }] }],
         } as unknown) as PackageInfo)
       ).toEqual([{ type: 'foo', enabled: true, streams: [] }]);
       expect(
-        packageToPackageConfigInputs(({
+        packageToPackagePolicyInputs(({
           ...mockPackage,
           config_templates: [{ inputs: [{ type: 'foo' }, { type: 'bar' }] }],
         } as unknown) as PackageInfo)
@@ -66,7 +66,7 @@ describe('Ingest Manager - packageToConfig', () => {
 
     it('returns inputs with streams for packages with streams', () => {
       expect(
-        packageToPackageConfigInputs(({
+        packageToPackagePolicyInputs(({
           ...mockPackage,
           datasets: [
             { type: 'logs', name: 'foo', streams: [{ input: 'foo' }] },
@@ -100,7 +100,7 @@ describe('Ingest Manager - packageToConfig', () => {
 
     it('returns inputs with streams configurations for packages with stream vars', () => {
       expect(
-        packageToPackageConfigInputs(({
+        packageToPackagePolicyInputs(({
           ...mockPackage,
           datasets: [
             {
@@ -171,7 +171,7 @@ describe('Ingest Manager - packageToConfig', () => {
 
     it('returns inputs with streams configurations for packages with stream and input vars', () => {
       expect(
-        packageToPackageConfigInputs(({
+        packageToPackagePolicyInputs(({
           ...mockPackage,
           datasets: [
             {
@@ -315,9 +315,9 @@ describe('Ingest Manager - packageToConfig', () => {
     });
   });
 
-  describe('packageToPackageConfig', () => {
-    it('returns package config with default name', () => {
-      expect(packageToPackageConfig(mockPackage, '1', '2')).toEqual({
+  describe('packageToPackagePolicy', () => {
+    it('returns package policy with default name', () => {
+      expect(packageToPackagePolicy(mockPackage, '1', '2')).toEqual({
         config_id: '1',
         namespace: '',
         enabled: true,
@@ -331,13 +331,13 @@ describe('Ingest Manager - packageToConfig', () => {
         },
       });
     });
-    it('returns package config with custom name', () => {
-      expect(packageToPackageConfig(mockPackage, '1', '2', 'default', 'pkgConfig-1')).toEqual({
+    it('returns package policy with custom name', () => {
+      expect(packageToPackagePolicy(mockPackage, '1', '2', 'default', 'pkgPolicy-1')).toEqual({
         config_id: '1',
         namespace: 'default',
         enabled: true,
         inputs: [],
-        name: 'pkgConfig-1',
+        name: 'pkgPolicy-1',
         output_id: '2',
         package: {
           name: 'mock-package',
@@ -346,21 +346,21 @@ describe('Ingest Manager - packageToConfig', () => {
         },
       });
     });
-    it('returns package config with namespace and description', () => {
+    it('returns package policy with namespace and description', () => {
       expect(
-        packageToPackageConfig(
+        packageToPackagePolicy(
           mockPackage,
           '1',
           '2',
           'mock-namespace',
-          'pkgConfig-1',
+          'pkgPolicy-1',
           'Test description'
         )
       ).toEqual({
         config_id: '1',
         enabled: true,
         inputs: [],
-        name: 'pkgConfig-1',
+        name: 'pkgPolicy-1',
         namespace: 'mock-namespace',
         description: 'Test description',
         output_id: '2',
@@ -371,20 +371,20 @@ describe('Ingest Manager - packageToConfig', () => {
         },
       });
     });
-    it('returns package config with inputs', () => {
+    it('returns package policy with inputs', () => {
       const mockPackageWithConfigTemplates = ({
         ...mockPackage,
         config_templates: [{ inputs: [{ type: 'foo' }] }],
       } as unknown) as PackageInfo;
 
       expect(
-        packageToPackageConfig(mockPackageWithConfigTemplates, '1', '2', 'default', 'pkgConfig-1')
+        packageToPackagePolicy(mockPackageWithConfigTemplates, '1', '2', 'default', 'pkgPolicy-1')
       ).toEqual({
         config_id: '1',
         namespace: 'default',
         enabled: true,
         inputs: [{ type: 'foo', enabled: true, streams: [] }],
-        name: 'pkgConfig-1',
+        name: 'pkgPolicy-1',
         output_id: '2',
         package: {
           name: 'mock-package',
diff --git a/x-pack/plugins/ingest_manager/common/services/package_to_config.ts b/x-pack/plugins/ingest_manager/common/services/package_to_config.ts
index 184b44cb9e5307..0f752be6d1d605 100644
--- a/x-pack/plugins/ingest_manager/common/services/package_to_config.ts
+++ b/x-pack/plugins/ingest_manager/common/services/package_to_config.ts
@@ -8,12 +8,12 @@ import {
   RegistryConfigTemplate,
   RegistryVarsEntry,
   RegistryStream,
-  PackageConfig,
-  PackageConfigConfigRecord,
-  PackageConfigConfigRecordEntry,
-  PackageConfigInput,
-  PackageConfigInputStream,
-  NewPackageConfig,
+  PackagePolicy,
+  PackagePolicyConfigRecord,
+  PackagePolicyConfigRecordEntry,
+  PackagePolicyInput,
+  PackagePolicyInputStream,
+  NewPackagePolicy,
 } from '../types';
 
 const getStreamsForInputType = (
@@ -40,27 +40,27 @@ const getStreamsForInputType = (
 };
 
 /*
- * This service creates a package config inputs definition from defaults provided in package info
+ * This service creates a package policy inputs definition from defaults provided in package info
  */
-export const packageToPackageConfigInputs = (packageInfo: PackageInfo): PackageConfig['inputs'] => {
-  const inputs: PackageConfig['inputs'] = [];
+export const packageToPackagePolicyInputs = (packageInfo: PackageInfo): PackagePolicy['inputs'] => {
+  const inputs: PackagePolicy['inputs'] = [];
 
-  // Assume package will only ever ship one package config template for now
-  const packageConfigTemplate: RegistryConfigTemplate | null =
+  // Assume package will only ever ship one package policy template for now
+  const packagePolicyTemplate: RegistryConfigTemplate | null =
     packageInfo.config_templates && packageInfo.config_templates[0]
       ? packageInfo.config_templates[0]
       : null;
 
-  // Create package config input property
-  if (packageConfigTemplate?.inputs?.length) {
-    // Map each package package config input to agent config package config input
-    packageConfigTemplate.inputs.forEach((packageInput) => {
+  // Create package policy input property
+  if (packagePolicyTemplate?.inputs?.length) {
+    // Map each package package policy input to agent policy package policy input
+    packagePolicyTemplate.inputs.forEach((packageInput) => {
       // Reduces registry var def into config object entry
       const varsReducer = (
-        configObject: PackageConfigConfigRecord,
+        configObject: PackagePolicyConfigRecord,
         registryVar: RegistryVarsEntry
-      ): PackageConfigConfigRecord => {
-        const configEntry: PackageConfigConfigRecordEntry = {
+      ): PackagePolicyConfigRecord => {
+        const configEntry: PackagePolicyConfigRecordEntry = {
           value: !registryVar.default && registryVar.multi ? [] : registryVar.default,
         };
         if (registryVar.type) {
@@ -70,12 +70,12 @@ export const packageToPackageConfigInputs = (packageInfo: PackageInfo): PackageC
         return configObject;
       };
 
-      // Map each package input stream into package config input stream
-      const streams: PackageConfigInputStream[] = getStreamsForInputType(
+      // Map each package input stream into package policy input stream
+      const streams: PackagePolicyInputStream[] = getStreamsForInputType(
         packageInput.type,
         packageInfo
       ).map((packageStream) => {
-        const stream: PackageConfigInputStream = {
+        const stream: PackagePolicyInputStream = {
           id: `${packageInput.type}-${packageStream.data_stream.dataset}`,
           enabled: packageStream.enabled === false ? false : true,
           data_stream: packageStream.data_stream,
@@ -86,7 +86,7 @@ export const packageToPackageConfigInputs = (packageInfo: PackageInfo): PackageC
         return stream;
       });
 
-      const input: PackageConfigInput = {
+      const input: PackagePolicyInput = {
         type: packageInput.type,
         enabled: streams.length ? !!streams.find((stream) => stream.enabled) : true,
         streams,
@@ -104,23 +104,23 @@ export const packageToPackageConfigInputs = (packageInfo: PackageInfo): PackageC
 };
 
 /**
- * Builds a `NewPackageConfig` structure based on a package
+ * Builds a `NewPackagePolicy` structure based on a package
  *
  * @param packageInfo
- * @param configId
+ * @param agentPolicyId
  * @param outputId
- * @param packageConfigName
+ * @param packagePolicyName
  */
-export const packageToPackageConfig = (
+export const packageToPackagePolicy = (
   packageInfo: PackageInfo,
-  configId: string,
+  agentPolicyId: string,
   outputId: string,
   namespace: string = '',
-  packageConfigName?: string,
+  packagePolicyName?: string,
   description?: string
-): NewPackageConfig => {
+): NewPackagePolicy => {
   return {
-    name: packageConfigName || `${packageInfo.name}-1`,
+    name: packagePolicyName || `${packageInfo.name}-1`,
     namespace,
     description,
     package: {
@@ -129,8 +129,8 @@ export const packageToPackageConfig = (
       version: packageInfo.version,
     },
     enabled: true,
-    config_id: configId,
+    config_id: agentPolicyId,
     output_id: outputId,
-    inputs: packageToPackageConfigInputs(packageInfo),
+    inputs: packageToPackagePolicyInputs(packageInfo),
   };
 };
diff --git a/x-pack/plugins/ingest_manager/common/services/routes.ts b/x-pack/plugins/ingest_manager/common/services/routes.ts
index 49de9a4d8fd854..1d802739a1b860 100644
--- a/x-pack/plugins/ingest_manager/common/services/routes.ts
+++ b/x-pack/plugins/ingest_manager/common/services/routes.ts
@@ -6,8 +6,8 @@
 import {
   EPM_API_ROOT,
   EPM_API_ROUTES,
-  PACKAGE_CONFIG_API_ROUTES,
-  AGENT_CONFIG_API_ROUTES,
+  PACKAGE_POLICY_API_ROUTES,
+  AGENT_POLICY_API_ROUTES,
   DATA_STREAM_API_ROUTES,
   FLEET_SETUP_API_ROUTES,
   AGENT_API_ROUTES,
@@ -48,61 +48,61 @@ export const epmRouteService = {
   },
 };
 
-export const packageConfigRouteService = {
+export const packagePolicyRouteService = {
   getListPath: () => {
-    return PACKAGE_CONFIG_API_ROUTES.LIST_PATTERN;
+    return PACKAGE_POLICY_API_ROUTES.LIST_PATTERN;
   },
 
-  getInfoPath: (packageConfigId: string) => {
-    return PACKAGE_CONFIG_API_ROUTES.INFO_PATTERN.replace('{packageConfigId}', packageConfigId);
+  getInfoPath: (packagePolicyId: string) => {
+    return PACKAGE_POLICY_API_ROUTES.INFO_PATTERN.replace('{packagePolicyId}', packagePolicyId);
   },
 
   getCreatePath: () => {
-    return PACKAGE_CONFIG_API_ROUTES.CREATE_PATTERN;
+    return PACKAGE_POLICY_API_ROUTES.CREATE_PATTERN;
   },
 
-  getUpdatePath: (packageConfigId: string) => {
-    return PACKAGE_CONFIG_API_ROUTES.UPDATE_PATTERN.replace('{packageConfigId}', packageConfigId);
+  getUpdatePath: (packagePolicyId: string) => {
+    return PACKAGE_POLICY_API_ROUTES.UPDATE_PATTERN.replace('{packagePolicyId}', packagePolicyId);
   },
 
   getDeletePath: () => {
-    return PACKAGE_CONFIG_API_ROUTES.DELETE_PATTERN;
+    return PACKAGE_POLICY_API_ROUTES.DELETE_PATTERN;
   },
 };
 
-export const agentConfigRouteService = {
+export const agentPolicyRouteService = {
   getListPath: () => {
-    return AGENT_CONFIG_API_ROUTES.LIST_PATTERN;
+    return AGENT_POLICY_API_ROUTES.LIST_PATTERN;
   },
 
-  getInfoPath: (agentConfigId: string) => {
-    return AGENT_CONFIG_API_ROUTES.INFO_PATTERN.replace('{agentConfigId}', agentConfigId);
+  getInfoPath: (agentPolicyId: string) => {
+    return AGENT_POLICY_API_ROUTES.INFO_PATTERN.replace('{agentPolicyId}', agentPolicyId);
   },
 
   getCreatePath: () => {
-    return AGENT_CONFIG_API_ROUTES.CREATE_PATTERN;
+    return AGENT_POLICY_API_ROUTES.CREATE_PATTERN;
   },
 
-  getUpdatePath: (agentConfigId: string) => {
-    return AGENT_CONFIG_API_ROUTES.UPDATE_PATTERN.replace('{agentConfigId}', agentConfigId);
+  getUpdatePath: (agentPolicyId: string) => {
+    return AGENT_POLICY_API_ROUTES.UPDATE_PATTERN.replace('{agentPolicyId}', agentPolicyId);
   },
 
-  getCopyPath: (agentConfigId: string) => {
-    return AGENT_CONFIG_API_ROUTES.COPY_PATTERN.replace('{agentConfigId}', agentConfigId);
+  getCopyPath: (agentPolicyId: string) => {
+    return AGENT_POLICY_API_ROUTES.COPY_PATTERN.replace('{agentPolicyId}', agentPolicyId);
   },
 
   getDeletePath: () => {
-    return AGENT_CONFIG_API_ROUTES.DELETE_PATTERN;
+    return AGENT_POLICY_API_ROUTES.DELETE_PATTERN;
   },
 
-  getInfoFullPath: (agentConfigId: string) => {
-    return AGENT_CONFIG_API_ROUTES.FULL_INFO_PATTERN.replace('{agentConfigId}', agentConfigId);
+  getInfoFullPath: (agentPolicyId: string) => {
+    return AGENT_POLICY_API_ROUTES.FULL_INFO_PATTERN.replace('{agentPolicyId}', agentPolicyId);
   },
 
-  getInfoFullDownloadPath: (agentConfigId: string) => {
-    return AGENT_CONFIG_API_ROUTES.FULL_INFO_DOWNLOAD_PATTERN.replace(
-      '{agentConfigId}',
-      agentConfigId
+  getInfoFullDownloadPath: (agentPolicyId: string) => {
+    return AGENT_POLICY_API_ROUTES.FULL_INFO_DOWNLOAD_PATTERN.replace(
+      '{agentPolicyId}',
+      agentPolicyId
     );
   },
 };
diff --git a/x-pack/plugins/ingest_manager/common/types/index.ts b/x-pack/plugins/ingest_manager/common/types/index.ts
index 69bcc498c18be4..cafd0f03f66e29 100644
--- a/x-pack/plugins/ingest_manager/common/types/index.ts
+++ b/x-pack/plugins/ingest_manager/common/types/index.ts
@@ -22,8 +22,8 @@ export interface IngestManagerConfigType {
       host?: string;
       ca_sha256?: string;
     };
-    agentConfigRolloutRateLimitIntervalMs: number;
-    agentConfigRolloutRateLimitRequestPerInterval: number;
+    agentPolicyRolloutRateLimitIntervalMs: number;
+    agentPolicyRolloutRateLimitRequestPerInterval: number;
   };
 }
 
diff --git a/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts b/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts
index cdaea1cc5f9a4b..e1a62eb7296035 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts
@@ -3,15 +3,15 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { PackageConfig, PackageConfigPackage } from './package_config';
+import { PackagePolicy, PackagePolicyPackage } from './package_config';
 import { Output } from './output';
 
-export enum AgentConfigStatus {
+export enum AgentPolicyStatus {
   Active = 'active',
   Inactive = 'inactive',
 }
 
-export interface NewAgentConfig {
+export interface NewAgentPolicy {
   name: string;
   namespace: string;
   description?: string;
@@ -19,18 +19,18 @@ export interface NewAgentConfig {
   monitoring_enabled?: Array<'logs' | 'metrics'>;
 }
 
-export interface AgentConfig extends NewAgentConfig {
+export interface AgentPolicy extends NewAgentPolicy {
   id: string;
-  status: AgentConfigStatus;
-  package_configs: string[] | PackageConfig[];
+  status: AgentPolicyStatus;
+  package_configs: string[] | PackagePolicy[];
   updated_at: string;
   updated_by: string;
   revision: number;
 }
 
-export type AgentConfigSOAttributes = Omit<AgentConfig, 'id'>;
+export type AgentPolicySOAttributes = Omit<AgentPolicy, 'id'>;
 
-export interface FullAgentConfigInputStream {
+export interface FullAgentPolicyInputStream {
   id: string;
   data_stream: {
     dataset: string;
@@ -39,28 +39,28 @@ export interface FullAgentConfigInputStream {
   [key: string]: any;
 }
 
-export interface FullAgentConfigInput {
+export interface FullAgentPolicyInput {
   id: string;
   name: string;
   type: string;
   data_stream: { namespace: string };
   use_output: string;
   meta?: {
-    package?: Pick<PackageConfigPackage, 'name' | 'version'>;
+    package?: Pick<PackagePolicyPackage, 'name' | 'version'>;
     [key: string]: unknown;
   };
-  streams: FullAgentConfigInputStream[];
+  streams: FullAgentPolicyInputStream[];
   [key: string]: any;
 }
 
-export interface FullAgentConfig {
+export interface FullAgentPolicy {
   id: string;
   outputs: {
     [key: string]: Pick<Output, 'type' | 'hosts' | 'ca_sha256' | 'api_key'> & {
       [key: string]: any;
     };
   };
-  inputs: FullAgentConfigInput[];
+  inputs: FullAgentPolicyInput[];
   revision?: number;
   agent?: {
     monitoring: {
diff --git a/x-pack/plugins/ingest_manager/common/types/models/package_config.ts b/x-pack/plugins/ingest_manager/common/types/models/package_config.ts
index 635afbd47850ed..b1aef24b88c1d6 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/package_config.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/package_config.ts
@@ -4,64 +4,64 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export interface PackageConfigPackage {
+export interface PackagePolicyPackage {
   name: string;
   title: string;
   version: string;
 }
 
-export interface PackageConfigConfigRecordEntry {
+export interface PackagePolicyConfigRecordEntry {
   type?: string;
   value?: any;
 }
 
-export type PackageConfigConfigRecord = Record<string, PackageConfigConfigRecordEntry>;
+export type PackagePolicyConfigRecord = Record<string, PackagePolicyConfigRecordEntry>;
 
-export interface NewPackageConfigInputStream {
+export interface NewPackagePolicyInputStream {
   id: string;
   enabled: boolean;
   data_stream: {
     dataset: string;
     type: string;
   };
-  vars?: PackageConfigConfigRecord;
-  config?: PackageConfigConfigRecord;
+  vars?: PackagePolicyConfigRecord;
+  config?: PackagePolicyConfigRecord;
 }
 
-export interface PackageConfigInputStream extends NewPackageConfigInputStream {
+export interface PackagePolicyInputStream extends NewPackagePolicyInputStream {
   compiled_stream?: any;
 }
 
-export interface NewPackageConfigInput {
+export interface NewPackagePolicyInput {
   type: string;
   enabled: boolean;
-  vars?: PackageConfigConfigRecord;
-  config?: PackageConfigConfigRecord;
-  streams: NewPackageConfigInputStream[];
+  vars?: PackagePolicyConfigRecord;
+  config?: PackagePolicyConfigRecord;
+  streams: NewPackagePolicyInputStream[];
 }
 
-export interface PackageConfigInput extends Omit<NewPackageConfigInput, 'streams'> {
-  streams: PackageConfigInputStream[];
+export interface PackagePolicyInput extends Omit<NewPackagePolicyInput, 'streams'> {
+  streams: PackagePolicyInputStream[];
 }
 
-export interface NewPackageConfig {
+export interface NewPackagePolicy {
   name: string;
   description?: string;
   namespace: string;
   enabled: boolean;
   config_id: string;
   output_id: string;
-  package?: PackageConfigPackage;
-  inputs: NewPackageConfigInput[];
+  package?: PackagePolicyPackage;
+  inputs: NewPackagePolicyInput[];
 }
 
-export interface UpdatePackageConfig extends NewPackageConfig {
+export interface UpdatePackagePolicy extends NewPackagePolicy {
   version?: string;
 }
 
-export interface PackageConfig extends Omit<NewPackageConfig, 'inputs'> {
+export interface PackagePolicy extends Omit<NewPackagePolicy, 'inputs'> {
   id: string;
-  inputs: PackageConfigInput[];
+  inputs: PackagePolicyInput[];
   version?: string;
   revision: number;
   updated_at: string;
@@ -70,4 +70,4 @@ export interface PackageConfig extends Omit<NewPackageConfig, 'inputs'> {
   created_by: string;
 }
 
-export type PackageConfigSOAttributes = Omit<PackageConfig, 'id' | 'version'>;
+export type PackagePolicySOAttributes = Omit<PackagePolicy, 'id' | 'version'>;
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/agent_config.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/agent_config.ts
index 4e1612d144edef..4683727ed51ac3 100644
--- a/x-pack/plugins/ingest_manager/common/types/rest_spec/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/agent_config.ts
@@ -3,81 +3,81 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { AgentConfig, NewAgentConfig, FullAgentConfig } from '../models';
+import { AgentPolicy, NewAgentPolicy, FullAgentPolicy } from '../models';
 import { ListWithKuery } from './common';
 
-export interface GetAgentConfigsRequest {
+export interface GetAgentPoliciesRequest {
   query: ListWithKuery & {
     full?: boolean;
   };
 }
 
-export type GetAgentConfigsResponseItem = AgentConfig & { agents?: number };
+export type GetAgentPoliciesResponseItem = AgentPolicy & { agents?: number };
 
-export interface GetAgentConfigsResponse {
-  items: GetAgentConfigsResponseItem[];
+export interface GetAgentPoliciesResponse {
+  items: GetAgentPoliciesResponseItem[];
   total: number;
   page: number;
   perPage: number;
   success: boolean;
 }
 
-export interface GetOneAgentConfigRequest {
+export interface GetOneAgentPolicyRequest {
   params: {
-    agentConfigId: string;
+    agentPolicyId: string;
   };
 }
 
-export interface GetOneAgentConfigResponse {
-  item: AgentConfig;
+export interface GetOneAgentPolicyResponse {
+  item: AgentPolicy;
   success: boolean;
 }
 
-export interface CreateAgentConfigRequest {
-  body: NewAgentConfig;
+export interface CreateAgentPolicyRequest {
+  body: NewAgentPolicy;
 }
 
-export interface CreateAgentConfigResponse {
-  item: AgentConfig;
+export interface CreateAgentPolicyResponse {
+  item: AgentPolicy;
   success: boolean;
 }
 
-export type UpdateAgentConfigRequest = GetOneAgentConfigRequest & {
-  body: NewAgentConfig;
+export type UpdateAgentPolicyRequest = GetOneAgentPolicyRequest & {
+  body: NewAgentPolicy;
 };
 
-export interface UpdateAgentConfigResponse {
-  item: AgentConfig;
+export interface UpdateAgentPolicyResponse {
+  item: AgentPolicy;
   success: boolean;
 }
 
-export interface CopyAgentConfigRequest {
-  body: Pick<AgentConfig, 'name' | 'description'>;
+export interface CopyAgentPolicyRequest {
+  body: Pick<AgentPolicy, 'name' | 'description'>;
 }
 
-export interface CopyAgentConfigResponse {
-  item: AgentConfig;
+export interface CopyAgentPolicyResponse {
+  item: AgentPolicy;
   success: boolean;
 }
 
-export interface DeleteAgentConfigRequest {
+export interface DeleteAgentPolicyRequest {
   body: {
-    agentConfigId: string;
+    agentPolicyId: string;
   };
 }
 
-export interface DeleteAgentConfigResponse {
+export interface DeleteAgentPolicyResponse {
   id: string;
   success: boolean;
 }
 
-export interface GetFullAgentConfigRequest {
+export interface GetFullAgentPolicyRequest {
   params: {
-    agentConfigId: string;
+    agentPolicyId: string;
   };
 }
 
-export interface GetFullAgentConfigResponse {
-  item: FullAgentConfig;
+export interface GetFullAgentPolicyResponse {
+  item: FullAgentPolicy;
   success: boolean;
 }
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/package_config.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/package_config.ts
index e62645debb7487..e5bba3d6deab3e 100644
--- a/x-pack/plugins/ingest_manager/common/types/rest_spec/package_config.ts
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/package_config.ts
@@ -3,9 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { PackageConfig, NewPackageConfig, UpdatePackageConfig } from '../models';
+import { PackagePolicy, NewPackagePolicy, UpdatePackagePolicy } from '../models';
 
-export interface GetPackageConfigsRequest {
+export interface GetPackagePoliciesRequest {
   query: {
     page: number;
     perPage: number;
@@ -13,47 +13,47 @@ export interface GetPackageConfigsRequest {
   };
 }
 
-export interface GetPackageConfigsResponse {
-  items: PackageConfig[];
+export interface GetPackagePoliciesResponse {
+  items: PackagePolicy[];
   total: number;
   page: number;
   perPage: number;
   success: boolean;
 }
 
-export interface GetOnePackageConfigRequest {
+export interface GetOnePackagePolicyRequest {
   params: {
-    packageConfigId: string;
+    packagePolicyId: string;
   };
 }
 
-export interface GetOnePackageConfigResponse {
-  item: PackageConfig;
+export interface GetOnePackagePolicyResponse {
+  item: PackagePolicy;
   success: boolean;
 }
 
-export interface CreatePackageConfigRequest {
-  body: NewPackageConfig;
+export interface CreatePackagePolicyRequest {
+  body: NewPackagePolicy;
 }
 
-export interface CreatePackageConfigResponse {
-  item: PackageConfig;
+export interface CreatePackagePolicyResponse {
+  item: PackagePolicy;
   success: boolean;
 }
 
-export type UpdatePackageConfigRequest = GetOnePackageConfigRequest & {
-  body: UpdatePackageConfig;
+export type UpdatePackagePolicyRequest = GetOnePackagePolicyRequest & {
+  body: UpdatePackagePolicy;
 };
 
-export type UpdatePackageConfigResponse = CreatePackageConfigResponse;
+export type UpdatePackagePolicyResponse = CreatePackagePolicyResponse;
 
-export interface DeletePackageConfigsRequest {
+export interface DeletePackagePoliciesRequest {
   body: {
-    packageConfigIds: string[];
+    packagePolicyIds: string[];
   };
 }
 
-export type DeletePackageConfigsResponse = Array<{
+export type DeletePackagePoliciesResponse = Array<{
   id: string;
   success: boolean;
 }>;
diff --git a/x-pack/plugins/ingest_manager/dev_docs/definitions.md b/x-pack/plugins/ingest_manager/dev_docs/definitions.md
index bd207806110554..7c318451d57972 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/definitions.md
+++ b/x-pack/plugins/ingest_manager/dev_docs/definitions.md
@@ -5,12 +5,12 @@ Overall documentation of Ingest Management is now maintained in the `elastic/sta
 
 This section is to define terms used across ingest management.
 
-## Package Config
+## Package policy
 
-A package config is a definition on how to collect data from a service, for example `nginx`. A package config contains
+A package policy is a definition on how to collect data from a service, for example `nginx`. A package policy contains
 definitions for one or multiple inputs and each input can contain one or multiple streams.
 
-With the example of the nginx Package Config, it contains two inputs: `logs` and `nginx/metrics`. Logs and metrics are collected
+With the example of the nginx Package policy, it contains two inputs: `logs` and `nginx/metrics`. Logs and metrics are collected
 differently. The `logs` input contains two streams, `access` and `error`, the `nginx/metrics` input contains the stubstatus stream.
 
 ## Data Stream
@@ -40,15 +40,15 @@ the index strategy is sent to Data Streams.
 
 ## Input
 
-An input is the configuration unit in an Agent Config that defines the options on how to collect data from
+An input is the configuration unit in an Agent policy that defines the options on how to collect data from
 an endpoint. This could be username / password which are need to authenticate with a service or a host url
 as an example.
 
-An input is part of a Package Config and contains streams.
+An input is part of a Package policy and contains streams.
 
 ## Integration
 
-An integration is a package with the type integration. An integration package has at least 1 package config
+An integration is a package with the type integration. An integration package has at least 1 package policy
 and usually collects data from / about a service.
 
 ## Namespace
@@ -60,9 +60,9 @@ A user-specified string that will be used to part of the index name in Elasticse
 A package contains all the assets for the Elastic Stack. A more detailed definition of a
 package can be found under https://github.com/elastic/package-registry.
 
-Besides the assets, a package contains the package config definitions with its inputs and streams.
+Besides the assets, a package contains the package policy definitions with its inputs and streams.
 
 ## Stream
 
-A stream is a configuration unit in the Elastic Agent config. A stream is part of an input and defines how the data
+A stream is a configuration unit in the Elastic Agent policy. A stream is part of an input and defines how the data
 fetched by this input should be processed and which Data Stream to send it to.
diff --git a/x-pack/plugins/ingest_manager/dev_docs/fleet_agents_interactions_detailed.md b/x-pack/plugins/ingest_manager/dev_docs/fleet_agents_interactions_detailed.md
index d563712fdf0a69..c87294c1aae143 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/fleet_agents_interactions_detailed.md
+++ b/x-pack/plugins/ingest_manager/dev_docs/fleet_agents_interactions_detailed.md
@@ -29,8 +29,8 @@ When an agent checkin fleet:
 - verify the access token is a valid ES API key
 - retrieve the agent (SO associated to this api key id)
 - Insert events SO
-- If the Agent configuration has been updated since last checkin
-  - generate the agent config
+- If the Agent policy has been updated since last checkin
+  - generate the agent policy
   - Create the missing API key for agent -> ES communication
 - Save the new agent (with last checkin date) in a SavedObject with keys encrypted inside the agent
 
@@ -44,6 +44,6 @@ An agent can acknowledge one or multiple actions by calling `POST /api/ingest_ma
 
 ## Other interactions
 
-### Agent Configuration update
+### Agent policy update
 
 When a configuration is updated, every SO agent running this configuration is updated with a timestamp of the latest config.
diff --git a/x-pack/plugins/ingest_manager/dev_docs/schema/agent_checkin.mml b/x-pack/plugins/ingest_manager/dev_docs/schema/agent_checkin.mml
index a5332c50ab9472..4f2eab1ce06276 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/schema/agent_checkin.mml
+++ b/x-pack/plugins/ingest_manager/dev_docs/schema/agent_checkin.mml
@@ -13,7 +13,7 @@ sequenceDiagram
   end
 
   alt If configuration updated since last checkin
-    Fleet API->>SavedObjects: getAgentConfiguration(configId)
+    Fleet API->>SavedObjects: getAgentPolicy(configId)
 
     opt If there is not API Key for default output
       Fleet API->>Elasticsearch: createAgentESApiKey()
@@ -34,4 +34,4 @@ sequenceDiagram
   end
 
 
-  Fleet API->>Agent: actions|agent config
+  Fleet API->>Agent: actions|agent policy
diff --git a/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml b/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml
index d157bf32fa66b7..d740adecd30e40 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml
+++ b/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml
@@ -18,7 +18,7 @@ classDiagram
     last_checkin
     local_metadata
     user_provided_metadata
-    actions // Encrypted  contains new agent config
+    actions // Encrypted  contains new agent policy
     default_api_key // Encrypted
 
 	}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/home_integration/tutorial_directory_notice.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/home_integration/tutorial_directory_notice.tsx
index 553623380dcc05..bc5435369f44a0 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/home_integration/tutorial_directory_notice.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/home_integration/tutorial_directory_notice.tsx
@@ -82,7 +82,7 @@ export const TutorialDirectoryNotice: TutorialDirectoryNoticeComponent = memo(()
           <FormattedMessage
             id="xpack.ingestManager.homeIntegration.tutorialDirectory.noticeText"
             defaultMessage="The Elastic Agent provides a simple, unified way to add monitoring for logs, metrics, and other types of data to your hosts.
-                You no longer need to install multiple Beats and other agents, which makes it easier and faster to deploy configurations across your infrastructure.
+                You no longer need to install multiple Beats and other agents, which makes it easier and faster to deploy policies across your infrastructure.
                 For more information, read our {blogPostLink}."
             values={{
               blogPostLink: (
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/home_integration/tutorial_module_notice.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/home_integration/tutorial_module_notice.tsx
index a26691bdd64a00..f4c5f0d140d24c 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/home_integration/tutorial_module_notice.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/home_integration/tutorial_module_notice.tsx
@@ -28,7 +28,7 @@ export const TutorialModuleNotice: TutorialModuleNoticeComponent = memo(({ modul
             <FormattedMessage
               id="xpack.ingestManager.homeIntegration.tutorialModule.noticeText"
               defaultMessage="{notePrefix} a newer version of this module is {availableAsIntegrationLink} in Ingest Manager Beta.
-              To learn more about agent configurations and the new Elastic Agent, read our {blogPostLink}."
+              To learn more about agent policies and the new Elastic Agent, read our {blogPostLink}."
               values={{
                 notePrefix: (
                   <strong>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx
index e8081e097fd429..be1b3df8a0c3eb 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx
@@ -167,7 +167,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
               'xpack.ingestManager.settings.integrationUpgradeEnabledFieldLabel',
               {
                 defaultMessage:
-                  'Automatically update integrations to the latest version to receive the latest assets. Agent configurations may need to be updated in order to use new features.',
+                  'Automatically update integrations to the latest version to receive the latest assets. Agent policies may need to be updated in order to use new features.',
               }
             ),
           },
@@ -210,7 +210,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
       <EuiText color="subdued" size="s">
         <FormattedMessage
           id="xpack.ingestManager.settings.globalOutputDescription"
-          defaultMessage="The global output is applied to all agent configurations and specifies where data is sent."
+          defaultMessage="The global output is applied to all agent policies and specifies where data is sent."
         />
       </EuiText>
       <EuiSpacer size="m" />
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/index.ts
index d31d66d889c965..185e1fa5eb0ce1 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/index.ts
@@ -7,11 +7,11 @@ export {
   PLUGIN_ID,
   EPM_API_ROUTES,
   AGENT_API_ROUTES,
-  AGENT_CONFIG_SAVED_OBJECT_TYPE,
+  AGENT_POLICY_SAVED_OBJECT_TYPE,
   AGENT_EVENT_SAVED_OBJECT_TYPE,
   AGENT_SAVED_OBJECT_TYPE,
   ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
-  PACKAGE_CONFIG_SAVED_OBJECT_TYPE,
+  PACKAGE_POLICY_SAVED_OBJECT_TYPE,
 } from '../../../../common';
 
 export * from './page_paths';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/page_paths.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/page_paths.ts
index 9f1088a94aa946..4a8dcfedc09361 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/page_paths.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/page_paths.ts
@@ -9,17 +9,17 @@ export type StaticPage =
   | 'integrations'
   | 'integrations_all'
   | 'integrations_installed'
-  | 'configurations'
-  | 'configurations_list'
+  | 'policies'
+  | 'policies_list'
   | 'fleet'
   | 'fleet_enrollment_tokens'
   | 'data_streams';
 
 export type DynamicPage =
   | 'integration_details'
-  | 'configuration_details'
-  | 'add_integration_from_configuration'
-  | 'add_integration_to_configuration'
+  | 'policy_details'
+  | 'add_integration_from_policy'
+  | 'add_integration_to_policy'
   | 'edit_integration'
   | 'fleet_agent_list'
   | 'fleet_agent_details';
@@ -40,13 +40,13 @@ export const PAGE_ROUTING_PATHS = {
   integrations_all: '/integrations',
   integrations_installed: '/integrations/installed',
   integration_details: '/integrations/detail/:pkgkey/:panel?',
-  configurations: '/configs',
-  configurations_list: '/configs',
-  configuration_details: '/configs/:configId/:tabId?',
-  configuration_details_settings: '/configs/:configId/settings',
-  add_integration_from_configuration: '/configs/:configId/add-integration',
-  add_integration_to_configuration: '/integrations/:pkgkey/add-integration',
-  edit_integration: '/configs/:configId/edit-integration/:packageConfigId',
+  policies: '/policies',
+  policies_list: '/policies',
+  policy_details: '/policies/:policyId/:tabId?',
+  policy_details_settings: '/policies/:policyId/settings',
+  add_integration_from_policy: '/policies/:policyId/add-integration',
+  add_integration_to_policy: '/integrations/:pkgkey/add-integration',
+  edit_integration: '/policies/:policyId/edit-integration/:packagePolicyId',
   fleet: '/fleet',
   fleet_agent_list: '/fleet/agents',
   fleet_agent_details: '/fleet/agents/:agentId/:tabId?',
@@ -68,13 +68,13 @@ export const pagePathGetters: {
   integrations_installed: () => '/integrations/installed',
   integration_details: ({ pkgkey, panel }) =>
     `/integrations/detail/${pkgkey}${panel ? `/${panel}` : ''}`,
-  configurations: () => '/configs',
-  configurations_list: () => '/configs',
-  configuration_details: ({ configId, tabId }) => `/configs/${configId}${tabId ? `/${tabId}` : ''}`,
-  add_integration_from_configuration: ({ configId }) => `/configs/${configId}/add-integration`,
-  add_integration_to_configuration: ({ pkgkey }) => `/integrations/${pkgkey}/add-integration`,
-  edit_integration: ({ configId, packageConfigId }) =>
-    `/configs/${configId}/edit-integration/${packageConfigId}`,
+  policies: () => '/policies',
+  policies_list: () => '/policies',
+  policy_details: ({ policyId, tabId }) => `/policies/${policyId}${tabId ? `/${tabId}` : ''}`,
+  add_integration_from_policy: ({ policyId }) => `/policies/${policyId}/add-integration`,
+  add_integration_to_policy: ({ pkgkey }) => `/integrations/${pkgkey}/add-integration`,
+  edit_integration: ({ policyId, packagePolicyId }) =>
+    `/policies/${policyId}/edit-integration/${packagePolicyId}`,
   fleet: () => '/fleet',
   fleet_agent_list: ({ kuery }) => `/fleet/agents${kuery ? `?kuery=${kuery}` : ''}`,
   fleet_agent_details: ({ agentId, tabId }) =>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_breadcrumbs.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_breadcrumbs.tsx
index 293638cff50bf1..387c2b7d594dda 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_breadcrumbs.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_breadcrumbs.tsx
@@ -72,51 +72,51 @@ const breadcrumbGetters: {
     },
     { text: pkgTitle },
   ],
-  configurations: () => [
+  policies: () => [
     BASE_BREADCRUMB,
     {
-      text: i18n.translate('xpack.ingestManager.breadcrumbs.configurationsPageTitle', {
-        defaultMessage: 'Configurations',
+      text: i18n.translate('xpack.ingestManager.breadcrumbs.policiesPageTitle', {
+        defaultMessage: 'Policies',
       }),
     },
   ],
-  configurations_list: () => [
+  policies_list: () => [
     BASE_BREADCRUMB,
     {
-      text: i18n.translate('xpack.ingestManager.breadcrumbs.configurationsPageTitle', {
-        defaultMessage: 'Configurations',
+      text: i18n.translate('xpack.ingestManager.breadcrumbs.policiesPageTitle', {
+        defaultMessage: 'Policies',
       }),
     },
   ],
-  configuration_details: ({ configName }) => [
+  policy_details: ({ configName }) => [
     BASE_BREADCRUMB,
     {
-      href: pagePathGetters.configurations(),
-      text: i18n.translate('xpack.ingestManager.breadcrumbs.configurationsPageTitle', {
-        defaultMessage: 'Configurations',
+      href: pagePathGetters.policies(),
+      text: i18n.translate('xpack.ingestManager.breadcrumbs.policiesPageTitle', {
+        defaultMessage: 'Policies',
       }),
     },
     { text: configName },
   ],
-  add_integration_from_configuration: ({ configName, configId }) => [
+  add_integration_from_policy: ({ configName, policyId }) => [
     BASE_BREADCRUMB,
     {
-      href: pagePathGetters.configurations(),
-      text: i18n.translate('xpack.ingestManager.breadcrumbs.configurationsPageTitle', {
-        defaultMessage: 'Configurations',
+      href: pagePathGetters.policies(),
+      text: i18n.translate('xpack.ingestManager.breadcrumbs.policiesPageTitle', {
+        defaultMessage: 'Policies',
       }),
     },
     {
-      href: pagePathGetters.configuration_details({ configId }),
+      href: pagePathGetters.policy_details({ policyId }),
       text: configName,
     },
     {
-      text: i18n.translate('xpack.ingestManager.breadcrumbs.addPackageConfigPageTitle', {
+      text: i18n.translate('xpack.ingestManager.breadcrumbs.addPackagePolicyPageTitle', {
         defaultMessage: 'Add integration',
       }),
     },
   ],
-  add_integration_to_configuration: ({ pkgTitle, pkgkey }) => [
+  add_integration_to_policy: ({ pkgTitle, pkgkey }) => [
     BASE_BREADCRUMB,
     {
       href: pagePathGetters.integrations(),
@@ -129,25 +129,25 @@ const breadcrumbGetters: {
       text: pkgTitle,
     },
     {
-      text: i18n.translate('xpack.ingestManager.breadcrumbs.addPackageConfigPageTitle', {
+      text: i18n.translate('xpack.ingestManager.breadcrumbs.addPackagePolicyPageTitle', {
         defaultMessage: 'Add integration',
       }),
     },
   ],
-  edit_integration: ({ configName, configId }) => [
+  edit_integration: ({ configName, policyId }) => [
     BASE_BREADCRUMB,
     {
-      href: pagePathGetters.configurations(),
-      text: i18n.translate('xpack.ingestManager.breadcrumbs.configurationsPageTitle', {
-        defaultMessage: 'Configurations',
+      href: pagePathGetters.policies(),
+      text: i18n.translate('xpack.ingestManager.breadcrumbs.policiesPageTitle', {
+        defaultMessage: 'Policies',
       }),
     },
     {
-      href: pagePathGetters.configuration_details({ configId }),
+      href: pagePathGetters.policy_details({ policyId }),
       text: configName,
     },
     {
-      text: i18n.translate('xpack.ingestManager.breadcrumbs.editPackageConfigPageTitle', {
+      text: i18n.translate('xpack.ingestManager.breadcrumbs.editPackagePolicyPageTitle', {
         defaultMessage: 'Edit integration',
       }),
     },
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_config.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_config.ts
index 0bb09c27310327..8707dcab9e5841 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_config.ts
@@ -9,100 +9,100 @@ import {
   useConditionalRequest,
   SendConditionalRequestConfig,
 } from './use_request';
-import { agentConfigRouteService } from '../../services';
+import { agentPolicyRouteService } from '../../services';
 import {
-  GetAgentConfigsRequest,
-  GetAgentConfigsResponse,
-  GetOneAgentConfigResponse,
-  GetFullAgentConfigResponse,
-  CreateAgentConfigRequest,
-  CreateAgentConfigResponse,
-  UpdateAgentConfigRequest,
-  UpdateAgentConfigResponse,
-  CopyAgentConfigRequest,
-  CopyAgentConfigResponse,
-  DeleteAgentConfigRequest,
-  DeleteAgentConfigResponse,
+  GetAgentPoliciesRequest,
+  GetAgentPoliciesResponse,
+  GetOneAgentPolicyResponse,
+  GetFullAgentPolicyResponse,
+  CreateAgentPolicyRequest,
+  CreateAgentPolicyResponse,
+  UpdateAgentPolicyRequest,
+  UpdateAgentPolicyResponse,
+  CopyAgentPolicyRequest,
+  CopyAgentPolicyResponse,
+  DeleteAgentPolicyRequest,
+  DeleteAgentPolicyResponse,
 } from '../../types';
 
-export const useGetAgentConfigs = (query?: GetAgentConfigsRequest['query']) => {
-  return useRequest<GetAgentConfigsResponse>({
-    path: agentConfigRouteService.getListPath(),
+export const useGetAgentPolicies = (query?: GetAgentPoliciesRequest['query']) => {
+  return useRequest<GetAgentPoliciesResponse>({
+    path: agentPolicyRouteService.getListPath(),
     method: 'get',
     query,
   });
 };
 
-export const useGetOneAgentConfig = (agentConfigId: string | undefined) => {
-  return useConditionalRequest<GetOneAgentConfigResponse>({
-    path: agentConfigId ? agentConfigRouteService.getInfoPath(agentConfigId) : undefined,
+export const useGetOneAgentPolicy = (agentPolicyId: string | undefined) => {
+  return useConditionalRequest<GetOneAgentPolicyResponse>({
+    path: agentPolicyId ? agentPolicyRouteService.getInfoPath(agentPolicyId) : undefined,
     method: 'get',
-    shouldSendRequest: !!agentConfigId,
+    shouldSendRequest: !!agentPolicyId,
   } as SendConditionalRequestConfig);
 };
 
-export const useGetOneAgentConfigFull = (agentConfigId: string) => {
-  return useRequest<GetFullAgentConfigResponse>({
-    path: agentConfigRouteService.getInfoFullPath(agentConfigId),
+export const useGetOneAgentPolicyFull = (agentPolicyId: string) => {
+  return useRequest<GetFullAgentPolicyResponse>({
+    path: agentPolicyRouteService.getInfoFullPath(agentPolicyId),
     method: 'get',
   });
 };
 
-export const sendGetOneAgentConfigFull = (
-  agentConfigId: string,
+export const sendGetOneAgentPolicyFull = (
+  agentPolicyId: string,
   query: { standalone?: boolean } = {}
 ) => {
-  return sendRequest<GetFullAgentConfigResponse>({
-    path: agentConfigRouteService.getInfoFullPath(agentConfigId),
+  return sendRequest<GetFullAgentPolicyResponse>({
+    path: agentPolicyRouteService.getInfoFullPath(agentPolicyId),
     method: 'get',
     query,
   });
 };
 
-export const sendGetOneAgentConfig = (agentConfigId: string) => {
-  return sendRequest<GetOneAgentConfigResponse>({
-    path: agentConfigRouteService.getInfoPath(agentConfigId),
+export const sendGetOneAgentPolicy = (agentPolicyId: string) => {
+  return sendRequest<GetOneAgentPolicyResponse>({
+    path: agentPolicyRouteService.getInfoPath(agentPolicyId),
     method: 'get',
   });
 };
 
-export const sendCreateAgentConfig = (
-  body: CreateAgentConfigRequest['body'],
+export const sendCreateAgentPolicy = (
+  body: CreateAgentPolicyRequest['body'],
   { withSysMonitoring }: { withSysMonitoring: boolean } = { withSysMonitoring: false }
 ) => {
-  return sendRequest<CreateAgentConfigResponse>({
-    path: agentConfigRouteService.getCreatePath(),
+  return sendRequest<CreateAgentPolicyResponse>({
+    path: agentPolicyRouteService.getCreatePath(),
     method: 'post',
     body: JSON.stringify(body),
     query: withSysMonitoring ? { sys_monitoring: true } : {},
   });
 };
 
-export const sendUpdateAgentConfig = (
-  agentConfigId: string,
-  body: UpdateAgentConfigRequest['body']
+export const sendUpdateAgentPolicy = (
+  agentPolicyId: string,
+  body: UpdateAgentPolicyRequest['body']
 ) => {
-  return sendRequest<UpdateAgentConfigResponse>({
-    path: agentConfigRouteService.getUpdatePath(agentConfigId),
+  return sendRequest<UpdateAgentPolicyResponse>({
+    path: agentPolicyRouteService.getUpdatePath(agentPolicyId),
     method: 'put',
     body: JSON.stringify(body),
   });
 };
 
-export const sendCopyAgentConfig = (
-  agentConfigId: string,
-  body: CopyAgentConfigRequest['body']
+export const sendCopyAgentPolicy = (
+  agentPolicyId: string,
+  body: CopyAgentPolicyRequest['body']
 ) => {
-  return sendRequest<CopyAgentConfigResponse>({
-    path: agentConfigRouteService.getCopyPath(agentConfigId),
+  return sendRequest<CopyAgentPolicyResponse>({
+    path: agentPolicyRouteService.getCopyPath(agentPolicyId),
     method: 'post',
     body: JSON.stringify(body),
   });
 };
 
-export const sendDeleteAgentConfig = (body: DeleteAgentConfigRequest['body']) => {
-  return sendRequest<DeleteAgentConfigResponse>({
-    path: agentConfigRouteService.getDeletePath(),
+export const sendDeleteAgentPolicy = (body: DeleteAgentPolicyRequest['body']) => {
+  return sendRequest<DeleteAgentPolicyResponse>({
+    path: agentPolicyRouteService.getDeletePath(),
     method: 'post',
     body: JSON.stringify(body),
   });
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/package_config.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/package_config.ts
index aba950123ead31..47a38ba3bfeae8 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/package_config.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/package_config.ts
@@ -4,59 +4,59 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { sendRequest, useRequest } from './use_request';
-import { packageConfigRouteService } from '../../services';
+import { packagePolicyRouteService } from '../../services';
 import {
-  CreatePackageConfigRequest,
-  CreatePackageConfigResponse,
-  UpdatePackageConfigRequest,
-  UpdatePackageConfigResponse,
+  CreatePackagePolicyRequest,
+  CreatePackagePolicyResponse,
+  UpdatePackagePolicyRequest,
+  UpdatePackagePolicyResponse,
 } from '../../types';
 import {
-  DeletePackageConfigsRequest,
-  DeletePackageConfigsResponse,
-  GetPackageConfigsRequest,
-  GetPackageConfigsResponse,
-  GetOnePackageConfigResponse,
+  DeletePackagePoliciesRequest,
+  DeletePackagePoliciesResponse,
+  GetPackagePoliciesRequest,
+  GetPackagePoliciesResponse,
+  GetOnePackagePolicyResponse,
 } from '../../../../../common/types/rest_spec';
 
-export const sendCreatePackageConfig = (body: CreatePackageConfigRequest['body']) => {
-  return sendRequest<CreatePackageConfigResponse>({
-    path: packageConfigRouteService.getCreatePath(),
+export const sendCreatePackagePolicy = (body: CreatePackagePolicyRequest['body']) => {
+  return sendRequest<CreatePackagePolicyResponse>({
+    path: packagePolicyRouteService.getCreatePath(),
     method: 'post',
     body: JSON.stringify(body),
   });
 };
 
-export const sendUpdatePackageConfig = (
-  packageConfigId: string,
-  body: UpdatePackageConfigRequest['body']
+export const sendUpdatePackagePolicy = (
+  packagePolicyId: string,
+  body: UpdatePackagePolicyRequest['body']
 ) => {
-  return sendRequest<UpdatePackageConfigResponse>({
-    path: packageConfigRouteService.getUpdatePath(packageConfigId),
+  return sendRequest<UpdatePackagePolicyResponse>({
+    path: packagePolicyRouteService.getUpdatePath(packagePolicyId),
     method: 'put',
     body: JSON.stringify(body),
   });
 };
 
-export const sendDeletePackageConfig = (body: DeletePackageConfigsRequest['body']) => {
-  return sendRequest<DeletePackageConfigsResponse>({
-    path: packageConfigRouteService.getDeletePath(),
+export const sendDeletePackagePolicy = (body: DeletePackagePoliciesRequest['body']) => {
+  return sendRequest<DeletePackagePoliciesResponse>({
+    path: packagePolicyRouteService.getDeletePath(),
     method: 'post',
     body: JSON.stringify(body),
   });
 };
 
-export function useGetPackageConfigs(query: GetPackageConfigsRequest['query']) {
-  return useRequest<GetPackageConfigsResponse>({
+export function useGetPackagePolicies(query: GetPackagePoliciesRequest['query']) {
+  return useRequest<GetPackagePoliciesResponse>({
     method: 'get',
-    path: packageConfigRouteService.getListPath(),
+    path: packagePolicyRouteService.getListPath(),
     query,
   });
 }
 
-export const sendGetOnePackageConfig = (packageConfigId: string) => {
-  return sendRequest<GetOnePackageConfigResponse>({
-    path: packageConfigRouteService.getInfoPath(packageConfigId),
+export const sendGetOnePackagePolicy = (packagePolicyId: string) => {
+  return sendRequest<GetOnePackagePolicyResponse>({
+    path: packagePolicyRouteService.getInfoPath(packagePolicyId),
     method: 'get',
   });
 };
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/index.tsx
index 443708ec6384fd..cc0b7226a99424 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/index.tsx
@@ -21,7 +21,7 @@ import {
 import { PAGE_ROUTING_PATHS } from './constants';
 import { DefaultLayout, WithoutHeaderLayout } from './layouts';
 import { Loading, Error } from './components';
-import { IngestManagerOverview, EPMApp, AgentConfigApp, FleetApp, DataStreamApp } from './sections';
+import { IngestManagerOverview, EPMApp, AgentPolicyApp, FleetApp, DataStreamApp } from './sections';
 import { DepsContext, ConfigContext, useConfig } from './hooks';
 import { PackageInstallProvider } from './sections/epm/hooks';
 import { useCore, sendSetup, sendGetPermissionsCheck } from './hooks';
@@ -190,9 +190,9 @@ const IngestManagerRoutes = memo<{ history: AppMountParameters['history']; basep
                       <EPMApp />
                     </DefaultLayout>
                   </Route>
-                  <Route path={PAGE_ROUTING_PATHS.configurations}>
+                  <Route path={PAGE_ROUTING_PATHS.policies}>
                     <DefaultLayout section="agent_config">
-                      <AgentConfigApp />
+                      <AgentPolicyApp />
                     </DefaultLayout>
                   </Route>
                   <Route path={PAGE_ROUTING_PATHS.data_streams}>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
index 09da96fac4462f..8244461da73260 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
@@ -77,13 +77,10 @@ export const DefaultLayout: React.FunctionComponent<Props> = ({
                       defaultMessage="Integrations"
                     />
                   </EuiTab>
-                  <EuiTab
-                    isSelected={section === 'agent_config'}
-                    href={getHref('configurations_list')}
-                  >
+                  <EuiTab isSelected={section === 'agent_config'} href={getHref('policies_list')}>
                     <FormattedMessage
-                      id="xpack.ingestManager.appNavigation.configurationsLinkText"
-                      defaultMessage="Configurations"
+                      id="xpack.ingestManager.appNavigation.policiesLinkText"
+                      defaultMessage="Policies"
                     />
                   </EuiTab>
                   <EuiTab
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/actions_menu.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/actions_menu.tsx
index a71de4b60c08cf..ccbf9e201777a3 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/actions_menu.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/actions_menu.tsx
@@ -6,22 +6,22 @@
 import React, { memo, useState, useMemo } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiContextMenuItem, EuiPortal } from '@elastic/eui';
-import { AgentConfig } from '../../../types';
+import { AgentPolicy } from '../../../types';
 import { useCapabilities } from '../../../hooks';
 import { ContextMenuActions } from '../../../components';
 import { AgentEnrollmentFlyout } from '../../fleet/components';
-import { ConfigYamlFlyout } from './config_yaml_flyout';
-import { AgentConfigCopyProvider } from './config_copy_provider';
+import { AgentPolicyYamlFlyout } from './config_yaml_flyout';
+import { AgentPolicyCopyProvider } from './config_copy_provider';
 
-export const AgentConfigActionMenu = memo<{
-  config: AgentConfig;
-  onCopySuccess?: (newAgentConfig: AgentConfig) => void;
+export const AgentPolicyActionMenu = memo<{
+  agentPolicy: AgentPolicy;
+  onCopySuccess?: (newAgentPolicy: AgentPolicy) => void;
   fullButton?: boolean;
   enrollmentFlyoutOpenByDefault?: boolean;
   onCancelEnrollment?: () => void;
 }>(
   ({
-    config,
+    agentPolicy,
     onCopySuccess,
     fullButton = false,
     enrollmentFlyoutOpenByDefault = false,
@@ -42,21 +42,21 @@ export const AgentConfigActionMenu = memo<{
     }, [onCancelEnrollment, setIsEnrollmentFlyoutOpen]);
 
     return (
-      <AgentConfigCopyProvider>
-        {(copyAgentConfigPrompt) => {
+      <AgentPolicyCopyProvider>
+        {(copyAgentPolicyPrompt) => {
           return (
             <>
               {isYamlFlyoutOpen ? (
                 <EuiPortal>
-                  <ConfigYamlFlyout
-                    configId={config.id}
+                  <AgentPolicyYamlFlyout
+                    policyId={agentPolicy.id}
                     onClose={() => setIsYamlFlyoutOpen(false)}
                   />
                 </EuiPortal>
               ) : null}
               {isEnrollmentFlyoutOpen && (
                 <EuiPortal>
-                  <AgentEnrollmentFlyout agentConfigs={[config]} onClose={onClose} />
+                  <AgentEnrollmentFlyout agentPolicies={[agentPolicy]} onClose={onClose} />
                 </EuiPortal>
               )}
               <ContextMenuActions
@@ -69,7 +69,7 @@ export const AgentConfigActionMenu = memo<{
                         },
                         children: (
                           <FormattedMessage
-                            id="xpack.ingestManager.agentConfigActionMenu.buttonText"
+                            id="xpack.ingestManager.agentPolicyActionMenu.buttonText"
                             defaultMessage="Actions"
                           />
                         ),
@@ -84,31 +84,31 @@ export const AgentConfigActionMenu = memo<{
                     key="enrollAgents"
                   >
                     <FormattedMessage
-                      id="xpack.ingestManager.agentConfigActionMenu.enrollAgentActionText"
+                      id="xpack.ingestManager.agentPolicyActionMenu.enrollAgentActionText"
                       defaultMessage="Add agent"
                     />
                   </EuiContextMenuItem>,
                   <EuiContextMenuItem
                     icon="inspect"
                     onClick={() => setIsYamlFlyoutOpen(!isYamlFlyoutOpen)}
-                    key="viewConfig"
+                    key="viewPolicy"
                   >
                     <FormattedMessage
-                      id="xpack.ingestManager.agentConfigActionMenu.viewConfigText"
-                      defaultMessage="View config"
+                      id="xpack.ingestManager.agentPolicyActionMenu.viewPolicyText"
+                      defaultMessage="View policy"
                     />
                   </EuiContextMenuItem>,
                   <EuiContextMenuItem
                     disabled={!hasWriteCapabilities}
                     icon="copy"
                     onClick={() => {
-                      copyAgentConfigPrompt(config, onCopySuccess);
+                      copyAgentPolicyPrompt(agentPolicy, onCopySuccess);
                     }}
-                    key="copyConfig"
+                    key="copyPolicy"
                   >
                     <FormattedMessage
-                      id="xpack.ingestManager.agentConfigActionMenu.copyConfigActionText"
-                      defaultMessage="Copy config"
+                      id="xpack.ingestManager.agentPolicyActionMenu.copyPolicyActionText"
+                      defaultMessage="Copy policy"
                     />
                   </EuiContextMenuItem>,
                 ]}
@@ -116,7 +116,7 @@ export const AgentConfigActionMenu = memo<{
             </>
           );
         }}
-      </AgentConfigCopyProvider>
+      </AgentPolicyCopyProvider>
     );
   }
 );
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_copy_provider.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_copy_provider.tsx
index c1bd0846b887e6..8a91cabe78d00f 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_copy_provider.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_copy_provider.tsx
@@ -8,63 +8,63 @@ import React, { Fragment, useRef, useState } from 'react';
 import { EuiConfirmModal, EuiOverlayMask, EuiFormRow, EuiFieldText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { AgentConfig } from '../../../types';
-import { sendCopyAgentConfig, useCore } from '../../../hooks';
+import { AgentPolicy } from '../../../types';
+import { sendCopyAgentPolicy, useCore } from '../../../hooks';
 
 interface Props {
-  children: (copyAgentConfig: CopyAgentConfig) => React.ReactElement;
+  children: (copyAgentPolicy: CopyAgentPolicy) => React.ReactElement;
 }
 
-export type CopyAgentConfig = (agentConfig: AgentConfig, onSuccess?: OnSuccessCallback) => void;
+export type CopyAgentPolicy = (agentPolicy: AgentPolicy, onSuccess?: OnSuccessCallback) => void;
 
-type OnSuccessCallback = (newAgentConfig: AgentConfig) => void;
+type OnSuccessCallback = (newAgentPolicy: AgentPolicy) => void;
 
-export const AgentConfigCopyProvider: React.FunctionComponent<Props> = ({ children }) => {
+export const AgentPolicyCopyProvider: React.FunctionComponent<Props> = ({ children }) => {
   const { notifications } = useCore();
-  const [agentConfig, setAgentConfig] = useState<AgentConfig>();
-  const [newAgentConfig, setNewAgentConfig] = useState<Pick<AgentConfig, 'name' | 'description'>>();
+  const [agentPolicy, setAgentPolicy] = useState<AgentPolicy>();
+  const [newAgentPolicy, setNewAgentPolicy] = useState<Pick<AgentPolicy, 'name' | 'description'>>();
   const [isModalOpen, setIsModalOpen] = useState<boolean>(false);
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const onSuccessCallback = useRef<OnSuccessCallback | null>(null);
 
-  const copyAgentConfigPrompt: CopyAgentConfig = (
-    agentConfigToCopy,
+  const copyAgentPolicyPrompt: CopyAgentPolicy = (
+    agentPolicyToCopy,
     onSuccess = () => undefined
   ) => {
-    if (!agentConfigToCopy) {
-      throw new Error('No agent config specified to copy');
+    if (!agentPolicyToCopy) {
+      throw new Error('No agent policy specified to copy');
     }
     setIsModalOpen(true);
-    setAgentConfig(agentConfigToCopy);
-    setNewAgentConfig({
+    setAgentPolicy(agentPolicyToCopy);
+    setNewAgentPolicy({
       name: i18n.translate(
-        'xpack.ingestManager.copyAgentConfig.confirmModal.defaultNewConfigName',
+        'xpack.ingestManager.copyAgentPolicy.confirmModal.defaultNewPolicyName',
         {
           defaultMessage: '{name} (copy)',
-          values: { name: agentConfigToCopy.name },
+          values: { name: agentPolicyToCopy.name },
         }
       ),
-      description: agentConfigToCopy.description,
+      description: agentPolicyToCopy.description,
     });
     onSuccessCallback.current = onSuccess;
   };
 
   const closeModal = () => {
-    setAgentConfig(undefined);
-    setNewAgentConfig(undefined);
+    setAgentPolicy(undefined);
+    setNewAgentPolicy(undefined);
     setIsLoading(false);
     setIsModalOpen(false);
   };
 
-  const copyAgentConfig = async () => {
+  const copyAgentPolicy = async () => {
     setIsLoading(true);
     try {
-      const { data } = await sendCopyAgentConfig(agentConfig!.id, newAgentConfig!);
+      const { data } = await sendCopyAgentPolicy(agentPolicy!.id, newAgentPolicy!);
 
       if (data?.success) {
         notifications.toasts.addSuccess(
-          i18n.translate('xpack.ingestManager.copyAgentConfig.successNotificationTitle', {
-            defaultMessage: 'Agent config copied',
+          i18n.translate('xpack.ingestManager.copyAgentPolicy.successNotificationTitle', {
+            defaultMessage: 'Agent policy copied',
           })
         );
         if (onSuccessCallback.current) {
@@ -74,16 +74,16 @@ export const AgentConfigCopyProvider: React.FunctionComponent<Props> = ({ childr
 
       if (!data?.success) {
         notifications.toasts.addDanger(
-          i18n.translate('xpack.ingestManager.copyAgentConfig.failureNotificationTitle', {
-            defaultMessage: "Error copying agent config '{id}'",
-            values: { id: agentConfig!.id },
+          i18n.translate('xpack.ingestManager.copyAgentPolicy.failureNotificationTitle', {
+            defaultMessage: "Error copying agent policy '{id}'",
+            values: { id: agentPolicy!.id },
           })
         );
       }
     } catch (e) {
       notifications.toasts.addDanger(
-        i18n.translate('xpack.ingestManager.copyAgentConfig.fatalErrorNotificationTitle', {
-          defaultMessage: 'Error copying agent config',
+        i18n.translate('xpack.ingestManager.copyAgentPolicy.fatalErrorNotificationTitle', {
+          defaultMessage: 'Error copying agent policy',
         })
       );
     }
@@ -91,7 +91,7 @@ export const AgentConfigCopyProvider: React.FunctionComponent<Props> = ({ childr
   };
 
   const renderModal = () => {
-    if (!isModalOpen || !agentConfig || !newAgentConfig) {
+    if (!isModalOpen || !agentPolicy || !newAgentPolicy) {
       return null;
     }
 
@@ -101,55 +101,55 @@ export const AgentConfigCopyProvider: React.FunctionComponent<Props> = ({ childr
           title={
             <span className="eui-textBreakWord">
               <FormattedMessage
-                id="xpack.ingestManager.copyAgentConfig.confirmModal.copyConfigTitle"
-                defaultMessage="Copy '{name}' agent configuration"
+                id="xpack.ingestManager.copyAgentPolicy.confirmModal.copyPolicyTitle"
+                defaultMessage="Copy '{name}' agent policy"
                 values={{
-                  name: agentConfig.name,
+                  name: agentPolicy.name,
                 }}
               />
             </span>
           }
           onCancel={closeModal}
-          onConfirm={copyAgentConfig}
+          onConfirm={copyAgentPolicy}
           cancelButtonText={
             <FormattedMessage
-              id="xpack.ingestManager.copyAgentConfig.confirmModal.cancelButtonLabel"
+              id="xpack.ingestManager.copyAgentPolicy.confirmModal.cancelButtonLabel"
               defaultMessage="Cancel"
             />
           }
           confirmButtonText={
             <FormattedMessage
-              id="xpack.ingestManager.copyAgentConfig.confirmModal.confirmButtonLabel"
-              defaultMessage="Copy configuration"
+              id="xpack.ingestManager.copyAgentPolicy.confirmModal.confirmButtonLabel"
+              defaultMessage="Copy policy"
             />
           }
-          confirmButtonDisabled={isLoading || !newAgentConfig.name.trim()}
+          confirmButtonDisabled={isLoading || !newAgentPolicy.name.trim()}
         >
           <p>
             <FormattedMessage
-              id="xpack.ingestManager.copyAgentConfig.confirmModal.copyConfigPrompt"
-              defaultMessage="Choose a name and description for your new agent configuration."
+              id="xpack.ingestManager.copyAgentPolicy.confirmModal.copyPolicyPrompt"
+              defaultMessage="Choose a name and description for your new agent policy."
             />
           </p>
           <EuiFormRow
             label={
               <FormattedMessage
-                id="xpack.ingestManager.copyAgentConfig.confirmModal.newNameLabel"
-                defaultMessage="New configuration name"
+                id="xpack.ingestManager.copyAgentPolicy.confirmModal.newNameLabel"
+                defaultMessage="New policy name"
               />
             }
             fullWidth
           >
             <EuiFieldText
               fullWidth
-              value={newAgentConfig.name}
-              onChange={(e) => setNewAgentConfig({ ...newAgentConfig, name: e.target.value })}
+              value={newAgentPolicy.name}
+              onChange={(e) => setNewAgentPolicy({ ...newAgentPolicy, name: e.target.value })}
             />
           </EuiFormRow>
           <EuiFormRow
             label={
               <FormattedMessage
-                id="xpack.ingestManager.copyAgentConfig.confirmModal.newDescriptionLabel"
+                id="xpack.ingestManager.copyAgentPolicy.confirmModal.newDescriptionLabel"
                 defaultMessage="Description"
               />
             }
@@ -157,9 +157,9 @@ export const AgentConfigCopyProvider: React.FunctionComponent<Props> = ({ childr
           >
             <EuiFieldText
               fullWidth
-              value={newAgentConfig.description}
+              value={newAgentPolicy.description}
               onChange={(e) =>
-                setNewAgentConfig({ ...newAgentConfig, description: e.target.value })
+                setNewAgentPolicy({ ...newAgentPolicy, description: e.target.value })
               }
             />
           </EuiFormRow>
@@ -170,7 +170,7 @@ export const AgentConfigCopyProvider: React.FunctionComponent<Props> = ({ childr
 
   return (
     <Fragment>
-      {children(copyAgentConfigPrompt)}
+      {children(copyAgentPolicyPrompt)}
       {renderModal()}
     </Fragment>
   );
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_delete_provider.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_delete_provider.tsx
index d517dde45d5e3c..c68d2c4e1ed40b 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_delete_provider.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_delete_provider.tsx
@@ -9,87 +9,87 @@ import { EuiConfirmModal, EuiOverlayMask, EuiCallOut } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { AGENT_SAVED_OBJECT_TYPE } from '../../../constants';
-import { sendDeleteAgentConfig, useCore, useConfig, sendRequest } from '../../../hooks';
+import { sendDeleteAgentPolicy, useCore, useConfig, sendRequest } from '../../../hooks';
 
 interface Props {
-  children: (deleteAgentConfig: DeleteAgentConfig) => React.ReactElement;
+  children: (deleteAgentPolicy: DeleteAgentPolicy) => React.ReactElement;
 }
 
-export type DeleteAgentConfig = (agentConfig: string, onSuccess?: OnSuccessCallback) => void;
+export type DeleteAgentPolicy = (agentPolicy: string, onSuccess?: OnSuccessCallback) => void;
 
-type OnSuccessCallback = (agentConfigDeleted: string) => void;
+type OnSuccessCallback = (agentPolicyDeleted: string) => void;
 
-export const AgentConfigDeleteProvider: React.FunctionComponent<Props> = ({ children }) => {
+export const AgentPolicyDeleteProvider: React.FunctionComponent<Props> = ({ children }) => {
   const { notifications } = useCore();
   const {
     fleet: { enabled: isFleetEnabled },
   } = useConfig();
-  const [agentConfig, setAgentConfig] = useState<string>();
+  const [agentPolicy, setAgentPolicy] = useState<string>();
   const [isModalOpen, setIsModalOpen] = useState<boolean>(false);
   const [isLoadingAgentsCount, setIsLoadingAgentsCount] = useState<boolean>(false);
   const [agentsCount, setAgentsCount] = useState<number>(0);
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const onSuccessCallback = useRef<OnSuccessCallback | null>(null);
 
-  const deleteAgentConfigPrompt: DeleteAgentConfig = (
-    agentConfigToDelete,
+  const deleteAgentPolicyPrompt: DeleteAgentPolicy = (
+    agentPolicyToDelete,
     onSuccess = () => undefined
   ) => {
-    if (!agentConfigToDelete) {
-      throw new Error('No agent config specified for deletion');
+    if (!agentPolicyToDelete) {
+      throw new Error('No agent policy specified for deletion');
     }
     setIsModalOpen(true);
-    setAgentConfig(agentConfigToDelete);
-    fetchAgentsCount(agentConfigToDelete);
+    setAgentPolicy(agentPolicyToDelete);
+    fetchAgentsCount(agentPolicyToDelete);
     onSuccessCallback.current = onSuccess;
   };
 
   const closeModal = () => {
-    setAgentConfig(undefined);
+    setAgentPolicy(undefined);
     setIsLoading(false);
     setIsLoadingAgentsCount(false);
     setIsModalOpen(false);
   };
 
-  const deleteAgentConfig = async () => {
+  const deleteAgentPolicy = async () => {
     setIsLoading(true);
 
     try {
-      const { data } = await sendDeleteAgentConfig({
-        agentConfigId: agentConfig!,
+      const { data } = await sendDeleteAgentPolicy({
+        agentPolicyId: agentPolicy!,
       });
 
       if (data?.success) {
         notifications.toasts.addSuccess(
-          i18n.translate('xpack.ingestManager.deleteAgentConfig.successSingleNotificationTitle', {
-            defaultMessage: "Deleted agent config '{id}'",
-            values: { id: agentConfig },
+          i18n.translate('xpack.ingestManager.deleteAgentPolicy.successSingleNotificationTitle', {
+            defaultMessage: "Deleted agent policy '{id}'",
+            values: { id: agentPolicy },
           })
         );
         if (onSuccessCallback.current) {
-          onSuccessCallback.current(agentConfig!);
+          onSuccessCallback.current(agentPolicy!);
         }
       }
 
       if (!data?.success) {
         notifications.toasts.addDanger(
-          i18n.translate('xpack.ingestManager.deleteAgentConfig.failureSingleNotificationTitle', {
-            defaultMessage: "Error deleting agent config '{id}'",
-            values: { id: agentConfig },
+          i18n.translate('xpack.ingestManager.deleteAgentPolicy.failureSingleNotificationTitle', {
+            defaultMessage: "Error deleting agent policy '{id}'",
+            values: { id: agentPolicy },
           })
         );
       }
     } catch (e) {
       notifications.toasts.addDanger(
-        i18n.translate('xpack.ingestManager.deleteAgentConfig.fatalErrorNotificationTitle', {
-          defaultMessage: 'Error deleting agent config',
+        i18n.translate('xpack.ingestManager.deleteAgentPolicy.fatalErrorNotificationTitle', {
+          defaultMessage: 'Error deleting agent policy',
         })
       );
     }
     closeModal();
   };
 
-  const fetchAgentsCount = async (agentConfigToCheck: string) => {
+  const fetchAgentsCount = async (agentPolicyToCheck: string) => {
     if (!isFleetEnabled || isLoadingAgentsCount) {
       return;
     }
@@ -98,7 +98,7 @@ export const AgentConfigDeleteProvider: React.FunctionComponent<Props> = ({ chil
       path: `/api/ingest_manager/fleet/agents`,
       method: 'get',
       query: {
-        kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id : ${agentConfigToCheck}`,
+        kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id : ${agentPolicyToCheck}`,
       },
     });
     setAgentsCount(data?.total || 0);
@@ -115,28 +115,28 @@ export const AgentConfigDeleteProvider: React.FunctionComponent<Props> = ({ chil
         <EuiConfirmModal
           title={
             <FormattedMessage
-              id="xpack.ingestManager.deleteAgentConfig.confirmModal.deleteConfigTitle"
-              defaultMessage="Delete this agent configuration?"
+              id="xpack.ingestManager.deleteAgentPolicy.confirmModal.deletePolicyTitle"
+              defaultMessage="Delete this agent policy?"
             />
           }
           onCancel={closeModal}
-          onConfirm={deleteAgentConfig}
+          onConfirm={deleteAgentPolicy}
           cancelButtonText={
             <FormattedMessage
-              id="xpack.ingestManager.deleteAgentConfig.confirmModal.cancelButtonLabel"
+              id="xpack.ingestManager.deleteAgentPolicy.confirmModal.cancelButtonLabel"
               defaultMessage="Cancel"
             />
           }
           confirmButtonText={
             isLoading || isLoadingAgentsCount ? (
               <FormattedMessage
-                id="xpack.ingestManager.deleteAgentConfig.confirmModal.loadingButtonLabel"
+                id="xpack.ingestManager.deleteAgentPolicy.confirmModal.loadingButtonLabel"
                 defaultMessage="Loading…"
               />
             ) : (
               <FormattedMessage
-                id="xpack.ingestManager.deleteAgentConfig.confirmModal.confirmButtonLabel"
-                defaultMessage="Delete configuration"
+                id="xpack.ingestManager.deleteAgentPolicy.confirmModal.confirmButtonLabel"
+                defaultMessage="Delete policy"
               />
             )
           }
@@ -145,22 +145,22 @@ export const AgentConfigDeleteProvider: React.FunctionComponent<Props> = ({ chil
         >
           {isLoadingAgentsCount ? (
             <FormattedMessage
-              id="xpack.ingestManager.deleteAgentConfig.confirmModal.loadingAgentsCountMessage"
+              id="xpack.ingestManager.deleteAgentPolicy.confirmModal.loadingAgentsCountMessage"
               defaultMessage="Checking amount of affected agents…"
             />
           ) : agentsCount ? (
             <EuiCallOut
               color="danger"
               title={i18n.translate(
-                'xpack.ingestManager.deleteAgentConfig.confirmModal.affectedAgentsTitle',
+                'xpack.ingestManager.deleteAgentPolicy.confirmModal.affectedAgentsTitle',
                 {
-                  defaultMessage: 'Configuration in use',
+                  defaultMessage: 'Policy in use',
                 }
               )}
             >
               <FormattedMessage
-                id="xpack.ingestManager.deleteAgentConfig.confirmModal.affectedAgentsMessage"
-                defaultMessage="{agentsCount, plural, one {# agent is} other {# agents are}} assigned to this agent configuration. Unassign these agents before deleting this configuration."
+                id="xpack.ingestManager.deleteAgentPolicy.confirmModal.affectedAgentsMessage"
+                defaultMessage="{agentsCount, plural, one {# agent is} other {# agents are}} assigned to this agent policy. Unassign these agents before deleting this policy."
                 values={{
                   agentsCount,
                 }}
@@ -168,7 +168,7 @@ export const AgentConfigDeleteProvider: React.FunctionComponent<Props> = ({ chil
             </EuiCallOut>
           ) : (
             <FormattedMessage
-              id="xpack.ingestManager.deleteAgentConfig.confirmModal.irreversibleMessage"
+              id="xpack.ingestManager.deleteAgentPolicy.confirmModal.irreversibleMessage"
               defaultMessage="This action cannot be undone."
             />
           )}
@@ -179,7 +179,7 @@ export const AgentConfigDeleteProvider: React.FunctionComponent<Props> = ({ chil
 
   return (
     <Fragment>
-      {children(deleteAgentConfigPrompt)}
+      {children(deleteAgentPolicyPrompt)}
       {renderModal()}
     </Fragment>
   );
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_form.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_form.tsx
index b60c36b282a0d3..4701d4b5794514 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_form.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_form.tsx
@@ -23,8 +23,8 @@ import {
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
-import { NewAgentConfig, AgentConfig } from '../../../types';
-import { AgentConfigDeleteProvider } from './config_delete_provider';
+import { NewAgentPolicy, AgentPolicy } from '../../../types';
+import { AgentPolicyDeleteProvider } from './config_delete_provider';
 
 interface ValidationResults {
   [key: string]: JSX.Element[];
@@ -36,24 +36,24 @@ const StyledEuiAccordion = styled(EuiAccordion)`
   }
 `;
 
-export const agentConfigFormValidation = (
-  agentConfig: Partial<NewAgentConfig | AgentConfig>
+export const agentPolicyFormValidation = (
+  agentPolicy: Partial<NewAgentPolicy | AgentPolicy>
 ): ValidationResults => {
   const errors: ValidationResults = {};
 
-  if (!agentConfig.name?.trim()) {
+  if (!agentPolicy.name?.trim()) {
     errors.name = [
       <FormattedMessage
-        id="xpack.ingestManager.agentConfigForm.nameRequiredErrorMessage"
-        defaultMessage="Agent config name is required"
+        id="xpack.ingestManager.agentPolicyForm.nameRequiredErrorMessage"
+        defaultMessage="Agent policy name is required"
       />,
     ];
   }
 
-  if (!agentConfig.namespace?.trim()) {
+  if (!agentPolicy.namespace?.trim()) {
     errors.namespace = [
       <FormattedMessage
-        id="xpack.ingestManager.agentConfigForm.namespaceRequiredErrorMessage"
+        id="xpack.ingestManager.agentPolicyForm.namespaceRequiredErrorMessage"
         defaultMessage="A namespace is required"
       />,
     ];
@@ -63,8 +63,8 @@ export const agentConfigFormValidation = (
 };
 
 interface Props {
-  agentConfig: Partial<NewAgentConfig | AgentConfig>;
-  updateAgentConfig: (u: Partial<NewAgentConfig | AgentConfig>) => void;
+  agentPolicy: Partial<NewAgentPolicy | AgentPolicy>;
+  updateAgentPolicy: (u: Partial<NewAgentPolicy | AgentPolicy>) => void;
   withSysMonitoring: boolean;
   updateSysMonitoring: (newValue: boolean) => void;
   validation: ValidationResults;
@@ -72,9 +72,9 @@ interface Props {
   onDelete?: () => void;
 }
 
-export const AgentConfigForm: React.FunctionComponent<Props> = ({
-  agentConfig,
-  updateAgentConfig,
+export const AgentPolicyForm: React.FunctionComponent<Props> = ({
+  agentPolicy,
+  updateAgentPolicy,
   withSysMonitoring,
   updateSysMonitoring,
   validation,
@@ -92,11 +92,11 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
         name: 'name',
         label: (
           <FormattedMessage
-            id="xpack.ingestManager.agentConfigForm.nameFieldLabel"
+            id="xpack.ingestManager.agentPolicyForm.nameFieldLabel"
             defaultMessage="Name"
           />
         ),
-        placeholder: i18n.translate('xpack.ingestManager.agentConfigForm.nameFieldPlaceholder', {
+        placeholder: i18n.translate('xpack.ingestManager.agentPolicyForm.nameFieldPlaceholder', {
           defaultMessage: 'Choose a name',
         }),
       },
@@ -104,14 +104,14 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
         name: 'description',
         label: (
           <FormattedMessage
-            id="xpack.ingestManager.agentConfigForm.descriptionFieldLabel"
+            id="xpack.ingestManager.agentPolicyForm.descriptionFieldLabel"
             defaultMessage="Description"
           />
         ),
         placeholder: i18n.translate(
-          'xpack.ingestManager.agentConfigForm.descriptionFieldPlaceholder',
+          'xpack.ingestManager.agentPolicyForm.descriptionFieldPlaceholder',
           {
-            defaultMessage: 'How will this configuration be used?',
+            defaultMessage: 'How will this policy be used?',
           }
         ),
       },
@@ -123,15 +123,15 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
       title={
         <h4>
           <FormattedMessage
-            id="xpack.ingestManager.configForm.generalSettingsGroupTitle"
+            id="xpack.ingestManager.policyForm.generalSettingsGroupTitle"
             defaultMessage="General settings"
           />
         </h4>
       }
       description={
         <FormattedMessage
-          id="xpack.ingestManager.configForm.generalSettingsGroupDescription"
-          defaultMessage="Choose a name and description for your agent configuration."
+          id="xpack.ingestManager.policyForm.generalSettingsGroupDescription"
+          defaultMessage="Choose a name and description for your agent policy."
         />
       }
     >
@@ -150,8 +150,8 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
       >
         <EuiFieldText
           fullWidth
-          value={agentConfig[name]}
-          onChange={(e) => updateAgentConfig({ [name]: e.target.value })}
+          value={agentPolicy[name]}
+          onChange={(e) => updateAgentPolicy({ [name]: e.target.value })}
           isInvalid={Boolean(touchedFields[name] && validation[name])}
           onBlur={() => setTouchedFields({ ...touchedFields, [name]: true })}
           placeholder={placeholder}
@@ -166,15 +166,15 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
         title={
           <h4>
             <FormattedMessage
-              id="xpack.ingestManager.agentConfigForm.namespaceFieldLabel"
+              id="xpack.ingestManager.agentPolicyForm.namespaceFieldLabel"
               defaultMessage="Default namespace"
             />
           </h4>
         }
         description={
           <FormattedMessage
-            id="xpack.ingestManager.agentConfigForm.namespaceFieldDescription"
-            defaultMessage="Apply a default namespace to integrations that use this configuration. Integrations can specify their own namespaces."
+            id="xpack.ingestManager.agentPolicyForm.namespaceFieldDescription"
+            defaultMessage="Apply a default namespace to integrations that use this policy. Integrations can specify their own namespaces."
           />
         }
       >
@@ -187,12 +187,12 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
             fullWidth
             singleSelection
             noSuggestions
-            selectedOptions={agentConfig.namespace ? [{ label: agentConfig.namespace }] : []}
+            selectedOptions={agentPolicy.namespace ? [{ label: agentPolicy.namespace }] : []}
             onCreateOption={(value: string) => {
-              updateAgentConfig({ namespace: value });
+              updateAgentPolicy({ namespace: value });
             }}
             onChange={(selectedOptions) => {
-              updateAgentConfig({
+              updateAgentPolicy({
                 namespace: (selectedOptions.length ? selectedOptions[0] : '') as string,
               });
             }}
@@ -205,14 +205,14 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
         title={
           <h4>
             <FormattedMessage
-              id="xpack.ingestManager.agentConfigForm.monitoringLabel"
+              id="xpack.ingestManager.agentPolicyForm.monitoringLabel"
               defaultMessage="Agent monitoring"
             />
           </h4>
         }
         description={
           <FormattedMessage
-            id="xpack.ingestManager.agentConfigForm.monitoringDescription"
+            id="xpack.ingestManager.agentPolicyForm.monitoringDescription"
             defaultMessage="Collect data about your agents for debugging and tracking performance."
           />
         }
@@ -224,15 +224,14 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
               label: (
                 <>
                   <FormattedMessage
-                    id="xpack.ingestManager.agentConfigForm.monitoringLogsFieldLabel"
+                    id="xpack.ingestManager.agentPolicyForm.monitoringLogsFieldLabel"
                     defaultMessage="Collect agent logs"
                   />{' '}
                   <EuiIconTip
                     content={i18n.translate(
-                      'xpack.ingestManager.agentConfigForm.monitoringLogsTooltipText',
+                      'xpack.ingestManager.agentPolicyForm.monitoringLogsTooltipText',
                       {
-                        defaultMessage:
-                          'Collect logs from Elastic Agents that use this configuration.',
+                        defaultMessage: 'Collect logs from Elastic Agents that use this policy.',
                       }
                     )}
                     position="right"
@@ -247,15 +246,14 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
               label: (
                 <>
                   <FormattedMessage
-                    id="xpack.ingestManager.agentConfigForm.monitoringMetricsFieldLabel"
+                    id="xpack.ingestManager.agentPolicyForm.monitoringMetricsFieldLabel"
                     defaultMessage="Collect agent metrics"
                   />{' '}
                   <EuiIconTip
                     content={i18n.translate(
-                      'xpack.ingestManager.agentConfigForm.monitoringMetricsTooltipText',
+                      'xpack.ingestManager.agentPolicyForm.monitoringMetricsTooltipText',
                       {
-                        defaultMessage:
-                          'Collect metrics from Elastic Agents that use this configuration.',
+                        defaultMessage: 'Collect metrics from Elastic Agents that use this policy.',
                       }
                     )}
                     position="right"
@@ -266,7 +264,7 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
               ),
             },
           ]}
-          idToSelectedMap={(agentConfig.monitoring_enabled || []).reduce(
+          idToSelectedMap={(agentPolicy.monitoring_enabled || []).reduce(
             (acc: { logs: boolean; metrics: boolean }, key) => {
               acc[key] = true;
               return acc;
@@ -279,10 +277,10 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
             }
 
             const hasLogs =
-              agentConfig.monitoring_enabled && agentConfig.monitoring_enabled.indexOf(id) >= 0;
+              agentPolicy.monitoring_enabled && agentPolicy.monitoring_enabled.indexOf(id) >= 0;
 
-            const previousValues = agentConfig.monitoring_enabled || [];
-            updateAgentConfig({
+            const previousValues = agentPolicy.monitoring_enabled || [];
+            updateAgentPolicy({
               monitoring_enabled: hasLogs
                 ? previousValues.filter((type) => type !== id)
                 : [...previousValues, id],
@@ -290,46 +288,46 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
           }}
         />
       </EuiDescribedFormGroup>
-      {isEditing && 'id' in agentConfig ? (
+      {isEditing && 'id' in agentPolicy ? (
         <EuiDescribedFormGroup
           title={
             <h4>
               <FormattedMessage
-                id="xpack.ingestManager.configForm.deleteConfigGroupTitle"
-                defaultMessage="Delete configuration"
+                id="xpack.ingestManager.policyForm.deletePolicyGroupTitle"
+                defaultMessage="Delete policy"
               />
             </h4>
           }
           description={
             <>
               <FormattedMessage
-                id="xpack.ingestManager.configForm.deleteConfigGroupDescription"
+                id="xpack.ingestManager.policyForm.deletePolicyGroupDescription"
                 defaultMessage="Existing data will not be deleted."
               />
               <EuiSpacer size="s" />
-              <AgentConfigDeleteProvider>
-                {(deleteAgentConfigPrompt) => {
+              <AgentPolicyDeleteProvider>
+                {(deleteAgentPolicyPrompt) => {
                   return (
                     <EuiButton
                       color="danger"
-                      disabled={Boolean(agentConfig.is_default)}
-                      onClick={() => deleteAgentConfigPrompt(agentConfig.id!, onDelete)}
+                      disabled={Boolean(agentPolicy.is_default)}
+                      onClick={() => deleteAgentPolicyPrompt(agentPolicy.id!, onDelete)}
                     >
                       <FormattedMessage
-                        id="xpack.ingestManager.configForm.deleteConfigActionText"
-                        defaultMessage="Delete configuration"
+                        id="xpack.ingestManager.policyForm.deletePolicyActionText"
+                        defaultMessage="Delete policy"
                       />
                     </EuiButton>
                   );
                 }}
-              </AgentConfigDeleteProvider>
-              {agentConfig.is_default ? (
+              </AgentPolicyDeleteProvider>
+              {agentPolicy.is_default ? (
                 <>
                   <EuiSpacer size="xs" />
                   <EuiText color="subdued" size="xs">
                     <FormattedMessage
-                      id="xpack.ingestManager.configForm.unableToDeleteDefaultConfigText"
-                      defaultMessage="Default configuration cannot be deleted"
+                      id="xpack.ingestManager.policyForm.unableToDeleteDefaultPolicyText"
+                      defaultMessage="Default policy cannot be deleted"
                     />
                   </EuiText>
                 </>
@@ -348,25 +346,25 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
         <EuiFormRow
           label={
             <FormattedMessage
-              id="xpack.ingestManager.agentConfigForm.systemMonitoringFieldLabel"
+              id="xpack.ingestManager.agentPolicyForm.systemMonitoringFieldLabel"
               defaultMessage="System monitoring"
             />
           }
         >
           <EuiCheckbox
-            id="agentConfigFormSystemMonitoringCheckbox"
+            id="agentPolicyFormSystemMonitoringCheckbox"
             label={
               <>
                 <FormattedMessage
-                  id="xpack.ingestManager.agentConfigForm.systemMonitoringText"
+                  id="xpack.ingestManager.agentPolicyForm.systemMonitoringText"
                   defaultMessage="Collect system metrics"
                 />{' '}
                 <EuiIconTip
                   content={i18n.translate(
-                    'xpack.ingestManager.agentConfigForm.systemMonitoringTooltipText',
+                    'xpack.ingestManager.agentPolicyForm.systemMonitoringTooltipText',
                     {
                       defaultMessage:
-                        'Enable this option to bootstrap your configuration with an integration that collects system metrics and information.',
+                        'Enable this option to bootstrap your policy with an integration that collects system metrics and information.',
                     }
                   )}
                   position="right"
@@ -390,7 +388,7 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
             id="advancedOptions"
             buttonContent={
               <FormattedMessage
-                id="xpack.ingestManager.agentConfigForm.advancedOptionsToggleLabel"
+                id="xpack.ingestManager.agentPolicyForm.advancedOptionsToggleLabel"
                 defaultMessage="Advanced options"
               />
             }
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_yaml_flyout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_yaml_flyout.tsx
index 9c2d09b02665f2..6c559eeb9dd17a 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_yaml_flyout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_yaml_flyout.tsx
@@ -19,9 +19,9 @@ import {
   EuiButtonEmpty,
   EuiButton,
 } from '@elastic/eui';
-import { useGetOneAgentConfigFull, useGetOneAgentConfig, useCore } from '../../../hooks';
+import { useGetOneAgentPolicyFull, useGetOneAgentPolicy, useCore } from '../../../hooks';
 import { Loading } from '../../../components';
-import { configToYaml, agentConfigRouteService } from '../../../services';
+import { policyToYaml, agentPolicyRouteService } from '../../../services';
 
 const FlyoutBody = styled(EuiFlyoutBody)`
   .euiFlyoutBody__overflowContent {
@@ -29,40 +29,40 @@ const FlyoutBody = styled(EuiFlyoutBody)`
   }
 `;
 
-export const ConfigYamlFlyout = memo<{ configId: string; onClose: () => void }>(
-  ({ configId, onClose }) => {
+export const AgentPolicyYamlFlyout = memo<{ policyId: string; onClose: () => void }>(
+  ({ policyId, onClose }) => {
     const core = useCore();
-    const { isLoading: isLoadingYaml, data: yamlData } = useGetOneAgentConfigFull(configId);
-    const { data: configData } = useGetOneAgentConfig(configId);
+    const { isLoading: isLoadingYaml, data: yamlData } = useGetOneAgentPolicyFull(policyId);
+    const { data: configData } = useGetOneAgentPolicy(policyId);
 
     const body =
       isLoadingYaml && !yamlData ? (
         <Loading />
       ) : (
         <EuiCodeBlock language="yaml" isCopyable fontSize="m">
-          {configToYaml(yamlData!.item)}
+          {policyToYaml(yamlData!.item)}
         </EuiCodeBlock>
       );
 
     const downloadLink = core.http.basePath.prepend(
-      agentConfigRouteService.getInfoFullDownloadPath(configId)
+      agentPolicyRouteService.getInfoFullDownloadPath(policyId)
     );
 
     return (
       <EuiFlyout onClose={onClose} size="l" maxWidth={640}>
-        <EuiFlyoutHeader hasBorder aria-labelledby="IngestManagerConfigYamlFlyoutTitle">
+        <EuiFlyoutHeader hasBorder aria-labelledby="IngestManagerAgentPolicyYamlFlyoutTitle">
           <EuiTitle size="m">
-            <h2 id="IngestManagerConfigYamlFlyoutTitle">
+            <h2 id="IngestManagerAgentPolicyYamlFlyoutTitle">
               {configData?.item ? (
                 <FormattedMessage
-                  id="xpack.ingestManager.configDetails.yamlflyoutTitleWithName"
-                  defaultMessage="'{name}' agent configuration"
+                  id="xpack.ingestManager.policyDetails.yamlflyoutTitleWithName"
+                  defaultMessage="'{name}' agent policy"
                   values={{ name: configData.item.name }}
                 />
               ) : (
                 <FormattedMessage
-                  id="xpack.ingestManager.configDetails.yamlflyoutTitleWithoutName"
-                  defaultMessage="Agent configuration"
+                  id="xpack.ingestManager.policyDetails.yamlflyoutTitleWithoutName"
+                  defaultMessage="Agent policy"
                 />
               )}
             </h2>
@@ -74,7 +74,7 @@ export const ConfigYamlFlyout = memo<{ configId: string; onClose: () => void }>(
             <EuiFlexItem grow={false}>
               <EuiButtonEmpty onClick={onClose} flush="left">
                 <FormattedMessage
-                  id="xpack.ingestManager.configDetails.yamlFlyoutCloseButtonLabel"
+                  id="xpack.ingestManager.policyDetails.yamlFlyoutCloseButtonLabel"
                   defaultMessage="Close"
                 />
               </EuiButtonEmpty>
@@ -86,8 +86,8 @@ export const ConfigYamlFlyout = memo<{ configId: string; onClose: () => void }>(
                 isDisabled={Boolean(isLoadingYaml && !yamlData)}
               >
                 <FormattedMessage
-                  id="xpack.ingestManager.configDetails.yamlDownloadButtonLabel"
-                  defaultMessage="Download configuration"
+                  id="xpack.ingestManager.policyDetails.yamlDownloadButtonLabel"
+                  defaultMessage="Download policy"
                 />
               </EuiButton>
             </EuiFlexItem>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/confirm_deploy_modal.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/confirm_deploy_modal.tsx
index 51f37f72a75145..9f215be5860984 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/confirm_deploy_modal.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/confirm_deploy_modal.tsx
@@ -8,20 +8,20 @@ import React from 'react';
 import { EuiCallOut, EuiOverlayMask, EuiConfirmModal, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { AgentConfig } from '../../../types';
+import { AgentPolicy } from '../../../types';
 
 export const ConfirmDeployConfigModal: React.FunctionComponent<{
   onConfirm: () => void;
   onCancel: () => void;
   agentCount: number;
-  agentConfig: AgentConfig;
-}> = ({ onConfirm, onCancel, agentCount, agentConfig }) => {
+  agentPolicy: AgentPolicy;
+}> = ({ onConfirm, onCancel, agentCount, agentPolicy }) => {
   return (
     <EuiOverlayMask>
       <EuiConfirmModal
         title={
           <FormattedMessage
-            id="xpack.ingestManager.agentConfig.confirmModalTitle"
+            id="xpack.ingestManager.agentPolicy.confirmModalTitle"
             defaultMessage="Save and deploy changes"
           />
         }
@@ -29,13 +29,13 @@ export const ConfirmDeployConfigModal: React.FunctionComponent<{
         onConfirm={onConfirm}
         cancelButtonText={
           <FormattedMessage
-            id="xpack.ingestManager.agentConfig.confirmModalCancelButtonLabel"
+            id="xpack.ingestManager.agentPolicy.confirmModalCancelButtonLabel"
             defaultMessage="Cancel"
           />
         }
         confirmButtonText={
           <FormattedMessage
-            id="xpack.ingestManager.agentConfig.confirmModalConfirmButtonLabel"
+            id="xpack.ingestManager.agentPolicy.confirmModalConfirmButtonLabel"
             defaultMessage="Save and deploy changes"
           />
         }
@@ -43,7 +43,7 @@ export const ConfirmDeployConfigModal: React.FunctionComponent<{
       >
         <EuiCallOut
           iconType="iInCircle"
-          title={i18n.translate('xpack.ingestManager.agentConfig.confirmModalCalloutTitle', {
+          title={i18n.translate('xpack.ingestManager.agentPolicy.confirmModalCalloutTitle', {
             defaultMessage:
               'This action will update {agentCount, plural, one {# agent} other {# agents}}',
             values: {
@@ -53,19 +53,19 @@ export const ConfirmDeployConfigModal: React.FunctionComponent<{
         >
           <div className="eui-textBreakWord">
             <FormattedMessage
-              id="xpack.ingestManager.agentConfig.confirmModalCalloutDescription"
-              defaultMessage="Fleet has detected that the selected agent configuration, {configName}, is already in use by
+              id="xpack.ingestManager.agentPolicy.confirmModalCalloutDescription"
+              defaultMessage="Fleet has detected that the selected agent policy, {configName}, is already in use by
             some of your agents. As a result of this action, Fleet will deploy updates to all agents
-            that use this configuration."
+            that use this policy."
               values={{
-                configName: <b>{agentConfig.name}</b>,
+                configName: <b>{agentPolicy.name}</b>,
               }}
             />
           </div>
         </EuiCallOut>
         <EuiSpacer size="l" />
         <FormattedMessage
-          id="xpack.ingestManager.agentConfig.confirmModalDescription"
+          id="xpack.ingestManager.agentPolicy.confirmModalDescription"
           defaultMessage="This action can not be undone. Are you sure you wish to continue?"
         />
       </EuiConfirmModal>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/index.ts
index 3794a1f1afd265..5266176ff296e9 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/index.ts
@@ -3,10 +3,10 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-export { AgentConfigForm, agentConfigFormValidation } from './config_form';
-export { AgentConfigDeleteProvider } from './config_delete_provider';
-export { PackageConfigDeleteProvider } from './package_config_delete_provider';
+export { AgentPolicyForm, agentPolicyFormValidation } from './config_form';
+export { AgentPolicyDeleteProvider } from './config_delete_provider';
+export { PackagePolicyDeleteProvider } from './package_config_delete_provider';
 export { LinkedAgentCount } from './linked_agent_count';
 export { ConfirmDeployConfigModal } from './confirm_deploy_modal';
 export { DangerEuiContextMenuItem } from './danger_eui_context_menu_item';
-export { AgentConfigActionMenu } from './actions_menu';
+export { AgentPolicyActionMenu } from './actions_menu';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/linked_agent_count.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/linked_agent_count.tsx
index 8294597e43c500..4b88617f14e4b0 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/linked_agent_count.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/linked_agent_count.tsx
@@ -10,12 +10,12 @@ import { EuiLink } from '@elastic/eui';
 import { useLink } from '../../../hooks';
 import { AGENT_SAVED_OBJECT_TYPE } from '../../../constants';
 
-export const LinkedAgentCount = memo<{ count: number; agentConfigId: string }>(
-  ({ count, agentConfigId }) => {
+export const LinkedAgentCount = memo<{ count: number; agentPolicyId: string }>(
+  ({ count, agentPolicyId }) => {
     const { getHref } = useLink();
     const displayValue = (
       <FormattedMessage
-        id="xpack.ingestManager.agentConfig.linkedAgentCountText"
+        id="xpack.ingestManager.agentPolicy.linkedAgentCountText"
         defaultMessage="{count, plural, one {# agent} other {# agents}}"
         values={{ count }}
       />
@@ -23,7 +23,7 @@ export const LinkedAgentCount = memo<{ count: number; agentConfigId: string }>(
     return count > 0 ? (
       <EuiLink
         href={getHref('fleet_agent_list', {
-          kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id : ${agentConfigId}`,
+          kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id : ${agentPolicyId}`,
         })}
       >
         {displayValue}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/package_config_delete_provider.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/package_config_delete_provider.tsx
index 3421b70715c351..aeba0c8d29f2d1 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/package_config_delete_provider.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/package_config_delete_provider.tsx
@@ -8,31 +8,31 @@ import React, { Fragment, useMemo, useRef, useState } from 'react';
 import { EuiCallOut, EuiConfirmModal, EuiOverlayMask, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { useCore, sendRequest, sendDeletePackageConfig, useConfig } from '../../../hooks';
+import { useCore, sendRequest, sendDeletePackagePolicy, useConfig } from '../../../hooks';
 import { AGENT_API_ROUTES, AGENT_SAVED_OBJECT_TYPE } from '../../../constants';
-import { AgentConfig } from '../../../types';
+import { AgentPolicy } from '../../../types';
 
 interface Props {
-  agentConfig: AgentConfig;
-  children: (deletePackageConfigsPrompt: DeletePackageConfigsPrompt) => React.ReactElement;
+  agentPolicy: AgentPolicy;
+  children: (deletePackagePoliciesPrompt: DeletePackagePoliciesPrompt) => React.ReactElement;
 }
 
-export type DeletePackageConfigsPrompt = (
-  packageConfigsToDelete: string[],
+export type DeletePackagePoliciesPrompt = (
+  packagePoliciesToDelete: string[],
   onSuccess?: OnSuccessCallback
 ) => void;
 
-type OnSuccessCallback = (packageConfigsDeleted: string[]) => void;
+type OnSuccessCallback = (packagePoliciesDeleted: string[]) => void;
 
-export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
-  agentConfig,
+export const PackagePolicyDeleteProvider: React.FunctionComponent<Props> = ({
+  agentPolicy,
   children,
 }) => {
   const { notifications } = useCore();
   const {
     fleet: { enabled: isFleetEnabled },
   } = useConfig();
-  const [packageConfigs, setPackageConfigs] = useState<string[]>([]);
+  const [packagePolicies, setPackagePolicies] = useState<string[]>([]);
   const [isModalOpen, setIsModalOpen] = useState<boolean>(false);
   const [isLoadingAgentsCount, setIsLoadingAgentsCount] = useState<boolean>(false);
   const [agentsCount, setAgentsCount] = useState<number>(0);
@@ -51,22 +51,22 @@ export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
         query: {
           page: 1,
           perPage: 1,
-          kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id : ${agentConfig.id}`,
+          kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id : ${agentPolicy.id}`,
         },
       });
       setAgentsCount(data?.total || 0);
       setIsLoadingAgentsCount(false);
     },
-    [agentConfig.id, isFleetEnabled, isLoadingAgentsCount]
+    [agentPolicy.id, isFleetEnabled, isLoadingAgentsCount]
   );
 
-  const deletePackageConfigsPrompt = useMemo(
-    (): DeletePackageConfigsPrompt => (packageConfigsToDelete, onSuccess = () => undefined) => {
-      if (!Array.isArray(packageConfigsToDelete) || packageConfigsToDelete.length === 0) {
-        throw new Error('No package configs specified for deletion');
+  const deletePackagePoliciesPrompt = useMemo(
+    (): DeletePackagePoliciesPrompt => (packagePoliciesToDelete, onSuccess = () => undefined) => {
+      if (!Array.isArray(packagePoliciesToDelete) || packagePoliciesToDelete.length === 0) {
+        throw new Error('No package policies specified for deletion');
       }
       setIsModalOpen(true);
-      setPackageConfigs(packageConfigsToDelete);
+      setPackagePolicies(packagePoliciesToDelete);
       fetchAgentsCount();
       onSuccessCallback.current = onSuccess;
     },
@@ -75,7 +75,7 @@ export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
 
   const closeModal = useMemo(
     () => () => {
-      setPackageConfigs([]);
+      setPackagePolicies([]);
       setIsLoading(false);
       setIsLoadingAgentsCount(false);
       setIsModalOpen(false);
@@ -83,12 +83,12 @@ export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
     []
   );
 
-  const deletePackageConfigs = useMemo(
+  const deletePackagePolicies = useMemo(
     () => async () => {
       setIsLoading(true);
 
       try {
-        const { data } = await sendDeletePackageConfig({ packageConfigIds: packageConfigs });
+        const { data } = await sendDeletePackagePolicy({ packagePolicyIds: packagePolicies });
         const successfulResults = data?.filter((result) => result.success) || [];
         const failedResults = data?.filter((result) => !result.success) || [];
 
@@ -96,14 +96,14 @@ export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
           const hasMultipleSuccesses = successfulResults.length > 1;
           const successMessage = hasMultipleSuccesses
             ? i18n.translate(
-                'xpack.ingestManager.deletePackageConfig.successMultipleNotificationTitle',
+                'xpack.ingestManager.deletePackagePolicy.successMultipleNotificationTitle',
                 {
                   defaultMessage: 'Deleted {count} integrations',
                   values: { count: successfulResults.length },
                 }
               )
             : i18n.translate(
-                'xpack.ingestManager.deletePackageConfig.successSingleNotificationTitle',
+                'xpack.ingestManager.deletePackagePolicy.successSingleNotificationTitle',
                 {
                   defaultMessage: "Deleted integration '{id}'",
                   values: { id: successfulResults[0].id },
@@ -116,14 +116,14 @@ export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
           const hasMultipleFailures = failedResults.length > 1;
           const failureMessage = hasMultipleFailures
             ? i18n.translate(
-                'xpack.ingestManager.deletePackageConfig.failureMultipleNotificationTitle',
+                'xpack.ingestManager.deletePackagePolicy.failureMultipleNotificationTitle',
                 {
                   defaultMessage: 'Error deleting {count} integrations',
                   values: { count: failedResults.length },
                 }
               )
             : i18n.translate(
-                'xpack.ingestManager.deletePackageConfig.failureSingleNotificationTitle',
+                'xpack.ingestManager.deletePackagePolicy.failureSingleNotificationTitle',
                 {
                   defaultMessage: "Error deleting integration '{id}'",
                   values: { id: failedResults[0].id },
@@ -137,14 +137,14 @@ export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
         }
       } catch (e) {
         notifications.toasts.addDanger(
-          i18n.translate('xpack.ingestManager.deletePackageConfig.fatalErrorNotificationTitle', {
+          i18n.translate('xpack.ingestManager.deletePackagePolicy.fatalErrorNotificationTitle', {
             defaultMessage: 'Error deleting integration',
           })
         );
       }
       closeModal();
     },
-    [closeModal, packageConfigs, notifications.toasts]
+    [closeModal, packagePolicies, notifications.toasts]
   );
 
   const renderModal = () => {
@@ -157,31 +157,31 @@ export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
         <EuiConfirmModal
           title={
             <FormattedMessage
-              id="xpack.ingestManager.deletePackageConfig.confirmModal.deleteMultipleTitle"
+              id="xpack.ingestManager.deletePackagePolicy.confirmModal.deleteMultipleTitle"
               defaultMessage="Delete {count, plural, one {integration} other {# integrations}}?"
-              values={{ count: packageConfigs.length }}
+              values={{ count: packagePolicies.length }}
             />
           }
           onCancel={closeModal}
-          onConfirm={deletePackageConfigs}
+          onConfirm={deletePackagePolicies}
           cancelButtonText={
             <FormattedMessage
-              id="xpack.ingestManager.deletePackageConfig.confirmModal.cancelButtonLabel"
+              id="xpack.ingestManager.deletePackagePolicy.confirmModal.cancelButtonLabel"
               defaultMessage="Cancel"
             />
           }
           confirmButtonText={
             isLoading || isLoadingAgentsCount ? (
               <FormattedMessage
-                id="xpack.ingestManager.deletePackageConfig.confirmModal.loadingButtonLabel"
+                id="xpack.ingestManager.deletePackagePolicy.confirmModal.loadingButtonLabel"
                 defaultMessage="Loading…"
               />
             ) : (
               <FormattedMessage
-                id="xpack.ingestManager.deletePackageConfig.confirmModal.confirmButtonLabel"
-                defaultMessage="Delete {agentConfigsCount, plural, one {integration} other {integrations}}"
+                id="xpack.ingestManager.deletePackagePolicy.confirmModal.confirmButtonLabel"
+                defaultMessage="Delete {agentPoliciesCount, plural, one {integration} other {integrations}}"
                 values={{
-                  agentConfigsCount: packageConfigs.length,
+                  agentPoliciesCount: packagePolicies.length,
                 }}
               />
             )
@@ -191,7 +191,7 @@ export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
         >
           {isLoadingAgentsCount ? (
             <FormattedMessage
-              id="xpack.ingestManager.deletePackageConfig.confirmModal.loadingAgentsCountMessage"
+              id="xpack.ingestManager.deletePackagePolicy.confirmModal.loadingAgentsCountMessage"
               defaultMessage="Checking affected agents…"
             />
           ) : agentsCount ? (
@@ -200,17 +200,17 @@ export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
                 color="danger"
                 title={
                   <FormattedMessage
-                    id="xpack.ingestManager.deletePackageConfig.confirmModal.affectedAgentsTitle"
+                    id="xpack.ingestManager.deletePackagePolicy.confirmModal.affectedAgentsTitle"
                     defaultMessage="This action will affect {agentsCount} {agentsCount, plural, one {agent} other {agents}}."
                     values={{ agentsCount }}
                   />
                 }
               >
                 <FormattedMessage
-                  id="xpack.ingestManager.deletePackageConfig.confirmModal.affectedAgentsMessage"
-                  defaultMessage="Fleet has detected that {agentConfigName} is already in use by some of your agents."
+                  id="xpack.ingestManager.deletePackagePolicy.confirmModal.affectedAgentsMessage"
+                  defaultMessage="Fleet has detected that {agentPolicyName} is already in use by some of your agents."
                   values={{
-                    agentConfigName: <strong>{agentConfig.name}</strong>,
+                    agentPolicyName: <strong>{agentPolicy.name}</strong>,
                   }}
                 />
               </EuiCallOut>
@@ -219,7 +219,7 @@ export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
           ) : null}
           {!isLoadingAgentsCount && (
             <FormattedMessage
-              id="xpack.ingestManager.deletePackageConfig.confirmModal.generalMessage"
+              id="xpack.ingestManager.deletePackagePolicy.confirmModal.generalMessage"
               defaultMessage="This action can not be undone. Are you sure you wish to continue?"
             />
           )}
@@ -230,7 +230,7 @@ export const PackageConfigDeleteProvider: React.FunctionComponent<Props> = ({
 
   return (
     <Fragment>
-      {children(deletePackageConfigsPrompt)}
+      {children(deletePackagePoliciesPrompt)}
       {renderModal()}
     </Fragment>
   );
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/custom_package_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/custom_package_config.tsx
index 98ab507c1453dc..47c14ce0a3e811 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/custom_package_config.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/custom_package_config.tsx
@@ -6,39 +6,39 @@
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiEmptyPrompt, EuiText } from '@elastic/eui';
-import { NewPackageConfig } from '../../../../types';
-import { CreatePackageConfigFrom } from '../types';
+import { NewPackagePolicy } from '../../../../types';
+import { CreatePackagePolicyFrom } from '../types';
 
-export interface CustomConfigurePackageConfigProps {
+export interface CustomConfigurePackagePolicyProps {
   packageName: string;
-  from: CreatePackageConfigFrom;
-  packageConfig: NewPackageConfig;
-  packageConfigId?: string;
+  from: CreatePackagePolicyFrom;
+  packagePolicy: NewPackagePolicy;
+  packagePolicyId?: string;
 }
 
 /**
  * Custom content type that external plugins can provide to Ingest's
- * package config UI.
+ * package policy UI.
  */
-export type CustomConfigurePackageConfigContent = React.FC<CustomConfigurePackageConfigProps>;
+export type CustomConfigurePackagePolicyContent = React.FC<CustomConfigurePackagePolicyProps>;
 
 type AllowedPackageKey = 'endpoint';
-const PackageConfigMapping: {
-  [key: string]: CustomConfigurePackageConfigContent;
+const PackagePolicyMapping: {
+  [key: string]: CustomConfigurePackagePolicyContent;
 } = {};
 
 /**
  * Plugins can call this function from the start lifecycle to
- * register a custom component in the Ingest package config.
+ * register a custom component in the Ingest package policy.
  */
-export function registerPackageConfigComponent(
+export function registerPackagePolicyComponent(
   key: AllowedPackageKey,
-  value: CustomConfigurePackageConfigContent
+  value: CustomConfigurePackagePolicyContent
 ) {
-  PackageConfigMapping[key] = value;
+  PackagePolicyMapping[key] = value;
 }
 
-const EmptyPackageConfig: CustomConfigurePackageConfigContent = () => (
+const EmptyPackagePolicy: CustomConfigurePackagePolicyContent = () => (
   <EuiEmptyPrompt
     iconType="checkInCircleFilled"
     iconColor="secondary"
@@ -46,7 +46,7 @@ const EmptyPackageConfig: CustomConfigurePackageConfigContent = () => (
       <EuiText>
         <p>
           <FormattedMessage
-            id="xpack.ingestManager.createPackageConfig.stepConfigure.noConfigOptionsMessage"
+            id="xpack.ingestManager.createPackagePolicy.stepConfigure.noPolicyOptionsMessage"
             defaultMessage="Nothing to configure"
           />
         </p>
@@ -55,7 +55,7 @@ const EmptyPackageConfig: CustomConfigurePackageConfigContent = () => (
   />
 );
 
-export const CustomPackageConfig = (props: CustomConfigurePackageConfigProps) => {
-  const CustomPackageConfigContent = PackageConfigMapping[props.packageName] || EmptyPackageConfig;
-  return <CustomPackageConfigContent {...props} />;
+export const CustomPackagePolicy = (props: CustomConfigurePackagePolicyProps) => {
+  const CustomPackagePolicyContent = PackagePolicyMapping[props.packageName] || EmptyPackagePolicy;
+  return <CustomPackagePolicyContent {...props} />;
 };
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/index.ts
index e8d2ef329b25ef..28b19d0bf7040d 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/index.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-export { CreatePackageConfigPageLayout } from './layout';
-export { PackageConfigInputPanel } from './package_config_input_panel';
-export { PackageConfigInputVarField } from './package_config_input_var_field';
-export { CustomPackageConfig } from './custom_package_config';
+export { CreatePackagePolicyPageLayout } from './layout';
+export { PackagePolicyInputPanel } from './package_config_input_panel';
+export { PackagePolicyInputVarField } from './package_config_input_var_field';
+export { CustomPackagePolicy } from './custom_package_config';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/layout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/layout.tsx
index 8316e2500453a5..5eb45a3bfb74e9 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/layout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/layout.tsx
@@ -16,15 +16,15 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import { WithHeaderLayout } from '../../../../layouts';
-import { AgentConfig, PackageInfo } from '../../../../types';
+import { AgentPolicy, PackageInfo } from '../../../../types';
 import { PackageIcon } from '../../../../components/package_icon';
-import { CreatePackageConfigFrom } from '../types';
+import { CreatePackagePolicyFrom } from '../types';
 
-export const CreatePackageConfigPageLayout: React.FunctionComponent<{
-  from: CreatePackageConfigFrom;
+export const CreatePackagePolicyPageLayout: React.FunctionComponent<{
+  from: CreatePackagePolicyFrom;
   cancelUrl: string;
   onCancel?: React.ReactEventHandler;
-  agentConfig?: AgentConfig;
+  agentPolicy?: AgentPolicy;
   packageInfo?: PackageInfo;
   'data-test-subj'?: string;
 }> = memo(
@@ -32,7 +32,7 @@ export const CreatePackageConfigPageLayout: React.FunctionComponent<{
     from,
     cancelUrl,
     onCancel,
-    agentConfig,
+    agentPolicy,
     packageInfo,
     children,
     'data-test-subj': dataTestSubj,
@@ -54,7 +54,7 @@ export const CreatePackageConfigPageLayout: React.FunctionComponent<{
                 <h1>
                   {from === 'edit' ? (
                     <FormattedMessage
-                      id="xpack.ingestManager.editPackageConfig.pageTitleWithPackageName"
+                      id="xpack.ingestManager.editPackagePolicy.pageTitleWithPackageName"
                       defaultMessage="Edit {packageName} integration"
                       values={{
                         packageName: packageInfo.title,
@@ -62,7 +62,7 @@ export const CreatePackageConfigPageLayout: React.FunctionComponent<{
                     />
                   ) : (
                     <FormattedMessage
-                      id="xpack.ingestManager.createPackageConfig.pageTitleWithPackageName"
+                      id="xpack.ingestManager.createPackagePolicy.pageTitleWithPackageName"
                       defaultMessage="Add {packageName} integration"
                       values={{
                         packageName: packageInfo.title,
@@ -80,7 +80,7 @@ export const CreatePackageConfigPageLayout: React.FunctionComponent<{
         <EuiText>
           <h1>
             <FormattedMessage
-              id="xpack.ingestManager.editPackageConfig.pageTitle"
+              id="xpack.ingestManager.editPackagePolicy.pageTitle"
               defaultMessage="Edit integration"
             />
           </h1>
@@ -89,7 +89,7 @@ export const CreatePackageConfigPageLayout: React.FunctionComponent<{
         <EuiText>
           <h1>
             <FormattedMessage
-              id="xpack.ingestManager.createPackageConfig.pageTitle"
+              id="xpack.ingestManager.createPackagePolicy.pageTitle"
               defaultMessage="Add integration"
             />
           </h1>
@@ -100,17 +100,17 @@ export const CreatePackageConfigPageLayout: React.FunctionComponent<{
     const pageDescription = useMemo(() => {
       return from === 'edit' ? (
         <FormattedMessage
-          id="xpack.ingestManager.editPackageConfig.pageDescription"
-          defaultMessage="Modify integration settings and deploy changes to the selected agent configuration."
+          id="xpack.ingestManager.editPackagePolicy.pageDescription"
+          defaultMessage="Modify integration settings and deploy changes to the selected agent policy."
         />
-      ) : from === 'config' ? (
+      ) : from === 'policy' ? (
         <FormattedMessage
-          id="xpack.ingestManager.createPackageConfig.pageDescriptionfromConfig"
-          defaultMessage="Configure an integration for the selected agent configuration."
+          id="xpack.ingestManager.createPackagePolicy.pageDescriptionfromPolicy"
+          defaultMessage="Configure an integration for the selected agent policy."
         />
       ) : (
         <FormattedMessage
-          id="xpack.ingestManager.createPackageConfig.pageDescriptionfromPackage"
+          id="xpack.ingestManager.createPackagePolicy.pageDescriptionfromPackage"
           defaultMessage="Follow the instructions below to add this integration to an agent configuraiton."
         />
       );
@@ -129,7 +129,7 @@ export const CreatePackageConfigPageLayout: React.FunctionComponent<{
             data-test-subj={`${dataTestSubj}_cancelBackLink`}
           >
             <FormattedMessage
-              id="xpack.ingestManager.createPackageConfig.cancelLinkText"
+              id="xpack.ingestManager.createPackagePolicy.cancelLinkText"
               defaultMessage="Cancel"
             />
           </EuiButtonEmpty>
@@ -145,16 +145,16 @@ export const CreatePackageConfigPageLayout: React.FunctionComponent<{
     );
 
     const rightColumn =
-      agentConfig && (from === 'config' || from === 'edit') ? (
+      agentPolicy && (from === 'policy' || from === 'edit') ? (
         <EuiDescriptionList className="eui-textRight" textStyle="reverse">
           <EuiDescriptionListTitle>
             <FormattedMessage
-              id="xpack.ingestManager.createPackageConfig.agentConfigurationNameLabel"
-              defaultMessage="Agent configuration"
+              id="xpack.ingestManager.createPackagePolicy.agentPolicyNameLabel"
+              defaultMessage="Agent policy"
             />
           </EuiDescriptionListTitle>
           <EuiDescriptionListDescription className="eui-textBreakWord">
-            {agentConfig?.name || '-'}
+            {agentPolicy?.name || '-'}
           </EuiDescriptionListDescription>
         </EuiDescriptionList>
       ) : undefined;
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_config.tsx
index fd3a64bc760a05..93441814757d35 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_config.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_config.tsx
@@ -14,29 +14,29 @@ import {
   EuiSpacer,
   EuiButtonEmpty,
 } from '@elastic/eui';
-import { PackageConfigInput, RegistryVarsEntry } from '../../../../types';
+import { PackagePolicyInput, RegistryVarsEntry } from '../../../../types';
 import {
   isAdvancedVar,
-  PackageConfigConfigValidationResults,
+  PackagePolicyConfigValidationResults,
   validationHasErrors,
 } from '../services';
-import { PackageConfigInputVarField } from './package_config_input_var_field';
+import { PackagePolicyInputVarField } from './package_config_input_var_field';
 
 const FlexItemWithMaxWidth = styled(EuiFlexItem)`
   max-width: calc(50% - ${(props) => props.theme.eui.euiSizeL});
 `;
 
-export const PackageConfigInputConfig: React.FunctionComponent<{
+export const PackagePolicyInputConfig: React.FunctionComponent<{
   packageInputVars?: RegistryVarsEntry[];
-  packageConfigInput: PackageConfigInput;
-  updatePackageConfigInput: (updatedInput: Partial<PackageConfigInput>) => void;
-  inputVarsValidationResults: PackageConfigConfigValidationResults;
+  packagePolicyInput: PackagePolicyInput;
+  updatePackagePolicyInput: (updatedInput: Partial<PackagePolicyInput>) => void;
+  inputVarsValidationResults: PackagePolicyConfigValidationResults;
   forceShowErrors?: boolean;
 }> = memo(
   ({
     packageInputVars,
-    packageConfigInput,
-    updatePackageConfigInput,
+    packagePolicyInput,
+    updatePackagePolicyInput,
     inputVarsValidationResults,
     forceShowErrors,
   }) => {
@@ -76,7 +76,7 @@ export const PackageConfigInputConfig: React.FunctionComponent<{
               <EuiText>
                 <h4>
                   <FormattedMessage
-                    id="xpack.ingestManager.createPackageConfig.stepConfigure.inputSettingsTitle"
+                    id="xpack.ingestManager.createPackagePolicy.stepConfigure.inputSettingsTitle"
                     defaultMessage="Settings"
                   />
                 </h4>
@@ -85,7 +85,7 @@ export const PackageConfigInputConfig: React.FunctionComponent<{
               <EuiText color="subdued" size="s">
                 <p>
                   <FormattedMessage
-                    id="xpack.ingestManager.createPackageConfig.stepConfigure.inputSettingsDescription"
+                    id="xpack.ingestManager.createPackagePolicy.stepConfigure.inputSettingsDescription"
                     defaultMessage="The following settings are applicable to all inputs below."
                   />
                 </p>
@@ -97,16 +97,16 @@ export const PackageConfigInputConfig: React.FunctionComponent<{
           <EuiFlexGroup direction="column" gutterSize="m">
             {requiredVars.map((varDef) => {
               const { name: varName, type: varType } = varDef;
-              const value = packageConfigInput.vars![varName].value;
+              const value = packagePolicyInput.vars![varName].value;
               return (
                 <EuiFlexItem key={varName}>
-                  <PackageConfigInputVarField
+                  <PackagePolicyInputVarField
                     varDef={varDef}
                     value={value}
                     onChange={(newValue: any) => {
-                      updatePackageConfigInput({
+                      updatePackagePolicyInput({
                         vars: {
-                          ...packageConfigInput.vars,
+                          ...packagePolicyInput.vars,
                           [varName]: {
                             type: varType,
                             value: newValue,
@@ -133,7 +133,7 @@ export const PackageConfigInputConfig: React.FunctionComponent<{
                         flush="left"
                       >
                         <FormattedMessage
-                          id="xpack.ingestManager.createPackageConfig.stepConfigure.toggleAdvancedOptionsButtonText"
+                          id="xpack.ingestManager.createPackagePolicy.stepConfigure.toggleAdvancedOptionsButtonText"
                           defaultMessage="Advanced options"
                         />
                       </EuiButtonEmpty>
@@ -142,7 +142,7 @@ export const PackageConfigInputConfig: React.FunctionComponent<{
                       <EuiFlexItem grow={false}>
                         <EuiText color="danger" size="s">
                           <FormattedMessage
-                            id="xpack.ingestManager.createPackageConfig.stepConfigure.errorCountText"
+                            id="xpack.ingestManager.createPackagePolicy.stepConfigure.errorCountText"
                             defaultMessage="{count, plural, one {# error} other {# errors}}"
                             values={{ count: advancedVarsWithErrorsCount }}
                           />
@@ -154,16 +154,16 @@ export const PackageConfigInputConfig: React.FunctionComponent<{
                 {isShowingAdvanced
                   ? advancedVars.map((varDef) => {
                       const { name: varName, type: varType } = varDef;
-                      const value = packageConfigInput.vars![varName].value;
+                      const value = packagePolicyInput.vars![varName].value;
                       return (
                         <EuiFlexItem key={varName}>
-                          <PackageConfigInputVarField
+                          <PackagePolicyInputVarField
                             varDef={varDef}
                             value={value}
                             onChange={(newValue: any) => {
-                              updatePackageConfigInput({
+                              updatePackagePolicyInput({
                                 vars: {
-                                  ...packageConfigInput.vars,
+                                  ...packagePolicyInput.vars,
                                   [varName]: {
                                     type: varType,
                                     value: newValue,
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_panel.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_panel.tsx
index 438a17b7ccf356..83eae7c3727041 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_panel.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_panel.tsx
@@ -17,18 +17,18 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import {
-  PackageConfigInput,
-  PackageConfigInputStream,
+  PackagePolicyInput,
+  PackagePolicyInputStream,
   RegistryInput,
   RegistryStream,
 } from '../../../../types';
 import {
-  PackageConfigInputValidationResults,
+  PackagePolicyInputValidationResults,
   hasInvalidButRequiredVar,
   countValidationErrors,
 } from '../services';
-import { PackageConfigInputConfig } from './package_config_input_config';
-import { PackageConfigInputStreamConfig } from './package_config_input_stream';
+import { PackagePolicyInputConfig } from './package_config_input_config';
+import { PackagePolicyInputStreamConfig } from './package_config_input_stream';
 
 const ShortenedHorizontalRule = styled(EuiHorizontalRule)`
   &&& {
@@ -40,18 +40,18 @@ const ShortenedHorizontalRule = styled(EuiHorizontalRule)`
 const shouldShowStreamsByDefault = (
   packageInput: RegistryInput,
   packageInputStreams: Array<RegistryStream & { data_stream: { dataset: string } }>,
-  packageConfigInput: PackageConfigInput
+  packagePolicyInput: PackagePolicyInput
 ): boolean => {
   return (
-    packageConfigInput.enabled &&
-    (hasInvalidButRequiredVar(packageInput.vars, packageConfigInput.vars) ||
+    packagePolicyInput.enabled &&
+    (hasInvalidButRequiredVar(packageInput.vars, packagePolicyInput.vars) ||
       Boolean(
         packageInputStreams.find(
           (stream) =>
             stream.enabled &&
             hasInvalidButRequiredVar(
               stream.vars,
-              packageConfigInput.streams.find(
+              packagePolicyInput.streams.find(
                 (pkgStream) => stream.data_stream.dataset === pkgStream.data_stream.dataset
               )?.vars
             )
@@ -60,25 +60,25 @@ const shouldShowStreamsByDefault = (
   );
 };
 
-export const PackageConfigInputPanel: React.FunctionComponent<{
+export const PackagePolicyInputPanel: React.FunctionComponent<{
   packageInput: RegistryInput;
   packageInputStreams: Array<RegistryStream & { data_stream: { dataset: string } }>;
-  packageConfigInput: PackageConfigInput;
-  updatePackageConfigInput: (updatedInput: Partial<PackageConfigInput>) => void;
-  inputValidationResults: PackageConfigInputValidationResults;
+  packagePolicyInput: PackagePolicyInput;
+  updatePackagePolicyInput: (updatedInput: Partial<PackagePolicyInput>) => void;
+  inputValidationResults: PackagePolicyInputValidationResults;
   forceShowErrors?: boolean;
 }> = memo(
   ({
     packageInput,
     packageInputStreams,
-    packageConfigInput,
-    updatePackageConfigInput,
+    packagePolicyInput,
+    updatePackagePolicyInput,
     inputValidationResults,
     forceShowErrors,
   }) => {
     // Showing streams toggle state
     const [isShowingStreams, setIsShowingStreams] = useState<boolean>(
-      shouldShowStreamsByDefault(packageInput, packageInputStreams, packageConfigInput)
+      shouldShowStreamsByDefault(packageInput, packageInputStreams, packagePolicyInput)
     );
 
     // Errors state
@@ -89,12 +89,12 @@ export const PackageConfigInputPanel: React.FunctionComponent<{
       .map((packageInputStream) => {
         return {
           packageInputStream,
-          packageConfigInputStream: packageConfigInput.streams.find(
+          packagePolicyInputStream: packagePolicyInput.streams.find(
             (stream) => stream.data_stream.dataset === packageInputStream.data_stream.dataset
           ),
         };
       })
-      .filter((stream) => Boolean(stream.packageConfigInputStream));
+      .filter((stream) => Boolean(stream.packagePolicyInputStream));
 
     return (
       <>
@@ -111,12 +111,12 @@ export const PackageConfigInputPanel: React.FunctionComponent<{
                   </EuiFlexItem>
                 </EuiFlexGroup>
               }
-              checked={packageConfigInput.enabled}
+              checked={packagePolicyInput.enabled}
               onChange={(e) => {
                 const enabled = e.target.checked;
-                updatePackageConfigInput({
+                updatePackagePolicyInput({
                   enabled,
-                  streams: packageConfigInput.streams.map((stream) => ({
+                  streams: packagePolicyInput.streams.map((stream) => ({
                     ...stream,
                     enabled,
                   })),
@@ -133,7 +133,7 @@ export const PackageConfigInputPanel: React.FunctionComponent<{
                 <EuiFlexItem grow={false}>
                   <EuiText color="danger" size="s">
                     <FormattedMessage
-                      id="xpack.ingestManager.createPackageConfig.stepConfigure.errorCountText"
+                      id="xpack.ingestManager.createPackagePolicy.stepConfigure.errorCountText"
                       defaultMessage="{count, plural, one {# error} other {# errors}}"
                       values={{ count: errorCount }}
                     />
@@ -148,7 +148,7 @@ export const PackageConfigInputPanel: React.FunctionComponent<{
                   aria-label={
                     isShowingStreams
                       ? i18n.translate(
-                          'xpack.ingestManager.createPackageConfig.stepConfigure.hideStreamsAriaLabel',
+                          'xpack.ingestManager.createPackagePolicy.stepConfigure.hideStreamsAriaLabel',
                           {
                             defaultMessage: 'Hide {type} inputs',
                             values: {
@@ -157,7 +157,7 @@ export const PackageConfigInputPanel: React.FunctionComponent<{
                           }
                         )
                       : i18n.translate(
-                          'xpack.ingestManager.createPackageConfig.stepConfigure.showStreamsAriaLabel',
+                          'xpack.ingestManager.createPackagePolicy.stepConfigure.showStreamsAriaLabel',
                           {
                             defaultMessage: 'Show {type} inputs',
                             values: {
@@ -175,13 +175,13 @@ export const PackageConfigInputPanel: React.FunctionComponent<{
         {/* Header rule break */}
         {isShowingStreams ? <EuiSpacer size="l" /> : null}
 
-        {/* Input level configuration */}
+        {/* Input level policy */}
         {isShowingStreams && packageInput.vars && packageInput.vars.length ? (
           <Fragment>
-            <PackageConfigInputConfig
+            <PackagePolicyInputConfig
               packageInputVars={packageInput.vars}
-              packageConfigInput={packageConfigInput}
-              updatePackageConfigInput={updatePackageConfigInput}
+              packagePolicyInput={packagePolicyInput}
+              updatePackagePolicyInput={updatePackagePolicyInput}
               inputVarsValidationResults={{ vars: inputValidationResults.vars }}
               forceShowErrors={forceShowErrors}
             />
@@ -189,45 +189,45 @@ export const PackageConfigInputPanel: React.FunctionComponent<{
           </Fragment>
         ) : null}
 
-        {/* Per-stream configuration */}
+        {/* Per-stream policy */}
         {isShowingStreams ? (
           <EuiFlexGroup direction="column">
-            {inputStreams.map(({ packageInputStream, packageConfigInputStream }, index) => (
+            {inputStreams.map(({ packageInputStream, packagePolicyInputStream }, index) => (
               <EuiFlexItem key={index}>
-                <PackageConfigInputStreamConfig
+                <PackagePolicyInputStreamConfig
                   packageInputStream={packageInputStream}
-                  packageConfigInputStream={packageConfigInputStream!}
-                  updatePackageConfigInputStream={(
-                    updatedStream: Partial<PackageConfigInputStream>
+                  packagePolicyInputStream={packagePolicyInputStream!}
+                  updatePackagePolicyInputStream={(
+                    updatedStream: Partial<PackagePolicyInputStream>
                   ) => {
-                    const indexOfUpdatedStream = packageConfigInput.streams.findIndex(
+                    const indexOfUpdatedStream = packagePolicyInput.streams.findIndex(
                       (stream) =>
                         stream.data_stream.dataset === packageInputStream.data_stream.dataset
                     );
-                    const newStreams = [...packageConfigInput.streams];
+                    const newStreams = [...packagePolicyInput.streams];
                     newStreams[indexOfUpdatedStream] = {
                       ...newStreams[indexOfUpdatedStream],
                       ...updatedStream,
                     };
 
-                    const updatedInput: Partial<PackageConfigInput> = {
+                    const updatedInput: Partial<PackagePolicyInput> = {
                       streams: newStreams,
                     };
 
                     // Update input enabled state if needed
-                    if (!packageConfigInput.enabled && updatedStream.enabled) {
+                    if (!packagePolicyInput.enabled && updatedStream.enabled) {
                       updatedInput.enabled = true;
                     } else if (
-                      packageConfigInput.enabled &&
+                      packagePolicyInput.enabled &&
                       !newStreams.find((stream) => stream.enabled)
                     ) {
                       updatedInput.enabled = false;
                     }
 
-                    updatePackageConfigInput(updatedInput);
+                    updatePackagePolicyInput(updatedInput);
                   }}
                   inputStreamValidationResults={
-                    inputValidationResults.streams![packageConfigInputStream!.id]
+                    inputValidationResults.streams![packagePolicyInputStream!.id]
                   }
                   forceShowErrors={forceShowErrors}
                 />
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_stream.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_stream.tsx
index 04a0f4e6dbb74b..1737ccc51f9100 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_stream.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_stream.tsx
@@ -16,29 +16,29 @@ import {
   EuiSpacer,
   EuiButtonEmpty,
 } from '@elastic/eui';
-import { PackageConfigInputStream, RegistryStream, RegistryVarsEntry } from '../../../../types';
+import { PackagePolicyInputStream, RegistryStream, RegistryVarsEntry } from '../../../../types';
 import {
   isAdvancedVar,
-  PackageConfigConfigValidationResults,
+  PackagePolicyConfigValidationResults,
   validationHasErrors,
 } from '../services';
-import { PackageConfigInputVarField } from './package_config_input_var_field';
+import { PackagePolicyInputVarField } from './package_config_input_var_field';
 
 const FlexItemWithMaxWidth = styled(EuiFlexItem)`
   max-width: calc(50% - ${(props) => props.theme.eui.euiSizeL});
 `;
 
-export const PackageConfigInputStreamConfig: React.FunctionComponent<{
+export const PackagePolicyInputStreamConfig: React.FunctionComponent<{
   packageInputStream: RegistryStream;
-  packageConfigInputStream: PackageConfigInputStream;
-  updatePackageConfigInputStream: (updatedStream: Partial<PackageConfigInputStream>) => void;
-  inputStreamValidationResults: PackageConfigConfigValidationResults;
+  packagePolicyInputStream: PackagePolicyInputStream;
+  updatePackagePolicyInputStream: (updatedStream: Partial<PackagePolicyInputStream>) => void;
+  inputStreamValidationResults: PackagePolicyConfigValidationResults;
   forceShowErrors?: boolean;
 }> = memo(
   ({
     packageInputStream,
-    packageConfigInputStream,
-    updatePackageConfigInputStream,
+    packagePolicyInputStream,
+    updatePackagePolicyInputStream,
     inputStreamValidationResults,
     forceShowErrors,
   }) => {
@@ -77,10 +77,10 @@ export const PackageConfigInputStreamConfig: React.FunctionComponent<{
             <EuiFlexItem grow={5}>
               <EuiSwitch
                 label={packageInputStream.title}
-                checked={packageConfigInputStream.enabled}
+                checked={packagePolicyInputStream.enabled}
                 onChange={(e) => {
                   const enabled = e.target.checked;
-                  updatePackageConfigInputStream({
+                  updatePackagePolicyInputStream({
                     enabled,
                   });
                 }}
@@ -100,16 +100,16 @@ export const PackageConfigInputStreamConfig: React.FunctionComponent<{
           <EuiFlexGroup direction="column" gutterSize="m">
             {requiredVars.map((varDef) => {
               const { name: varName, type: varType } = varDef;
-              const value = packageConfigInputStream.vars![varName].value;
+              const value = packagePolicyInputStream.vars![varName].value;
               return (
                 <EuiFlexItem key={varName}>
-                  <PackageConfigInputVarField
+                  <PackagePolicyInputVarField
                     varDef={varDef}
                     value={value}
                     onChange={(newValue: any) => {
-                      updatePackageConfigInputStream({
+                      updatePackagePolicyInputStream({
                         vars: {
-                          ...packageConfigInputStream.vars,
+                          ...packagePolicyInputStream.vars,
                           [varName]: {
                             type: varType,
                             value: newValue,
@@ -135,7 +135,7 @@ export const PackageConfigInputStreamConfig: React.FunctionComponent<{
                         flush="left"
                       >
                         <FormattedMessage
-                          id="xpack.ingestManager.createPackageConfig.stepConfigure.toggleAdvancedOptionsButtonText"
+                          id="xpack.ingestManager.createPackagePolicy.stepConfigure.toggleAdvancedOptionsButtonText"
                           defaultMessage="Advanced options"
                         />
                       </EuiButtonEmpty>
@@ -144,7 +144,7 @@ export const PackageConfigInputStreamConfig: React.FunctionComponent<{
                       <EuiFlexItem grow={false}>
                         <EuiText color="danger" size="s">
                           <FormattedMessage
-                            id="xpack.ingestManager.createPackageConfig.stepConfigure.errorCountText"
+                            id="xpack.ingestManager.createPackagePolicy.stepConfigure.errorCountText"
                             defaultMessage="{count, plural, one {# error} other {# errors}}"
                             values={{ count: advancedVarsWithErrorsCount }}
                           />
@@ -156,16 +156,16 @@ export const PackageConfigInputStreamConfig: React.FunctionComponent<{
                 {isShowingAdvanced
                   ? advancedVars.map((varDef) => {
                       const { name: varName, type: varType } = varDef;
-                      const value = packageConfigInputStream.vars![varName].value;
+                      const value = packagePolicyInputStream.vars![varName].value;
                       return (
                         <EuiFlexItem key={varName}>
-                          <PackageConfigInputVarField
+                          <PackagePolicyInputVarField
                             varDef={varDef}
                             value={value}
                             onChange={(newValue: any) => {
-                              updatePackageConfigInputStream({
+                              updatePackagePolicyInputStream({
                                 vars: {
-                                  ...packageConfigInputStream.vars,
+                                  ...packagePolicyInputStream.vars,
                                   [varName]: {
                                     type: varType,
                                     value: newValue,
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_var_field.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_var_field.tsx
index eb681096a080e6..3620b11948b541 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_var_field.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_var_field.tsx
@@ -12,7 +12,7 @@ import { RegistryVarsEntry } from '../../../../types';
 import 'brace/mode/yaml';
 import 'brace/theme/textmate';
 
-export const PackageConfigInputVarField: React.FunctionComponent<{
+export const PackagePolicyInputVarField: React.FunctionComponent<{
   varDef: RegistryVarsEntry;
   value: any;
   onChange: (newValue: any) => void;
@@ -78,7 +78,7 @@ export const PackageConfigInputVarField: React.FunctionComponent<{
         !required ? (
           <EuiText size="xs" color="subdued">
             <FormattedMessage
-              id="xpack.ingestManager.createPackageConfig.stepConfigure.inputVarFieldOptionalLabel"
+              id="xpack.ingestManager.createPackagePolicy.stepConfigure.inputVarFieldOptionalLabel"
               defaultMessage="Optional"
             />
           </EuiText>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx
index 74cbcdca512dbb..73e876985de7f0 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx
@@ -19,32 +19,32 @@ import {
 } from '@elastic/eui';
 import { EuiStepProps } from '@elastic/eui/src/components/steps/step';
 import {
-  AgentConfig,
+  AgentPolicy,
   PackageInfo,
-  NewPackageConfig,
-  CreatePackageConfigRouteState,
+  NewPackagePolicy,
+  CreatePackagePolicyRouteState,
 } from '../../../types';
 import {
   useLink,
   useBreadcrumbs,
-  sendCreatePackageConfig,
+  sendCreatePackagePolicy,
   useCore,
   useConfig,
   sendGetAgentStatus,
 } from '../../../hooks';
 import { Loading } from '../../../components';
 import { ConfirmDeployConfigModal } from '../components';
-import { CreatePackageConfigPageLayout } from './components';
-import { CreatePackageConfigFrom, PackageConfigFormState } from './types';
+import { CreatePackagePolicyPageLayout } from './components';
+import { CreatePackagePolicyFrom, PackagePolicyFormState } from './types';
 import {
-  PackageConfigValidationResults,
-  validatePackageConfig,
+  PackagePolicyValidationResults,
+  validatePackagePolicy,
   validationHasErrors,
 } from './services';
 import { StepSelectPackage } from './step_select_package';
 import { StepSelectConfig } from './step_select_config';
 import { StepConfigurePackage } from './step_configure_package';
-import { StepDefinePackageConfig } from './step_define_package_config';
+import { StepDefinePackagePolicy } from './step_define_package_config';
 import { useIntraAppState } from '../../../hooks/use_intra_app_state';
 
 const StepsWithLessPadding = styled(EuiSteps)`
@@ -53,7 +53,7 @@ const StepsWithLessPadding = styled(EuiSteps)`
   }
 `;
 
-export const CreatePackageConfigPage: React.FunctionComponent = () => {
+export const CreatePackagePolicyPage: React.FunctionComponent = () => {
   const {
     notifications,
     chrome: { getIsNavDrawerLocked$ },
@@ -64,12 +64,12 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
     fleet: { enabled: isFleetEnabled },
   } = useConfig();
   const {
-    params: { configId, pkgkey },
+    params: { policyId, pkgkey },
   } = useRouteMatch();
   const { getHref, getPath } = useLink();
   const history = useHistory();
-  const routeState = useIntraAppState<CreatePackageConfigRouteState>();
-  const from: CreatePackageConfigFrom = configId ? 'config' : 'package';
+  const routeState = useIntraAppState<CreatePackagePolicyRouteState>();
+  const from: CreatePackagePolicyFrom = policyId ? 'policy' : 'package';
   const [isNavDrawerLocked, setIsNavDrawerLocked] = useState(false);
 
   useEffect(() => {
@@ -80,31 +80,31 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
     return () => subscription.unsubscribe();
   });
 
-  // Agent config and package info states
-  const [agentConfig, setAgentConfig] = useState<AgentConfig>();
+  // Agent policy and package info states
+  const [agentPolicy, setAgentPolicy] = useState<AgentPolicy>();
   const [packageInfo, setPackageInfo] = useState<PackageInfo>();
   const [isLoadingSecondStep, setIsLoadingSecondStep] = useState<boolean>(false);
 
-  const agentConfigId = agentConfig?.id;
+  const agentPolicyId = agentPolicy?.id;
   // Retrieve agent count
   useEffect(() => {
     const getAgentCount = async () => {
-      if (agentConfigId) {
-        const { data } = await sendGetAgentStatus({ configId: agentConfigId });
+      if (agentPolicyId) {
+        const { data } = await sendGetAgentStatus({ configId: agentPolicyId });
         if (data?.results.total) {
           setAgentCount(data.results.total);
         }
       }
     };
 
-    if (isFleetEnabled && agentConfigId) {
+    if (isFleetEnabled && agentPolicyId) {
       getAgentCount();
     }
-  }, [agentConfigId, isFleetEnabled]);
+  }, [agentPolicyId, isFleetEnabled]);
   const [agentCount, setAgentCount] = useState<number>(0);
 
-  // New package config state
-  const [packageConfig, setPackageConfig] = useState<NewPackageConfig>({
+  // New package policy state
+  const [packagePolicy, setPackagePolicy] = useState<NewPackagePolicy>({
     name: '',
     description: '',
     namespace: '',
@@ -114,18 +114,18 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
     inputs: [],
   });
 
-  // Package config validation state
-  const [validationResults, setValidationResults] = useState<PackageConfigValidationResults>();
+  // Package policy validation state
+  const [validationResults, setValidationResults] = useState<PackagePolicyValidationResults>();
 
   // Form state
-  const [formState, setFormState] = useState<PackageConfigFormState>('INVALID');
+  const [formState, setFormState] = useState<PackagePolicyFormState>('INVALID');
 
   // Update package info method
   const updatePackageInfo = useCallback(
     (updatedPackageInfo: PackageInfo | undefined) => {
       if (updatedPackageInfo) {
         setPackageInfo(updatedPackageInfo);
-        if (agentConfig) {
+        if (agentPolicy) {
           setFormState('VALID');
         }
       } else {
@@ -136,70 +136,70 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
       // eslint-disable-next-line no-console
       console.debug('Package info updated', updatedPackageInfo);
     },
-    [agentConfig, setPackageInfo, setFormState]
+    [agentPolicy, setPackageInfo, setFormState]
   );
 
-  // Update agent config method
-  const updateAgentConfig = useCallback(
-    (updatedAgentConfig: AgentConfig | undefined) => {
-      if (updatedAgentConfig) {
-        setAgentConfig(updatedAgentConfig);
+  // Update agent policy method
+  const updateAgentPolicy = useCallback(
+    (updatedAgentPolicy: AgentPolicy | undefined) => {
+      if (updatedAgentPolicy) {
+        setAgentPolicy(updatedAgentPolicy);
         if (packageInfo) {
           setFormState('VALID');
         }
       } else {
         setFormState('INVALID');
-        setAgentConfig(undefined);
+        setAgentPolicy(undefined);
       }
 
       // eslint-disable-next-line no-console
-      console.debug('Agent config updated', updatedAgentConfig);
+      console.debug('Agent policy updated', updatedAgentPolicy);
     },
-    [packageInfo, setAgentConfig, setFormState]
+    [packageInfo, setAgentPolicy, setFormState]
   );
 
   const hasErrors = validationResults ? validationHasErrors(validationResults) : false;
 
-  // Update package config validation
-  const updatePackageConfigValidation = useCallback(
-    (newPackageConfig?: NewPackageConfig) => {
+  // Update package policy validation
+  const updatePackagePolicyValidation = useCallback(
+    (newPackagePolicy?: NewPackagePolicy) => {
       if (packageInfo) {
-        const newValidationResult = validatePackageConfig(
-          newPackageConfig || packageConfig,
+        const newValidationResult = validatePackagePolicy(
+          newPackagePolicy || packagePolicy,
           packageInfo
         );
         setValidationResults(newValidationResult);
         // eslint-disable-next-line no-console
-        console.debug('Package config validation results', newValidationResult);
+        console.debug('Package policy validation results', newValidationResult);
 
         return newValidationResult;
       }
     },
-    [packageConfig, packageInfo]
+    [packagePolicy, packageInfo]
   );
 
-  // Update package config method
-  const updatePackageConfig = useCallback(
-    (updatedFields: Partial<NewPackageConfig>) => {
-      const newPackageConfig = {
-        ...packageConfig,
+  // Update package policy method
+  const updatePackagePolicy = useCallback(
+    (updatedFields: Partial<NewPackagePolicy>) => {
+      const newPackagePolicy = {
+        ...packagePolicy,
         ...updatedFields,
       };
-      setPackageConfig(newPackageConfig);
+      setPackagePolicy(newPackagePolicy);
 
       // eslint-disable-next-line no-console
-      console.debug('Package config updated', newPackageConfig);
-      const newValidationResults = updatePackageConfigValidation(newPackageConfig);
-      const hasPackage = newPackageConfig.package;
+      console.debug('Package policy updated', newPackagePolicy);
+      const newValidationResults = updatePackagePolicyValidation(newPackagePolicy);
+      const hasPackage = newPackagePolicy.package;
       const hasValidationErrors = newValidationResults
         ? validationHasErrors(newValidationResults)
         : false;
-      const hasAgentConfig = newPackageConfig.config_id && newPackageConfig.config_id !== '';
-      if (hasPackage && hasAgentConfig && !hasValidationErrors) {
+      const hasAgentPolicy = newPackagePolicy.config_id && newPackagePolicy.config_id !== '';
+      if (hasPackage && hasAgentPolicy && !hasValidationErrors) {
         setFormState('VALID');
       }
     },
-    [packageConfig, updatePackageConfigValidation]
+    [packagePolicy, updatePackagePolicyValidation]
   );
 
   // Cancel path
@@ -207,10 +207,10 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
     if (routeState && routeState.onCancelUrl) {
       return routeState.onCancelUrl;
     }
-    return from === 'config'
-      ? getHref('configuration_details', { configId: agentConfigId || configId })
+    return from === 'policy'
+      ? getHref('policy_details', { policyId: agentPolicyId || policyId })
       : getHref('integration_details', { pkgkey });
-  }, [agentConfigId, configId, from, getHref, pkgkey, routeState]);
+  }, [agentPolicyId, policyId, from, getHref, pkgkey, routeState]);
 
   const cancelClickHandler: ReactEventHandler = useCallback(
     (ev) => {
@@ -222,10 +222,10 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
     [routeState, navigateToApp]
   );
 
-  // Save package config
-  const savePackageConfig = async () => {
+  // Save package policy
+  const savePackagePolicy = async () => {
     setFormState('LOADING');
-    const result = await sendCreatePackageConfig(packageConfig);
+    const result = await sendCreatePackagePolicy(packagePolicy);
     setFormState('SUBMITTED');
     return result;
   };
@@ -239,7 +239,7 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
       setFormState('CONFIRM');
       return;
     }
-    const { error, data } = await savePackageConfig();
+    const { error, data } = await savePackagePolicy();
     if (!error) {
       if (routeState && routeState.onSaveNavigateTo) {
         navigateToApp(
@@ -248,26 +248,26 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
             : routeState.onSaveNavigateTo)
         );
       } else {
-        history.push(getPath('configuration_details', { configId: agentConfig?.id || configId }));
+        history.push(getPath('policy_details', { policyId: agentPolicy?.id || policyId }));
       }
 
       notifications.toasts.addSuccess({
-        title: i18n.translate('xpack.ingestManager.createPackageConfig.addedNotificationTitle', {
-          defaultMessage: `Successfully added '{packageConfigName}'`,
+        title: i18n.translate('xpack.ingestManager.createPackagePolicy.addedNotificationTitle', {
+          defaultMessage: `Successfully added '{packagePolicyName}'`,
           values: {
-            packageConfigName: packageConfig.name,
+            packagePolicyName: packagePolicy.name,
           },
         }),
         text:
-          agentCount && agentConfig
-            ? i18n.translate('xpack.ingestManager.createPackageConfig.addedNotificationMessage', {
-                defaultMessage: `Fleet will deploy updates to all agents that use the '{agentConfigName}' configuration`,
+          agentCount && agentPolicy
+            ? i18n.translate('xpack.ingestManager.createPackagePolicy.addedNotificationMessage', {
+                defaultMessage: `Fleet will deploy updates to all agents that use the '{agentPolicyName}' policy`,
                 values: {
-                  agentConfigName: agentConfig.name,
+                  agentPolicyName: agentPolicy.name,
                 },
               })
             : undefined,
-        'data-test-subj': 'packageConfigCreateSuccessToast',
+        'data-test-subj': 'packagePolicyCreateSuccessToast',
       });
     } else {
       notifications.toasts.addError(error, {
@@ -281,7 +281,7 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
     from,
     cancelUrl,
     onCancel: cancelClickHandler,
-    agentConfig,
+    agentPolicy,
     packageInfo,
   };
 
@@ -290,44 +290,44 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
       <StepSelectConfig
         pkgkey={pkgkey}
         updatePackageInfo={updatePackageInfo}
-        agentConfig={agentConfig}
-        updateAgentConfig={updateAgentConfig}
+        agentPolicy={agentPolicy}
+        updateAgentPolicy={updateAgentPolicy}
         setIsLoadingSecondStep={setIsLoadingSecondStep}
       />
     ),
-    [pkgkey, updatePackageInfo, agentConfig, updateAgentConfig]
+    [pkgkey, updatePackageInfo, agentPolicy, updateAgentPolicy]
   );
 
   const stepSelectPackage = useMemo(
     () => (
       <StepSelectPackage
-        agentConfigId={configId}
-        updateAgentConfig={updateAgentConfig}
+        agentPolicyId={policyId}
+        updateAgentPolicy={updateAgentPolicy}
         packageInfo={packageInfo}
         updatePackageInfo={updatePackageInfo}
         setIsLoadingSecondStep={setIsLoadingSecondStep}
       />
     ),
-    [configId, updateAgentConfig, packageInfo, updatePackageInfo]
+    [policyId, updateAgentPolicy, packageInfo, updatePackageInfo]
   );
 
   const stepConfigurePackage = useMemo(
     () =>
       isLoadingSecondStep ? (
         <Loading />
-      ) : agentConfig && packageInfo ? (
+      ) : agentPolicy && packageInfo ? (
         <>
-          <StepDefinePackageConfig
-            agentConfig={agentConfig}
+          <StepDefinePackagePolicy
+            agentPolicy={agentPolicy}
             packageInfo={packageInfo}
-            packageConfig={packageConfig}
-            updatePackageConfig={updatePackageConfig}
+            packagePolicy={packagePolicy}
+            updatePackagePolicy={updatePackagePolicy}
             validationResults={validationResults!}
           />
           <StepConfigurePackage
             packageInfo={packageInfo}
-            packageConfig={packageConfig}
-            updatePackageConfig={updatePackageConfig}
+            packagePolicy={packagePolicy}
+            updatePackagePolicy={updatePackagePolicy}
             validationResults={validationResults!}
             submitAttempted={formState === 'INVALID'}
           />
@@ -336,12 +336,12 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
         <div />
       ),
     [
-      agentConfig,
+      agentPolicy,
       formState,
       isLoadingSecondStep,
-      packageConfig,
+      packagePolicy,
       packageInfo,
-      updatePackageConfig,
+      updatePackagePolicy,
       validationResults,
     ]
   );
@@ -350,38 +350,38 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
     from === 'package'
       ? {
           title: i18n.translate(
-            'xpack.ingestManager.createPackageConfig.stepSelectAgentConfigTitle',
+            'xpack.ingestManager.createPackagePolicy.stepSelectAgentPolicyTitle',
             {
-              defaultMessage: 'Select an agent configuration',
+              defaultMessage: 'Select an agent policy',
             }
           ),
           children: stepSelectConfig,
         }
       : {
-          title: i18n.translate('xpack.ingestManager.createPackageConfig.stepSelectPackageTitle', {
+          title: i18n.translate('xpack.ingestManager.createPackagePolicy.stepSelectPackageTitle', {
             defaultMessage: 'Select an integration',
           }),
           children: stepSelectPackage,
         },
     {
       title: i18n.translate(
-        'xpack.ingestManager.createPackageConfig.stepConfigurePackageConfigTitle',
+        'xpack.ingestManager.createPackagePolicy.stepConfigurePackagePolicyTitle',
         {
           defaultMessage: 'Configure integration',
         }
       ),
-      status: !packageInfo || !agentConfig || isLoadingSecondStep ? 'disabled' : undefined,
+      status: !packageInfo || !agentPolicy || isLoadingSecondStep ? 'disabled' : undefined,
       'data-test-subj': 'dataCollectionSetupStep',
       children: stepConfigurePackage,
     },
   ];
 
   return (
-    <CreatePackageConfigPageLayout {...layoutProps} data-test-subj="createPackageConfig">
-      {formState === 'CONFIRM' && agentConfig && (
+    <CreatePackagePolicyPageLayout {...layoutProps} data-test-subj="createPackagePolicy">
+      {formState === 'CONFIRM' && agentPolicy && (
         <ConfirmDeployConfigModal
           agentCount={agentCount}
-          agentConfig={agentConfig}
+          agentPolicy={agentPolicy}
           onConfirm={onSubmit}
           onCancel={() => setFormState('VALID')}
         />
@@ -393,8 +393,8 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
               pkgkey={`${packageInfo.name}-${packageInfo.version}`}
             />
           )
-        : agentConfig && (
-            <ConfigurationBreadcrumb configName={agentConfig.name} configId={agentConfig.id} />
+        : agentPolicy && (
+            <ConfigurationBreadcrumb configName={agentPolicy.name} policyId={agentPolicy.id} />
           )}
       <StepsWithLessPadding steps={steps} />
       <EuiSpacer size="l" />
@@ -410,10 +410,10 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
       >
         <EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
           <EuiFlexItem grow={false}>
-            {!isLoadingSecondStep && agentConfig && packageInfo && formState === 'INVALID' ? (
+            {!isLoadingSecondStep && agentPolicy && packageInfo && formState === 'INVALID' ? (
               <FormattedMessage
-                id="xpack.ingestManager.createPackageConfig.errorOnSaveText"
-                defaultMessage="Your integration configuration has errors. Please fix them before saving."
+                id="xpack.ingestManager.createPackagePolicy.errorOnSaveText"
+                defaultMessage="Your integration policy has errors. Please fix them before saving."
               />
             ) : null}
           </EuiFlexItem>
@@ -425,10 +425,10 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
                   color="ghost"
                   href={cancelUrl}
                   onClick={cancelClickHandler}
-                  data-test-subj="createPackageConfigCancelButton"
+                  data-test-subj="createPackagePolicyCancelButton"
                 >
                   <FormattedMessage
-                    id="xpack.ingestManager.createPackageConfig.cancelButton"
+                    id="xpack.ingestManager.createPackagePolicy.cancelButton"
                     defaultMessage="Cancel"
                   />
                 </EuiButtonEmpty>
@@ -441,10 +441,10 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
                   iconType="save"
                   color="primary"
                   fill
-                  data-test-subj="createPackageConfigSaveButton"
+                  data-test-subj="createPackagePolicySaveButton"
                 >
                   <FormattedMessage
-                    id="xpack.ingestManager.createPackageConfig.saveButton"
+                    id="xpack.ingestManager.createPackagePolicy.saveButton"
                     defaultMessage="Save integration"
                   />
                 </EuiButton>
@@ -453,15 +453,15 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => {
           </EuiFlexItem>
         </EuiFlexGroup>
       </EuiBottomBar>
-    </CreatePackageConfigPageLayout>
+    </CreatePackagePolicyPageLayout>
   );
 };
 
 const ConfigurationBreadcrumb: React.FunctionComponent<{
   configName: string;
-  configId: string;
-}> = ({ configName, configId }) => {
-  useBreadcrumbs('add_integration_from_configuration', { configName, configId });
+  policyId: string;
+}> = ({ configName, policyId }) => {
+  useBreadcrumbs('add_integration_from_policy', { configName, policyId });
   return null;
 };
 
@@ -469,6 +469,6 @@ const IntegrationBreadcrumb: React.FunctionComponent<{
   pkgTitle: string;
   pkgkey: string;
 }> = ({ pkgTitle, pkgkey }) => {
-  useBreadcrumbs('add_integration_to_configuration', { pkgTitle, pkgkey });
+  useBreadcrumbs('add_integration_to_policy', { pkgTitle, pkgkey });
   return null;
 };
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/has_invalid_but_required_var.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/has_invalid_but_required_var.ts
index f632d40a05621c..142625f3eb2a9b 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/has_invalid_but_required_var.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/has_invalid_but_required_var.ts
@@ -3,23 +3,23 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { PackageConfigConfigRecord, RegistryVarsEntry } from '../../../../types';
-import { validatePackageConfigConfig } from './';
+import { PackagePolicyConfigRecord, RegistryVarsEntry } from '../../../../types';
+import { validatePackagePolicyConfig } from './';
 
 export const hasInvalidButRequiredVar = (
   registryVars?: RegistryVarsEntry[],
-  packageConfigVars?: PackageConfigConfigRecord
+  packagePolicyVars?: PackagePolicyConfigRecord
 ): boolean => {
   return (
-    (registryVars && !packageConfigVars) ||
+    (registryVars && !packagePolicyVars) ||
     Boolean(
       registryVars &&
         registryVars.find(
           (registryVar) =>
             registryVar.required &&
-            (!packageConfigVars ||
-              !packageConfigVars[registryVar.name] ||
-              validatePackageConfigConfig(packageConfigVars[registryVar.name], registryVar)?.length)
+            (!packagePolicyVars ||
+              !packagePolicyVars[registryVar.name] ||
+              validatePackagePolicyConfig(packagePolicyVars[registryVar.name], registryVar)?.length)
         )
     )
   );
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/index.ts
index 0d33a4e113f033..3b2a4935368eea 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/index.ts
@@ -6,11 +6,11 @@
 export { isAdvancedVar } from './is_advanced_var';
 export { hasInvalidButRequiredVar } from './has_invalid_but_required_var';
 export {
-  PackageConfigValidationResults,
-  PackageConfigConfigValidationResults,
-  PackageConfigInputValidationResults,
-  validatePackageConfig,
-  validatePackageConfigConfig,
+  PackagePolicyValidationResults,
+  PackagePolicyConfigValidationResults,
+  PackagePolicyInputValidationResults,
+  validatePackagePolicy,
+  validatePackagePolicyConfig,
   validationHasErrors,
   countValidationErrors,
 } from './validate_package_config';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts
index 0514ad574a8cdb..f375352c5a0557 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts
@@ -7,10 +7,10 @@ import { i18n } from '@kbn/i18n';
 import { safeLoad } from 'js-yaml';
 import { getFlattenedObject } from '../../../../services';
 import {
-  NewPackageConfig,
-  PackageConfigInput,
-  PackageConfigInputStream,
-  PackageConfigConfigRecordEntry,
+  NewPackagePolicy,
+  PackagePolicyInput,
+  PackagePolicyInputStream,
+  PackagePolicyConfigRecordEntry,
   PackageInfo,
   RegistryInput,
   RegistryStream,
@@ -21,47 +21,47 @@ type Errors = string[] | null;
 
 type ValidationEntry = Record<string, Errors>;
 
-export interface PackageConfigConfigValidationResults {
+export interface PackagePolicyConfigValidationResults {
   vars?: ValidationEntry;
 }
 
-export type PackageConfigInputValidationResults = PackageConfigConfigValidationResults & {
-  streams?: Record<PackageConfigInputStream['id'], PackageConfigConfigValidationResults>;
+export type PackagePolicyInputValidationResults = PackagePolicyConfigValidationResults & {
+  streams?: Record<PackagePolicyInputStream['id'], PackagePolicyConfigValidationResults>;
 };
 
-export interface PackageConfigValidationResults {
+export interface PackagePolicyValidationResults {
   name: Errors;
   description: Errors;
   namespace: Errors;
-  inputs: Record<PackageConfigInput['type'], PackageConfigInputValidationResults> | null;
+  inputs: Record<PackagePolicyInput['type'], PackagePolicyInputValidationResults> | null;
 }
 
 /*
- * Returns validation information for a given package config and package info
- * Note: this method assumes that `packageConfig` is correctly structured for the given package
+ * Returns validation information for a given package policy and package info
+ * Note: this method assumes that `packagePolicy` is correctly structured for the given package
  */
-export const validatePackageConfig = (
-  packageConfig: NewPackageConfig,
+export const validatePackagePolicy = (
+  packagePolicy: NewPackagePolicy,
   packageInfo: PackageInfo
-): PackageConfigValidationResults => {
-  const validationResults: PackageConfigValidationResults = {
+): PackagePolicyValidationResults => {
+  const validationResults: PackagePolicyValidationResults = {
     name: null,
     description: null,
     namespace: null,
     inputs: {},
   };
 
-  if (!packageConfig.name.trim()) {
+  if (!packagePolicy.name.trim()) {
     validationResults.name = [
-      i18n.translate('xpack.ingestManager.packageConfigValidation.nameRequiredErrorMessage', {
+      i18n.translate('xpack.ingestManager.packagePolicyValidation.nameRequiredErrorMessage', {
         defaultMessage: 'Name is required',
       }),
     ];
   }
 
-  if (!packageConfig.namespace.trim()) {
+  if (!packagePolicy.namespace.trim()) {
     validationResults.namespace = [
-      i18n.translate('xpack.ingestManager.packageConfigValidation.namespaceRequiredErrorMessage', {
+      i18n.translate('xpack.ingestManager.packagePolicyValidation.namespaceRequiredErrorMessage', {
         defaultMessage: 'Namespace is required',
       }),
     ];
@@ -93,13 +93,13 @@ export const validatePackageConfig = (
     return datasets;
   }, {} as Record<string, RegistryStream[]>);
 
-  // Validate each package config input with either its own config fields or streams
-  packageConfig.inputs.forEach((input) => {
+  // Validate each package policy input with either its own config fields or streams
+  packagePolicy.inputs.forEach((input) => {
     if (!input.vars && !input.streams) {
       return;
     }
 
-    const inputValidationResults: PackageConfigInputValidationResults = {
+    const inputValidationResults: PackagePolicyInputValidationResults = {
       vars: undefined,
       streams: {},
     };
@@ -117,7 +117,7 @@ export const validatePackageConfig = (
     if (inputConfigs.length) {
       inputValidationResults.vars = inputConfigs.reduce((results, [name, configEntry]) => {
         results[name] = input.enabled
-          ? validatePackageConfigConfig(configEntry, inputVarsByName[name])
+          ? validatePackagePolicyConfig(configEntry, inputVarsByName[name])
           : null;
         return results;
       }, {} as ValidationEntry);
@@ -128,7 +128,7 @@ export const validatePackageConfig = (
     // Validate each input stream with config fields
     if (input.streams.length) {
       input.streams.forEach((stream) => {
-        const streamValidationResults: PackageConfigConfigValidationResults = {};
+        const streamValidationResults: PackagePolicyConfigValidationResults = {};
 
         // Validate stream-level config fields
         if (stream.vars) {
@@ -146,7 +146,7 @@ export const validatePackageConfig = (
             (results, [name, configEntry]) => {
               results[name] =
                 input.enabled && stream.enabled
-                  ? validatePackageConfigConfig(configEntry, streamVarsByName[name])
+                  ? validatePackagePolicyConfig(configEntry, streamVarsByName[name])
                   : null;
               return results;
             },
@@ -171,8 +171,8 @@ export const validatePackageConfig = (
   return validationResults;
 };
 
-export const validatePackageConfigConfig = (
-  configEntry: PackageConfigConfigRecordEntry,
+export const validatePackagePolicyConfig = (
+  configEntry: PackagePolicyConfigRecordEntry,
   varDef: RegistryVarsEntry
 ): string[] | null => {
   const errors = [];
@@ -186,7 +186,7 @@ export const validatePackageConfigConfig = (
   if (varDef.required) {
     if (parsedValue === undefined || (typeof parsedValue === 'string' && !parsedValue)) {
       errors.push(
-        i18n.translate('xpack.ingestManager.packageConfigValidation.requiredErrorMessage', {
+        i18n.translate('xpack.ingestManager.packagePolicyValidation.requiredErrorMessage', {
           defaultMessage: '{fieldName} is required',
           values: {
             fieldName: varDef.title || varDef.name,
@@ -202,7 +202,7 @@ export const validatePackageConfigConfig = (
     } catch (e) {
       errors.push(
         i18n.translate(
-          'xpack.ingestManager.packageConfigValidation.invalidYamlFormatErrorMessage',
+          'xpack.ingestManager.packagePolicyValidation.invalidYamlFormatErrorMessage',
           {
             defaultMessage: 'Invalid YAML format',
           }
@@ -214,7 +214,7 @@ export const validatePackageConfigConfig = (
   if (varDef.multi) {
     if (parsedValue && !Array.isArray(parsedValue)) {
       errors.push(
-        i18n.translate('xpack.ingestManager.packageConfigValidation.invalidArrayErrorMessage', {
+        i18n.translate('xpack.ingestManager.packagePolicyValidation.invalidArrayErrorMessage', {
           defaultMessage: 'Invalid format',
         })
       );
@@ -224,7 +224,7 @@ export const validatePackageConfigConfig = (
       (!parsedValue || (Array.isArray(parsedValue) && parsedValue.length === 0))
     ) {
       errors.push(
-        i18n.translate('xpack.ingestManager.packageConfigValidation.requiredErrorMessage', {
+        i18n.translate('xpack.ingestManager.packagePolicyValidation.requiredErrorMessage', {
           defaultMessage: '{fieldName} is required',
           values: {
             fieldName: varDef.title || varDef.name,
@@ -239,9 +239,9 @@ export const validatePackageConfigConfig = (
 
 export const countValidationErrors = (
   validationResults:
-    | PackageConfigValidationResults
-    | PackageConfigInputValidationResults
-    | PackageConfigConfigValidationResults
+    | PackagePolicyValidationResults
+    | PackagePolicyInputValidationResults
+    | PackagePolicyConfigValidationResults
 ): number => {
   const flattenedValidation = getFlattenedObject(validationResults);
   const errors = Object.values(flattenedValidation).filter((value) => Boolean(value)) || [];
@@ -250,9 +250,9 @@ export const countValidationErrors = (
 
 export const validationHasErrors = (
   validationResults:
-    | PackageConfigValidationResults
-    | PackageConfigInputValidationResults
-    | PackageConfigConfigValidationResults
+    | PackagePolicyValidationResults
+    | PackagePolicyInputValidationResults
+    | PackagePolicyConfigValidationResults
 ): boolean => {
   return countValidationErrors(validationResults) > 0;
 };
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts.test.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts.test.ts
index 47874525b8a5a2..7073c915c296a4 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts.test.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts.test.ts
@@ -6,12 +6,12 @@
 import {
   PackageInfo,
   InstallationStatus,
-  NewPackageConfig,
+  NewPackagePolicy,
   RegistryConfigTemplate,
 } from '../../../../types';
-import { validatePackageConfig, validationHasErrors } from './validate_package_config';
+import { validatePackagePolicy, validationHasErrors } from './validate_package_config';
 
-describe('Ingest Manager - validatePackageConfig()', () => {
+describe('Ingest Manager - validatePackagePolicy()', () => {
   const mockPackage = ({
     name: 'mock-package',
     title: 'Mock package',
@@ -92,9 +92,9 @@ describe('Ingest Manager - validatePackageConfig()', () => {
     ],
     config_templates: [
       {
-        name: 'pkgConfig1',
-        title: 'Package config 1',
-        description: 'test package config',
+        name: 'pkgPolicy1',
+        title: 'Package policy 1',
+        description: 'test package policy',
         inputs: [
           {
             type: 'foo',
@@ -141,8 +141,8 @@ describe('Ingest Manager - validatePackageConfig()', () => {
     ],
   } as unknown) as PackageInfo;
 
-  const validPackageConfig: NewPackageConfig = {
-    name: 'pkgConfig1-1',
+  const validPackagePolicy: NewPackagePolicy = {
+    name: 'pkgPolicy1-1',
     namespace: 'default',
     config_id: 'test-config',
     enabled: true,
@@ -226,8 +226,8 @@ describe('Ingest Manager - validatePackageConfig()', () => {
     ],
   };
 
-  const invalidPackageConfig: NewPackageConfig = {
-    ...validPackageConfig,
+  const invalidPackagePolicy: NewPackagePolicy = {
+    ...validPackagePolicy,
     name: '',
     inputs: [
       {
@@ -350,14 +350,14 @@ describe('Ingest Manager - validatePackageConfig()', () => {
     },
   };
 
-  it('returns no errors for valid package config', () => {
-    expect(validatePackageConfig(validPackageConfig, mockPackage)).toEqual(
+  it('returns no errors for valid package policy', () => {
+    expect(validatePackagePolicy(validPackagePolicy, mockPackage)).toEqual(
       noErrorsValidationResults
     );
   });
 
-  it('returns errors for invalid package config', () => {
-    expect(validatePackageConfig(invalidPackageConfig, mockPackage)).toEqual({
+  it('returns errors for invalid package policy', () => {
+    expect(validatePackagePolicy(invalidPackagePolicy, mockPackage)).toEqual({
       name: ['Name is required'],
       description: null,
       namespace: null,
@@ -397,17 +397,17 @@ describe('Ingest Manager - validatePackageConfig()', () => {
   });
 
   it('returns no errors for disabled inputs', () => {
-    const disabledInputs = invalidPackageConfig.inputs.map((input) => ({
+    const disabledInputs = invalidPackagePolicy.inputs.map((input) => ({
       ...input,
       enabled: false,
     }));
     expect(
-      validatePackageConfig({ ...validPackageConfig, inputs: disabledInputs }, mockPackage)
+      validatePackagePolicy({ ...validPackagePolicy, inputs: disabledInputs }, mockPackage)
     ).toEqual(noErrorsValidationResults);
   });
 
-  it('returns only package config and input-level errors for disabled streams', () => {
-    const inputsWithDisabledStreams = invalidPackageConfig.inputs.map((input) =>
+  it('returns only package policy and input-level errors for disabled streams', () => {
+    const inputsWithDisabledStreams = invalidPackagePolicy.inputs.map((input) =>
       input.streams
         ? {
             ...input,
@@ -416,8 +416,8 @@ describe('Ingest Manager - validatePackageConfig()', () => {
         : input
     );
     expect(
-      validatePackageConfig(
-        { ...invalidPackageConfig, inputs: inputsWithDisabledStreams },
+      validatePackagePolicy(
+        { ...invalidPackagePolicy, inputs: inputsWithDisabledStreams },
         mockPackage
       )
     ).toEqual({
@@ -461,9 +461,9 @@ describe('Ingest Manager - validatePackageConfig()', () => {
     });
   });
 
-  it('returns no errors for packages with no package configs', () => {
+  it('returns no errors for packages with no package policies', () => {
     expect(
-      validatePackageConfig(validPackageConfig, {
+      validatePackagePolicy(validPackagePolicy, {
         ...mockPackage,
         config_templates: undefined,
       })
@@ -474,7 +474,7 @@ describe('Ingest Manager - validatePackageConfig()', () => {
       inputs: null,
     });
     expect(
-      validatePackageConfig(validPackageConfig, {
+      validatePackagePolicy(validPackagePolicy, {
         ...mockPackage,
         config_templates: [],
       })
@@ -488,7 +488,7 @@ describe('Ingest Manager - validatePackageConfig()', () => {
 
   it('returns no errors for packages with no inputs', () => {
     expect(
-      validatePackageConfig(validPackageConfig, {
+      validatePackagePolicy(validPackagePolicy, {
         ...mockPackage,
         config_templates: [{} as RegistryConfigTemplate],
       })
@@ -499,7 +499,7 @@ describe('Ingest Manager - validatePackageConfig()', () => {
       inputs: null,
     });
     expect(
-      validatePackageConfig(validPackageConfig, {
+      validatePackagePolicy(validPackagePolicy, {
         ...mockPackage,
         config_templates: [({ inputs: [] } as unknown) as RegistryConfigTemplate],
       })
@@ -553,7 +553,7 @@ describe('Ingest Manager - validationHasErrors()', () => {
     ).toBe(false);
   });
 
-  it('returns true for package config validation results with errors', () => {
+  it('returns true for package policy validation results with errors', () => {
     expect(
       validationHasErrors({
         name: ['name error'],
@@ -595,7 +595,7 @@ describe('Ingest Manager - validationHasErrors()', () => {
     ).toBe(true);
   });
 
-  it('returns false for package config validation results with no errors', () => {
+  it('returns false for package policy validation results with no errors', () => {
     expect(
       validationHasErrors({
         name: null,
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_configure_package.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_configure_package.tsx
index a41d4d72db34ca..e24a797bd352ac 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_configure_package.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_configure_package.tsx
@@ -5,11 +5,11 @@
  */
 import React from 'react';
 import { EuiHorizontalRule, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import { PackageInfo, RegistryStream, NewPackageConfig, PackageConfigInput } from '../../../types';
+import { PackageInfo, RegistryStream, NewPackagePolicy, PackagePolicyInput } from '../../../types';
 import { Loading } from '../../../components';
-import { PackageConfigValidationResults } from './services';
-import { PackageConfigInputPanel, CustomPackageConfig } from './components';
-import { CreatePackageConfigFrom } from './types';
+import { PackagePolicyValidationResults } from './services';
+import { PackagePolicyInputPanel, CustomPackagePolicy } from './components';
+import { CreatePackagePolicyFrom } from './types';
 
 const findStreamsForInputType = (
   inputType: string,
@@ -34,19 +34,19 @@ const findStreamsForInputType = (
 };
 
 export const StepConfigurePackage: React.FunctionComponent<{
-  from?: CreatePackageConfigFrom;
+  from?: CreatePackagePolicyFrom;
   packageInfo: PackageInfo;
-  packageConfig: NewPackageConfig;
-  packageConfigId?: string;
-  updatePackageConfig: (fields: Partial<NewPackageConfig>) => void;
-  validationResults: PackageConfigValidationResults;
+  packagePolicy: NewPackagePolicy;
+  packagePolicyId?: string;
+  updatePackagePolicy: (fields: Partial<NewPackagePolicy>) => void;
+  validationResults: PackagePolicyValidationResults;
   submitAttempted: boolean;
 }> = ({
-  from = 'config',
+  from = 'policy',
   packageInfo,
-  packageConfig,
-  packageConfigId,
-  updatePackageConfig,
+  packagePolicy,
+  packagePolicyId,
+  updatePackagePolicy,
   validationResults,
   submitAttempted,
 }) => {
@@ -61,30 +61,30 @@ export const StepConfigurePackage: React.FunctionComponent<{
         <EuiHorizontalRule margin="m" />
         <EuiFlexGroup direction="column" gutterSize="none">
           {packageInfo.config_templates[0].inputs.map((packageInput) => {
-            const packageConfigInput = packageConfig.inputs.find(
+            const packagePolicyInput = packagePolicy.inputs.find(
               (input) => input.type === packageInput.type
             );
             const packageInputStreams = findStreamsForInputType(packageInput.type, packageInfo);
-            return packageConfigInput ? (
+            return packagePolicyInput ? (
               <EuiFlexItem key={packageInput.type}>
-                <PackageConfigInputPanel
+                <PackagePolicyInputPanel
                   packageInput={packageInput}
                   packageInputStreams={packageInputStreams}
-                  packageConfigInput={packageConfigInput}
-                  updatePackageConfigInput={(updatedInput: Partial<PackageConfigInput>) => {
-                    const indexOfUpdatedInput = packageConfig.inputs.findIndex(
+                  packagePolicyInput={packagePolicyInput}
+                  updatePackagePolicyInput={(updatedInput: Partial<PackagePolicyInput>) => {
+                    const indexOfUpdatedInput = packagePolicy.inputs.findIndex(
                       (input) => input.type === packageInput.type
                     );
-                    const newInputs = [...packageConfig.inputs];
+                    const newInputs = [...packagePolicy.inputs];
                     newInputs[indexOfUpdatedInput] = {
                       ...newInputs[indexOfUpdatedInput],
                       ...updatedInput,
                     };
-                    updatePackageConfig({
+                    updatePackagePolicy({
                       inputs: newInputs,
                     });
                   }}
-                  inputValidationResults={validationResults!.inputs![packageConfigInput.type]}
+                  inputValidationResults={validationResults!.inputs![packagePolicyInput.type]}
                   forceShowErrors={submitAttempted}
                 />
                 <EuiHorizontalRule margin="m" />
@@ -94,11 +94,11 @@ export const StepConfigurePackage: React.FunctionComponent<{
         </EuiFlexGroup>
       </>
     ) : (
-      <CustomPackageConfig
+      <CustomPackagePolicy
         from={from}
         packageName={packageInfo.name}
-        packageConfig={packageConfig}
-        packageConfigId={packageConfigId}
+        packagePolicy={packagePolicy}
+        packagePolicyId={packagePolicyId}
       />
     );
 
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_define_package_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_define_package_config.tsx
index f487b4e5235e71..9ad396601cec43 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_define_package_config.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_define_package_config.tsx
@@ -16,41 +16,41 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
 } from '@elastic/eui';
-import { AgentConfig, PackageInfo, PackageConfig, NewPackageConfig } from '../../../types';
-import { packageToPackageConfigInputs } from '../../../services';
+import { AgentPolicy, PackageInfo, PackagePolicy, NewPackagePolicy } from '../../../types';
+import { packageToPackagePolicyInputs } from '../../../services';
 import { Loading } from '../../../components';
-import { PackageConfigValidationResults } from './services';
+import { PackagePolicyValidationResults } from './services';
 
-export const StepDefinePackageConfig: React.FunctionComponent<{
-  agentConfig: AgentConfig;
+export const StepDefinePackagePolicy: React.FunctionComponent<{
+  agentPolicy: AgentPolicy;
   packageInfo: PackageInfo;
-  packageConfig: NewPackageConfig;
-  updatePackageConfig: (fields: Partial<NewPackageConfig>) => void;
-  validationResults: PackageConfigValidationResults;
-}> = ({ agentConfig, packageInfo, packageConfig, updatePackageConfig, validationResults }) => {
+  packagePolicy: NewPackagePolicy;
+  updatePackagePolicy: (fields: Partial<NewPackagePolicy>) => void;
+  validationResults: PackagePolicyValidationResults;
+}> = ({ agentPolicy, packageInfo, packagePolicy, updatePackagePolicy, validationResults }) => {
   // Form show/hide states
   const [isShowingAdvanced, setIsShowingAdvanced] = useState<boolean>(false);
 
-  // Update package config's package and config info
+  // Update package policy's package and agent policy info
   useEffect(() => {
-    const pkg = packageConfig.package;
+    const pkg = packagePolicy.package;
     const currentPkgKey = pkg ? `${pkg.name}-${pkg.version}` : '';
     const pkgKey = `${packageInfo.name}-${packageInfo.version}`;
 
-    // If package has changed, create shell package config with input&stream values based on package info
+    // If package has changed, create shell package policy with input&stream values based on package info
     if (currentPkgKey !== pkgKey) {
-      // Existing package configs on the agent config using the package name, retrieve highest number appended to package config name
+      // Existing package policies on the agent policy using the package name, retrieve highest number appended to package policy name
       const dsPackageNamePattern = new RegExp(`${packageInfo.name}-(\\d+)`);
-      const dsWithMatchingNames = (agentConfig.package_configs as PackageConfig[])
+      const dsWithMatchingNames = (agentPolicy.package_configs as PackagePolicy[])
         .filter((ds) => Boolean(ds.name.match(dsPackageNamePattern)))
         .map((ds) => parseInt(ds.name.match(dsPackageNamePattern)![1], 10))
         .sort();
 
-      updatePackageConfig({
+      updatePackagePolicy({
         name:
           // For Endpoint packages, the user must fill in the name, thus we don't attempt to generate
           // a default one here.
-          // FIXME: Improve package configs name uniqueness - https://github.com/elastic/kibana/issues/72948
+          // FIXME: Improve package policies name uniqueness - https://github.com/elastic/kibana/issues/72948
           packageInfo.name !== 'endpoint'
             ? `${packageInfo.name}-${
                 dsWithMatchingNames.length
@@ -63,23 +63,23 @@ export const StepDefinePackageConfig: React.FunctionComponent<{
           title: packageInfo.title,
           version: packageInfo.version,
         },
-        inputs: packageToPackageConfigInputs(packageInfo),
+        inputs: packageToPackagePolicyInputs(packageInfo),
       });
     }
 
-    // If agent config has changed, update package config's config ID and namespace
-    if (packageConfig.config_id !== agentConfig.id) {
-      updatePackageConfig({
-        config_id: agentConfig.id,
-        namespace: agentConfig.namespace,
+    // If agent policy has changed, update package policy's agent policy ID and namespace
+    if (packagePolicy.config_id !== agentPolicy.id) {
+      updatePackagePolicy({
+        config_id: agentPolicy.id,
+        namespace: agentPolicy.namespace,
       });
     }
   }, [
-    packageConfig.package,
-    packageConfig.config_id,
-    agentConfig,
+    packagePolicy.package,
+    packagePolicy.config_id,
+    agentPolicy,
     packageInfo,
-    updatePackageConfig,
+    updatePackagePolicy,
   ]);
 
   return validationResults ? (
@@ -87,14 +87,14 @@ export const StepDefinePackageConfig: React.FunctionComponent<{
       title={
         <h4>
           <FormattedMessage
-            id="xpack.ingestManager.createPackageConfig.stepConfigure.integrationSettingsSectionTitle"
+            id="xpack.ingestManager.createPackagePolicy.stepConfigure.integrationSettingsSectionTitle"
             defaultMessage="Integration settings"
           />
         </h4>
       }
       description={
         <FormattedMessage
-          id="xpack.ingestManager.createPackageConfig.stepConfigure.integrationSettingsSectionDescription"
+          id="xpack.ingestManager.createPackagePolicy.stepConfigure.integrationSettingsSectionDescription"
           defaultMessage="Choose a name and description to help identify how this integration will be used."
         />
       }
@@ -106,19 +106,19 @@ export const StepDefinePackageConfig: React.FunctionComponent<{
           error={validationResults.name}
           label={
             <FormattedMessage
-              id="xpack.ingestManager.createPackageConfig.stepConfigure.packageConfigNameInputLabel"
+              id="xpack.ingestManager.createPackagePolicy.stepConfigure.packagePolicyNameInputLabel"
               defaultMessage="Integration name"
             />
           }
         >
           <EuiFieldText
-            value={packageConfig.name}
+            value={packagePolicy.name}
             onChange={(e) =>
-              updatePackageConfig({
+              updatePackagePolicy({
                 name: e.target.value,
               })
             }
-            data-test-subj="packageConfigNameInput"
+            data-test-subj="packagePolicyNameInput"
           />
         </EuiFormRow>
 
@@ -126,14 +126,14 @@ export const StepDefinePackageConfig: React.FunctionComponent<{
         <EuiFormRow
           label={
             <FormattedMessage
-              id="xpack.ingestManager.createPackageConfig.stepConfigure.packageConfigDescriptionInputLabel"
+              id="xpack.ingestManager.createPackagePolicy.stepConfigure.packagePolicyDescriptionInputLabel"
               defaultMessage="Description"
             />
           }
           labelAppend={
             <EuiText size="xs" color="subdued">
               <FormattedMessage
-                id="xpack.ingestManager.createPackageConfig.stepConfigure.inputVarFieldOptionalLabel"
+                id="xpack.ingestManager.createPackagePolicy.stepConfigure.inputVarFieldOptionalLabel"
                 defaultMessage="Optional"
               />
             </EuiText>
@@ -142,9 +142,9 @@ export const StepDefinePackageConfig: React.FunctionComponent<{
           error={validationResults.description}
         >
           <EuiFieldText
-            value={packageConfig.description}
+            value={packagePolicy.description}
             onChange={(e) =>
-              updatePackageConfig({
+              updatePackagePolicy({
                 description: e.target.value,
               })
             }
@@ -162,7 +162,7 @@ export const StepDefinePackageConfig: React.FunctionComponent<{
               flush="left"
             >
               <FormattedMessage
-                id="xpack.ingestManager.createPackageConfig.stepConfigure.advancedOptionsToggleLinkText"
+                id="xpack.ingestManager.createPackagePolicy.stepConfigure.advancedOptionsToggleLinkText"
                 defaultMessage="Advanced options"
               />
             </EuiButtonEmpty>
@@ -171,7 +171,7 @@ export const StepDefinePackageConfig: React.FunctionComponent<{
             <EuiFlexItem grow={false}>
               <EuiText color="danger" size="s">
                 <FormattedMessage
-                  id="xpack.ingestManager.createPackageConfig.stepConfigure.errorCountText"
+                  id="xpack.ingestManager.createPackagePolicy.stepConfigure.errorCountText"
                   defaultMessage="{count, plural, one {# error} other {# errors}}"
                   values={{ count: 1 }}
                 />
@@ -190,7 +190,7 @@ export const StepDefinePackageConfig: React.FunctionComponent<{
               error={validationResults.namespace}
               label={
                 <FormattedMessage
-                  id="xpack.ingestManager.createPackageConfig.stepConfigure.packageConfigNamespaceInputLabel"
+                  id="xpack.ingestManager.createPackagePolicy.stepConfigure.packagePolicyNamespaceInputLabel"
                   defaultMessage="Namespace"
                 />
               }
@@ -199,15 +199,15 @@ export const StepDefinePackageConfig: React.FunctionComponent<{
                 noSuggestions
                 singleSelection={true}
                 selectedOptions={
-                  packageConfig.namespace ? [{ label: packageConfig.namespace }] : []
+                  packagePolicy.namespace ? [{ label: packagePolicy.namespace }] : []
                 }
                 onCreateOption={(newNamespace: string) => {
-                  updatePackageConfig({
+                  updatePackagePolicy({
                     namespace: newNamespace,
                   });
                 }}
                 onChange={(newNamespaces: Array<{ label: string }>) => {
-                  updatePackageConfig({
+                  updatePackagePolicy({
                     namespace: newNamespaces.length ? newNamespaces[0].label : '',
                   });
                 }}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_config.tsx
index 6f06530100d716..2fd5f7afaf03ba 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_config.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_config.tsx
@@ -18,33 +18,33 @@ import {
   EuiLink,
 } from '@elastic/eui';
 import { Error } from '../../../components';
-import { AgentConfig, PackageInfo, GetAgentConfigsResponseItem } from '../../../types';
-import { isPackageLimited, doesAgentConfigAlreadyIncludePackage } from '../../../services';
+import { AgentPolicy, PackageInfo, GetAgentPoliciesResponseItem } from '../../../types';
+import { isPackageLimited, doesAgentPolicyAlreadyIncludePackage } from '../../../services';
 import {
   useGetPackageInfoByKey,
-  useGetAgentConfigs,
-  sendGetOneAgentConfig,
+  useGetAgentPolicies,
+  sendGetOneAgentPolicy,
   useCapabilities,
   useFleetStatus,
 } from '../../../hooks';
-import { CreateAgentConfigFlyout } from '../list_page/components';
+import { CreateAgentPolicyFlyout } from '../list_page/components';
 
-const AgentConfigWrapper = styled(EuiFormRow)`
+const AgentPolicyWrapper = styled(EuiFormRow)`
   .euiFormRow__label {
     width: 100%;
   }
 `;
 
 // Custom styling for drop down list items due to:
-//  1) the max-width and overflow properties is added to prevent long config
+//  1) the max-width and overflow properties is added to prevent long agent policy
 //     names/descriptions from overflowing the flex items
 //  2) max-width is built from the grow property on the flex items because the value
 //     changes based on if Fleet is enabled/setup or not
-const AgentConfigNameColumn = styled(EuiFlexItem)`
+const AgentPolicyNameColumn = styled(EuiFlexItem)`
   max-width: ${(props) => `${((props.grow as number) / 9) * 100}%`};
   overflow: hidden;
 `;
-const AgentConfigDescriptionColumn = styled(EuiFlexItem)`
+const AgentPolicyDescriptionColumn = styled(EuiFlexItem)`
   max-width: ${(props) => `${((props.grow as number) / 9) * 100}%`};
   overflow: hidden;
 `;
@@ -52,21 +52,21 @@ const AgentConfigDescriptionColumn = styled(EuiFlexItem)`
 export const StepSelectConfig: React.FunctionComponent<{
   pkgkey: string;
   updatePackageInfo: (packageInfo: PackageInfo | undefined) => void;
-  agentConfig: AgentConfig | undefined;
-  updateAgentConfig: (config: AgentConfig | undefined) => void;
+  agentPolicy: AgentPolicy | undefined;
+  updateAgentPolicy: (agentPolicy: AgentPolicy | undefined) => void;
   setIsLoadingSecondStep: (isLoading: boolean) => void;
-}> = ({ pkgkey, updatePackageInfo, agentConfig, updateAgentConfig, setIsLoadingSecondStep }) => {
+}> = ({ pkgkey, updatePackageInfo, agentPolicy, updateAgentPolicy, setIsLoadingSecondStep }) => {
   const { isReady: isFleetReady } = useFleetStatus();
 
-  // Selected config state
-  const [selectedConfigId, setSelectedConfigId] = useState<string | undefined>(
-    agentConfig ? agentConfig.id : undefined
+  // Selected agent policy state
+  const [selectedPolicyId, setSelectedPolicyId] = useState<string | undefined>(
+    agentPolicy ? agentPolicy.id : undefined
   );
   const [selectedConfigError, setSelectedConfigError] = useState<Error>();
 
-  // Create new config flyout state
+  // Create new agent policy flyout state
   const hasWriteCapabilites = useCapabilities().write;
-  const [isCreateAgentConfigFlyoutOpen, setIsCreateAgentConfigFlyoutOpen] = useState<boolean>(
+  const [isCreateAgentPolicyFlyoutOpen, setIsCreateAgentPolicyFlyoutOpen] = useState<boolean>(
     false
   );
 
@@ -78,23 +78,23 @@ export const StepSelectConfig: React.FunctionComponent<{
   } = useGetPackageInfoByKey(pkgkey);
   const isLimitedPackage = (packageInfoData && isPackageLimited(packageInfoData.response)) || false;
 
-  // Fetch agent configs info
+  // Fetch agent policies info
   const {
-    data: agentConfigsData,
-    error: agentConfigsError,
-    isLoading: isAgentConfigsLoading,
-    sendRequest: refreshAgentConfigs,
-  } = useGetAgentConfigs({
+    data: agentPoliciesData,
+    error: agentPoliciesError,
+    isLoading: isAgentPoliciesLoading,
+    sendRequest: refreshAgentPolicies,
+  } = useGetAgentPolicies({
     page: 1,
     perPage: 1000,
     sortField: 'name',
     sortOrder: 'asc',
     full: true,
   });
-  const agentConfigs = agentConfigsData?.items || [];
-  const agentConfigsById = agentConfigs.reduce(
-    (acc: { [key: string]: GetAgentConfigsResponseItem }, config) => {
-      acc[config.id] = config;
+  const agentPolicies = agentPoliciesData?.items || [];
+  const agentPoliciesById = agentPolicies.reduce(
+    (acc: { [key: string]: GetAgentPoliciesResponseItem }, policy) => {
+      acc[policy.id] = agentPolicy;
       return acc;
     },
     {}
@@ -107,63 +107,63 @@ export const StepSelectConfig: React.FunctionComponent<{
     }
   }, [packageInfoData, updatePackageInfo]);
 
-  // Update parent selected agent config state
+  // Update parent selected agent policy state
   useEffect(() => {
-    const fetchAgentConfigInfo = async () => {
-      if (selectedConfigId) {
+    const fetchAgentPolicyInfo = async () => {
+      if (selectedPolicyId) {
         setIsLoadingSecondStep(true);
-        const { data, error } = await sendGetOneAgentConfig(selectedConfigId);
+        const { data, error } = await sendGetOneAgentPolicy(selectedPolicyId);
         if (error) {
           setSelectedConfigError(error);
-          updateAgentConfig(undefined);
+          updateAgentPolicy(undefined);
         } else if (data && data.item) {
           setSelectedConfigError(undefined);
-          updateAgentConfig(data.item);
+          updateAgentPolicy(data.item);
         }
       } else {
         setSelectedConfigError(undefined);
-        updateAgentConfig(undefined);
+        updateAgentPolicy(undefined);
       }
       setIsLoadingSecondStep(false);
     };
-    if (!agentConfig || selectedConfigId !== agentConfig.id) {
-      fetchAgentConfigInfo();
+    if (!agentPolicy || selectedPolicyId !== agentPolicy.id) {
+      fetchAgentPolicyInfo();
     }
-  }, [selectedConfigId, agentConfig, updateAgentConfig, setIsLoadingSecondStep]);
+  }, [selectedPolicyId, agentPolicy, updateAgentPolicy, setIsLoadingSecondStep]);
 
-  const agentConfigOptions: Array<EuiComboBoxOptionOption<string>> = packageInfoData
-    ? agentConfigs.map((agentConf) => {
+  const agentPolicyOptions: Array<EuiComboBoxOptionOption<string>> = packageInfoData
+    ? agentPolicies.map((agentConf) => {
         const alreadyHasLimitedPackage =
           (isLimitedPackage &&
-            doesAgentConfigAlreadyIncludePackage(agentConf, packageInfoData.response.name)) ||
+            doesAgentPolicyAlreadyIncludePackage(agentConf, packageInfoData.response.name)) ||
           false;
         return {
           label: agentConf.name,
           value: agentConf.id,
           disabled: alreadyHasLimitedPackage,
-          'data-test-subj': 'agentConfigItem',
+          'data-test-subj': 'agentPolicyItem',
         };
       })
     : [];
 
-  const selectedConfigOption = agentConfigOptions.find(
-    (option) => option.value === selectedConfigId
+  const selectedConfigOption = agentPolicyOptions.find(
+    (option) => option.value === selectedPolicyId
   );
 
-  // Try to select default agent config
+  // Try to select default agent policy
   useEffect(() => {
-    if (!selectedConfigId && agentConfigs.length && agentConfigOptions.length) {
-      const defaultAgentConfig = agentConfigs.find((config) => config.is_default);
-      if (defaultAgentConfig) {
-        const defaultAgentConfigOption = agentConfigOptions.find(
-          (option) => option.value === defaultAgentConfig.id
+    if (!selectedPolicyId && agentPolicies.length && agentPolicyOptions.length) {
+      const defaultAgentPolicy = agentPolicies.find((policy) => policy.is_default);
+      if (defaultAgentPolicy) {
+        const defaultAgentPolicyOption = agentPolicyOptions.find(
+          (option) => option.value === defaultAgentPolicy.id
         );
-        if (defaultAgentConfigOption && !defaultAgentConfigOption.disabled) {
-          setSelectedConfigId(defaultAgentConfig.id);
+        if (defaultAgentPolicyOption && !defaultAgentPolicyOption.disabled) {
+          setSelectedPolicyId(defaultAgentPolicy.id);
         }
       }
     }
-  }, [agentConfigs, agentConfigOptions, selectedConfigId]);
+  }, [agentPolicies, agentPolicyOptions, selectedPolicyId]);
 
   // Display package error if there is one
   if (packageInfoError) {
@@ -171,7 +171,7 @@ export const StepSelectConfig: React.FunctionComponent<{
       <Error
         title={
           <FormattedMessage
-            id="xpack.ingestManager.createPackageConfig.StepSelectConfig.errorLoadingPackageTitle"
+            id="xpack.ingestManager.createPackagePolicy.StepSelectPolicy.errorLoadingPackageTitle"
             defaultMessage="Error loading package information"
           />
         }
@@ -180,31 +180,31 @@ export const StepSelectConfig: React.FunctionComponent<{
     );
   }
 
-  // Display agent configs list error if there is one
-  if (agentConfigsError) {
+  // Display agent policies list error if there is one
+  if (agentPoliciesError) {
     return (
       <Error
         title={
           <FormattedMessage
-            id="xpack.ingestManager.createPackageConfig.StepSelectConfig.errorLoadingAgentConfigsTitle"
-            defaultMessage="Error loading agent configurations"
+            id="xpack.ingestManager.createPackagePolicy.StepSelectPolicy.errorLoadingAgentPoliciesTitle"
+            defaultMessage="Error loading agent policies"
           />
         }
-        error={agentConfigsError}
+        error={agentPoliciesError}
       />
     );
   }
 
   return (
     <>
-      {isCreateAgentConfigFlyoutOpen ? (
+      {isCreateAgentPolicyFlyoutOpen ? (
         <EuiPortal>
-          <CreateAgentConfigFlyout
-            onClose={(newAgentConfig?: AgentConfig) => {
-              setIsCreateAgentConfigFlyoutOpen(false);
-              if (newAgentConfig) {
-                refreshAgentConfigs();
-                setSelectedConfigId(newAgentConfig.id);
+          <CreateAgentPolicyFlyout
+            onClose={(newAgentPolicy?: AgentPolicy) => {
+              setIsCreateAgentPolicyFlyoutOpen(false);
+              if (newAgentPolicy) {
+                refreshAgentPolicies();
+                setSelectedPolicyId(newAgentPolicy.id);
               }
             }}
             ownFocus={true}
@@ -213,25 +213,25 @@ export const StepSelectConfig: React.FunctionComponent<{
       ) : null}
       <EuiFlexGroup direction="column" gutterSize="m">
         <EuiFlexItem>
-          <AgentConfigWrapper
+          <AgentPolicyWrapper
             fullWidth={true}
             label={
               <EuiFlexGroup justifyContent="spaceBetween">
                 <EuiFlexItem>
                   <FormattedMessage
-                    id="xpack.ingestManager.createPackageConfig.StepSelectConfig.agentConfigLabel"
-                    defaultMessage="Agent configuration"
+                    id="xpack.ingestManager.createPackagePolicy.StepSelectPolicy.agentPolicyLabel"
+                    defaultMessage="Agent policy"
                   />
                 </EuiFlexItem>
                 <EuiFlexItem grow={false}>
                   <div>
                     <EuiLink
                       disabled={!hasWriteCapabilites}
-                      onClick={() => setIsCreateAgentConfigFlyoutOpen(true)}
+                      onClick={() => setIsCreateAgentPolicyFlyoutOpen(true)}
                     >
                       <FormattedMessage
-                        id="xpack.ingestManager.createPackageConfig.StepSelectConfig.addButton"
-                        defaultMessage="Create agent configuration"
+                        id="xpack.ingestManager.createPackagePolicy.StepSelectPolicy.addButton"
+                        defaultMessage="Create agent policy"
                       />
                     </EuiLink>
                   </div>
@@ -239,12 +239,12 @@ export const StepSelectConfig: React.FunctionComponent<{
               </EuiFlexGroup>
             }
             helpText={
-              isFleetReady && selectedConfigId ? (
+              isFleetReady && selectedPolicyId ? (
                 <FormattedMessage
-                  id="xpack.ingestManager.createPackageConfig.StepSelectConfig.agentConfigAgentsDescriptionText"
-                  defaultMessage="{count, plural, one {# agent} other {# agents}} are enrolled with the selected agent configuration."
+                  id="xpack.ingestManager.createPackagePolicy.StepSelectPolicy.agentPolicyAgentsDescriptionText"
+                  defaultMessage="{count, plural, one {# agent} other {# agents}} are enrolled with the selected agent policy."
                   values={{
-                    count: agentConfigsById[selectedConfigId].agents || 0,
+                    count: agentPoliciesById[selectedPolicyId].agents || 0,
                   }}
                 />
               ) : null
@@ -252,35 +252,35 @@ export const StepSelectConfig: React.FunctionComponent<{
           >
             <EuiComboBox
               placeholder={i18n.translate(
-                'xpack.ingestManager.createPackageConfig.StepSelectConfig.agentConfigPlaceholderText',
+                'xpack.ingestManager.createPackagePolicy.StepSelectPolicy.agentPolicyPlaceholderText',
                 {
-                  defaultMessage: 'Select an agent configuration to add this integration to',
+                  defaultMessage: 'Select an agent policy to add this integration to',
                 }
               )}
               singleSelection={{ asPlainText: true }}
               isClearable={false}
               fullWidth={true}
-              isLoading={isAgentConfigsLoading || isPackageInfoLoading}
-              options={agentConfigOptions}
+              isLoading={isAgentPoliciesLoading || isPackageInfoLoading}
+              options={agentPolicyOptions}
               renderOption={(option: EuiComboBoxOptionOption<string>) => {
                 return (
                   <EuiFlexGroup>
-                    <AgentConfigNameColumn grow={2}>
+                    <AgentPolicyNameColumn grow={2}>
                       <span className="eui-textTruncate">{option.label}</span>
-                    </AgentConfigNameColumn>
-                    <AgentConfigDescriptionColumn grow={isFleetReady ? 5 : 7}>
+                    </AgentPolicyNameColumn>
+                    <AgentPolicyDescriptionColumn grow={isFleetReady ? 5 : 7}>
                       <EuiTextColor className="eui-textTruncate" color="subdued">
-                        {agentConfigsById[option.value!].description}
+                        {agentPoliciesById[option.value!].description}
                       </EuiTextColor>
-                    </AgentConfigDescriptionColumn>
+                    </AgentPolicyDescriptionColumn>
                     {isFleetReady ? (
                       <EuiFlexItem grow={2} className="eui-textRight">
                         <EuiTextColor color="subdued">
                           <FormattedMessage
-                            id="xpack.ingestManager.createPackageConfig.StepSelectConfig.agentConfigAgentsCountText"
+                            id="xpack.ingestManager.createPackagePolicy.StepSelectPolicy.agentPolicyAgentsCountText"
                             defaultMessage="{count, plural, one {# agent} other {# agents}} enrolled"
                             values={{
-                              count: agentConfigsById[option.value!].agents || 0,
+                              count: agentPoliciesById[option.value!].agents || 0,
                             }}
                           />
                         </EuiTextColor>
@@ -293,24 +293,24 @@ export const StepSelectConfig: React.FunctionComponent<{
               onChange={(options) => {
                 const selectedOption = options[0] || undefined;
                 if (selectedOption) {
-                  if (selectedOption.value !== selectedConfigId) {
-                    setSelectedConfigId(selectedOption.value);
+                  if (selectedOption.value !== selectedPolicyId) {
+                    setSelectedPolicyId(selectedOption.value);
                   }
                 } else {
-                  setSelectedConfigId(undefined);
+                  setSelectedPolicyId(undefined);
                 }
               }}
             />
-          </AgentConfigWrapper>
+          </AgentPolicyWrapper>
         </EuiFlexItem>
-        {/* Display selected agent config error if there is one */}
+        {/* Display selected agent policy error if there is one */}
         {selectedConfigError ? (
           <EuiFlexItem>
             <Error
               title={
                 <FormattedMessage
-                  id="xpack.ingestManager.createPackageConfig.StepSelectConfig.errorLoadingSelectedAgentConfigTitle"
-                  defaultMessage="Error loading selected agent config"
+                  id="xpack.ingestManager.createPackagePolicy.StepSelectPolicy.errorLoadingSelectedAgentPolicyTitle"
+                  defaultMessage="Error loading selected agent policy"
                 />
               }
               error={selectedConfigError}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_package.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_package.tsx
index 048ae101fcd6f6..ab7a415ec7a90d 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_package.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_package.tsx
@@ -8,9 +8,9 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiFlexGroup, EuiFlexItem, EuiSelectable, EuiSpacer } from '@elastic/eui';
 import { Error } from '../../../components';
-import { AgentConfig, PackageInfo, PackageConfig, GetPackagesResponse } from '../../../types';
+import { AgentPolicy, PackageInfo, PackagePolicy, GetPackagesResponse } from '../../../types';
 import {
-  useGetOneAgentConfig,
+  useGetOneAgentPolicy,
   useGetPackages,
   useGetLimitedPackages,
   sendGetPackageInfoByKey,
@@ -18,14 +18,14 @@ import {
 import { PackageIcon } from '../../../components/package_icon';
 
 export const StepSelectPackage: React.FunctionComponent<{
-  agentConfigId: string;
-  updateAgentConfig: (config: AgentConfig | undefined) => void;
+  agentPolicyId: string;
+  updateAgentPolicy: (agentPolicy: AgentPolicy | undefined) => void;
   packageInfo?: PackageInfo;
   updatePackageInfo: (packageInfo: PackageInfo | undefined) => void;
   setIsLoadingSecondStep: (isLoading: boolean) => void;
 }> = ({
-  agentConfigId,
-  updateAgentConfig,
+  agentPolicyId,
+  updateAgentPolicy,
   packageInfo,
   updatePackageInfo,
   setIsLoadingSecondStep,
@@ -36,15 +36,15 @@ export const StepSelectPackage: React.FunctionComponent<{
   );
   const [selectedPkgError, setSelectedPkgError] = useState<Error>();
 
-  // Fetch agent config info
+  // Fetch agent policy info
   const {
-    data: agentConfigData,
-    error: agentConfigError,
-    isLoading: isAgentConfigsLoading,
-  } = useGetOneAgentConfig(agentConfigId);
+    data: agentPolicyData,
+    error: agentPolicyError,
+    isLoading: isAgentPoliciesLoading,
+  } = useGetOneAgentPolicy(agentPolicyId);
 
   // Fetch packages info
-  // Filter out limited packages already part of selected agent config
+  // Filter out limited packages already part of selected agent policy
   const [packages, setPackages] = useState<GetPackagesResponse['response']>([]);
   const {
     data: packagesData,
@@ -56,22 +56,22 @@ export const StepSelectPackage: React.FunctionComponent<{
     isLoading: isLimitedPackagesLoading,
   } = useGetLimitedPackages();
   useEffect(() => {
-    if (packagesData?.response && limitedPackagesData?.response && agentConfigData?.item) {
+    if (packagesData?.response && limitedPackagesData?.response && agentPolicyData?.item) {
       const allPackages = packagesData.response;
       const limitedPackages = limitedPackagesData.response;
-      const usedLimitedPackages = (agentConfigData.item.package_configs as PackageConfig[])
-        .map((packageConfig) => packageConfig.package?.name || '')
+      const usedLimitedPackages = (agentPolicyData.item.package_configs as PackagePolicy[])
+        .map((packagePolicy) => packagePolicy.package?.name || '')
         .filter((pkgName) => limitedPackages.includes(pkgName));
       setPackages(allPackages.filter((pkg) => !usedLimitedPackages.includes(pkg.name)));
     }
-  }, [packagesData, limitedPackagesData, agentConfigData]);
+  }, [packagesData, limitedPackagesData, agentPolicyData]);
 
-  // Update parent agent config state
+  // Update parent agent policy state
   useEffect(() => {
-    if (agentConfigData && agentConfigData.item) {
-      updateAgentConfig(agentConfigData.item);
+    if (agentPolicyData && agentPolicyData.item) {
+      updateAgentPolicy(agentPolicyData.item);
     }
-  }, [agentConfigData, updateAgentConfig]);
+  }, [agentPolicyData, updateAgentPolicy]);
 
   // Update parent selected package state
   useEffect(() => {
@@ -97,17 +97,17 @@ export const StepSelectPackage: React.FunctionComponent<{
     }
   }, [selectedPkgKey, packageInfo, updatePackageInfo, setIsLoadingSecondStep]);
 
-  // Display agent config error if there is one
-  if (agentConfigError) {
+  // Display agent policy error if there is one
+  if (agentPolicyError) {
     return (
       <Error
         title={
           <FormattedMessage
-            id="xpack.ingestManager.createPackageConfig.stepSelectPackage.errorLoadingConfigTitle"
-            defaultMessage="Error loading agent configuration information"
+            id="xpack.ingestManager.createPackagePolicy.stepSelectPackage.errorLoadingPolicyTitle"
+            defaultMessage="Error loading agent policy information"
           />
         }
-        error={agentConfigError}
+        error={agentPolicyError}
       />
     );
   }
@@ -118,7 +118,7 @@ export const StepSelectPackage: React.FunctionComponent<{
       <Error
         title={
           <FormattedMessage
-            id="xpack.ingestManager.createPackageConfig.stepSelectPackage.errorLoadingPackagesTitle"
+            id="xpack.ingestManager.createPackagePolicy.stepSelectPackage.errorLoadingPackagesTitle"
             defaultMessage="Error loading integrations"
           />
         }
@@ -134,7 +134,7 @@ export const StepSelectPackage: React.FunctionComponent<{
           searchable
           allowExclusions={false}
           singleSelection={true}
-          isLoading={isPackagesLoading || isLimitedPackagesLoading || isAgentConfigsLoading}
+          isLoading={isPackagesLoading || isLimitedPackagesLoading || isAgentPoliciesLoading}
           options={packages.map(({ title, name, version, icons }) => {
             const pkgkey = `${name}-${version}`;
             return {
@@ -157,7 +157,7 @@ export const StepSelectPackage: React.FunctionComponent<{
           }}
           searchProps={{
             placeholder: i18n.translate(
-              'xpack.ingestManager.createPackageConfig.stepSelectPackage.filterPackagesInputPlaceholder',
+              'xpack.ingestManager.createPackagePolicy.stepSelectPackage.filterPackagesInputPlaceholder',
               {
                 defaultMessage: 'Search for integrations',
               }
@@ -190,7 +190,7 @@ export const StepSelectPackage: React.FunctionComponent<{
           <Error
             title={
               <FormattedMessage
-                id="xpack.ingestManager.createPackageConfig.stepSelectPackage.errorLoadingSelectedPackageTitle"
+                id="xpack.ingestManager.createPackagePolicy.stepSelectPackage.errorLoadingSelectedPackageTitle"
                 defaultMessage="Error loading selected integration"
               />
             }
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/types.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/types.ts
index 5386ff17fe96b1..c6e16c2cb4d970 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/types.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/types.ts
@@ -4,5 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export type CreatePackageConfigFrom = 'package' | 'config' | 'edit';
-export type PackageConfigFormState = 'VALID' | 'INVALID' | 'CONFIRM' | 'LOADING' | 'SUBMITTED';
+export type CreatePackagePolicyFrom = 'package' | 'policy' | 'edit';
+export type PackagePolicyFormState = 'VALID' | 'INVALID' | 'CONFIRM' | 'LOADING' | 'SUBMITTED';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/index.ts
index e53206c68c4432..17556b13fd1180 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/index.ts
@@ -3,6 +3,6 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-export { PackageConfigsTable } from './package_configs/package_configs_table';
-export { ConfigPackageConfigsView } from './package_configs';
+export { PackagePoliciesTable } from './package_configs/package_configs_table';
+export { ConfigPackagePoliciesView } from './package_configs';
 export { ConfigSettingsView } from './settings';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/index.tsx
index 3aef297e8d22eb..fa5f6c054b63d9 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/index.tsx
@@ -5,19 +5,19 @@
  */
 
 import React, { memo } from 'react';
-import { AgentConfig, PackageConfig } from '../../../../../types';
-import { NoPackageConfigs } from './no_package_configs';
-import { PackageConfigsTable } from './package_configs_table';
+import { AgentPolicy, PackagePolicy } from '../../../../../types';
+import { NoPackagePolicies } from './no_package_configs';
+import { PackagePoliciesTable } from './package_configs_table';
 
-export const ConfigPackageConfigsView = memo<{ config: AgentConfig }>(({ config }) => {
-  if (config.package_configs.length === 0) {
-    return <NoPackageConfigs configId={config.id} />;
+export const ConfigPackagePoliciesView = memo<{ agentPolicy: AgentPolicy }>(({ agentPolicy }) => {
+  if (agentPolicy.package_configs.length === 0) {
+    return <NoPackagePolicies policyId={agentPolicy.id} />;
   }
 
   return (
-    <PackageConfigsTable
-      config={config}
-      packageConfigs={(config.package_configs || []) as PackageConfig[]}
+    <PackagePoliciesTable
+      agentPolicy={agentPolicy}
+      packagePolicies={(agentPolicy.package_configs || []) as PackagePolicy[]}
     />
   );
 });
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/no_package_configs.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/no_package_configs.tsx
index ad75c707836980..b84466ee073ebe 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/no_package_configs.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/no_package_configs.tsx
@@ -8,7 +8,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiButton, EuiEmptyPrompt } from '@elastic/eui';
 import { useCapabilities, useLink } from '../../../../../hooks';
 
-export const NoPackageConfigs = memo<{ configId: string }>(({ configId }) => {
+export const NoPackagePolicies = memo<{ policyId: string }>(({ policyId }) => {
   const { getHref } = useLink();
   const hasWriteCapabilities = useCapabilities().write;
 
@@ -18,25 +18,25 @@ export const NoPackageConfigs = memo<{ configId: string }>(({ configId }) => {
       title={
         <h3>
           <FormattedMessage
-            id="xpack.ingestManager.configDetailsPackageConfigs.createFirstTitle"
+            id="xpack.ingestManager.policyDetailsPackagePolicies.createFirstTitle"
             defaultMessage="Add your first integration"
           />
         </h3>
       }
       body={
         <FormattedMessage
-          id="xpack.ingestManager.configDetailsPackageConfigs.createFirstMessage"
-          defaultMessage="This configuration does not have any integrations yet."
+          id="xpack.ingestManager.policyDetailsPackagePolicies.createFirstMessage"
+          defaultMessage="This policy does not have any integrations yet."
         />
       }
       actions={
         <EuiButton
           isDisabled={!hasWriteCapabilities}
           fill
-          href={getHref('add_integration_from_configuration', { configId })}
+          href={getHref('add_integration_from_policy', { policyId })}
         >
           <FormattedMessage
-            id="xpack.ingestManager.configDetailsPackageConfigs.createFirstButtonText"
+            id="xpack.ingestManager.policyDetailsPackagePolicies.createFirstButtonText"
             defaultMessage="Add integration"
           />
         </EuiButton>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/package_configs_table.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/package_configs_table.tsx
index 1aa0fd1220833b..0d1c85ec644298 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/package_configs_table.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/package_configs_table.tsx
@@ -15,13 +15,13 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
 } from '@elastic/eui';
-import { AgentConfig, PackageConfig } from '../../../../../types';
+import { AgentPolicy, PackagePolicy } from '../../../../../types';
 import { PackageIcon, ContextMenuActions } from '../../../../../components';
-import { PackageConfigDeleteProvider, DangerEuiContextMenuItem } from '../../../components';
+import { PackagePolicyDeleteProvider, DangerEuiContextMenuItem } from '../../../components';
 import { useCapabilities, useLink } from '../../../../../hooks';
 import { useConfigRefresh } from '../../hooks';
 
-interface InMemoryPackageConfig extends PackageConfig {
+interface InMemoryPackagePolicy extends PackagePolicy {
   inputTypes: string[];
   packageName?: string;
   packageTitle?: string;
@@ -29,11 +29,11 @@ interface InMemoryPackageConfig extends PackageConfig {
 }
 
 interface Props {
-  packageConfigs: PackageConfig[];
-  config: AgentConfig;
+  packagePolicies: PackagePolicy[];
+  agentPolicy: AgentPolicy;
   // Pass through props to InMemoryTable
-  loading?: EuiInMemoryTableProps<InMemoryPackageConfig>['loading'];
-  message?: EuiInMemoryTableProps<InMemoryPackageConfig>['message'];
+  loading?: EuiInMemoryTableProps<InMemoryPackagePolicy>['loading'];
+  message?: EuiInMemoryTableProps<InMemoryPackagePolicy>['message'];
 }
 
 interface FilterOption {
@@ -44,29 +44,29 @@ interface FilterOption {
 const stringSortAscending = (a: string, b: string): number => a.localeCompare(b);
 const toFilterOption = (value: string): FilterOption => ({ name: value, value });
 
-export const PackageConfigsTable: React.FunctionComponent<Props> = ({
-  packageConfigs: originalPackageConfigs,
-  config,
+export const PackagePoliciesTable: React.FunctionComponent<Props> = ({
+  packagePolicies: originalPackagePolicies,
+  agentPolicy,
   ...rest
 }) => {
   const { getHref } = useLink();
   const hasWriteCapabilities = useCapabilities().write;
   const refreshConfig = useConfigRefresh();
 
-  // With the package configs provided on input, generate the list of package configs
+  // With the package policies provided on input, generate the list of package policies
   // used in the InMemoryTable (flattens some values for search) as well as
   // the list of options that will be used in the filters dropdowns
-  const [packageConfigs, namespaces, inputTypes] = useMemo((): [
-    InMemoryPackageConfig[],
+  const [packagePolicies, namespaces, inputTypes] = useMemo((): [
+    InMemoryPackagePolicy[],
     FilterOption[],
     FilterOption[]
   ] => {
     const namespacesValues: string[] = [];
     const inputTypesValues: string[] = [];
-    const mappedPackageConfigs = originalPackageConfigs.map<InMemoryPackageConfig>(
-      (packageConfig) => {
-        if (packageConfig.namespace && !namespacesValues.includes(packageConfig.namespace)) {
-          namespacesValues.push(packageConfig.namespace);
+    const mappedPackagePolicies = originalPackagePolicies.map<InMemoryPackagePolicy>(
+      (packagePolicy) => {
+        if (packagePolicy.namespace && !namespacesValues.includes(packagePolicy.namespace)) {
+          namespacesValues.push(packagePolicy.namespace);
         }
 
         const dsInputTypes: string[] = [];
@@ -74,11 +74,11 @@ export const PackageConfigsTable: React.FunctionComponent<Props> = ({
         dsInputTypes.sort(stringSortAscending);
 
         return {
-          ...packageConfig,
+          ...packagePolicy,
           inputTypes: dsInputTypes,
-          packageName: packageConfig.package?.name ?? '',
-          packageTitle: packageConfig.package?.title ?? '',
-          packageVersion: packageConfig.package?.version ?? '',
+          packageName: packagePolicy.package?.name ?? '',
+          packageTitle: packagePolicy.package?.title ?? '',
+          packageVersion: packagePolicy.package?.version ?? '',
         };
       }
     );
@@ -87,19 +87,19 @@ export const PackageConfigsTable: React.FunctionComponent<Props> = ({
     inputTypesValues.sort(stringSortAscending);
 
     return [
-      mappedPackageConfigs,
+      mappedPackagePolicies,
       namespacesValues.map(toFilterOption),
       inputTypesValues.map(toFilterOption),
     ];
-  }, [originalPackageConfigs]);
+  }, [originalPackagePolicies]);
 
   const columns = useMemo(
-    (): EuiInMemoryTableProps<InMemoryPackageConfig>['columns'] => [
+    (): EuiInMemoryTableProps<InMemoryPackagePolicy>['columns'] => [
       {
         field: 'name',
         sortable: true,
         name: i18n.translate(
-          'xpack.ingestManager.configDetails.packageConfigsTable.nameColumnTitle',
+          'xpack.ingestManager.policyDetails.packagePoliciesTable.nameColumnTitle',
           {
             defaultMessage: 'Name',
           }
@@ -113,7 +113,7 @@ export const PackageConfigsTable: React.FunctionComponent<Props> = ({
       {
         field: 'description',
         name: i18n.translate(
-          'xpack.ingestManager.configDetails.packageConfigsTable.descriptionColumnTitle',
+          'xpack.ingestManager.policyDetails.packagePoliciesTable.descriptionColumnTitle',
           {
             defaultMessage: 'Description',
           }
@@ -128,19 +128,19 @@ export const PackageConfigsTable: React.FunctionComponent<Props> = ({
         field: 'packageTitle',
         sortable: true,
         name: i18n.translate(
-          'xpack.ingestManager.configDetails.packageConfigsTable.packageNameColumnTitle',
+          'xpack.ingestManager.policyDetails.packagePoliciesTable.packageNameColumnTitle',
           {
             defaultMessage: 'Integration',
           }
         ),
-        render(packageTitle: string, packageConfig: InMemoryPackageConfig) {
+        render(packageTitle: string, packagePolicy: InMemoryPackagePolicy) {
           return (
             <EuiFlexGroup gutterSize="s" alignItems="center">
-              {packageConfig.package && (
+              {packagePolicy.package && (
                 <EuiFlexItem grow={false}>
                   <PackageIcon
-                    packageName={packageConfig.package.name}
-                    version={packageConfig.package.version}
+                    packageName={packagePolicy.package.name}
+                    version={packagePolicy.package.version}
                     size="m"
                     tryApi={true}
                   />
@@ -154,36 +154,36 @@ export const PackageConfigsTable: React.FunctionComponent<Props> = ({
       {
         field: 'namespace',
         name: i18n.translate(
-          'xpack.ingestManager.configDetails.packageConfigsTable.namespaceColumnTitle',
+          'xpack.ingestManager.policyDetails.packagePoliciesTable.namespaceColumnTitle',
           {
             defaultMessage: 'Namespace',
           }
         ),
-        render: (namespace: InMemoryPackageConfig['namespace']) => {
+        render: (namespace: InMemoryPackagePolicy['namespace']) => {
           return namespace ? <EuiBadge color="hollow">{namespace}</EuiBadge> : '';
         },
       },
       {
         name: i18n.translate(
-          'xpack.ingestManager.configDetails.packageConfigsTable.actionsColumnTitle',
+          'xpack.ingestManager.policyDetails.packagePoliciesTable.actionsColumnTitle',
           {
             defaultMessage: 'Actions',
           }
         ),
         actions: [
           {
-            render: (packageConfig: InMemoryPackageConfig) => (
+            render: (packagePolicy: InMemoryPackagePolicy) => (
               <ContextMenuActions
                 items={[
-                  // FIXME: implement View package config action
+                  // FIXME: implement View package policy action
                   // <EuiContextMenuItem
                   //   disabled
                   //   icon="inspect"
                   //   onClick={() => {}}
-                  //   key="packageConfigView"
+                  //   key="packagePolicyView"
                   // >
                   //   <FormattedMessage
-                  //     id="xpack.ingestManager.configDetails.packageConfigsTable.viewActionTitle"
+                  //     id="xpack.ingestManager.policyDetails.packagePoliciesTable.viewActionTitle"
                   //     defaultMessage="View integration"
                   //   />
                   // </EuiContextMenuItem>,
@@ -191,41 +191,41 @@ export const PackageConfigsTable: React.FunctionComponent<Props> = ({
                     disabled={!hasWriteCapabilities}
                     icon="pencil"
                     href={getHref('edit_integration', {
-                      configId: config.id,
-                      packageConfigId: packageConfig.id,
+                      policyId: agentPolicy.id,
+                      packagePolicyId: packagePolicy.id,
                     })}
-                    key="packageConfigEdit"
+                    key="packagePolicyEdit"
                   >
                     <FormattedMessage
-                      id="xpack.ingestManager.configDetails.packageConfigsTable.editActionTitle"
+                      id="xpack.ingestManager.policyDetails.packagePoliciesTable.editActionTitle"
                       defaultMessage="Edit integration"
                     />
                   </EuiContextMenuItem>,
-                  // FIXME: implement Copy package config action
-                  // <EuiContextMenuItem disabled icon="copy" onClick={() => {}} key="packageConfigCopy">
+                  // FIXME: implement Copy package policy action
+                  // <EuiContextMenuItem disabled icon="copy" onClick={() => {}} key="packagePolicyCopy">
                   //   <FormattedMessage
-                  //     id="xpack.ingestManager.configDetails.packageConfigsTable.copyActionTitle"
+                  //     id="xpack.ingestManager.policyDetails.packagePoliciesTable.copyActionTitle"
                   //     defaultMessage="Copy integration"
                   //   />
                   // </EuiContextMenuItem>,
-                  <PackageConfigDeleteProvider agentConfig={config} key="packageConfigDelete">
-                    {(deletePackageConfigsPrompt) => {
+                  <PackagePolicyDeleteProvider agentPolicy={agentPolicy} key="packagePolicyDelete">
+                    {(deletePackagePoliciesPrompt) => {
                       return (
                         <DangerEuiContextMenuItem
                           disabled={!hasWriteCapabilities}
                           icon="trash"
                           onClick={() => {
-                            deletePackageConfigsPrompt([packageConfig.id], refreshConfig);
+                            deletePackagePoliciesPrompt([packagePolicy.id], refreshConfig);
                           }}
                         >
                           <FormattedMessage
-                            id="xpack.ingestManager.configDetails.packageConfigsTable.deleteActionTitle"
+                            id="xpack.ingestManager.policyDetails.packagePoliciesTable.deleteActionTitle"
                             defaultMessage="Delete integration"
                           />
                         </DangerEuiContextMenuItem>
                       );
                     }}
-                  </PackageConfigDeleteProvider>,
+                  </PackagePolicyDeleteProvider>,
                 ]}
               />
             ),
@@ -233,13 +233,13 @@ export const PackageConfigsTable: React.FunctionComponent<Props> = ({
         ],
       },
     ],
-    [config, getHref, hasWriteCapabilities, refreshConfig]
+    [agentPolicy, getHref, hasWriteCapabilities, refreshConfig]
   );
 
   return (
-    <EuiInMemoryTable<InMemoryPackageConfig>
+    <EuiInMemoryTable<InMemoryPackagePolicy>
       itemId="id"
-      items={packageConfigs}
+      items={packagePolicies}
       columns={columns}
       sorting={{
         sort: {
@@ -251,13 +251,13 @@ export const PackageConfigsTable: React.FunctionComponent<Props> = ({
       search={{
         toolsRight: [
           <EuiButton
-            key="addPackageConfigButton"
+            key="addPackagePolicyButton"
             isDisabled={!hasWriteCapabilities}
             iconType="plusInCircle"
-            href={getHref('add_integration_from_configuration', { configId: config.id })}
+            href={getHref('add_integration_from_policy', { policyId: agentPolicy.id })}
           >
             <FormattedMessage
-              id="xpack.ingestManager.configDetails.addPackageConfigButtonText"
+              id="xpack.ingestManager.policyDetails.addPackagePolicyButtonText"
               defaultMessage="Add integration"
             />
           </EuiButton>,
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/settings/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/settings/index.tsx
index dfdd63bd984dda..1e5eb8abf08d37 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/settings/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/settings/index.tsx
@@ -9,18 +9,18 @@ import styled from 'styled-components';
 import { EuiBottomBar, EuiFlexGroup, EuiFlexItem, EuiButtonEmpty, EuiButton } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { AgentConfig } from '../../../../../types';
+import { AgentPolicy } from '../../../../../types';
 import {
   useLink,
   useCore,
   useCapabilities,
-  sendUpdateAgentConfig,
+  sendUpdateAgentPolicy,
   useConfig,
   sendGetAgentStatus,
 } from '../../../../../hooks';
 import {
-  AgentConfigForm,
-  agentConfigFormValidation,
+  AgentPolicyForm,
+  agentPolicyFormValidation,
   ConfirmDeployConfigModal,
 } from '../../../components';
 import { useConfigRefresh } from '../../hooks';
@@ -31,8 +31,8 @@ const FormWrapper = styled.div`
   margin-left: auto;
 `;
 
-export const ConfigSettingsView = memo<{ config: AgentConfig }>(
-  ({ config: originalAgentConfig }) => {
+export const ConfigSettingsView = memo<{ agentPolicy: AgentPolicy }>(
+  ({ agentPolicy: originalAgentPolicy }) => {
     const {
       notifications,
       chrome: { getIsNavDrawerLocked$ },
@@ -46,14 +46,14 @@ export const ConfigSettingsView = memo<{ config: AgentConfig }>(
     const hasWriteCapabilites = useCapabilities().write;
     const refreshConfig = useConfigRefresh();
     const [isNavDrawerLocked, setIsNavDrawerLocked] = useState(false);
-    const [agentConfig, setAgentConfig] = useState<AgentConfig>({
-      ...originalAgentConfig,
+    const [agentPolicy, setAgentPolicy] = useState<AgentPolicy>({
+      ...originalAgentPolicy,
     });
     const [isLoading, setIsLoading] = useState<boolean>(false);
     const [hasChanges, setHasChanges] = useState<boolean>(false);
     const [agentCount, setAgentCount] = useState<number>(0);
     const [withSysMonitoring, setWithSysMonitoring] = useState<boolean>(true);
-    const validation = agentConfigFormValidation(agentConfig);
+    const validation = agentPolicyFormValidation(agentPolicy);
 
     useEffect(() => {
       const subscription = getIsNavDrawerLocked$().subscribe((newIsNavDrawerLocked: boolean) => {
@@ -63,20 +63,20 @@ export const ConfigSettingsView = memo<{ config: AgentConfig }>(
       return () => subscription.unsubscribe();
     });
 
-    const updateAgentConfig = (updatedFields: Partial<AgentConfig>) => {
-      setAgentConfig({
-        ...agentConfig,
+    const updateAgentPolicy = (updatedFields: Partial<AgentPolicy>) => {
+      setAgentPolicy({
+        ...agentPolicy,
         ...updatedFields,
       });
       setHasChanges(true);
     };
 
-    const submitUpdateAgentConfig = async () => {
+    const submitUpdateAgentPolicy = async () => {
       setIsLoading(true);
       try {
         // eslint-disable-next-line @typescript-eslint/naming-convention
-        const { name, description, namespace, monitoring_enabled } = agentConfig;
-        const { data, error } = await sendUpdateAgentConfig(agentConfig.id, {
+        const { name, description, namespace, monitoring_enabled } = agentPolicy;
+        const { data, error } = await sendUpdateAgentPolicy(agentPolicy.id, {
           name,
           description,
           namespace,
@@ -84,9 +84,9 @@ export const ConfigSettingsView = memo<{ config: AgentConfig }>(
         });
         if (data?.success) {
           notifications.toasts.addSuccess(
-            i18n.translate('xpack.ingestManager.editAgentConfig.successNotificationTitle', {
+            i18n.translate('xpack.ingestManager.editAgentPolicy.successNotificationTitle', {
               defaultMessage: "Successfully updated '{name}' settings",
-              values: { name: agentConfig.name },
+              values: { name: agentPolicy.name },
             })
           );
           refreshConfig();
@@ -95,15 +95,15 @@ export const ConfigSettingsView = memo<{ config: AgentConfig }>(
           notifications.toasts.addDanger(
             error
               ? error.message
-              : i18n.translate('xpack.ingestManager.editAgentConfig.errorNotificationTitle', {
-                  defaultMessage: 'Unable to update agent config',
+              : i18n.translate('xpack.ingestManager.editAgentPolicy.errorNotificationTitle', {
+                  defaultMessage: 'Unable to update agent policy',
                 })
           );
         }
       } catch (e) {
         notifications.toasts.addDanger(
-          i18n.translate('xpack.ingestManager.editAgentConfig.errorNotificationTitle', {
-            defaultMessage: 'Unable to update agent config',
+          i18n.translate('xpack.ingestManager.editAgentPolicy.errorNotificationTitle', {
+            defaultMessage: 'Unable to update agent policy',
           })
         );
       }
@@ -114,14 +114,14 @@ export const ConfigSettingsView = memo<{ config: AgentConfig }>(
       // Retrieve agent count if fleet is enabled
       if (isFleetEnabled) {
         setIsLoading(true);
-        const { data } = await sendGetAgentStatus({ configId: agentConfig.id });
+        const { data } = await sendGetAgentStatus({ configId: agentPolicy.id });
         if (data?.results.total) {
           setAgentCount(data.results.total);
         } else {
-          await submitUpdateAgentConfig();
+          await submitUpdateAgentPolicy();
         }
       } else {
-        await submitUpdateAgentConfig();
+        await submitUpdateAgentPolicy();
       }
     };
 
@@ -130,10 +130,10 @@ export const ConfigSettingsView = memo<{ config: AgentConfig }>(
         {agentCount ? (
           <ConfirmDeployConfigModal
             agentCount={agentCount}
-            agentConfig={agentConfig}
+            agentPolicy={agentPolicy}
             onConfirm={() => {
               setAgentCount(0);
-              submitUpdateAgentConfig();
+              submitUpdateAgentPolicy();
             }}
             onCancel={() => {
               setAgentCount(0);
@@ -141,15 +141,15 @@ export const ConfigSettingsView = memo<{ config: AgentConfig }>(
             }}
           />
         ) : null}
-        <AgentConfigForm
-          agentConfig={agentConfig}
-          updateAgentConfig={updateAgentConfig}
+        <AgentPolicyForm
+          agentPolicy={agentPolicy}
+          updateAgentPolicy={updateAgentPolicy}
           withSysMonitoring={withSysMonitoring}
           updateSysMonitoring={(newValue) => setWithSysMonitoring(newValue)}
           validation={validation}
           isEditing={true}
           onDelete={() => {
-            history.push(getPath('configurations_list'));
+            history.push(getPath('policies_list'));
           }}
         />
         {/* TODO #64541 - Remove classes */}
@@ -166,7 +166,7 @@ export const ConfigSettingsView = memo<{ config: AgentConfig }>(
             <EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
               <EuiFlexItem>
                 <FormattedMessage
-                  id="xpack.ingestManager.editAgentConfig.unsavedChangesText"
+                  id="xpack.ingestManager.editAgentPolicy.unsavedChangesText"
                   defaultMessage="You have unsaved changes"
                 />
               </EuiFlexItem>
@@ -176,12 +176,12 @@ export const ConfigSettingsView = memo<{ config: AgentConfig }>(
                     <EuiButtonEmpty
                       color="ghost"
                       onClick={() => {
-                        setAgentConfig({ ...originalAgentConfig });
+                        setAgentPolicy({ ...originalAgentPolicy });
                         setHasChanges(false);
                       }}
                     >
                       <FormattedMessage
-                        id="xpack.ingestManager.editAgentConfig.cancelButtonText"
+                        id="xpack.ingestManager.editAgentPolicy.cancelButtonText"
                         defaultMessage="Cancel"
                       />
                     </EuiButtonEmpty>
@@ -199,12 +199,12 @@ export const ConfigSettingsView = memo<{ config: AgentConfig }>(
                     >
                       {isLoading ? (
                         <FormattedMessage
-                          id="xpack.ingestManager.editAgentConfig.savingButtonText"
+                          id="xpack.ingestManager.editAgentPolicy.savingButtonText"
                           defaultMessage="Saving…"
                         />
                       ) : (
                         <FormattedMessage
-                          id="xpack.ingestManager.editAgentConfig.saveButtonText"
+                          id="xpack.ingestManager.editAgentPolicy.saveButtonText"
                           defaultMessage="Save changes"
                         />
                       )}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/use_agent_status.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/use_agent_status.tsx
index 214deb81f535c8..71dcd728d5d1bb 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/use_agent_status.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/use_agent_status.tsx
@@ -11,11 +11,11 @@ import { UseRequestConfig } from '../../../../hooks/use_request/use_request';
 
 type RequestOptions = Pick<Partial<UseRequestConfig>, 'pollIntervalMs'>;
 
-export function useGetAgentStatus(configId?: string, options?: RequestOptions) {
+export function useGetAgentStatus(policyId?: string, options?: RequestOptions) {
   const agentStatusRequest = useRequest<GetAgentStatusResponse>({
     path: agentRouteService.getStatusPath(),
     query: {
-      configId,
+      policyId,
     },
     method: 'get',
     ...options,
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx
index b87bd66cce0eaf..acc8b723e759dc 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx
@@ -20,14 +20,14 @@ import {
 } from '@elastic/eui';
 import { Props as EuiTabProps } from '@elastic/eui/src/components/tabs/tab';
 import styled from 'styled-components';
-import { AgentConfig, AgentConfigDetailsDeployAgentAction } from '../../../types';
+import { AgentPolicy, AgentPolicyDetailsDeployAgentAction } from '../../../types';
 import { PAGE_ROUTING_PATHS } from '../../../constants';
-import { useGetOneAgentConfig, useLink, useBreadcrumbs, useCore } from '../../../hooks';
+import { useGetOneAgentPolicy, useLink, useBreadcrumbs, useCore } from '../../../hooks';
 import { Loading, Error } from '../../../components';
 import { WithHeaderLayout } from '../../../layouts';
 import { ConfigRefreshContext, useGetAgentStatus, AgentStatusRefreshContext } from './hooks';
-import { LinkedAgentCount, AgentConfigActionMenu } from '../components';
-import { ConfigPackageConfigsView, ConfigSettingsView } from './components';
+import { LinkedAgentCount, AgentPolicyActionMenu } from '../components';
+import { ConfigPackagePoliciesView, ConfigSettingsView } from './components';
 import { useIntraAppState } from '../../../hooks/use_intra_app_state';
 
 const Divider = styled.div`
@@ -36,22 +36,22 @@ const Divider = styled.div`
   border-left: ${(props) => props.theme.eui.euiBorderThin};
 `;
 
-export const AgentConfigDetailsPage: React.FunctionComponent = () => {
+export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
   const {
-    params: { configId, tabId = '' },
-  } = useRouteMatch<{ configId: string; tabId?: string }>();
+    params: { policyId, tabId = '' },
+  } = useRouteMatch<{ policyId: string; tabId?: string }>();
   const history = useHistory();
   const { getHref, getPath } = useLink();
-  const agentConfigRequest = useGetOneAgentConfig(configId);
-  const agentConfig = agentConfigRequest.data ? agentConfigRequest.data.item : null;
-  const { isLoading, error, sendRequest: refreshAgentConfig } = agentConfigRequest;
-  const [redirectToAgentConfigList] = useState<boolean>(false);
-  const agentStatusRequest = useGetAgentStatus(configId);
+  const agentPolicyRequest = useGetOneAgentPolicy(policyId);
+  const agentPolicy = agentPolicyRequest.data ? agentPolicyRequest.data.item : null;
+  const { isLoading, error, sendRequest: refreshAgentPolicy } = agentPolicyRequest;
+  const [redirectToAgentPolicyList] = useState<boolean>(false);
+  const agentStatusRequest = useGetAgentStatus(policyId);
   const { refreshAgentStatus } = agentStatusRequest;
   const {
     application: { navigateToApp },
   } = useCore();
-  const routeState = useIntraAppState<AgentConfigDetailsDeployAgentAction>();
+  const routeState = useIntraAppState<AgentPolicyDetailsDeployAgentAction>();
   const agentStatus = agentStatusRequest.data?.results;
   const queryParams = new URLSearchParams(useLocation().search);
   const openEnrollmentFlyoutOpenByDefault = queryParams.get('openEnrollmentFlyout') === 'true';
@@ -62,25 +62,25 @@ export const AgentConfigDetailsPage: React.FunctionComponent = () => {
         <EuiFlexItem>
           <EuiButtonEmpty
             iconType="arrowLeft"
-            href={getHref('configurations_list')}
+            href={getHref('policies_list')}
             flush="left"
             size="xs"
           >
             <FormattedMessage
-              id="xpack.ingestManager.configDetails.viewAgentListTitle"
-              defaultMessage="View all agent configurations"
+              id="xpack.ingestManager.policyDetails.viewAgentListTitle"
+              defaultMessage="View all agent policies"
             />
           </EuiButtonEmpty>
         </EuiFlexItem>
         <EuiFlexItem>
           <EuiText className="eui-textBreakWord">
             <h1>
-              {(agentConfig && agentConfig.name) || (
+              {(agentPolicy && agentPolicy.name) || (
                 <FormattedMessage
-                  id="xpack.ingestManager.configDetails.configDetailsTitle"
+                  id="xpack.ingestManager.policyDetails.policyDetailsTitle"
                   defaultMessage="Config '{id}'"
                   values={{
-                    id: configId,
+                    id: policyId,
                   }}
                 />
               )}
@@ -88,17 +88,17 @@ export const AgentConfigDetailsPage: React.FunctionComponent = () => {
           </EuiText>
         </EuiFlexItem>
 
-        {agentConfig && agentConfig.description ? (
+        {agentPolicy && agentPolicy.description ? (
           <EuiFlexItem>
             <EuiSpacer size="s" />
             <EuiText color="subdued" size="s" className="eui-textBreakWord">
-              {agentConfig.description}
+              {agentPolicy.description}
             </EuiText>
           </EuiFlexItem>
         ) : null}
       </EuiFlexGroup>
     ),
-    [getHref, agentConfig, configId]
+    [getHref, agentPolicy, policyId]
   );
 
   const enrollmentCancelClickHandler = useCallback(() => {
@@ -109,26 +109,26 @@ export const AgentConfigDetailsPage: React.FunctionComponent = () => {
 
   const headerRightContent = useMemo(
     () =>
-      agentConfig ? (
+      agentPolicy ? (
         <EuiFlexGroup justifyContent={'flexEnd'} direction="row">
           {[
             {
-              label: i18n.translate('xpack.ingestManager.configDetails.summary.revision', {
+              label: i18n.translate('xpack.ingestManager.policyDetails.summary.revision', {
                 defaultMessage: 'Revision',
               }),
-              content: agentConfig?.revision ?? 0,
+              content: agentPolicy?.revision ?? 0,
             },
             { isDivider: true },
             {
-              label: i18n.translate('xpack.ingestManager.configDetails.summary.package_configs', {
+              label: i18n.translate('xpack.ingestManager.policyDetails.summary.integrations', {
                 defaultMessage: 'Integrations',
               }),
               content: (
                 <EuiI18nNumber
                   value={
-                    (agentConfig &&
-                      agentConfig.package_configs &&
-                      agentConfig.package_configs.length) ||
+                    (agentPolicy &&
+                      agentPolicy.package_configs &&
+                      agentPolicy.package_configs.length) ||
                     0
                   }
                 />
@@ -136,25 +136,25 @@ export const AgentConfigDetailsPage: React.FunctionComponent = () => {
             },
             { isDivider: true },
             {
-              label: i18n.translate('xpack.ingestManager.configDetails.summary.usedBy', {
+              label: i18n.translate('xpack.ingestManager.policyDetails.summary.usedBy', {
                 defaultMessage: 'Used by',
               }),
               content: (
                 <LinkedAgentCount
                   count={(agentStatus && agentStatus.total) || 0}
-                  agentConfigId={(agentConfig && agentConfig.id) || ''}
+                  agentPolicyId={(agentPolicy && agentPolicy.id) || ''}
                 />
               ),
             },
             { isDivider: true },
             {
-              label: i18n.translate('xpack.ingestManager.configDetails.summary.lastUpdated', {
+              label: i18n.translate('xpack.ingestManager.policyDetails.summary.lastUpdated', {
                 defaultMessage: 'Last updated on',
               }),
               content:
-                (agentConfig && (
+                (agentPolicy && (
                   <FormattedDate
-                    value={agentConfig?.updated_at}
+                    value={agentPolicy?.updated_at}
                     year="numeric"
                     month="short"
                     day="2-digit"
@@ -164,12 +164,12 @@ export const AgentConfigDetailsPage: React.FunctionComponent = () => {
             },
             { isDivider: true },
             {
-              content: agentConfig && (
-                <AgentConfigActionMenu
-                  config={agentConfig}
+              content: agentPolicy && (
+                <AgentPolicyActionMenu
+                  agentPolicy={agentPolicy}
                   fullButton={true}
-                  onCopySuccess={(newAgentConfig: AgentConfig) => {
-                    history.push(getPath('configuration_details', { configId: newAgentConfig.id }));
+                  onCopySuccess={(newAgentPolicy: AgentPolicy) => {
+                    history.push(getPath('policy_details', { policyId: newAgentPolicy.id }));
                   }}
                   enrollmentFlyoutOpenByDefault={openEnrollmentFlyoutOpenByDefault}
                   onCancelEnrollment={
@@ -201,32 +201,32 @@ export const AgentConfigDetailsPage: React.FunctionComponent = () => {
         </EuiFlexGroup>
       ) : undefined,
     /* eslint-disable-next-line react-hooks/exhaustive-deps */
-    [agentConfig, configId, agentStatus]
+    [agentPolicy, policyId, agentStatus]
   );
 
   const headerTabs = useMemo(() => {
     return [
       {
         id: 'integrations',
-        name: i18n.translate('xpack.ingestManager.configDetails.subTabs.packageConfigsTabText', {
+        name: i18n.translate('xpack.ingestManager.policyDetails.subTabs.packagePoliciesTabText', {
           defaultMessage: 'Integrations',
         }),
-        href: getHref('configuration_details', { configId, tabId: 'integrations' }),
+        href: getHref('policy_details', { policyId, tabId: 'integrations' }),
         isSelected: tabId === '' || tabId === 'integrations',
       },
       {
         id: 'settings',
-        name: i18n.translate('xpack.ingestManager.configDetails.subTabs.settingsTabText', {
+        name: i18n.translate('xpack.ingestManager.policyDetails.subTabs.settingsTabText', {
           defaultMessage: 'Settings',
         }),
-        href: getHref('configuration_details', { configId, tabId: 'settings' }),
+        href: getHref('policy_details', { policyId, tabId: 'settings' }),
         isSelected: tabId === 'settings',
       },
     ];
-  }, [getHref, configId, tabId]);
+  }, [getHref, policyId, tabId]);
 
   const content = useMemo(() => {
-    if (redirectToAgentConfigList) {
+    if (redirectToAgentPolicyList) {
       return <Redirect to="/" />;
     }
 
@@ -239,8 +239,8 @@ export const AgentConfigDetailsPage: React.FunctionComponent = () => {
         <Error
           title={
             <FormattedMessage
-              id="xpack.ingestManager.configDetails.unexceptedErrorTitle"
-              defaultMessage="An error happened while loading the config"
+              id="xpack.ingestManager.policyDetails.unexceptedErrorTitle"
+              defaultMessage="An error happened while loading the agent policy"
             />
           }
           error={error}
@@ -248,30 +248,30 @@ export const AgentConfigDetailsPage: React.FunctionComponent = () => {
       );
     }
 
-    if (!agentConfig) {
+    if (!agentPolicy) {
       return (
         <Error
           title={
             <FormattedMessage
-              id="xpack.ingestManager.configDetails.unexceptedErrorTitle"
-              defaultMessage="An error happened while loading the config"
+              id="xpack.ingestManager.policyDetails.unexceptedErrorTitle"
+              defaultMessage="An error happened while loading the agent policy"
             />
           }
-          error={i18n.translate('xpack.ingestManager.configDetails.configNotFoundErrorTitle', {
+          error={i18n.translate('xpack.ingestManager.policyDetails.policyNotFoundErrorTitle', {
             defaultMessage: "Config '{id}' not found",
             values: {
-              id: configId,
+              id: policyId,
             },
           })}
         />
       );
     }
 
-    return <AgentConfigDetailsContent agentConfig={agentConfig} />;
-  }, [agentConfig, configId, error, isLoading, redirectToAgentConfigList]);
+    return <AgentPolicyDetailsContent agentPolicy={agentPolicy} />;
+  }, [agentPolicy, policyId, error, isLoading, redirectToAgentPolicyList]);
 
   return (
-    <ConfigRefreshContext.Provider value={{ refresh: refreshAgentConfig }}>
+    <ConfigRefreshContext.Provider value={{ refresh: refreshAgentPolicy }}>
       <AgentStatusRefreshContext.Provider value={{ refresh: refreshAgentStatus }}>
         <WithHeaderLayout
           leftColumn={headerLeftContent}
@@ -285,22 +285,22 @@ export const AgentConfigDetailsPage: React.FunctionComponent = () => {
   );
 };
 
-const AgentConfigDetailsContent: React.FunctionComponent<{ agentConfig: AgentConfig }> = ({
-  agentConfig,
+const AgentPolicyDetailsContent: React.FunctionComponent<{ agentPolicy: AgentPolicy }> = ({
+  agentPolicy,
 }) => {
-  useBreadcrumbs('configuration_details', { configName: agentConfig.name });
+  useBreadcrumbs('policy_details', { configName: agentPolicy.name });
   return (
     <Switch>
       <Route
-        path={PAGE_ROUTING_PATHS.configuration_details_settings}
+        path={PAGE_ROUTING_PATHS.policy_details_settings}
         render={() => {
-          return <ConfigSettingsView config={agentConfig} />;
+          return <ConfigSettingsView agentPolicy={agentPolicy} />;
         }}
       />
       <Route
-        path={PAGE_ROUTING_PATHS.configuration_details}
+        path={PAGE_ROUTING_PATHS.policy_details}
         render={() => {
-          return <ConfigPackageConfigsView config={agentConfig} />;
+          return <ConfigPackagePoliciesView agentPolicy={agentPolicy} />;
         }}
       />
     </Switch>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx
index 3005f8d36f343c..a125b3a4346ef0 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx
@@ -15,34 +15,34 @@ import {
   EuiFlexItem,
   EuiSpacer,
 } from '@elastic/eui';
-import { AgentConfig, PackageInfo, UpdatePackageConfig } from '../../../types';
+import { AgentPolicy, PackageInfo, UpdatePackagePolicy } from '../../../types';
 import {
   useLink,
   useBreadcrumbs,
   useCore,
   useConfig,
-  sendUpdatePackageConfig,
+  sendUpdatePackagePolicy,
   sendGetAgentStatus,
-  sendGetOneAgentConfig,
-  sendGetOnePackageConfig,
+  sendGetOneAgentPolicy,
+  sendGetOnePackagePolicy,
   sendGetPackageInfoByKey,
 } from '../../../hooks';
 import { Loading, Error } from '../../../components';
 import { ConfirmDeployConfigModal } from '../components';
-import { CreatePackageConfigPageLayout } from '../create_package_config_page/components';
+import { CreatePackagePolicyPageLayout } from '../create_package_config_page/components';
 import {
-  PackageConfigValidationResults,
-  validatePackageConfig,
+  PackagePolicyValidationResults,
+  validatePackagePolicy,
   validationHasErrors,
 } from '../create_package_config_page/services';
 import {
-  PackageConfigFormState,
-  CreatePackageConfigFrom,
+  PackagePolicyFormState,
+  CreatePackagePolicyFrom,
 } from '../create_package_config_page/types';
 import { StepConfigurePackage } from '../create_package_config_page/step_configure_package';
-import { StepDefinePackageConfig } from '../create_package_config_page/step_define_package_config';
+import { StepDefinePackagePolicy } from '../create_package_config_page/step_define_package_config';
 
-export const EditPackageConfigPage: React.FunctionComponent = () => {
+export const EditPackagePolicyPage: React.FunctionComponent = () => {
   const {
     notifications,
     chrome: { getIsNavDrawerLocked$ },
@@ -52,7 +52,7 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
     fleet: { enabled: isFleetEnabled },
   } = useConfig();
   const {
-    params: { configId, packageConfigId },
+    params: { policyId, packagePolicyId },
   } = useRouteMatch();
   const history = useHistory();
   const { getHref, getPath } = useLink();
@@ -66,12 +66,12 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
     return () => subscription.unsubscribe();
   });
 
-  // Agent config, package info, and package config states
+  // Agent policy, package info, and package policy states
   const [isLoadingData, setIsLoadingData] = useState<boolean>(true);
   const [loadingError, setLoadingError] = useState<Error>();
-  const [agentConfig, setAgentConfig] = useState<AgentConfig>();
+  const [agentPolicy, setAgentPolicy] = useState<AgentPolicy>();
   const [packageInfo, setPackageInfo] = useState<PackageInfo>();
-  const [packageConfig, setPackageConfig] = useState<UpdatePackageConfig>({
+  const [packagePolicy, setPackagePolicy] = useState<UpdatePackagePolicy>({
     name: '',
     description: '',
     namespace: '',
@@ -82,20 +82,20 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
     version: '',
   });
 
-  // Retrieve agent config, package, and package config info
+  // Retrieve agent policy, package, and package policy info
   useEffect(() => {
     const getData = async () => {
       setIsLoadingData(true);
       setLoadingError(undefined);
       try {
-        const [{ data: agentConfigData }, { data: packageConfigData }] = await Promise.all([
-          sendGetOneAgentConfig(configId),
-          sendGetOnePackageConfig(packageConfigId),
+        const [{ data: agentPolicyData }, { data: packagePolicyData }] = await Promise.all([
+          sendGetOneAgentPolicy(policyId),
+          sendGetOnePackagePolicy(packagePolicyId),
         ]);
-        if (agentConfigData?.item) {
-          setAgentConfig(agentConfigData.item);
+        if (agentPolicyData?.item) {
+          setAgentPolicy(agentPolicyData.item);
         }
-        if (packageConfigData?.item) {
+        if (packagePolicyData?.item) {
           const {
             id,
             revision,
@@ -106,11 +106,11 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
             updated_by,
             updated_at,
             /* eslint-enable @typescript-eslint/naming-convention */
-            ...restOfPackageConfig
-          } = packageConfigData.item;
+            ...restOfPackagePolicy
+          } = packagePolicyData.item;
           // Remove `compiled_stream` from all stream info, we assign this after saving
-          const newPackageConfig = {
-            ...restOfPackageConfig,
+          const newPackagePolicy = {
+            ...restOfPackagePolicy,
             inputs: inputs.map((input) => {
               const { streams, ...restOfInput } = input;
               return {
@@ -123,14 +123,14 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
               };
             }),
           };
-          setPackageConfig(newPackageConfig);
-          if (packageConfigData.item.package) {
+          setPackagePolicy(newPackagePolicy);
+          if (packagePolicyData.item.package) {
             const { data: packageData } = await sendGetPackageInfoByKey(
-              `${packageConfigData.item.package.name}-${packageConfigData.item.package.version}`
+              `${packagePolicyData.item.package.name}-${packagePolicyData.item.package.version}`
             );
             if (packageData?.response) {
               setPackageInfo(packageData.response);
-              setValidationResults(validatePackageConfig(newPackageConfig, packageData.response));
+              setValidationResults(validatePackagePolicy(newPackagePolicy, packageData.response));
               setFormState('VALID');
             }
           }
@@ -141,13 +141,13 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
       setIsLoadingData(false);
     };
     getData();
-  }, [configId, packageConfigId]);
+  }, [policyId, packagePolicyId]);
 
   // Retrieve agent count
   const [agentCount, setAgentCount] = useState<number>(0);
   useEffect(() => {
     const getAgentCount = async () => {
-      const { data } = await sendGetAgentStatus({ configId });
+      const { data } = await sendGetAgentStatus({ configId: policyId });
       if (data?.results.total) {
         setAgentCount(data.results.total);
       }
@@ -156,42 +156,42 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
     if (isFleetEnabled) {
       getAgentCount();
     }
-  }, [configId, isFleetEnabled]);
+  }, [policyId, isFleetEnabled]);
 
-  // Package config validation state
-  const [validationResults, setValidationResults] = useState<PackageConfigValidationResults>();
+  // Package policy validation state
+  const [validationResults, setValidationResults] = useState<PackagePolicyValidationResults>();
   const hasErrors = validationResults ? validationHasErrors(validationResults) : false;
 
-  // Update package config validation
-  const updatePackageConfigValidation = useCallback(
-    (newPackageConfig?: UpdatePackageConfig) => {
+  // Update package policy validation
+  const updatePackagePolicyValidation = useCallback(
+    (newPackagePolicy?: UpdatePackagePolicy) => {
       if (packageInfo) {
-        const newValidationResult = validatePackageConfig(
-          newPackageConfig || packageConfig,
+        const newValidationResult = validatePackagePolicy(
+          newPackagePolicy || packagePolicy,
           packageInfo
         );
         setValidationResults(newValidationResult);
         // eslint-disable-next-line no-console
-        console.debug('Package config validation results', newValidationResult);
+        console.debug('Package policy validation results', newValidationResult);
 
         return newValidationResult;
       }
     },
-    [packageConfig, packageInfo]
+    [packagePolicy, packageInfo]
   );
 
-  // Update package config method
-  const updatePackageConfig = useCallback(
-    (updatedFields: Partial<UpdatePackageConfig>) => {
-      const newPackageConfig = {
-        ...packageConfig,
+  // Update package policy method
+  const updatePackagePolicy = useCallback(
+    (updatedFields: Partial<UpdatePackagePolicy>) => {
+      const newPackagePolicy = {
+        ...packagePolicy,
         ...updatedFields,
       };
-      setPackageConfig(newPackageConfig);
+      setPackagePolicy(newPackagePolicy);
 
       // eslint-disable-next-line no-console
-      console.debug('Package config updated', newPackageConfig);
-      const newValidationResults = updatePackageConfigValidation(newPackageConfig);
+      console.debug('Package policy updated', newPackagePolicy);
+      const newValidationResults = updatePackagePolicyValidation(newPackagePolicy);
       const hasValidationErrors = newValidationResults
         ? validationHasErrors(newValidationResults)
         : false;
@@ -199,17 +199,17 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
         setFormState('VALID');
       }
     },
-    [packageConfig, updatePackageConfigValidation]
+    [packagePolicy, updatePackagePolicyValidation]
   );
 
   // Cancel url
-  const cancelUrl = getHref('configuration_details', { configId });
+  const cancelUrl = getHref('policy_details', { policyId });
 
-  // Save package config
-  const [formState, setFormState] = useState<PackageConfigFormState>('INVALID');
-  const savePackageConfig = async () => {
+  // Save package policy
+  const [formState, setFormState] = useState<PackagePolicyFormState>('INVALID');
+  const savePackagePolicy = async () => {
     setFormState('LOADING');
-    const result = await sendUpdatePackageConfig(packageConfigId, packageConfig);
+    const result = await sendUpdatePackagePolicy(packagePolicyId, packagePolicy);
     setFormState('SUBMITTED');
     return result;
   };
@@ -223,22 +223,22 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
       setFormState('CONFIRM');
       return;
     }
-    const { error } = await savePackageConfig();
+    const { error } = await savePackagePolicy();
     if (!error) {
-      history.push(getPath('configuration_details', { configId }));
+      history.push(getPath('policy_details', { policyId }));
       notifications.toasts.addSuccess({
-        title: i18n.translate('xpack.ingestManager.editPackageConfig.updatedNotificationTitle', {
-          defaultMessage: `Successfully updated '{packageConfigName}'`,
+        title: i18n.translate('xpack.ingestManager.editPackagePolicy.updatedNotificationTitle', {
+          defaultMessage: `Successfully updated '{packagePolicyName}'`,
           values: {
-            packageConfigName: packageConfig.name,
+            packagePolicyName: packagePolicy.name,
           },
         }),
         text:
-          agentCount && agentConfig
-            ? i18n.translate('xpack.ingestManager.editPackageConfig.updatedNotificationMessage', {
-                defaultMessage: `Fleet will deploy updates to all agents that use the '{agentConfigName}' configuration`,
+          agentCount && agentPolicy
+            ? i18n.translate('xpack.ingestManager.editPackagePolicy.updatedNotificationMessage', {
+                defaultMessage: `Fleet will deploy updates to all agents that use the '{agentPolicyName}' policy`,
                 values: {
-                  agentConfigName: agentConfig.name,
+                  agentPolicyName: agentPolicy.name,
                 },
               })
             : undefined,
@@ -246,25 +246,25 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
     } else {
       if (error.statusCode === 409) {
         notifications.toasts.addError(error, {
-          title: i18n.translate('xpack.ingestManager.editPackageConfig.failedNotificationTitle', {
-            defaultMessage: `Error updating '{packageConfigName}'`,
+          title: i18n.translate('xpack.ingestManager.editPackagePolicy.failedNotificationTitle', {
+            defaultMessage: `Error updating '{packagePolicyName}'`,
             values: {
-              packageConfigName: packageConfig.name,
+              packagePolicyName: packagePolicy.name,
             },
           }),
           toastMessage: i18n.translate(
-            'xpack.ingestManager.editPackageConfig.failedConflictNotificationMessage',
+            'xpack.ingestManager.editPackagePolicy.failedConflictNotificationMessage',
             {
-              defaultMessage: `Data is out of date. Refresh the page to get the latest configuration.`,
+              defaultMessage: `Data is out of date. Refresh the page to get the latest policy.`,
             }
           ),
         });
       } else {
         notifications.toasts.addError(error, {
-          title: i18n.translate('xpack.ingestManager.editPackageConfig.failedNotificationTitle', {
-            defaultMessage: `Error updating '{packageConfigName}'`,
+          title: i18n.translate('xpack.ingestManager.editPackagePolicy.failedNotificationTitle', {
+            defaultMessage: `Error updating '{packagePolicyName}'`,
             values: {
-              packageConfigName: packageConfig.name,
+              packagePolicyName: packagePolicy.name,
             },
           }),
         });
@@ -274,72 +274,72 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
   };
 
   const layoutProps = {
-    from: 'edit' as CreatePackageConfigFrom,
+    from: 'edit' as CreatePackagePolicyFrom,
     cancelUrl,
-    agentConfig,
+    agentPolicy,
     packageInfo,
   };
 
   const configurePackage = useMemo(
     () =>
-      agentConfig && packageInfo ? (
+      agentPolicy && packageInfo ? (
         <>
-          <StepDefinePackageConfig
-            agentConfig={agentConfig}
+          <StepDefinePackagePolicy
+            agentPolicy={agentPolicy}
             packageInfo={packageInfo}
-            packageConfig={packageConfig}
-            updatePackageConfig={updatePackageConfig}
+            packagePolicy={packagePolicy}
+            updatePackagePolicy={updatePackagePolicy}
             validationResults={validationResults!}
           />
 
           <StepConfigurePackage
             from={'edit'}
             packageInfo={packageInfo}
-            packageConfig={packageConfig}
-            packageConfigId={packageConfigId}
-            updatePackageConfig={updatePackageConfig}
+            packagePolicy={packagePolicy}
+            packagePolicyId={packagePolicyId}
+            updatePackagePolicy={updatePackagePolicy}
             validationResults={validationResults!}
             submitAttempted={formState === 'INVALID'}
           />
         </>
       ) : null,
     [
-      agentConfig,
+      agentPolicy,
       formState,
-      packageConfig,
-      packageConfigId,
+      packagePolicy,
+      packagePolicyId,
       packageInfo,
-      updatePackageConfig,
+      updatePackagePolicy,
       validationResults,
     ]
   );
 
   return (
-    <CreatePackageConfigPageLayout {...layoutProps} data-test-subj="editPackageConfig">
+    <CreatePackagePolicyPageLayout {...layoutProps} data-test-subj="editPackagePolicy">
       {isLoadingData ? (
         <Loading />
-      ) : loadingError || !agentConfig || !packageInfo ? (
+      ) : loadingError || !agentPolicy || !packageInfo ? (
         <Error
           title={
             <FormattedMessage
-              id="xpack.ingestManager.editPackageConfig.errorLoadingDataTitle"
+              id="xpack.ingestManager.editPackagePolicy.errorLoadingDataTitle"
               defaultMessage="Error loading data"
             />
           }
           error={
             loadingError ||
-            i18n.translate('xpack.ingestManager.editPackageConfig.errorLoadingDataMessage', {
+            i18n.translate('xpack.ingestManager.editPackagePolicy.errorLoadingDataMessage', {
               defaultMessage: 'There was an error loading this intergration information',
             })
           }
         />
       ) : (
         <>
-          <Breadcrumb configName={agentConfig.name} configId={configId} />
+          <Breadcrumb configName={agentPolicy.name} policyId={policyId} />
           {formState === 'CONFIRM' && (
             <ConfirmDeployConfigModal
               agentCount={agentCount}
-              agentConfig={agentConfig}
+              agentPolicy={agentPolicy}
               onConfirm={onSubmit}
               onCancel={() => setFormState('VALID')}
             />
@@ -358,10 +358,10 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
           >
             <EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
               <EuiFlexItem grow={false}>
-                {agentConfig && packageInfo && formState === 'INVALID' ? (
+                {agentPolicy && packageInfo && formState === 'INVALID' ? (
                   <FormattedMessage
-                    id="xpack.ingestManager.createPackageConfig.errorOnSaveText"
-                    defaultMessage="Your integration configuration has errors. Please fix them before saving."
+                    id="xpack.ingestManager.createPackagePolicy.errorOnSaveText"
+                    defaultMessage="Your integration policy has errors. Please fix them before saving."
                   />
                 ) : null}
               </EuiFlexItem>
@@ -370,7 +370,7 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
                   <EuiFlexItem grow={false}>
                     <EuiButtonEmpty color="ghost" href={cancelUrl}>
                       <FormattedMessage
-                        id="xpack.ingestManager.editPackageConfig.cancelButton"
+                        id="xpack.ingestManager.editPackagePolicy.cancelButton"
                         defaultMessage="Cancel"
                       />
                     </EuiButtonEmpty>
@@ -385,7 +385,7 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
                       fill
                     >
                       <FormattedMessage
-                        id="xpack.ingestManager.editPackageConfig.saveButton"
+                        id="xpack.ingestManager.editPackagePolicy.saveButton"
                         defaultMessage="Save integration"
                       />
                     </EuiButton>
@@ -396,14 +396,14 @@ export const EditPackageConfigPage: React.FunctionComponent = () => {
           </EuiBottomBar>
         </>
       )}
-    </CreatePackageConfigPageLayout>
+    </CreatePackagePolicyPageLayout>
   );
 };
 
-const Breadcrumb: React.FunctionComponent<{ configName: string; configId: string }> = ({
+const Breadcrumb: React.FunctionComponent<{ configName: string; policyId: string }> = ({
   configName,
-  configId,
+  policyId,
 }) => {
-  useBreadcrumbs('edit_integration', { configName, configId });
+  useBreadcrumbs('edit_integration', { configName, policyId });
   return null;
 };
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/index.tsx
index 727ef233472516..8ef3eeee140e44 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/index.tsx
@@ -7,28 +7,28 @@ import React from 'react';
 import { HashRouter as Router, Switch, Route } from 'react-router-dom';
 import { PAGE_ROUTING_PATHS } from '../../constants';
 import { useBreadcrumbs } from '../../hooks';
-import { AgentConfigListPage } from './list_page';
-import { AgentConfigDetailsPage } from './details_page';
-import { CreatePackageConfigPage } from './create_package_config_page';
-import { EditPackageConfigPage } from './edit_package_config_page';
+import { AgentPolicyListPage } from './list_page';
+import { AgentPolicyDetailsPage } from './details_page';
+import { CreatePackagePolicyPage } from './create_package_config_page';
+import { EditPackagePolicyPage } from './edit_package_config_page';
 
-export const AgentConfigApp: React.FunctionComponent = () => {
-  useBreadcrumbs('configurations');
+export const AgentPolicyApp: React.FunctionComponent = () => {
+  useBreadcrumbs('policies');
 
   return (
     <Router>
       <Switch>
         <Route path={PAGE_ROUTING_PATHS.edit_integration}>
-          <EditPackageConfigPage />
+          <EditPackagePolicyPage />
         </Route>
-        <Route path={PAGE_ROUTING_PATHS.add_integration_from_configuration}>
-          <CreatePackageConfigPage />
+        <Route path={PAGE_ROUTING_PATHS.add_integration_from_policy}>
+          <CreatePackagePolicyPage />
         </Route>
-        <Route path={PAGE_ROUTING_PATHS.configuration_details}>
-          <AgentConfigDetailsPage />
+        <Route path={PAGE_ROUTING_PATHS.policy_details}>
+          <AgentPolicyDetailsPage />
         </Route>
-        <Route path={PAGE_ROUTING_PATHS.configurations_list}>
-          <AgentConfigListPage />
+        <Route path={PAGE_ROUTING_PATHS.policies_list}>
+          <AgentPolicyListPage />
         </Route>
       </Switch>
     </Router>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/components/create_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/components/create_config.tsx
index 749716b473c858..b072990727e3cc 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/components/create_config.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/components/create_config.tsx
@@ -21,25 +21,25 @@ import {
   EuiFlyoutProps,
   EuiSpacer,
 } from '@elastic/eui';
-import { NewAgentConfig, AgentConfig } from '../../../../types';
-import { useCapabilities, useCore, sendCreateAgentConfig } from '../../../../hooks';
-import { AgentConfigForm, agentConfigFormValidation } from '../../components';
+import { NewAgentPolicy, AgentPolicy } from '../../../../types';
+import { useCapabilities, useCore, sendCreateAgentPolicy } from '../../../../hooks';
+import { AgentPolicyForm, agentPolicyFormValidation } from '../../components';
 
 const FlyoutWithHigherZIndex = styled(EuiFlyout)`
   z-index: ${(props) => props.theme.eui.euiZLevel5};
 `;
 
 interface Props extends EuiFlyoutProps {
-  onClose: (createdAgentConfig?: AgentConfig) => void;
+  onClose: (createdAgentPolicy?: AgentPolicy) => void;
 }
 
-export const CreateAgentConfigFlyout: React.FunctionComponent<Props> = ({
+export const CreateAgentPolicyFlyout: React.FunctionComponent<Props> = ({
   onClose,
   ...restOfProps
 }) => {
   const { notifications } = useCore();
   const hasWriteCapabilites = useCapabilities().write;
-  const [agentConfig, setAgentConfig] = useState<NewAgentConfig>({
+  const [agentPolicy, setAgentPolicy] = useState<NewAgentPolicy>({
     name: '',
     description: '',
     namespace: 'default',
@@ -48,26 +48,26 @@ export const CreateAgentConfigFlyout: React.FunctionComponent<Props> = ({
   });
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const [withSysMonitoring, setWithSysMonitoring] = useState<boolean>(true);
-  const validation = agentConfigFormValidation(agentConfig);
+  const validation = agentPolicyFormValidation(agentPolicy);
 
-  const updateAgentConfig = (updatedFields: Partial<NewAgentConfig>) => {
-    setAgentConfig({
-      ...agentConfig,
+  const updateAgentPolicy = (updatedFields: Partial<NewAgentPolicy>) => {
+    setAgentPolicy({
+      ...agentPolicy,
       ...updatedFields,
     });
   };
 
-  const createAgentConfig = async () => {
-    return await sendCreateAgentConfig(agentConfig, { withSysMonitoring });
+  const createAgentPolicy = async () => {
+    return await sendCreateAgentPolicy(agentPolicy, { withSysMonitoring });
   };
 
   const header = (
-    <EuiFlyoutHeader hasBorder aria-labelledby="CreateAgentConfigFlyoutTitle">
+    <EuiFlyoutHeader hasBorder aria-labelledby="CreateAgentPolicyFlyoutTitle">
       <EuiTitle size="m">
-        <h2 id="CreateAgentConfigFlyoutTitle">
+        <h2 id="CreateAgentPolicyFlyoutTitle">
           <FormattedMessage
-            id="xpack.ingestManager.createAgentConfig.flyoutTitle"
-            defaultMessage="Create agent configuration"
+            id="xpack.ingestManager.createAgentPolicy.flyoutTitle"
+            defaultMessage="Create agent policy"
           />
         </h2>
       </EuiTitle>
@@ -75,8 +75,8 @@ export const CreateAgentConfigFlyout: React.FunctionComponent<Props> = ({
       <EuiText size="s">
         <p>
           <FormattedMessage
-            id="xpack.ingestManager.createAgentConfig.flyoutTitleDescription"
-            defaultMessage="Agent configurations are used to manage settings across a group of agents. You can add integrations to your agent configuration to specify what data your agents collect. When you edit an agent configuration, you can use Fleet to deploy updates to a specified group of agents."
+            id="xpack.ingestManager.createAgentPolicy.flyoutTitleDescription"
+            defaultMessage="Agent policies are used to manage settings across a group of agents. You can add integrations to your agent policy to specify what data your agents collect. When you edit an agent policy, you can use Fleet to deploy updates to a specified group of agents."
           />
         </p>
       </EuiText>
@@ -85,9 +85,9 @@ export const CreateAgentConfigFlyout: React.FunctionComponent<Props> = ({
 
   const body = (
     <EuiFlyoutBody>
-      <AgentConfigForm
-        agentConfig={agentConfig}
-        updateAgentConfig={updateAgentConfig}
+      <AgentPolicyForm
+        agentPolicy={agentPolicy}
+        updateAgentPolicy={updateAgentPolicy}
         withSysMonitoring={withSysMonitoring}
         updateSysMonitoring={(newValue) => setWithSysMonitoring(newValue)}
         validation={validation}
@@ -101,7 +101,7 @@ export const CreateAgentConfigFlyout: React.FunctionComponent<Props> = ({
         <EuiFlexItem grow={false}>
           <EuiButtonEmpty onClick={() => onClose()} flush="left">
             <FormattedMessage
-              id="xpack.ingestManager.createAgentConfig.cancelButtonLabel"
+              id="xpack.ingestManager.createAgentPolicy.cancelButtonLabel"
               defaultMessage="Cancel"
             />
           </EuiButtonEmpty>
@@ -114,15 +114,15 @@ export const CreateAgentConfigFlyout: React.FunctionComponent<Props> = ({
             onClick={async () => {
               setIsLoading(true);
               try {
-                const { data, error } = await createAgentConfig();
+                const { data, error } = await createAgentPolicy();
                 setIsLoading(false);
                 if (data?.success) {
                   notifications.toasts.addSuccess(
                     i18n.translate(
-                      'xpack.ingestManager.createAgentConfig.successNotificationTitle',
+                      'xpack.ingestManager.createAgentPolicy.successNotificationTitle',
                       {
-                        defaultMessage: "Agent config '{name}' created",
-                        values: { name: agentConfig.name },
+                        defaultMessage: "Agent policy '{name}' created",
+                        values: { name: agentPolicy.name },
                       }
                     )
                   );
@@ -132,9 +132,9 @@ export const CreateAgentConfigFlyout: React.FunctionComponent<Props> = ({
                     error
                       ? error.message
                       : i18n.translate(
-                          'xpack.ingestManager.createAgentConfig.errorNotificationTitle',
+                          'xpack.ingestManager.createAgentPolicy.errorNotificationTitle',
                           {
-                            defaultMessage: 'Unable to create agent config',
+                            defaultMessage: 'Unable to create agent policy',
                           }
                         )
                   );
@@ -142,16 +142,16 @@ export const CreateAgentConfigFlyout: React.FunctionComponent<Props> = ({
               } catch (e) {
                 setIsLoading(false);
                 notifications.toasts.addDanger(
-                  i18n.translate('xpack.ingestManager.createAgentConfig.errorNotificationTitle', {
-                    defaultMessage: 'Unable to create agent config',
+                  i18n.translate('xpack.ingestManager.createAgentPolicy.errorNotificationTitle', {
+                    defaultMessage: 'Unable to create agent policy',
                   })
                 );
               }
             }}
           >
             <FormattedMessage
-              id="xpack.ingestManager.createAgentConfig.submitButtonLabel"
-              defaultMessage="Create agent configuration"
+              id="xpack.ingestManager.createAgentPolicy.submitButtonLabel"
+              defaultMessage="Create agent policy"
             />
           </EuiButton>
         </EuiFlexItem>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/components/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/components/index.ts
index 43668b4ffb8049..a8d63872a37fb7 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/components/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/components/index.ts
@@ -3,4 +3,4 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-export { CreateAgentConfigFlyout } from './create_config';
+export { CreateAgentPolicyFlyout } from './create_config';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/index.tsx
index 229adb946412b2..e5c02b609657e0 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/index.tsx
@@ -21,12 +21,12 @@ import { CriteriaWithPagination } from '@elastic/eui/src/components/basic_table/
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, FormattedDate } from '@kbn/i18n/react';
 import { useHistory } from 'react-router-dom';
-import { AgentConfig } from '../../../types';
-import { AGENT_CONFIG_SAVED_OBJECT_TYPE } from '../../../constants';
+import { AgentPolicy } from '../../../types';
+import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '../../../constants';
 import { WithHeaderLayout } from '../../../layouts';
 import {
   useCapabilities,
-  useGetAgentConfigs,
+  useGetAgentPolicies,
   usePagination,
   useSorting,
   useLink,
@@ -35,10 +35,10 @@ import {
   useBreadcrumbs,
 } from '../../../hooks';
 import { SearchBar } from '../../../components';
-import { LinkedAgentCount, AgentConfigActionMenu } from '../components';
-import { CreateAgentConfigFlyout } from './components';
+import { LinkedAgentCount, AgentPolicyActionMenu } from '../components';
+import { CreateAgentPolicyFlyout } from './components';
 
-const AgentConfigListPageLayout: React.FunctionComponent = ({ children }) => (
+const AgentPolicyListPageLayout: React.FunctionComponent = ({ children }) => (
   <WithHeaderLayout
     leftColumn={
       <EuiFlexGroup direction="column" gutterSize="m">
@@ -46,8 +46,8 @@ const AgentConfigListPageLayout: React.FunctionComponent = ({ children }) => (
           <EuiText>
             <h1>
               <FormattedMessage
-                id="xpack.ingestManager.agentConfigList.pageTitle"
-                defaultMessage="Agent Configurations"
+                id="xpack.ingestManager.agentPolicyList.pageTitle"
+                defaultMessage="Agent policies"
               />
             </h1>
           </EuiText>
@@ -56,8 +56,8 @@ const AgentConfigListPageLayout: React.FunctionComponent = ({ children }) => (
           <EuiText color="subdued">
             <p>
               <FormattedMessage
-                id="xpack.ingestManager.agentConfigList.pageSubtitle"
-                defaultMessage="Use agent configurations to manage your agents and the data they collect."
+                id="xpack.ingestManager.agentPolicyList.pageSubtitle"
+                defaultMessage="Use agent policies to manage your agents and the data they collect."
               />
             </p>
           </EuiText>
@@ -69,8 +69,8 @@ const AgentConfigListPageLayout: React.FunctionComponent = ({ children }) => (
   </WithHeaderLayout>
 );
 
-export const AgentConfigListPage: React.FunctionComponent<{}> = () => {
-  useBreadcrumbs('configurations_list');
+export const AgentPolicyListPage: React.FunctionComponent<{}> = () => {
+  useBreadcrumbs('policies_list');
   const { getHref, getPath } = useLink();
   // Config information
   const hasWriteCapabilites = useCapabilities().write;
@@ -86,30 +86,30 @@ export const AgentConfigListPage: React.FunctionComponent<{}> = () => {
       : urlParams.kuery ?? ''
   );
   const { pagination, pageSizeOptions, setPagination } = usePagination();
-  const { sorting, setSorting } = useSorting<AgentConfig>({
+  const { sorting, setSorting } = useSorting<AgentPolicy>({
     field: 'updated_at',
     direction: 'desc',
   });
   const history = useHistory();
-  const isCreateAgentConfigFlyoutOpen = 'create' in urlParams;
-  const setIsCreateAgentConfigFlyoutOpen = useCallback(
+  const isCreateAgentPolicyFlyoutOpen = 'create' in urlParams;
+  const setIsCreateAgentPolicyFlyoutOpen = useCallback(
     (isOpen: boolean) => {
-      if (isOpen !== isCreateAgentConfigFlyoutOpen) {
+      if (isOpen !== isCreateAgentPolicyFlyoutOpen) {
         if (isOpen) {
           history.push(
-            `${getPath('configurations_list')}?${toUrlParams({ ...urlParams, create: null })}`
+            `${getPath('policies_list')}?${toUrlParams({ ...urlParams, create: null })}`
           );
         } else {
           const { create, ...params } = urlParams;
-          history.push(`${getPath('configurations_list')}?${toUrlParams(params)}`);
+          history.push(`${getPath('policies_list')}?${toUrlParams(params)}`);
         }
       }
     },
-    [getPath, history, isCreateAgentConfigFlyoutOpen, toUrlParams, urlParams]
+    [getPath, history, isCreateAgentPolicyFlyoutOpen, toUrlParams, urlParams]
   );
 
-  // Fetch agent configs
-  const { isLoading, data: agentConfigData, sendRequest } = useGetAgentConfigs({
+  // Fetch agent policies
+  const { isLoading, data: agentPolicyData, sendRequest } = useGetAgentPolicies({
     page: pagination.currentPage,
     perPage: pagination.pageSize,
     sortField: sorting?.field,
@@ -117,35 +117,35 @@ export const AgentConfigListPage: React.FunctionComponent<{}> = () => {
     kuery: search,
   });
 
-  // Some configs retrieved, set up table props
+  // Some policies retrieved, set up table props
   const columns = useMemo(() => {
     const cols: Array<
-      EuiTableFieldDataColumnType<AgentConfig> | EuiTableActionsColumnType<AgentConfig>
+      EuiTableFieldDataColumnType<AgentPolicy> | EuiTableActionsColumnType<AgentPolicy>
     > = [
       {
         field: 'name',
         sortable: true,
-        name: i18n.translate('xpack.ingestManager.agentConfigList.nameColumnTitle', {
+        name: i18n.translate('xpack.ingestManager.agentPolicyList.nameColumnTitle', {
           defaultMessage: 'Name',
         }),
         width: '20%',
-        render: (name: string, agentConfig: AgentConfig) => (
+        render: (name: string, agentPolicy: AgentPolicy) => (
           <EuiFlexGroup gutterSize="s" alignItems="baseline" style={{ minWidth: 0 }}>
             <EuiFlexItem grow={false} className="eui-textTruncate">
               <EuiLink
                 className="eui-textTruncate"
-                href={getHref('configuration_details', { configId: agentConfig.id })}
-                title={name || agentConfig.id}
+                href={getHref('policy_details', { policyId: agentPolicy.id })}
+                title={name || agentPolicy.id}
               >
-                {name || agentConfig.id}
+                {name || agentPolicy.id}
               </EuiLink>
             </EuiFlexItem>
             <EuiFlexItem grow={true}>
               <EuiText color="subdued" size="xs" style={{ whiteSpace: 'nowrap' }}>
                 <FormattedMessage
-                  id="xpack.ingestManager.agentConfigList.revisionNumber"
+                  id="xpack.ingestManager.agentPolicyList.revisionNumber"
                   defaultMessage="rev. {revNumber}"
-                  values={{ revNumber: agentConfig.revision }}
+                  values={{ revNumber: agentPolicy.revision }}
                 />
               </EuiText>
             </EuiFlexItem>
@@ -154,7 +154,7 @@ export const AgentConfigListPage: React.FunctionComponent<{}> = () => {
       },
       {
         field: 'description',
-        name: i18n.translate('xpack.ingestManager.agentConfigList.descriptionColumnTitle', {
+        name: i18n.translate('xpack.ingestManager.agentPolicyList.descriptionColumnTitle', {
           defaultMessage: 'Description',
         }),
         width: '35%',
@@ -167,40 +167,46 @@ export const AgentConfigListPage: React.FunctionComponent<{}> = () => {
       {
         field: 'updated_at',
         sortable: true,
-        name: i18n.translate('xpack.ingestManager.agentConfigList.updatedOnColumnTitle', {
+        name: i18n.translate('xpack.ingestManager.agentPolicyList.updatedOnColumnTitle', {
           defaultMessage: 'Last updated on',
         }),
-        render: (date: AgentConfig['updated_at']) => (
+        render: (date: AgentPolicy['updated_at']) => (
           <FormattedDate value={date} year="numeric" month="short" day="2-digit" />
         ),
       },
       {
         field: 'agents',
-        name: i18n.translate('xpack.ingestManager.agentConfigList.agentsColumnTitle', {
+        name: i18n.translate('xpack.ingestManager.agentPolicyList.agentsColumnTitle', {
           defaultMessage: 'Agents',
         }),
         dataType: 'number',
-        render: (agents: number, config: AgentConfig) => (
-          <LinkedAgentCount count={agents} agentConfigId={config.id} />
+        render: (agents: number, agentPolicy: AgentPolicy) => (
+          <LinkedAgentCount count={agents} agentPolicyId={agentPolicy.id} />
         ),
       },
       {
         field: 'package_configs',
-        name: i18n.translate('xpack.ingestManager.agentConfigList.packageConfigsCountColumnTitle', {
-          defaultMessage: 'Integrations',
-        }),
+        name: i18n.translate(
+          'xpack.ingestManager.agentPolicyList.packagePoliciesCountColumnTitle',
+          {
+            defaultMessage: 'Integrations',
+          }
+        ),
         dataType: 'number',
-        render: (packageConfigs: AgentConfig['package_configs']) =>
-          packageConfigs ? packageConfigs.length : 0,
+        render: (packagePolicies: AgentPolicy['package_configs']) =>
+          packagePolicies ? packagePolicies.length : 0,
       },
       {
-        name: i18n.translate('xpack.ingestManager.agentConfigList.actionsColumnTitle', {
+        name: i18n.translate('xpack.ingestManager.agentPolicyList.actionsColumnTitle', {
           defaultMessage: 'Actions',
         }),
         actions: [
           {
-            render: (config: AgentConfig) => (
-              <AgentConfigActionMenu config={config} onCopySuccess={() => sendRequest()} />
+            render: (agentPolicy: AgentPolicy) => (
+              <AgentPolicyActionMenu
+                agentPolicy={agentPolicy}
+                onCopySuccess={() => sendRequest()}
+              />
             ),
           },
         ],
@@ -215,21 +221,21 @@ export const AgentConfigListPage: React.FunctionComponent<{}> = () => {
     return cols;
   }, [getHref, isFleetEnabled, sendRequest]);
 
-  const createAgentConfigButton = useMemo(
+  const createAgentPolicyButton = useMemo(
     () => (
       <EuiButton
         fill
         iconType="plusInCircle"
         isDisabled={!hasWriteCapabilites}
-        onClick={() => setIsCreateAgentConfigFlyoutOpen(true)}
+        onClick={() => setIsCreateAgentPolicyFlyoutOpen(true)}
       >
         <FormattedMessage
-          id="xpack.ingestManager.agentConfigList.addButton"
-          defaultMessage="Create agent configuration"
+          id="xpack.ingestManager.agentPolicyList.addButton"
+          defaultMessage="Create agent policy"
         />
       </EuiButton>
     ),
-    [hasWriteCapabilites, setIsCreateAgentConfigFlyoutOpen]
+    [hasWriteCapabilites, setIsCreateAgentPolicyFlyoutOpen]
   );
 
   const emptyPrompt = useMemo(
@@ -238,18 +244,18 @@ export const AgentConfigListPage: React.FunctionComponent<{}> = () => {
         title={
           <h2>
             <FormattedMessage
-              id="xpack.ingestManager.agentConfigList.noAgentConfigsPrompt"
-              defaultMessage="No agent configurations"
+              id="xpack.ingestManager.agentPolicyList.noAgentPoliciesPrompt"
+              defaultMessage="No agent policies"
             />
           </h2>
         }
-        actions={createAgentConfigButton}
+        actions={createAgentPolicyButton}
       />
     ),
-    [createAgentConfigButton]
+    [createAgentPolicyButton]
   );
 
-  const onTableChange = (criteria: CriteriaWithPagination<AgentConfig>) => {
+  const onTableChange = (criteria: CriteriaWithPagination<AgentPolicy>) => {
     const newPagination = {
       ...pagination,
       currentPage: criteria.page.index + 1,
@@ -260,11 +266,11 @@ export const AgentConfigListPage: React.FunctionComponent<{}> = () => {
   };
 
   return (
-    <AgentConfigListPageLayout>
-      {isCreateAgentConfigFlyoutOpen ? (
-        <CreateAgentConfigFlyout
+    <AgentPolicyListPageLayout>
+      {isCreateAgentPolicyFlyoutOpen ? (
+        <CreateAgentPolicyFlyout
           onClose={() => {
-            setIsCreateAgentConfigFlyoutOpen(false);
+            setIsCreateAgentPolicyFlyoutOpen(false);
             sendRequest();
           }}
         />
@@ -280,41 +286,41 @@ export const AgentConfigListPage: React.FunctionComponent<{}> = () => {
               });
               setSearch(newSearch);
             }}
-            fieldPrefix={AGENT_CONFIG_SAVED_OBJECT_TYPE}
+            fieldPrefix={AGENT_POLICY_SAVED_OBJECT_TYPE}
           />
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
           <EuiButton color="primary" iconType="refresh" onClick={() => sendRequest()}>
             <FormattedMessage
-              id="xpack.ingestManager.agentConfigList.reloadAgentConfigsButtonText"
+              id="xpack.ingestManager.agentPolicyList.reloadAgentPoliciesButtonText"
               defaultMessage="Reload"
             />
           </EuiButton>
         </EuiFlexItem>
-        <EuiFlexItem grow={false}>{createAgentConfigButton}</EuiFlexItem>
+        <EuiFlexItem grow={false}>{createAgentPolicyButton}</EuiFlexItem>
       </EuiFlexGroup>
 
       <EuiSpacer size="m" />
-      <EuiBasicTable<AgentConfig>
+      <EuiBasicTable<AgentPolicy>
         loading={isLoading}
         hasActions={true}
         noItemsMessage={
           isLoading ? (
             <FormattedMessage
-              id="xpack.ingestManager.agentConfigList.loadingAgentConfigsMessage"
-              defaultMessage="Loading agent configurations…"
+              id="xpack.ingestManager.agentPolicyList.loadingAgentPoliciesMessage"
+              defaultMessage="Loading agent policies…"
             />
-          ) : !search.trim() && (agentConfigData?.total ?? 0) === 0 ? (
+          ) : !search.trim() && (agentPolicyData?.total ?? 0) === 0 ? (
             emptyPrompt
           ) : (
             <FormattedMessage
-              id="xpack.ingestManager.agentConfigList.noFilteredAgentConfigsPrompt"
-              defaultMessage="No agent configurations found. {clearFiltersLink}"
+              id="xpack.ingestManager.agentPolicyList.noFilteredAgentPoliciesPrompt"
+              defaultMessage="No agent policies found. {clearFiltersLink}"
               values={{
                 clearFiltersLink: (
                   <EuiLink onClick={() => setSearch('')}>
                     <FormattedMessage
-                      id="xpack.ingestManager.agentConfigList.clearFiltersLinkText"
+                      id="xpack.ingestManager.agentPolicyList.clearFiltersLinkText"
                       defaultMessage="Clear filters"
                     />
                   </EuiLink>
@@ -323,19 +329,19 @@ export const AgentConfigListPage: React.FunctionComponent<{}> = () => {
             />
           )
         }
-        items={agentConfigData ? agentConfigData.items : []}
+        items={agentPolicyData ? agentPolicyData.items : []}
         itemId="id"
         columns={columns}
         isSelectable={false}
         pagination={{
           pageIndex: pagination.currentPage - 1,
           pageSize: pagination.pageSize,
-          totalItemCount: agentConfigData ? agentConfigData.total : 0,
+          totalItemCount: agentPolicyData ? agentPolicyData.total : 0,
           pageSizeOptions,
         }}
         sorting={{ sort: sorting }}
         onChange={onTableChange}
       />
-    </AgentConfigListPageLayout>
+    </AgentPolicyListPageLayout>
   );
 };
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/data_stream/list_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/data_stream/list_page/index.tsx
index 39e6d90e64bea7..d8ab46fbf87f7f 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/data_stream/list_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/data_stream/list_page/index.tsx
@@ -66,7 +66,7 @@ export const DataStreamListPage: React.FunctionComponent<{}> = () => {
   // Fetch data streams
   const { isLoading, data: dataStreamsData, sendRequest } = useGetDataStreams();
 
-  // Some configs retrieved, set up table props
+  // Some policies retrieved, set up table props
   const columns = useMemo(() => {
     const cols: Array<
       EuiTableFieldDataColumnType<DataStream> | EuiTableActionsColumnType<DataStream>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/index.tsx
index f15b7d7f182a8d..55dbda316d759f 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/index.tsx
@@ -8,7 +8,7 @@ import React from 'react';
 import { HashRouter as Router, Switch, Route } from 'react-router-dom';
 import { PAGE_ROUTING_PATHS } from '../../constants';
 import { useBreadcrumbs } from '../../hooks';
-import { CreatePackageConfigPage } from '../agent_config/create_package_config_page';
+import { CreatePackagePolicyPage } from '../agent_config/create_package_config_page';
 import { EPMHomePage } from './screens/home';
 import { Detail } from './screens/detail';
 
@@ -18,8 +18,8 @@ export const EPMApp: React.FunctionComponent = () => {
   return (
     <Router>
       <Switch>
-        <Route path={PAGE_ROUTING_PATHS.add_integration_to_configuration}>
-          <CreatePackageConfigPage />
+        <Route path={PAGE_ROUTING_PATHS.add_integration_to_policy}>
+          <CreatePackagePolicyPage />
         </Route>
         <Route path={PAGE_ROUTING_PATHS.integration_details}>
           <Detail />
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/confirm_package_uninstall.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/confirm_package_uninstall.tsx
index 11cdbe0be7b626..f4d5226ebe950a 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/confirm_package_uninstall.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/confirm_package_uninstall.tsx
@@ -56,7 +56,7 @@ export const ConfirmPackageUninstall = (props: ConfirmPackageUninstallProps) =>
           <p>
             <FormattedMessage
               id="xpack.ingestManager.integrations.settings.confirmUninstallModal.uninstallCallout.description"
-              defaultMessage="Kibana and Elasticsearch assets that were created by this integration will be removed. Agents configurations and any data sent by your agents will not be effected."
+              defaultMessage="Kibana and Elasticsearch assets that were created by this integration will be removed. Agents policies and any data sent by your agents will not be effected."
             />
           </p>
         </EuiCallOut>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/content.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/content.tsx
index f53b4e9150ca10..07e3fdb72d25fb 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/content.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/content.tsx
@@ -13,7 +13,7 @@ import { AssetsFacetGroup } from '../../components/assets_facet_group';
 import { CenterColumn, LeftColumn, RightColumn } from './layout';
 import { OverviewPanel } from './overview_panel';
 import { SideNavLinks } from './side_nav_links';
-import { PackageConfigsPanel } from './package_configs_panel';
+import { PackagePoliciesPanel } from './package_configs_panel';
 import { SettingsPanel } from './settings_panel';
 
 type ContentProps = PackageInfo & Pick<DetailParams, 'panel'>;
@@ -63,7 +63,7 @@ export function ContentPanel(props: ContentPanelProps) {
         />
       );
     case 'usages':
-      return <PackageConfigsPanel name={name} version={version} />;
+      return <PackagePoliciesPanel name={name} version={version} />;
     case 'overview':
     default:
       return <OverviewPanel {...props} />;
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/index.tsx
index 3267fbbe3733c2..84d3f97f3ee059 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/index.tsx
@@ -182,12 +182,12 @@ export function Detail() {
                     fill
                     isDisabled={!hasWriteCapabilites}
                     iconType="plusInCircle"
-                    href={getHref('add_integration_to_configuration', {
+                    href={getHref('add_integration_to_policy', {
                       pkgkey,
                     })}
                   >
                     <FormattedMessage
-                      id="xpack.ingestManager.epm.addPackageConfigButtonText"
+                      id="xpack.ingestManager.epm.addPackagePolicyButtonText"
                       defaultMessage="Add {packageName}"
                       values={{
                         packageName: packageInfo.title,
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/package_configs_panel.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/package_configs_panel.tsx
index 8f22d17984840e..d97d891ac5e5d7 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/package_configs_panel.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/package_configs_panel.tsx
@@ -10,11 +10,11 @@ import { useGetPackageInstallStatus } from '../../hooks';
 import { InstallStatus } from '../../../../types';
 import { useLink } from '../../../../hooks';
 
-interface PackageConfigsPanelProps {
+interface PackagePoliciesPanelProps {
   name: string;
   version: string;
 }
-export const PackageConfigsPanel = ({ name, version }: PackageConfigsPanelProps) => {
+export const PackagePoliciesPanel = ({ name, version }: PackagePoliciesPanelProps) => {
   const { getPath } = useLink();
   const getPackageInstallStatus = useGetPackageInstallStatus();
   const packageInstallStatus = getPackageInstallStatus(name);
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/settings_panel.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/settings_panel.tsx
index 4832a89479026e..4ac6fe6872e17e 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/settings_panel.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/settings_panel.tsx
@@ -10,8 +10,8 @@ import { EuiTitle, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
 import { EuiSpacer } from '@elastic/eui';
 import styled from 'styled-components';
 import { InstallStatus, PackageInfo } from '../../../../types';
-import { useGetPackageConfigs } from '../../../../hooks';
-import { PACKAGE_CONFIG_SAVED_OBJECT_TYPE } from '../../../../constants';
+import { useGetPackagePolicies } from '../../../../hooks';
+import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../../constants';
 import { useGetPackageInstallStatus } from '../../hooks';
 import { InstallationButton } from './installation_button';
 import { UpdateIcon } from '../../components/icons';
@@ -46,13 +46,13 @@ export const SettingsPanel = (
 ) => {
   const { name, title, removable, latestVersion, version } = props;
   const getPackageInstallStatus = useGetPackageInstallStatus();
-  const { data: packageConfigsData } = useGetPackageConfigs({
+  const { data: packagePoliciesData } = useGetPackagePolicies({
     perPage: 0,
     page: 1,
-    kuery: `${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.package.name:${props.name}`,
+    kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name:${props.name}`,
   });
   const { status: installationStatus, version: installedVersion } = getPackageInstallStatus(name);
-  const packageHasUsages = !!packageConfigsData?.total;
+  const packageHasUsages = !!packagePoliciesData?.total;
   const updateAvailable = installedVersion && installedVersion < latestVersion ? true : false;
   const isViewingOldPackage = version < latestVersion;
   // hide install/remove options if the user has version of the package is installed
@@ -185,7 +185,7 @@ export const SettingsPanel = (
               <p>
                 <InstallationButton
                   {...props}
-                  disabled={!packageConfigsData || removable === false ? true : packageHasUsages}
+                  disabled={!packagePoliciesData || removable === false ? true : packageHasUsages}
                 />
               </p>
             </EuiFlexItem>
@@ -194,7 +194,7 @@ export const SettingsPanel = (
             <p>
               <FormattedMessage
                 id="xpack.ingestManager.integrations.settings.packageUninstallNoteDescription.packageUninstallNoteDetail"
-                defaultMessage="{strongNote} {title} cannot be uninstalled because there are active agents that use this integration. To uninstall, remove all {title} integrations from your agent configurations."
+                defaultMessage="{strongNote} {title} cannot be uninstalled because there are active agents that use this integration. To uninstall, remove all {title} integrations from your agent policies."
                 values={{
                   title,
                   strongNote: (
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/side_nav_links.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/side_nav_links.tsx
index 8e9b0bf7d0cfdf..c508c8f68611a2 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/side_nav_links.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/side_nav_links.tsx
@@ -18,7 +18,7 @@ const PanelDisplayNames: Record<DetailViewPanelName, string> = {
   overview: i18n.translate('xpack.ingestManager.epm.packageDetailsNav.overviewLinkText', {
     defaultMessage: 'Overview',
   }),
-  usages: i18n.translate('xpack.ingestManager.epm.packageDetailsNav.packageConfigsLinkText', {
+  usages: i18n.translate('xpack.ingestManager.epm.packageDetailsNav.packagePoliciesLinkText', {
     defaultMessage: 'Usages',
   }),
   settings: i18n.translate('xpack.ingestManager.epm.packageDetailsNav.settingsLinkText', {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/actions_menu.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/actions_menu.tsx
index 0f48a230bbf5c8..815a608481c14b 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/actions_menu.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/actions_menu.tsx
@@ -58,7 +58,7 @@ export const AgentDetailsActionMenu: React.FunctionComponent<{
           >
             <FormattedMessage
               id="xpack.ingestManager.agentList.reassignActionText"
-              defaultMessage="Assign new agent config"
+              defaultMessage="Assign new agent policy"
             />
           </EuiContextMenuItem>,
           <AgentUnenrollProvider key="unenrollAgent" forceUnenroll={isUnenrolling}>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/agent_details.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/agent_details.tsx
index de0c65d508db9e..abfc4c208eeebe 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/agent_details.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/agent_details.tsx
@@ -13,14 +13,14 @@ import {
   EuiLink,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { Agent, AgentConfig } from '../../../../types';
+import { Agent, AgentPolicy } from '../../../../types';
 import { useLink } from '../../../../hooks';
 import { AgentHealth } from '../../components';
 
 export const AgentDetailsContent: React.FunctionComponent<{
   agent: Agent;
-  agentConfig?: AgentConfig;
-}> = memo(({ agent, agentConfig }) => {
+  agentPolicy?: AgentPolicy;
+}> = memo(({ agent, agentPolicy }) => {
   const { getHref } = useLink();
   return (
     <EuiDescriptionList>
@@ -48,15 +48,15 @@ export const AgentDetailsContent: React.FunctionComponent<{
           description: <AgentHealth agent={agent} />,
         },
         {
-          title: i18n.translate('xpack.ingestManager.agentDetails.agentConfigurationLabel', {
-            defaultMessage: 'Agent configuration',
+          title: i18n.translate('xpack.ingestManager.agentDetails.agentPolicyLabel', {
+            defaultMessage: 'Agent policy',
           }),
-          description: agentConfig ? (
+          description: agentPolicy ? (
             <EuiLink
-              href={getHref('configuration_details', { configId: agent.config_id! })}
+              href={getHref('policy_details', { policyId: agent.config_id! })}
               className="eui-textBreakWord"
             >
-              {agentConfig.name || agent.config_id}
+              {agentPolicy.name || agent.config_id}
             </EuiLink>
           ) : (
             agent.config_id || '-'
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx
index 43e4d696ded660..766808493e8b98 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx
@@ -66,7 +66,7 @@ export const SUBTYPE_LABEL: { [key in AgentEvent['subtype']]: JSX.Element } = {
   CONFIG: (
     <EuiBadge color="hollow">
       <FormattedMessage
-        id="xpack.ingestManager.agentEventSubtype.configLabel"
+        id="xpack.ingestManager.agentEventSubtype.policyLabel"
         defaultMessage="Config"
       />
     </EuiBadge>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/index.tsx
index 0bd25ac8cf4015..087c7889ba1c77 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/index.tsx
@@ -19,12 +19,12 @@ import {
 import { Props as EuiTabProps } from '@elastic/eui/src/components/tabs/tab';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { Agent, AgentConfig, AgentDetailsReassignConfigAction } from '../../../types';
+import { Agent, AgentPolicy, AgentDetailsReassignPolicyAction } from '../../../types';
 import { PAGE_ROUTING_PATHS } from '../../../constants';
 import { Loading, Error } from '../../../components';
 import {
   useGetOneAgent,
-  useGetOneAgentConfig,
+  useGetOneAgentPolicy,
   useLink,
   useBreadcrumbs,
   useCore,
@@ -56,15 +56,15 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
     pollIntervalMs: 5000,
   });
   const {
-    isLoading: isAgentConfigLoading,
-    data: agentConfigData,
-    sendRequest: sendAgentConfigRequest,
-  } = useGetOneAgentConfig(agentData?.item?.config_id);
+    isLoading: isAgentPolicyLoading,
+    data: agentPolicyData,
+    sendRequest: sendAgentPolicyRequest,
+  } = useGetOneAgentPolicy(agentData?.item?.config_id);
 
   const {
     application: { navigateToApp },
   } = useCore();
-  const routeState = useIntraAppState<AgentDetailsReassignConfigAction>();
+  const routeState = useIntraAppState<AgentDetailsReassignPolicyAction>();
   const queryParams = new URLSearchParams(useLocation().search);
   const openReassignFlyoutOpenByDefault = queryParams.get('openReassignFlyout') === 'true';
 
@@ -127,17 +127,17 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
             },
             { isDivider: true },
             {
-              label: i18n.translate('xpack.ingestManager.agentDetails.configurationLabel', {
-                defaultMessage: 'Configuration',
+              label: i18n.translate('xpack.ingestManager.agentDetails.policyLabel', {
+                defaultMessage: 'Policy',
               }),
-              content: isAgentConfigLoading ? (
+              content: isAgentPolicyLoading ? (
                 <Loading size="m" />
-              ) : agentConfigData?.item ? (
+              ) : agentPolicyData?.item ? (
                 <EuiLink
-                  href={getHref('configuration_details', { configId: agentData.item.config_id! })}
+                  href={getHref('policy_details', { policyId: agentData.item.config_id! })}
                   className="eui-textBreakWord"
                 >
-                  {agentConfigData.item.name || agentData.item.config_id}
+                  {agentPolicyData.item.name || agentData.item.config_id}
                 </EuiLink>
               ) : (
                 agentData.item.config_id || '-'
@@ -174,7 +174,7 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
         </EuiFlexGroup>
       ) : undefined,
     /* eslint-disable-next-line react-hooks/exhaustive-deps */
-    [agentConfigData, agentData, getHref, isAgentConfigLoading]
+    [agentPolicyData, agentData, getHref, isAgentPolicyLoading]
   );
 
   const headerTabs = useMemo(() => {
@@ -203,7 +203,7 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
       value={{
         refresh: () => {
           sendAgentRequest();
-          sendAgentConfigRequest();
+          sendAgentPolicyRequest();
         },
       }}
     >
@@ -225,7 +225,7 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
             error={error}
           />
         ) : agentData && agentData.item ? (
-          <AgentDetailsPageContent agent={agentData.item} agentConfig={agentConfigData?.item} />
+          <AgentDetailsPageContent agent={agentData.item} agentPolicy={agentPolicyData?.item} />
         ) : (
           <Error
             title={
@@ -252,8 +252,8 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
 
 const AgentDetailsPageContent: React.FunctionComponent<{
   agent: Agent;
-  agentConfig?: AgentConfig;
-}> = ({ agent, agentConfig }) => {
+  agentPolicy?: AgentPolicy;
+}> = ({ agent, agentPolicy }) => {
   useBreadcrumbs('fleet_agent_details', {
     agentHost:
       typeof agent.local_metadata.host === 'object' &&
@@ -266,7 +266,7 @@ const AgentDetailsPageContent: React.FunctionComponent<{
       <Route
         path={PAGE_ROUTING_PATHS.fleet_agent_details_details}
         render={() => {
-          return <AgentDetailsContent agent={agent} agentConfig={agentConfig} />;
+          return <AgentDetailsContent agent={agent} agentPolicy={agentPolicy} />;
         }}
       />
       <Route
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
index c52f8447214a03..52e9cdd638b6ae 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
@@ -24,11 +24,11 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, FormattedRelative } from '@kbn/i18n/react';
 import { AgentEnrollmentFlyout } from '../components';
-import { Agent, AgentConfig } from '../../../types';
+import { Agent, AgentPolicy } from '../../../types';
 import {
   usePagination,
   useCapabilities,
-  useGetAgentConfigs,
+  useGetAgentPolicies,
   useGetAgents,
   useUrlParams,
   useLink,
@@ -95,7 +95,7 @@ const RowActions = React.memo<{ agent: Agent; onReassignClick: () => void; refre
           >
             <FormattedMessage
               id="xpack.ingestManager.agentList.reassignActionText"
-              defaultMessage="Assign new agent config"
+              defaultMessage="Assign new agent policy"
             />
           </EuiContextMenuItem>,
           <AgentUnenrollProvider forceUnenroll={isUnenrolling}>
@@ -150,9 +150,9 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
   const [search, setSearch] = useState(defaultKuery);
   const { pagination, pageSizeOptions, setPagination } = usePagination();
 
-  // Configs state for filtering
-  const [isConfigsFilterOpen, setIsConfigsFilterOpen] = useState<boolean>(false);
-  const [selectedConfigs, setSelectedConfigs] = useState<string[]>([]);
+  // Policies state for filtering
+  const [isAgentPoliciesFilterOpen, setIsAgentPoliciesFilterOpen] = useState<boolean>(false);
+  const [selectedAgentPolicies, setSelectedAgentPolicies] = useState<string[]>([]);
 
   // Status for filtering
   const [isStatusFilterOpen, setIsStatutsFilterOpen] = useState<boolean>(false);
@@ -160,18 +160,20 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
 
   const clearFilters = useCallback(() => {
     setSearch('');
-    setSelectedConfigs([]);
+    setSelectedAgentPolicies([]);
     setSelectedStatus([]);
-  }, [setSearch, setSelectedConfigs, setSelectedStatus]);
+  }, [setSearch, setSelectedAgentPolicies, setSelectedStatus]);
 
-  // Add a config id to current search
-  const addConfigFilter = (configId: string) => {
-    setSelectedConfigs([...selectedConfigs, configId]);
+  // Add a agent policy id to current search
+  const addConfigFilter = (policyId: string) => {
+    setSelectedAgentPolicies([...selectedAgentPolicies, policyId]);
   };
 
-  // Remove a config id from current search
-  const removeConfigFilter = (configId: string) => {
-    setSelectedConfigs(selectedConfigs.filter((config) => config !== configId));
+  // Remove a agent policy id from current search
+  const removeConfigFilter = (policyId: string) => {
+    setSelectedAgentPolicies(
+      selectedAgentPolicies.filter((agentPolicy) => agentPolicy !== policyId)
+    );
   };
 
   // Agent enrollment flyout state
@@ -181,12 +183,12 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
   const [agentToReassignId, setAgentToReassignId] = useState<string | undefined>(undefined);
 
   let kuery = search.trim();
-  if (selectedConfigs.length) {
+  if (selectedAgentPolicies.length) {
     if (kuery) {
       kuery = `(${kuery}) and`;
     }
-    kuery = `${kuery} ${AGENT_SAVED_OBJECT_TYPE}.config_id : (${selectedConfigs
-      .map((config) => `"${config}"`)
+    kuery = `${kuery} ${AGENT_SAVED_OBJECT_TYPE}.config_id : (${selectedAgentPolicies
+      .map((agentPolicy) => `"${agentPolicy}"`)
       .join(' or ')})`;
   }
 
@@ -229,20 +231,20 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
   const totalAgents = agentsRequest.data ? agentsRequest.data.total : 0;
   const { isLoading } = agentsRequest;
 
-  const agentConfigsRequest = useGetAgentConfigs({
+  const agentPoliciesRequest = useGetAgentPolicies({
     page: 1,
     perPage: 1000,
   });
 
-  const agentConfigs = agentConfigsRequest.data ? agentConfigsRequest.data.items : [];
-  const agentConfigsIndexedById = useMemo(() => {
-    return agentConfigs.reduce((acc, config) => {
-      acc[config.id] = config;
+  const agentPolicies = agentPoliciesRequest.data ? agentPoliciesRequest.data.items : [];
+  const agentPoliciesIndexedById = useMemo(() => {
+    return agentPolicies.reduce((acc, agentPolicy) => {
+      acc[agentPolicy.id] = agentPolicy;
 
       return acc;
-    }, {} as { [k: string]: AgentConfig });
-  }, [agentConfigs]);
-  const { isLoading: isAgentConfigsLoading } = agentConfigsRequest;
+    }, {} as { [k: string]: AgentPolicy });
+  }, [agentPolicies]);
+  const { isLoading: isAgentPoliciesLoading } = agentPoliciesRequest;
 
   const columns = [
     {
@@ -266,20 +268,20 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
     },
     {
       field: 'config_id',
-      name: i18n.translate('xpack.ingestManager.agentList.configColumnTitle', {
-        defaultMessage: 'Agent config',
+      name: i18n.translate('xpack.ingestManager.agentList.policyColumnTitle', {
+        defaultMessage: 'Agent policy',
       }),
-      render: (configId: string, agent: Agent) => {
-        const configName = agentConfigs.find((p) => p.id === configId)?.name;
+      render: (policyId: string, agent: Agent) => {
+        const configName = agentPolicies.find((p) => p.id === policyId)?.name;
         return (
           <EuiFlexGroup gutterSize="s" alignItems="center" style={{ minWidth: 0 }}>
             <EuiFlexItem grow={false} className="eui-textTruncate">
               <EuiLink
-                href={getHref('configuration_details', { configId })}
+                href={getHref('policy_details', { policyId })}
                 className="eui-textTruncate"
-                title={configName || configId}
+                title={configName || policyId}
               >
-                {configName || configId}
+                {configName || policyId}
               </EuiLink>
             </EuiFlexItem>
             {agent.config_revision && (
@@ -295,8 +297,8 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
             )}
             {agent.config_id &&
               agent.config_revision &&
-              agentConfigsIndexedById[agent.config_id] &&
-              agentConfigsIndexedById[agent.config_id].revision > agent.config_revision && (
+              agentPoliciesIndexedById[agent.config_id] &&
+              agentPoliciesIndexedById[agent.config_id].revision > agent.config_revision && (
                 <EuiFlexItem grow={false}>
                   <EuiText color="subdued" size="xs" className="eui-textNoWrap">
                     <EuiIcon size="m" type="alert" color="warning" />
@@ -382,7 +384,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
     <>
       {isEnrollmentFlyoutOpen ? (
         <AgentEnrollmentFlyout
-          agentConfigs={agentConfigs}
+          agentPolicies={agentPolicies}
           onClose={() => setIsEnrollmentFlyoutOpen(false)}
         />
       ) : null}
@@ -424,7 +426,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
                       isSelected={isStatusFilterOpen}
                       hasActiveFilters={selectedStatus.length > 0}
                       numActiveFilters={selectedStatus.length}
-                      disabled={isAgentConfigsLoading}
+                      disabled={isAgentPoliciesLoading}
                     >
                       <FormattedMessage
                         id="xpack.ingestManager.agentList.statusFilterText"
@@ -459,37 +461,37 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
                   button={
                     <EuiFilterButton
                       iconType="arrowDown"
-                      onClick={() => setIsConfigsFilterOpen(!isConfigsFilterOpen)}
-                      isSelected={isConfigsFilterOpen}
-                      hasActiveFilters={selectedConfigs.length > 0}
-                      numActiveFilters={selectedConfigs.length}
-                      numFilters={agentConfigs.length}
-                      disabled={isAgentConfigsLoading}
+                      onClick={() => setIsAgentPoliciesFilterOpen(!isAgentPoliciesFilterOpen)}
+                      isSelected={isAgentPoliciesFilterOpen}
+                      hasActiveFilters={selectedAgentPolicies.length > 0}
+                      numActiveFilters={selectedAgentPolicies.length}
+                      numFilters={agentPolicies.length}
+                      disabled={isAgentPoliciesLoading}
                     >
                       <FormattedMessage
-                        id="xpack.ingestManager.agentList.configFilterText"
-                        defaultMessage="Agent config"
+                        id="xpack.ingestManager.agentList.policyFilterText"
+                        defaultMessage="Agent policy"
                       />
                     </EuiFilterButton>
                   }
-                  isOpen={isConfigsFilterOpen}
-                  closePopover={() => setIsConfigsFilterOpen(false)}
+                  isOpen={isAgentPoliciesFilterOpen}
+                  closePopover={() => setIsAgentPoliciesFilterOpen(false)}
                   panelPaddingSize="none"
                 >
                   <div className="euiFilterSelect__items">
-                    {agentConfigs.map((config, index) => (
+                    {agentPolicies.map((agentPolicy, index) => (
                       <EuiFilterSelectItem
-                        checked={selectedConfigs.includes(config.id) ? 'on' : undefined}
+                        checked={selectedAgentPolicies.includes(agentPolicy.id) ? 'on' : undefined}
                         key={index}
                         onClick={() => {
-                          if (selectedConfigs.includes(config.id)) {
-                            removeConfigFilter(config.id);
+                          if (selectedAgentPolicies.includes(agentPolicy.id)) {
+                            removeConfigFilter(agentPolicy.id);
                           } else {
-                            addConfigFilter(config.id);
+                            addConfigFilter(agentPolicy.id);
                           }
                         }}
                       >
-                        {config.name}
+                        {agentPolicy.name}
                       </EuiFilterSelectItem>
                     ))}
                   </div>
@@ -521,7 +523,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
               id="xpack.ingestManager.agentList.loadingAgentsMessage"
               defaultMessage="Loading agents…"
             />
-          ) : search.trim() || selectedConfigs.length || selectedStatus.length ? (
+          ) : search.trim() || selectedAgentPolicies.length || selectedStatus.length ? (
             <FormattedMessage
               id="xpack.ingestManager.agentList.noFilteredAgentsPrompt"
               defaultMessage="No agents found. {clearFiltersLink}"
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_config_package_badges.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_config_package_badges.tsx
index fcdb5ff02e7a41..35685b5c12b346 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_config_package_badges.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_config_package_badges.tsx
@@ -6,36 +6,36 @@
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiSpacer, EuiText, EuiFlexGroup, EuiFlexItem, EuiBadge } from '@elastic/eui';
-import { PackageConfig } from '../../../types';
-import { useGetOneAgentConfig } from '../../../hooks';
+import { PackagePolicy } from '../../../types';
+import { useGetOneAgentPolicy } from '../../../hooks';
 import { PackageIcon } from '../../../components/package_icon';
 
 interface Props {
-  agentConfigId: string;
+  agentPolicyId: string;
 }
 
-export const AgentConfigPackageBadges: React.FunctionComponent<Props> = ({ agentConfigId }) => {
-  const agentConfigRequest = useGetOneAgentConfig(agentConfigId);
-  const agentConfig = agentConfigRequest.data ? agentConfigRequest.data.item : null;
+export const AgentPolicyPackageBadges: React.FunctionComponent<Props> = ({ agentPolicyId }) => {
+  const agentPolicyRequest = useGetOneAgentPolicy(agentPolicyId);
+  const agentPolicy = agentPolicyRequest.data ? agentPolicyRequest.data.item : null;
 
-  if (!agentConfig) {
+  if (!agentPolicy) {
     return null;
   }
   return (
     <>
       <EuiText>
         <FormattedMessage
-          id="xpack.ingestManager.agentReassignConfig.configDescription"
-          defaultMessage="The selected agent configuration will collect data for {count, plural, one {{countValue} integration} other {{countValue} integrations}}:"
+          id="xpack.ingestManager.agentReassignPolicy.policyDescription"
+          defaultMessage="The selected agent policy will collect data for {count, plural, one {{countValue} integration} other {{countValue} integrations}}:"
           values={{
-            count: agentConfig.package_configs.length,
-            countValue: <b>{agentConfig.package_configs.length}</b>,
+            count: agentPolicy.package_configs.length,
+            countValue: <b>{agentPolicy.package_configs.length}</b>,
           }}
         />
       </EuiText>
       <EuiSpacer size="s" />
-      {(agentConfig.package_configs as PackageConfig[]).map((packageConfig, idx) => {
-        if (!packageConfig.package) {
+      {(agentPolicy.package_configs as PackagePolicy[]).map((packagePolicy, idx) => {
+        if (!packagePolicy.package) {
           return null;
         }
         return (
@@ -43,13 +43,13 @@ export const AgentConfigPackageBadges: React.FunctionComponent<Props> = ({ agent
             <EuiFlexGroup direction="row" gutterSize="xs" alignItems="center">
               <EuiFlexItem grow={false}>
                 <PackageIcon
-                  packageName={packageConfig.package.name}
-                  version={packageConfig.package.version}
+                  packageName={packagePolicy.package.name}
+                  version={packagePolicy.package.version}
                   size="s"
                   tryApi={true}
                 />
               </EuiFlexItem>
-              <EuiFlexItem grow={false}>{packageConfig.package.title}</EuiFlexItem>
+              <EuiFlexItem grow={false}>{packagePolicy.package.title}</EuiFlexItem>
             </EuiFlexGroup>
           </EuiBadge>
         );
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx
index 5343d86244f1ea..ca4831bd1df6f0 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx
@@ -8,12 +8,12 @@ import React, { useState, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiSelect, EuiSpacer, EuiText, EuiButtonEmpty } from '@elastic/eui';
-import { AgentConfig, GetEnrollmentAPIKeysResponse } from '../../../../types';
+import { AgentPolicy, GetEnrollmentAPIKeysResponse } from '../../../../types';
 import { sendGetEnrollmentAPIKeys, useCore } from '../../../../hooks';
-import { AgentConfigPackageBadges } from '../agent_config_package_badges';
+import { AgentPolicyPackageBadges } from '../agent_config_package_badges';
 
 type Props = {
-  agentConfigs?: AgentConfig[];
+  agentPolicies?: AgentPolicy[];
   onConfigChange?: (key: string) => void;
 } & (
   | {
@@ -25,9 +25,9 @@ type Props = {
     }
 );
 
-export const EnrollmentStepAgentConfig: React.FC<Props> = (props) => {
+export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
   const { notifications } = useCore();
-  const { withKeySelection, agentConfigs, onConfigChange } = props;
+  const { withKeySelection, agentPolicies, onConfigChange } = props;
   const onKeyChange = props.withKeySelection && props.onKeyChange;
 
   const [isAuthenticationSettingsOpen, setIsAuthenticationSettingsOpen] = useState(false);
@@ -35,17 +35,17 @@ export const EnrollmentStepAgentConfig: React.FC<Props> = (props) => {
     []
   );
   const [selectedState, setSelectedState] = useState<{
-    agentConfigId?: string;
+    agentPolicyId?: string;
     enrollmentAPIKeyId?: string;
   }>({});
 
   useEffect(
     function triggerOnConfigChangeEffect() {
-      if (onConfigChange && selectedState.agentConfigId) {
-        onConfigChange(selectedState.agentConfigId);
+      if (onConfigChange && selectedState.agentPolicyId) {
+        onConfigChange(selectedState.agentPolicyId);
       }
     },
-    [selectedState.agentConfigId, onConfigChange]
+    [selectedState.agentPolicyId, onConfigChange]
   );
 
   useEffect(
@@ -63,25 +63,25 @@ export const EnrollmentStepAgentConfig: React.FC<Props> = (props) => {
 
   useEffect(
     function useDefaultConfigEffect() {
-      if (agentConfigs && agentConfigs.length && !selectedState.agentConfigId) {
-        if (agentConfigs.length === 1) {
+      if (agentPolicies && agentPolicies.length && !selectedState.agentPolicyId) {
+        if (agentPolicies.length === 1) {
           setSelectedState({
             ...selectedState,
-            agentConfigId: agentConfigs[0].id,
+            agentPolicyId: agentPolicies[0].id,
           });
           return;
         }
 
-        const defaultConfig = agentConfigs.find((config) => config.is_default);
+        const defaultConfig = agentPolicies.find((agentPolicy) => agentPolicy.is_default);
         if (defaultConfig) {
           setSelectedState({
             ...selectedState,
-            agentConfigId: defaultConfig.id,
+            agentPolicyId: defaultConfig.id,
           });
         }
       }
     },
-    [agentConfigs, selectedState]
+    [agentPolicies, selectedState]
   );
 
   useEffect(
@@ -89,7 +89,7 @@ export const EnrollmentStepAgentConfig: React.FC<Props> = (props) => {
       if (!withKeySelection) {
         return;
       }
-      if (!selectedState.agentConfigId) {
+      if (!selectedState.agentPolicyId) {
         setEnrollmentAPIKeys([]);
         return;
       }
@@ -109,7 +109,7 @@ export const EnrollmentStepAgentConfig: React.FC<Props> = (props) => {
           }
 
           setEnrollmentAPIKeys(
-            res.data.list.filter((key) => key.config_id === selectedState.agentConfigId)
+            res.data.list.filter((key) => key.config_id === selectedState.agentPolicyId)
           );
         } catch (error) {
           notifications.toasts.addError(error, {
@@ -119,7 +119,7 @@ export const EnrollmentStepAgentConfig: React.FC<Props> = (props) => {
       }
       fetchEnrollmentAPIKeys();
     },
-    [withKeySelection, selectedState.agentConfigId, notifications.toasts]
+    [withKeySelection, selectedState.agentPolicyId, notifications.toasts]
   );
 
   useEffect(
@@ -130,11 +130,11 @@ export const EnrollmentStepAgentConfig: React.FC<Props> = (props) => {
       if (
         !selectedState.enrollmentAPIKeyId &&
         enrollmentAPIKeys.length > 0 &&
-        enrollmentAPIKeys[0].config_id === selectedState.agentConfigId
+        enrollmentAPIKeys[0].config_id === selectedState.agentPolicyId
       ) {
         const enrollmentAPIKeyId = enrollmentAPIKeys[0].id;
         setSelectedState({
-          agentConfigId: selectedState.agentConfigId,
+          agentPolicyId: selectedState.agentPolicyId,
           enrollmentAPIKeyId,
         });
       }
@@ -143,7 +143,7 @@ export const EnrollmentStepAgentConfig: React.FC<Props> = (props) => {
       withKeySelection,
       enrollmentAPIKeys,
       selectedState.enrollmentAPIKeyId,
-      selectedState.agentConfigId,
+      selectedState.agentPolicyId,
     ]
   );
 
@@ -154,31 +154,31 @@ export const EnrollmentStepAgentConfig: React.FC<Props> = (props) => {
         prepend={
           <EuiText>
             <FormattedMessage
-              id="xpack.ingestManager.enrollmentStepAgentConfig.configSelectLabel"
-              defaultMessage="Agent configuration"
+              id="xpack.ingestManager.enrollmentStepAgentPolicy.policySelectLabel"
+              defaultMessage="Agent policy"
             />
           </EuiText>
         }
-        isLoading={!agentConfigs}
-        options={(agentConfigs || []).map((config) => ({
-          value: config.id,
-          text: config.name,
+        isLoading={!agentPolicies}
+        options={(agentPolicies || []).map((agentPolicy) => ({
+          value: agentPolicy.id,
+          text: agentPolicy.name,
         }))}
-        value={selectedState.agentConfigId || undefined}
+        value={selectedState.agentPolicyId || undefined}
         onChange={(e) =>
           setSelectedState({
-            agentConfigId: e.target.value,
+            agentPolicyId: e.target.value,
             enrollmentAPIKeyId: undefined,
           })
         }
         aria-label={i18n.translate(
-          'xpack.ingestManager.enrollmentStepAgentConfig.configSelectAriaLabel',
-          { defaultMessage: 'Agent configuration' }
+          'xpack.ingestManager.enrollmentStepAgentPolicy.policySelectAriaLabel',
+          { defaultMessage: 'Agent policy' }
         )}
       />
       <EuiSpacer size="m" />
-      {selectedState.agentConfigId && (
-        <AgentConfigPackageBadges agentConfigId={selectedState.agentConfigId} />
+      {selectedState.agentPolicyId && (
+        <AgentPolicyPackageBadges agentPolicyId={selectedState.agentPolicyId} />
       )}
       {withKeySelection && onKeyChange && (
         <>
@@ -189,7 +189,7 @@ export const EnrollmentStepAgentConfig: React.FC<Props> = (props) => {
             onClick={() => setIsAuthenticationSettingsOpen(!isAuthenticationSettingsOpen)}
           >
             <FormattedMessage
-              id="xpack.ingestManager.enrollmentStepAgentConfig.showAuthenticationSettingsButton"
+              id="xpack.ingestManager.enrollmentStepAgentPolicy.showAuthenticationSettingsButton"
               defaultMessage="Authentication settings"
             />
           </EuiButtonEmpty>
@@ -206,7 +206,7 @@ export const EnrollmentStepAgentConfig: React.FC<Props> = (props) => {
                 prepend={
                   <EuiText>
                     <FormattedMessage
-                      id="xpack.ingestManager.enrollmentStepAgentConfig.enrollmentTokenSelectLabel"
+                      id="xpack.ingestManager.enrollmentStepAgentPolicy.enrollmentTokenSelectLabel"
                       defaultMessage="Enrollment token"
                     />
                   </EuiText>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/index.tsx
index 9c7bea51f46eaf..f85d0bea74f22f 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/index.tsx
@@ -18,18 +18,18 @@ import {
   EuiTabs,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { AgentConfig } from '../../../../types';
+import { AgentPolicy } from '../../../../types';
 import { ManagedInstructions } from './managed_instructions';
 import { StandaloneInstructions } from './standalone_instructions';
 
 interface Props {
   onClose: () => void;
-  agentConfigs?: AgentConfig[];
+  agentPolicies?: AgentPolicy[];
 }
 
 export const AgentEnrollmentFlyout: React.FunctionComponent<Props> = ({
   onClose,
-  agentConfigs,
+  agentPolicies,
 }) => {
   const [mode, setMode] = useState<'managed' | 'standalone'>('managed');
 
@@ -62,9 +62,9 @@ export const AgentEnrollmentFlyout: React.FunctionComponent<Props> = ({
 
       <EuiFlyoutBody>
         {mode === 'managed' ? (
-          <ManagedInstructions agentConfigs={agentConfigs} />
+          <ManagedInstructions agentPolicies={agentPolicies} />
         ) : (
-          <StandaloneInstructions agentConfigs={agentConfigs} />
+          <StandaloneInstructions agentPolicies={agentPolicies} />
         )}
       </EuiFlyoutBody>
       <EuiFlyoutFooter>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx
index eefb7f1bb7b5ff..3821d8a2384cad 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx
@@ -9,7 +9,7 @@ import { EuiSteps, EuiLink, EuiText, EuiSpacer } from '@elastic/eui';
 import { EuiContainedStepProps } from '@elastic/eui/src/components/steps/steps';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { AgentConfig } from '../../../../types';
+import { AgentPolicy } from '../../../../types';
 import {
   useGetOneEnrollmentAPIKey,
   useCore,
@@ -18,13 +18,13 @@ import {
   useFleetStatus,
 } from '../../../../hooks';
 import { ManualInstructions } from '../../../../components/enrollment_instructions';
-import { DownloadStep, AgentConfigSelectionStep } from './steps';
+import { DownloadStep, AgentPolicySelectionStep } from './steps';
 
 interface Props {
-  agentConfigs?: AgentConfig[];
+  agentPolicies?: AgentPolicy[];
 }
 
-export const ManagedInstructions: React.FunctionComponent<Props> = ({ agentConfigs }) => {
+export const ManagedInstructions: React.FunctionComponent<Props> = ({ agentPolicies }) => {
   const { getHref } = useLink();
   const core = useCore();
   const fleetStatus = useFleetStatus();
@@ -40,7 +40,7 @@ export const ManagedInstructions: React.FunctionComponent<Props> = ({ agentConfi
 
   const steps: EuiContainedStepProps[] = [
     DownloadStep(),
-    AgentConfigSelectionStep({ agentConfigs, setSelectedAPIKeyId }),
+    AgentPolicySelectionStep({ agentPolicies, setSelectedAPIKeyId }),
     {
       title: i18n.translate('xpack.ingestManager.agentEnrollment.stepEnrollAndRunAgentTitle', {
         defaultMessage: 'Enroll and start the Elastic Agent',
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx
index bb3b2d1797ca93..4f5055c97b6408 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx
@@ -19,59 +19,59 @@ import {
 import { EuiContainedStepProps } from '@elastic/eui/src/components/steps/steps';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { AgentConfig } from '../../../../types';
-import { useCore, sendGetOneAgentConfigFull } from '../../../../hooks';
-import { DownloadStep, AgentConfigSelectionStep } from './steps';
-import { configToYaml, agentConfigRouteService } from '../../../../services';
+import { AgentPolicy } from '../../../../types';
+import { useCore, sendGetOneAgentPolicyFull } from '../../../../hooks';
+import { DownloadStep, AgentPolicySelectionStep } from './steps';
+import { policyToYaml, agentPolicyRouteService } from '../../../../services';
 
 interface Props {
-  agentConfigs?: AgentConfig[];
+  agentPolicies?: AgentPolicy[];
 }
 
 const RUN_INSTRUCTIONS = './elastic-agent run';
 
-export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentConfigs }) => {
+export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentPolicies }) => {
   const core = useCore();
   const { notifications } = core;
 
-  const [selectedConfigId, setSelectedConfigId] = useState<string | undefined>();
-  const [fullAgentConfig, setFullAgentConfig] = useState<any | undefined>();
+  const [selectedPolicyId, setSelectedPolicyId] = useState<string | undefined>();
+  const [fullAgentPolicy, setFullAgentPolicy] = useState<any | undefined>();
 
-  const downloadLink = selectedConfigId
+  const downloadLink = selectedPolicyId
     ? core.http.basePath.prepend(
-        `${agentConfigRouteService.getInfoFullDownloadPath(selectedConfigId)}?standalone=true`
+        `${agentPolicyRouteService.getInfoFullDownloadPath(selectedPolicyId)}?standalone=true`
       )
     : undefined;
 
   useEffect(() => {
-    async function fetchFullConfig() {
+    async function fetchFullPolicy() {
       try {
-        if (!selectedConfigId) {
+        if (!selectedPolicyId) {
           return;
         }
-        const res = await sendGetOneAgentConfigFull(selectedConfigId, { standalone: true });
+        const res = await sendGetOneAgentPolicyFull(selectedPolicyId, { standalone: true });
         if (res.error) {
           throw res.error;
         }
 
         if (!res.data) {
-          throw new Error('No data while fetching full agent config');
+          throw new Error('No data while fetching full agent policy');
         }
 
-        setFullAgentConfig(res.data.item);
+        setFullAgentPolicy(res.data.item);
       } catch (error) {
         notifications.toasts.addError(error, {
           title: 'Error',
         });
       }
     }
-    fetchFullConfig();
-  }, [selectedConfigId, notifications.toasts]);
+    fetchFullPolicy();
+  }, [selectedPolicyId, notifications.toasts]);
 
-  const yaml = useMemo(() => configToYaml(fullAgentConfig), [fullAgentConfig]);
+  const yaml = useMemo(() => policyToYaml(fullAgentPolicy), [fullAgentPolicy]);
   const steps: EuiContainedStepProps[] = [
     DownloadStep(),
-    AgentConfigSelectionStep({ agentConfigs, setSelectedConfigId }),
+    AgentPolicySelectionStep({ agentPolicies, setSelectedPolicyId }),
     {
       title: i18n.translate('xpack.ingestManager.agentEnrollment.stepConfigureAgentTitle', {
         defaultMessage: 'Configure the agent',
@@ -81,7 +81,7 @@ export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentCo
           <EuiText>
             <FormattedMessage
               id="xpack.ingestManager.agentEnrollment.stepConfigureAgentDescription"
-              defaultMessage="Copy this configuration and put it into a file named {fileName} on the system where the Elastic Agent is installed. Don’t forget to modify {ESUsernameVariable} and {ESPasswordVariable} in the {outputSection} section of the configuration file so that it uses your actual Elasticsearch credentials."
+              defaultMessage="Copy this policy and put it into a file named {fileName} on the system where the Elastic Agent is installed. Don’t forget to modify {ESUsernameVariable} and {ESPasswordVariable} in the {outputSection} section of the policy file so that it uses your actual Elasticsearch credentials."
               values={{
                 fileName: <EuiCode>elastic-agent.yml</EuiCode>,
                 ESUsernameVariable: <EuiCode>ES_USERNAME</EuiCode>,
@@ -96,7 +96,7 @@ export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentCo
                   {(copy) => (
                     <EuiButton onClick={copy} iconType="copyClipboard">
                       <FormattedMessage
-                        id="xpack.ingestManager.agentEnrollment.copyConfigurationButton"
+                        id="xpack.ingestManager.agentEnrollment.copyPolicyButton"
                         defaultMessage="Copy to clipboard"
                       />
                     </EuiButton>
@@ -106,8 +106,8 @@ export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentCo
               <EuiFlexItem grow={false}>
                 <EuiButton iconType="download" href={downloadLink} isDisabled={!downloadLink}>
                   <FormattedMessage
-                    id="xpack.ingestManager.agentEnrollment.downloadConfigurationButton"
-                    defaultMessage="Download configuration"
+                    id="xpack.ingestManager.agentEnrollment.downloadPolicyButton"
+                    defaultMessage="Download policy"
                   />
                 </EuiButton>
               </EuiFlexItem>
@@ -170,7 +170,7 @@ export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentCo
       <EuiText>
         <FormattedMessage
           id="xpack.ingestManager.agentEnrollment.standaloneDescription"
-          defaultMessage="Agents running in standalone mode need to be updated manually if you ever wish to make changes to their configuration. Follow the instructions below to download and setup an Elastic Agent in standalone mode."
+          defaultMessage="Agents running in standalone mode need to be updated manually if you ever wish to make changes to their policy. Follow the instructions below to download and setup an Elastic Agent in standalone mode."
         />
       </EuiText>
       <EuiSpacer size="l" />
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/steps.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/steps.tsx
index d01e2071699209..92f0bde55aa89c 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/steps.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/steps.tsx
@@ -8,8 +8,8 @@ import React from 'react';
 import { EuiText, EuiButton, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { EnrollmentStepAgentConfig } from './config_selection';
-import { AgentConfig } from '../../../../types';
+import { EnrollmentStepAgentPolicy } from './config_selection';
+import { AgentPolicy } from '../../../../types';
 
 export const DownloadStep = () => {
   return {
@@ -41,25 +41,25 @@ export const DownloadStep = () => {
   };
 };
 
-export const AgentConfigSelectionStep = ({
-  agentConfigs,
+export const AgentPolicySelectionStep = ({
+  agentPolicies,
   setSelectedAPIKeyId,
-  setSelectedConfigId,
+  setSelectedPolicyId,
 }: {
-  agentConfigs?: AgentConfig[];
+  agentPolicies?: AgentPolicy[];
   setSelectedAPIKeyId?: (key: string) => void;
-  setSelectedConfigId?: (configId: string) => void;
+  setSelectedPolicyId?: (policyId: string) => void;
 }) => {
   return {
-    title: i18n.translate('xpack.ingestManager.agentEnrollment.stepChooseAgentConfigTitle', {
-      defaultMessage: 'Choose an agent configuration',
+    title: i18n.translate('xpack.ingestManager.agentEnrollment.stepChooseAgentPolicyTitle', {
+      defaultMessage: 'Choose an agent policy',
     }),
     children: (
-      <EnrollmentStepAgentConfig
-        agentConfigs={agentConfigs}
+      <EnrollmentStepAgentPolicy
+        agentPolicies={agentPolicies}
         withKeySelection={setSelectedAPIKeyId ? true : false}
         onKeyChange={setSelectedAPIKeyId}
-        onConfigChange={setSelectedConfigId}
+        onConfigChange={setSelectedPolicyId}
       />
     ),
   };
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx
index c067de1cfea5a8..9588200b243c90 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx
@@ -22,8 +22,8 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { Agent } from '../../../../types';
-import { sendPutAgentReassign, useCore, useGetAgentConfigs } from '../../../../hooks';
-import { AgentConfigPackageBadges } from '../agent_config_package_badges';
+import { sendPutAgentReassign, useCore, useGetAgentPolicies } from '../../../../hooks';
+import { AgentPolicyPackageBadges } from '../agent_config_package_badges';
 
 interface Props {
   onClose: () => void;
@@ -32,35 +32,35 @@ interface Props {
 
 export const AgentReassignConfigFlyout: React.FunctionComponent<Props> = ({ onClose, agent }) => {
   const { notifications } = useCore();
-  const [selectedAgentConfigId, setSelectedAgentConfigId] = useState<string | undefined>(
+  const [selectedAgentPolicyId, setSelectedAgentPolicyId] = useState<string | undefined>(
     agent.config_id
   );
 
-  const agentConfigsRequest = useGetAgentConfigs({
+  const agentPoliciesRequest = useGetAgentPolicies({
     page: 1,
     perPage: 1000,
   });
-  const agentConfigs = agentConfigsRequest.data ? agentConfigsRequest.data.items : [];
+  const agentPolicies = agentPoliciesRequest.data ? agentPoliciesRequest.data.items : [];
 
   const [isSubmitting, setIsSubmitting] = useState(false);
 
   async function onSubmit() {
     try {
       setIsSubmitting(true);
-      if (!selectedAgentConfigId) {
-        throw new Error('No selected config id');
+      if (!selectedAgentPolicyId) {
+        throw new Error('No selected agent policy id');
       }
       const res = await sendPutAgentReassign(agent.id, {
-        config_id: selectedAgentConfigId,
+        config_id: selectedAgentPolicyId,
       });
       if (res.error) {
         throw res.error;
       }
       setIsSubmitting(false);
       const successMessage = i18n.translate(
-        'xpack.ingestManager.agentReassignConfig.successSingleNotificationTitle',
+        'xpack.ingestManager.agentReassignPolicy.successSingleNotificationTitle',
         {
-          defaultMessage: 'Agent configuration reassigned',
+          defaultMessage: 'Agent policy reassigned',
         }
       );
       notifications.toasts.addSuccess(successMessage);
@@ -68,7 +68,7 @@ export const AgentReassignConfigFlyout: React.FunctionComponent<Props> = ({ onCl
     } catch (error) {
       setIsSubmitting(false);
       notifications.toasts.addError(error, {
-        title: 'Unable to reassign agent configuration',
+        title: 'Unable to reassign agent policy',
       });
     }
   }
@@ -79,16 +79,16 @@ export const AgentReassignConfigFlyout: React.FunctionComponent<Props> = ({ onCl
         <EuiTitle size="m">
           <h2 id="FleetAgentReassigmentFlyoutTitle">
             <FormattedMessage
-              id="xpack.ingestManager.agentReassignConfig.flyoutTitle"
-              defaultMessage="Assign new agent configuration"
+              id="xpack.ingestManager.agentReassignPolicy.flyoutTitle"
+              defaultMessage="Assign new agent policy"
             />
           </h2>
         </EuiTitle>
         <EuiSpacer size="m" />
         <EuiText size="s">
           <FormattedMessage
-            id="xpack.ingestManager.agentReassignConfig.flyoutDescription"
-            defaultMessage="Choose a new agent configuration to assign the selected agent to."
+            id="xpack.ingestManager.agentReassignPolicy.flyoutDescription"
+            defaultMessage="Choose a new agent policy to assign the selected agent to."
           />
         </EuiText>
       </EuiFlyoutHeader>
@@ -97,26 +97,26 @@ export const AgentReassignConfigFlyout: React.FunctionComponent<Props> = ({ onCl
           <EuiFlexItem>
             <EuiFormRow
               fullWidth
-              label={i18n.translate('xpack.ingestManager.agentReassignConfig.selectConfigLabel', {
-                defaultMessage: 'Agent configuration',
+              label={i18n.translate('xpack.ingestManager.agentReassignPolicy.selectPolicyLabel', {
+                defaultMessage: 'Agent policy',
               })}
             >
               <EuiSelect
                 fullWidth
-                options={agentConfigs.map((config) => ({
-                  value: config.id,
-                  text: config.name,
+                options={agentPolicies.map((agentPolicy) => ({
+                  value: agentPolicy.id,
+                  text: agentPolicy.name,
                 }))}
-                value={selectedAgentConfigId}
-                onChange={(e) => setSelectedAgentConfigId(e.target.value)}
+                value={selectedAgentPolicyId}
+                onChange={(e) => setSelectedAgentPolicyId(e.target.value)}
               />
             </EuiFormRow>
           </EuiFlexItem>
         </EuiFlexGroup>
         <EuiSpacer size="l" />
 
-        {selectedAgentConfigId && (
-          <AgentConfigPackageBadges agentConfigId={selectedAgentConfigId} />
+        {selectedAgentPolicyId && (
+          <AgentPolicyPackageBadges agentPolicyId={selectedAgentPolicyId} />
         )}
       </EuiFlyoutBody>
       <EuiFlyoutFooter>
@@ -124,21 +124,21 @@ export const AgentReassignConfigFlyout: React.FunctionComponent<Props> = ({ onCl
           <EuiFlexItem grow={false}>
             <EuiButtonEmpty onClick={onClose} flush="left">
               <FormattedMessage
-                id="xpack.ingestManager.agentReassignConfig.cancelButtonLabel"
+                id="xpack.ingestManager.agentReassignPolicy.cancelButtonLabel"
                 defaultMessage="Cancel"
               />
             </EuiButtonEmpty>
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
             <EuiButton
-              disabled={selectedAgentConfigId === agent.config_id}
+              disabled={selectedAgentPolicyId === agent.config_id}
               fill
               onClick={onSubmit}
               isLoading={isSubmitting}
             >
               <FormattedMessage
-                id="xpack.ingestManager.agentReassignConfig.continueButtonLabel"
-                defaultMessage="Assign configuration"
+                id="xpack.ingestManager.agentReassignPolicy.continueButtonLabel"
+                defaultMessage="Assign policy"
               />
             </EuiButton>
           </EuiFlexItem>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/list_layout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/list_layout.tsx
index 16acda9dc4afd2..9741fdd8210b21 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/list_layout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/list_layout.tsx
@@ -21,7 +21,7 @@ import { Props as EuiTabProps } from '@elastic/eui/src/components/tabs/tab';
 import { useRouteMatch } from 'react-router-dom';
 import { PAGE_ROUTING_PATHS } from '../../../constants';
 import { WithHeaderLayout } from '../../../layouts';
-import { useCapabilities, useLink, useGetAgentConfigs } from '../../../hooks';
+import { useCapabilities, useLink, useGetAgentPolicies } from '../../../hooks';
 import { useGetAgentStatus } from '../../agent_config/details_page/hooks';
 import { AgentEnrollmentFlyout } from '../components';
 import { DonutChart } from './donut_chart';
@@ -135,7 +135,7 @@ export const ListLayout: React.FunctionComponent<{}> = ({ children }) => {
           <p>
             <FormattedMessage
               id="xpack.ingestManager.fleet.pageSubtitle"
-              defaultMessage="Manage and deploy configuration updates to a group of agents of any size."
+              defaultMessage="Manage and deploy policy updates to a group of agents of any size."
             />
           </p>
         </EuiText>
@@ -143,12 +143,12 @@ export const ListLayout: React.FunctionComponent<{}> = ({ children }) => {
     </EuiFlexGroup>
   );
 
-  const agentConfigsRequest = useGetAgentConfigs({
+  const agentPoliciesRequest = useGetAgentPolicies({
     page: 1,
     perPage: 1000,
   });
 
-  const agentConfigs = agentConfigsRequest.data ? agentConfigsRequest.data.items : [];
+  const agentPolicies = agentPoliciesRequest.data ? agentPoliciesRequest.data.items : [];
 
   const routeMatch = useRouteMatch();
 
@@ -183,7 +183,7 @@ export const ListLayout: React.FunctionComponent<{}> = ({ children }) => {
     >
       {isEnrollmentFlyoutOpen ? (
         <AgentEnrollmentFlyout
-          agentConfigs={agentConfigs}
+          agentPolicies={agentPolicies}
           onClose={() => setIsEnrollmentFlyoutOpen(false)}
         />
       ) : null}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/components/new_enrollment_key_flyout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/components/new_enrollment_key_flyout.tsx
index f191b6889a60ae..8f32e912aa0cb8 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/components/new_enrollment_key_flyout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/components/new_enrollment_key_flyout.tsx
@@ -21,7 +21,7 @@ import {
   EuiSelect,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { AgentConfig } from '../../../../types';
+import { AgentPolicy } from '../../../../types';
 import { useInput, useCore, sendRequest } from '../../../../hooks';
 import { enrollmentAPIKeyRouteService } from '../../../../services';
 
@@ -32,7 +32,7 @@ function useCreateApiKeyForm(
   const { notifications } = useCore();
   const [isLoading, setIsLoading] = useState(false);
   const apiKeyNameInput = useInput('');
-  const configIdInput = useInput(configDefaultValue);
+  const policyIdInput = useInput(configDefaultValue);
 
   const onSubmit = async (event: React.FormEvent) => {
     event.preventDefault();
@@ -43,10 +43,10 @@ function useCreateApiKeyForm(
         path: enrollmentAPIKeyRouteService.getCreatePath(),
         body: JSON.stringify({
           name: apiKeyNameInput.value,
-          config_id: configIdInput.value,
+          config_id: policyIdInput.value,
         }),
       });
-      configIdInput.clear();
+      policyIdInput.clear();
       apiKeyNameInput.clear();
       setIsLoading(false);
       onSuccess(res.data.item.id);
@@ -66,21 +66,21 @@ function useCreateApiKeyForm(
   return {
     isLoading,
     onSubmit,
-    configIdInput,
+    policyIdInput,
     apiKeyNameInput,
   };
 }
 
 interface Props {
   onClose: () => void;
-  agentConfigs: AgentConfig[];
+  agentPolicies: AgentPolicy[];
 }
 
 export const NewEnrollmentTokenFlyout: React.FunctionComponent<Props> = ({
   onClose,
-  agentConfigs = [],
+  agentPolicies = [],
 }) => {
-  const configDefaultValue = agentConfigs.find((config) => config.is_default)?.id;
+  const configDefaultValue = agentPolicies.find((agentPolicy) => agentPolicy.is_default)?.id;
   const form = useCreateApiKeyForm(configDefaultValue, () => {
     onClose();
   });
@@ -102,15 +102,18 @@ export const NewEnrollmentTokenFlyout: React.FunctionComponent<Props> = ({
         </EuiFormRow>
 
         <EuiFormRow
-          label={i18n.translate('xpack.ingestManager.newEnrollmentKey.configLabel', {
-            defaultMessage: 'Configuration',
+          label={i18n.translate('xpack.ingestManager.newEnrollmentKey.policyLabel', {
+            defaultMessage: 'Policy',
           })}
         >
           <EuiSelect
             required={true}
             defaultValue={configDefaultValue}
-            {...form.configIdInput.props}
-            options={agentConfigs.map((config) => ({ value: config.id, text: config.name }))}
+            {...form.policyIdInput.props}
+            options={agentPolicies.map((agentPolicy) => ({
+              value: agentPolicy.id,
+              text: agentPolicy.name,
+            }))}
           />
         </EuiFormRow>
         <EuiButton type="submit" fill isLoading={form.isLoading}>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/index.tsx
index 6e8796135214ec..52fbc23d297fb7 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/index.tsx
@@ -24,7 +24,7 @@ import {
   useBreadcrumbs,
   usePagination,
   useGetEnrollmentAPIKeys,
-  useGetAgentConfigs,
+  useGetAgentPolicies,
   sendGetOneEnrollmentAPIKey,
   useCore,
   sendDeleteOneEnrollmentAPIKey,
@@ -165,12 +165,12 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
     perPage: pagination.pageSize,
     kuery: search.trim() !== '' ? search : undefined,
   });
-  const agentConfigsRequest = useGetAgentConfigs({
+  const agentPoliciesRequest = useGetAgentPolicies({
     page: 1,
     perPage: 1000,
   });
 
-  const agentConfigs = agentConfigsRequest.data ? agentConfigsRequest.data.items : [];
+  const agentPolicies = agentPoliciesRequest.data ? agentPoliciesRequest.data.items : [];
 
   const total = enrollmentAPIKeysRequest?.data?.total ?? 0;
   const items = enrollmentAPIKeysRequest?.data?.list ?? [];
@@ -199,12 +199,12 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
     },
     {
       field: 'config_id',
-      name: i18n.translate('xpack.ingestManager.enrollmentTokensList.configTitle', {
-        defaultMessage: 'Agent config',
+      name: i18n.translate('xpack.ingestManager.enrollmentTokensList.policyTitle', {
+        defaultMessage: 'Agent policy',
       }),
-      render: (configId: string) => {
-        const config = agentConfigs.find((c) => c.id === configId);
-        const value = config ? config.name : configId;
+      render: (policyId: string) => {
+        const agentPolicy = agentPolicies.find((c) => c.id === policyId);
+        const value = agentPolicy ? agentPolicy.name : policyId;
         return (
           <span className="eui-textTruncate" title={value}>
             {value}
@@ -255,7 +255,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
     <>
       {flyoutOpen && (
         <NewEnrollmentTokenFlyout
-          agentConfigs={agentConfigs}
+          agentPolicies={agentPolicies}
           onClose={() => {
             setFlyoutOpen(false);
             enrollmentAPIKeysRequest.sendRequest();
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/setup_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/setup_page/index.tsx
index ffd8591a642c1a..eeade9036df000 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/setup_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/setup_page/index.tsx
@@ -134,7 +134,7 @@ export const SetupPage: React.FunctionComponent<{
           <EuiSpacer size="m" />
           <FormattedMessage
             id="xpack.ingestManager.setupPage.missingRequirementsElasticsearchTitle"
-            defaultMessage="In your Elasticsearch configuration, enable:"
+            defaultMessage="In your Elasticsearch policy, enable:"
           />
           <EuiSpacer size="l" />
           <RequirementItem isMissing={false}>
@@ -190,7 +190,7 @@ xpack.security.authc.api_key.enabled: true`}
           <EuiSpacer size="l" />
           <FormattedMessage
             id="xpack.ingestManager.setupPage.missingRequirementsKibanaTitle"
-            defaultMessage="In your Kibana configuration, enable:"
+            defaultMessage="In your Kibana policy, enable:"
           />
           <EuiSpacer size="l" />
           <RequirementItem isMissing={missingRequirements.includes('tls_required')}>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/index.tsx
index 1f46c4cc820cb9..97a89260b4ab09 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/index.tsx
@@ -5,7 +5,7 @@
  */
 export { IngestManagerOverview } from './overview';
 export { EPMApp } from './epm';
-export { AgentConfigApp } from './agent_config';
+export { AgentPolicyApp } from './agent_config';
 export { DataStreamApp } from './data_stream';
 export { FleetApp } from './fleet';
 
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/agent_section.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/agent_section.tsx
index 7e33589bffea12..d7b08bf5ffa3a3 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/agent_section.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/agent_section.tsx
@@ -30,7 +30,7 @@ export const OverviewAgentSection = () => {
         })}
         tooltip={i18n.translate('xpack.ingestManager.overviewPageFleetPanelTooltip', {
           defaultMessage:
-            'Use Fleet to enroll agents and manage their configurations from a central location.',
+            'Use Fleet to enroll agents and manage their policies from a central location.',
         })}
         linkTo={getHref('fleet_agent_list')}
         linkToText={i18n.translate('xpack.ingestManager.overviewPageFleetPanelAction', {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/configuration_section.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/configuration_section.tsx
index 56aaba1d433212..0b4d3f393678ba 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/configuration_section.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/configuration_section.tsx
@@ -15,15 +15,15 @@ import {
 } from '@elastic/eui';
 import { OverviewPanel } from './overview_panel';
 import { OverviewStats } from './overview_stats';
-import { useLink, useGetPackageConfigs } from '../../../hooks';
-import { AgentConfig } from '../../../types';
+import { useLink, useGetPackagePolicies } from '../../../hooks';
+import { AgentPolicy } from '../../../types';
 import { Loading } from '../../fleet/components';
 
-export const OverviewConfigurationSection: React.FC<{ agentConfigs: AgentConfig[] }> = ({
-  agentConfigs,
+export const OverviewConfigurationSection: React.FC<{ agentPolicies: AgentPolicy[] }> = ({
+  agentPolicies,
 }) => {
   const { getHref } = useLink();
-  const packageConfigsRequest = useGetPackageConfigs({
+  const packagePoliciesRequest = useGetPackagePolicies({
     page: 1,
     perPage: 10000,
   });
@@ -31,39 +31,39 @@ export const OverviewConfigurationSection: React.FC<{ agentConfigs: AgentConfig[
   return (
     <EuiFlexItem component="section">
       <OverviewPanel
-        title={i18n.translate('xpack.ingestManager.overviewPageConfigurationsPanelTitle', {
-          defaultMessage: 'Agent configurations',
+        title={i18n.translate('xpack.ingestManager.overviewPagePoliciesPanelTitle', {
+          defaultMessage: 'Agent policies',
         })}
-        tooltip={i18n.translate('xpack.ingestManager.overviewPageConfigurationsPanelTooltip', {
-          defaultMessage: 'Use agent configurations to control the data that your agents collect.',
+        tooltip={i18n.translate('xpack.ingestManager.overviewPagePoliciesPanelTooltip', {
+          defaultMessage: 'Use agent policies to control the data that your agents collect.',
         })}
-        linkTo={getHref('configurations_list')}
-        linkToText={i18n.translate('xpack.ingestManager.overviewPageConfigurationsPanelAction', {
-          defaultMessage: 'View configurations',
+        linkTo={getHref('policies_list')}
+        linkToText={i18n.translate('xpack.ingestManager.overviewPagePoliciesPanelAction', {
+          defaultMessage: 'View policies',
         })}
       >
         <OverviewStats>
-          {packageConfigsRequest.isLoading ? (
+          {packagePoliciesRequest.isLoading ? (
             <Loading />
           ) : (
             <>
               <EuiDescriptionListTitle>
                 <FormattedMessage
-                  id="xpack.ingestManager.overviewConfigTotalTitle"
+                  id="xpack.ingestManager.overviewPolicyTotalTitle"
                   defaultMessage="Total available"
                 />
               </EuiDescriptionListTitle>
               <EuiDescriptionListDescription>
-                <EuiI18nNumber value={agentConfigs.length} />
+                <EuiI18nNumber value={agentPolicies.length} />
               </EuiDescriptionListDescription>
               <EuiDescriptionListTitle>
                 <FormattedMessage
-                  id="xpack.ingestManager.overviewPackageConfigTitle"
-                  defaultMessage="Configured integrations"
+                  id="xpack.ingestManager.overviewPackagePolicyTitle"
+                  defaultMessage="Used integrations"
                 />
               </EuiDescriptionListTitle>
               <EuiDescriptionListDescription>
-                <EuiI18nNumber value={packageConfigsRequest.data?.total ?? 0} />
+                <EuiI18nNumber value={packagePoliciesRequest.data?.total ?? 0} />
               </EuiDescriptionListDescription>
             </>
           )}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/integration_section.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/integration_section.tsx
index ba16b47e73051f..1e138ae922afc9 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/integration_section.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/integration_section.tsx
@@ -37,7 +37,7 @@ export const OverviewIntegrationSection: React.FC = () => {
         })}
         tooltip={i18n.translate('xpack.ingestManager.overviewPageIntegrationsPanelTooltip', {
           defaultMessage:
-            'Browse and install integrations for the Elastic Stack. Add integrations to your agent configurations to start sending data.',
+            'Browse and install integrations for the Elastic Stack. Add integrations to your agent policies to start sending data.',
         })}
         linkTo={getHref('integrations_all')}
         linkToText={i18n.translate('xpack.ingestManager.overviewPageIntegrationsPanelAction', {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
index ea7ae093ee59ad..945eb22aa59bec 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
@@ -16,7 +16,7 @@ import {
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 import { WithHeaderLayout } from '../../layouts';
-import { useGetAgentConfigs, useBreadcrumbs } from '../../hooks';
+import { useGetAgentPolicies, useBreadcrumbs } from '../../hooks';
 import { AgentEnrollmentFlyout } from '../fleet/components';
 import { OverviewAgentSection } from './components/agent_section';
 import { OverviewConfigurationSection } from './components/configuration_section';
@@ -29,12 +29,12 @@ export const IngestManagerOverview: React.FunctionComponent = () => {
   // Agent enrollment flyout state
   const [isEnrollmentFlyoutOpen, setIsEnrollmentFlyoutOpen] = useState<boolean>(false);
 
-  // Agent configs required for enrollment flyout
-  const agentConfigsRequest = useGetAgentConfigs({
+  // Agent policies required for enrollment flyout
+  const agentPoliciesRequest = useGetAgentPolicies({
     page: 1,
     perPage: 1000,
   });
-  const agentConfigs = agentConfigsRequest.data ? agentConfigsRequest.data.items : [];
+  const agentPolicies = agentPoliciesRequest.data ? agentPoliciesRequest.data.items : [];
 
   return (
     <WithHeaderLayout
@@ -71,7 +71,7 @@ export const IngestManagerOverview: React.FunctionComponent = () => {
               <p>
                 <FormattedMessage
                   id="xpack.ingestManager.overviewPageSubtitle"
-                  defaultMessage="Central management for Elastic Agents and agent configurations."
+                  defaultMessage="Central management for Elastic Agents and agent policies."
                 />
               </p>
             </EuiText>
@@ -93,14 +93,14 @@ export const IngestManagerOverview: React.FunctionComponent = () => {
     >
       {isEnrollmentFlyoutOpen && (
         <AgentEnrollmentFlyout
-          agentConfigs={agentConfigs}
+          agentPolicies={agentPolicies}
           onClose={() => setIsEnrollmentFlyoutOpen(false)}
         />
       )}
 
       <EuiFlexGrid gutterSize="l" columns={2}>
         <OverviewIntegrationSection />
-        <OverviewConfigurationSection agentConfigs={agentConfigs} />
+        <OverviewConfigurationSection agentPolicies={agentPolicies} />
         <OverviewAgentSection />
         <OverviewDatastreamSection />
       </EuiFlexGrid>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/services/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/services/index.ts
index 9c3b84d0835b85..6e325948ce0f70 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/services/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/services/index.ts
@@ -8,8 +8,8 @@ export { getFlattenedObject } from '../../../../../../../src/core/public';
 
 export {
   AgentStatusKueryHelper,
-  agentConfigRouteService,
-  packageConfigRouteService,
+  agentPolicyRouteService,
+  packagePolicyRouteService,
   dataStreamRouteService,
   fleetSetupRouteService,
   agentRouteService,
@@ -19,9 +19,9 @@ export {
   outputRoutesService,
   settingsRoutesService,
   appRoutesService,
-  packageToPackageConfigInputs,
-  storedPackageConfigsToAgentInputs,
-  configToYaml,
+  packageToPackagePolicyInputs,
+  storedPackagePoliciesToAgentInputs,
+  policyToYaml,
   isPackageLimited,
-  doesAgentConfigAlreadyIncludePackage,
+  doesAgentPolicyAlreadyIncludePackage,
 } from '../../../../common';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/index.ts
index dc27da18bc008f..80e27b7c4d0bf3 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/index.ts
@@ -9,40 +9,40 @@ export {
   // Object types
   Agent,
   AgentMetadata,
-  AgentConfig,
-  NewAgentConfig,
+  AgentPolicy,
+  NewAgentPolicy,
   AgentEvent,
   EnrollmentAPIKey,
-  PackageConfig,
-  NewPackageConfig,
-  UpdatePackageConfig,
-  PackageConfigInput,
-  PackageConfigInputStream,
-  PackageConfigConfigRecord,
-  PackageConfigConfigRecordEntry,
+  PackagePolicy,
+  NewPackagePolicy,
+  UpdatePackagePolicy,
+  PackagePolicyInput,
+  PackagePolicyInputStream,
+  PackagePolicyConfigRecord,
+  PackagePolicyConfigRecordEntry,
   Output,
   DataStream,
   // API schema - misc setup, status
   GetFleetStatusResponse,
-  // API schemas - Agent Config
-  GetAgentConfigsRequest,
-  GetAgentConfigsResponse,
-  GetAgentConfigsResponseItem,
-  GetOneAgentConfigResponse,
-  GetFullAgentConfigResponse,
-  CreateAgentConfigRequest,
-  CreateAgentConfigResponse,
-  UpdateAgentConfigRequest,
-  UpdateAgentConfigResponse,
-  CopyAgentConfigRequest,
-  CopyAgentConfigResponse,
-  DeleteAgentConfigRequest,
-  DeleteAgentConfigResponse,
-  // API schemas - Package config
-  CreatePackageConfigRequest,
-  CreatePackageConfigResponse,
-  UpdatePackageConfigRequest,
-  UpdatePackageConfigResponse,
+  // API schemas - Agent policy
+  GetAgentPoliciesRequest,
+  GetAgentPoliciesResponse,
+  GetAgentPoliciesResponseItem,
+  GetOneAgentPolicyResponse,
+  GetFullAgentPolicyResponse,
+  CreateAgentPolicyRequest,
+  CreateAgentPolicyResponse,
+  UpdateAgentPolicyRequest,
+  UpdateAgentPolicyResponse,
+  CopyAgentPolicyRequest,
+  CopyAgentPolicyResponse,
+  DeleteAgentPolicyRequest,
+  DeleteAgentPolicyResponse,
+  // API schemas - Package policy
+  CreatePackagePolicyRequest,
+  CreatePackagePolicyResponse,
+  UpdatePackagePolicyRequest,
+  UpdatePackagePolicyResponse,
   // API schemas - Data Streams
   GetDataStreamsResponse,
   // API schemas - Agents
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/intra_app_route_state.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/intra_app_route_state.ts
index 4fd770501ae3f2..c3faf7fc450d8f 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/intra_app_route_state.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/intra_app_route_state.ts
@@ -5,16 +5,16 @@
  */
 
 import { ApplicationStart } from 'kibana/public';
-import { PackageConfig } from './';
+import { PackagePolicy } from './';
 
 /**
- * Supported routing state for the create package config page routes
+ * Supported routing state for the create package policy page routes
  */
-export interface CreatePackageConfigRouteState {
-  /** On a successful save of the package config, use navigate to the given app */
+export interface CreatePackagePolicyRouteState {
+  /** On a successful save of the package policy, use navigate to the given app */
   onSaveNavigateTo?:
     | Parameters<ApplicationStart['navigateToApp']>
-    | ((newPackageConfig: PackageConfig) => Parameters<ApplicationStart['navigateToApp']>);
+    | ((newPackagePolicy: PackagePolicy) => Parameters<ApplicationStart['navigateToApp']>);
   /** On cancel, navigate to the given app */
   onCancelNavigateTo?: Parameters<ApplicationStart['navigateToApp']>;
   /** Url to be used on cancel links */
@@ -22,17 +22,17 @@ export interface CreatePackageConfigRouteState {
 }
 
 /**
- * Supported routing state for the agent config details page routes with deploy agents action
+ * Supported routing state for the agent policy details page routes with deploy agents action
  */
-export interface AgentConfigDetailsDeployAgentAction {
+export interface AgentPolicyDetailsDeployAgentAction {
   /** On done, navigate to the given app */
   onDoneNavigateTo?: Parameters<ApplicationStart['navigateToApp']>;
 }
 
 /**
- * Supported routing state for the agent config details page routes with deploy agents action
+ * Supported routing state for the agent policy details page routes with deploy agents action
  */
-export interface AgentDetailsReassignConfigAction {
+export interface AgentDetailsReassignPolicyAction {
   /** On done, navigate to the given app */
   onDoneNavigateTo?: Parameters<ApplicationStart['navigateToApp']>;
 }
@@ -41,6 +41,6 @@ export interface AgentDetailsReassignConfigAction {
  * All possible Route states.
  */
 export type AnyIntraAppRouteState =
-  | CreatePackageConfigRouteState
-  | AgentConfigDetailsDeployAgentAction
-  | AgentDetailsReassignConfigAction;
+  | CreatePackagePolicyRouteState
+  | AgentPolicyDetailsDeployAgentAction
+  | AgentDetailsReassignPolicyAction;
diff --git a/x-pack/plugins/ingest_manager/public/index.ts b/x-pack/plugins/ingest_manager/public/index.ts
index 866d17145b0758..9bb89f4ec07d20 100644
--- a/x-pack/plugins/ingest_manager/public/index.ts
+++ b/x-pack/plugins/ingest_manager/public/index.ts
@@ -13,10 +13,10 @@ export const plugin = (initializerContext: PluginInitializerContext) => {
 };
 
 export {
-  CustomConfigurePackageConfigContent,
-  CustomConfigurePackageConfigProps,
-  registerPackageConfigComponent,
+  CustomConfigurePackagePolicyContent,
+  CustomConfigurePackagePolicyProps,
+  registerPackagePolicyComponent,
 } from './applications/ingest_manager/sections/agent_config/create_package_config_page/components/custom_package_config';
 
-export { NewPackageConfig } from './applications/ingest_manager/types';
+export { NewPackagePolicy } from './applications/ingest_manager/types';
 export * from './applications/ingest_manager/types/intra_app_route_state';
diff --git a/x-pack/plugins/ingest_manager/public/plugin.ts b/x-pack/plugins/ingest_manager/public/plugin.ts
index fde4e93f8e39ff..f1ed601da93ad2 100644
--- a/x-pack/plugins/ingest_manager/public/plugin.ts
+++ b/x-pack/plugins/ingest_manager/public/plugin.ts
@@ -25,7 +25,7 @@ import {
   TutorialDirectoryHeaderLink,
   TutorialModuleNotice,
 } from './applications/ingest_manager/components/home_integration';
-import { registerPackageConfigComponent } from './applications/ingest_manager/sections/agent_config/create_package_config_page/components/custom_package_config';
+import { registerPackagePolicyComponent } from './applications/ingest_manager/sections/agent_config/create_package_config_page/components/custom_package_config';
 
 export { IngestManagerConfigType } from '../common/types';
 
@@ -38,7 +38,7 @@ export interface IngestManagerSetup {}
  * Describes public IngestManager plugin contract returned at the `start` stage.
  */
 export interface IngestManagerStart {
-  registerPackageConfigComponent: typeof registerPackageConfigComponent;
+  registerPackagePolicyComponent: typeof registerPackagePolicyComponent;
   isInitialized: () => Promise<true>;
 }
 
@@ -127,7 +127,7 @@ export class IngestManagerPlugin
 
         return successPromise;
       },
-      registerPackageConfigComponent,
+      registerPackagePolicyComponent,
     };
   }
 
diff --git a/x-pack/plugins/ingest_manager/server/collectors/package_collectors.ts b/x-pack/plugins/ingest_manager/server/collectors/package_collectors.ts
index 399e38f1919ba4..8a88f4e61c2faf 100644
--- a/x-pack/plugins/ingest_manager/server/collectors/package_collectors.ts
+++ b/x-pack/plugins/ingest_manager/server/collectors/package_collectors.ts
@@ -7,8 +7,8 @@
 import { SavedObjectsClient } from 'kibana/server';
 import _ from 'lodash';
 import { getPackageSavedObjects } from '../services/epm/packages/get';
-import { agentConfigService } from '../services';
-import { NewPackageConfig } from '../types';
+import { agentPolicyService } from '../services';
+import { NewPackagePolicy } from '../types';
 
 export interface PackageUsage {
   name: string;
@@ -21,19 +21,19 @@ export const getPackageUsage = async (soClient?: SavedObjectsClient): Promise<Pa
     return [];
   }
   const packagesSavedObjects = await getPackageSavedObjects(soClient);
-  const agentConfigs = await agentConfigService.list(soClient, {
+  const agentPolicies = await agentPolicyService.list(soClient, {
     perPage: 1000, // avoiding pagination
-    withPackageConfigs: true,
+    withPackagePolicies: true,
   });
 
-  // Once we provide detailed telemetry on agent configs, this logic should probably be moved
-  // to the (then to be created) agent config collector, so we only query and loop over these
+  // Once we provide detailed telemetry on agent policies, this logic should probably be moved
+  // to the (then to be created) agent policy collector, so we only query and loop over these
   // objects once.
 
-  const packagesInConfigs = agentConfigs.items.map((agentConfig) => {
-    const packageConfigs: NewPackageConfig[] = agentConfig.package_configs as NewPackageConfig[];
-    return packageConfigs
-      .map((packageConfig) => packageConfig.package?.name)
+  const packagesInConfigs = agentPolicies.items.map((agentPolicy) => {
+    const packagePolicies: NewPackagePolicy[] = agentPolicy.package_configs as NewPackagePolicy[];
+    return packagePolicies
+      .map((packagePolicy) => packagePolicy.package?.name)
       .filter((packageName): packageName is string => packageName !== undefined);
   });
 
diff --git a/x-pack/plugins/ingest_manager/server/constants/index.ts b/x-pack/plugins/ingest_manager/server/constants/index.ts
index 1ec13bd80f0fb9..29771d05d3d33f 100644
--- a/x-pack/plugins/ingest_manager/server/constants/index.ts
+++ b/x-pack/plugins/ingest_manager/server/constants/index.ts
@@ -10,8 +10,8 @@ export {
   AGENT_POLLING_THRESHOLD_MS,
   AGENT_POLLING_INTERVAL,
   AGENT_UPDATE_LAST_CHECKIN_INTERVAL_MS,
-  AGENT_CONFIG_ROLLUP_RATE_LIMIT_REQUEST_PER_INTERVAL,
-  AGENT_CONFIG_ROLLUP_RATE_LIMIT_INTERVAL_MS,
+  AGENT_POLICY_ROLLUP_RATE_LIMIT_REQUEST_PER_INTERVAL,
+  AGENT_POLICY_ROLLUP_RATE_LIMIT_INTERVAL_MS,
   AGENT_UPDATE_ACTIONS_INTERVAL_MS,
   INDEX_PATTERN_PLACEHOLDER_SUFFIX,
   // Routes
@@ -19,9 +19,9 @@ export {
   PLUGIN_ID,
   EPM_API_ROUTES,
   DATA_STREAM_API_ROUTES,
-  PACKAGE_CONFIG_API_ROUTES,
+  PACKAGE_POLICY_API_ROUTES,
   AGENT_API_ROUTES,
-  AGENT_CONFIG_API_ROUTES,
+  AGENT_POLICY_API_ROUTES,
   FLEET_SETUP_API_ROUTES,
   ENROLLMENT_API_KEY_ROUTES,
   INSTALL_SCRIPT_API_ROUTES,
@@ -33,14 +33,14 @@ export {
   AGENT_SAVED_OBJECT_TYPE,
   AGENT_EVENT_SAVED_OBJECT_TYPE,
   AGENT_ACTION_SAVED_OBJECT_TYPE,
-  AGENT_CONFIG_SAVED_OBJECT_TYPE,
-  PACKAGE_CONFIG_SAVED_OBJECT_TYPE,
+  AGENT_POLICY_SAVED_OBJECT_TYPE,
+  PACKAGE_POLICY_SAVED_OBJECT_TYPE,
   OUTPUT_SAVED_OBJECT_TYPE,
   PACKAGES_SAVED_OBJECT_TYPE,
   INDEX_PATTERN_SAVED_OBJECT_TYPE,
   ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
   GLOBAL_SETTINGS_SAVED_OBJECT_TYPE,
   // Defaults
-  DEFAULT_AGENT_CONFIG,
+  DEFAULT_AGENT_POLICY,
   DEFAULT_OUTPUT,
 } from '../../common';
diff --git a/x-pack/plugins/ingest_manager/server/index.ts b/x-pack/plugins/ingest_manager/server/index.ts
index e2f659f54d6254..0b0fcf3128ddf9 100644
--- a/x-pack/plugins/ingest_manager/server/index.ts
+++ b/x-pack/plugins/ingest_manager/server/index.ts
@@ -35,15 +35,15 @@ export const config = {
         host: schema.maybe(schema.string()),
         ca_sha256: schema.maybe(schema.string()),
       }),
-      agentConfigRolloutRateLimitIntervalMs: schema.number({ defaultValue: 5000 }),
-      agentConfigRolloutRateLimitRequestPerInterval: schema.number({ defaultValue: 5 }),
+      agentPolicyRolloutRateLimitIntervalMs: schema.number({ defaultValue: 5000 }),
+      agentPolicyRolloutRateLimitRequestPerInterval: schema.number({ defaultValue: 5 }),
     }),
   }),
 };
 
 export type IngestManagerConfigType = TypeOf<typeof config.schema>;
 
-export { PackageConfigServiceInterface } from './services/package_config';
+export { PackagePolicyServiceInterface } from './services/package_config';
 
 export const plugin = (initializerContext: PluginInitializerContext) => {
   return new IngestManagerPlugin(initializerContext);
diff --git a/x-pack/plugins/ingest_manager/server/integration_tests/router.test.ts b/x-pack/plugins/ingest_manager/server/integration_tests/router.test.ts
index 9d671c629ef912..62a97b5ded72e4 100644
--- a/x-pack/plugins/ingest_manager/server/integration_tests/router.test.ts
+++ b/x-pack/plugins/ingest_manager/server/integration_tests/router.test.ts
@@ -42,11 +42,11 @@ describe('ingestManager', () => {
 
     afterAll(async () => await root.shutdown());
 
-    it('does not have agent config api', async () => {
+    it('does not have agent policy api', async () => {
       await kbnTestServer.request.get(root, '/api/ingest_manager/agent_configs').expect(404);
     });
 
-    it('does not have package configs api', async () => {
+    it('does not have package policies api', async () => {
       await kbnTestServer.request.get(root, '/api/ingest_manager/package_configs').expect(404);
     });
 
@@ -75,11 +75,11 @@ describe('ingestManager', () => {
 
     afterAll(async () => await root.shutdown());
 
-    it('has agent config api', async () => {
+    it('has agent policy api', async () => {
       await kbnTestServer.request.get(root, '/api/ingest_manager/agent_configs').expect(200);
     });
 
-    it('has package configs api', async () => {
+    it('has package policies api', async () => {
       await kbnTestServer.request.get(root, '/api/ingest_manager/package_configs').expect(200);
     });
 
@@ -114,11 +114,11 @@ describe('ingestManager', () => {
 
     afterAll(async () => await root.shutdown());
 
-    it('has agent config api', async () => {
+    it('has agent policy api', async () => {
       await kbnTestServer.request.get(root, '/api/ingest_manager/agent_configs').expect(200);
     });
 
-    it('has package configs api', async () => {
+    it('has package policies api', async () => {
       await kbnTestServer.request.get(root, '/api/ingest_manager/package_configs').expect(200);
     });
 
@@ -148,11 +148,11 @@ describe('ingestManager', () => {
 
     afterAll(async () => await root.shutdown());
 
-    it('has agent config api', async () => {
+    it('has agent policy api', async () => {
       await kbnTestServer.request.get(root, '/api/ingest_manager/agent_configs').expect(200);
     });
 
-    it('has package configs api', async () => {
+    it('has package policies api', async () => {
       await kbnTestServer.request.get(root, '/api/ingest_manager/package_configs').expect(200);
     });
 
@@ -183,11 +183,11 @@ describe('ingestManager', () => {
 
     afterAll(async () => await root.shutdown());
 
-    it('has agent config api', async () => {
+    it('has agent policy api', async () => {
       await kbnTestServer.request.get(root, '/api/ingest_manager/agent_configs').expect(200);
     });
 
-    it('has package configs api', async () => {
+    it('has package policies api', async () => {
       await kbnTestServer.request.get(root, '/api/ingest_manager/package_configs').expect(200);
     });
 
diff --git a/x-pack/plugins/ingest_manager/server/mocks.ts b/x-pack/plugins/ingest_manager/server/mocks.ts
index 52cd2947830875..68dfb880eee558 100644
--- a/x-pack/plugins/ingest_manager/server/mocks.ts
+++ b/x-pack/plugins/ingest_manager/server/mocks.ts
@@ -8,7 +8,7 @@ import { loggingSystemMock, savedObjectsServiceMock } from 'src/core/server/mock
 import { IngestManagerAppContext } from './plugin';
 import { encryptedSavedObjectsMock } from '../../encrypted_saved_objects/server/mocks';
 import { securityMock } from '../../security/server/mocks';
-import { PackageConfigServiceInterface } from './services/package_config';
+import { PackagePolicyServiceInterface } from './services/package_config';
 
 export const createAppContextStartContractMock = (): IngestManagerAppContext => {
   return {
@@ -22,10 +22,10 @@ export const createAppContextStartContractMock = (): IngestManagerAppContext =>
   };
 };
 
-export const createPackageConfigServiceMock = () => {
+export const createPackagePolicyServiceMock = () => {
   return {
     assignPackageStream: jest.fn(),
-    buildPackageConfigFromPackage: jest.fn(),
+    buildPackagePolicyFromPackage: jest.fn(),
     bulkCreate: jest.fn(),
     create: jest.fn(),
     delete: jest.fn(),
@@ -33,5 +33,5 @@ export const createPackageConfigServiceMock = () => {
     getByIDs: jest.fn(),
     list: jest.fn(),
     update: jest.fn(),
-  } as jest.Mocked<PackageConfigServiceInterface>;
+  } as jest.Mocked<PackagePolicyServiceInterface>;
 };
diff --git a/x-pack/plugins/ingest_manager/server/plugin.ts b/x-pack/plugins/ingest_manager/server/plugin.ts
index e5e1194d59ecb9..ce1659176faaf7 100644
--- a/x-pack/plugins/ingest_manager/server/plugin.ts
+++ b/x-pack/plugins/ingest_manager/server/plugin.ts
@@ -25,8 +25,8 @@ import { PluginSetupContract as FeaturesPluginSetup } from '../../features/serve
 import {
   PLUGIN_ID,
   OUTPUT_SAVED_OBJECT_TYPE,
-  AGENT_CONFIG_SAVED_OBJECT_TYPE,
-  PACKAGE_CONFIG_SAVED_OBJECT_TYPE,
+  AGENT_POLICY_SAVED_OBJECT_TYPE,
+  PACKAGE_POLICY_SAVED_OBJECT_TYPE,
   PACKAGES_SAVED_OBJECT_TYPE,
   AGENT_SAVED_OBJECT_TYPE,
   AGENT_EVENT_SAVED_OBJECT_TYPE,
@@ -36,9 +36,9 @@ import { registerSavedObjects, registerEncryptedSavedObjects } from './saved_obj
 import {
   registerLimitedConcurrencyRoutes,
   registerEPMRoutes,
-  registerPackageConfigRoutes,
+  registerPackagePolicyRoutes,
   registerDataStreamRoutes,
-  registerAgentConfigRoutes,
+  registerAgentPolicyRoutes,
   registerSetupRoutes,
   registerAgentRoutes,
   registerEnrollmentApiKeyRoutes,
@@ -47,14 +47,14 @@ import {
   registerSettingsRoutes,
   registerAppRoutes,
 } from './routes';
-import { IngestManagerConfigType, NewPackageConfig } from '../common';
+import { IngestManagerConfigType, NewPackagePolicy } from '../common';
 import {
   appContextService,
   licenseService,
   ESIndexPatternSavedObjectService,
   ESIndexPatternService,
   AgentService,
-  packageConfigService,
+  packagePolicyService,
 } from './services';
 import {
   getAgentStatusById,
@@ -95,8 +95,8 @@ export type IngestManagerSetupContract = void;
 
 const allSavedObjectTypes = [
   OUTPUT_SAVED_OBJECT_TYPE,
-  AGENT_CONFIG_SAVED_OBJECT_TYPE,
-  PACKAGE_CONFIG_SAVED_OBJECT_TYPE,
+  AGENT_POLICY_SAVED_OBJECT_TYPE,
+  PACKAGE_POLICY_SAVED_OBJECT_TYPE,
   PACKAGES_SAVED_OBJECT_TYPE,
   AGENT_SAVED_OBJECT_TYPE,
   AGENT_EVENT_SAVED_OBJECT_TYPE,
@@ -107,8 +107,8 @@ const allSavedObjectTypes = [
  * Callbacks supported by the Ingest plugin
  */
 export type ExternalCallback = [
-  'packageConfigCreate',
-  (newPackageConfig: NewPackageConfig) => Promise<NewPackageConfig>
+  'packagePolicyCreate',
+  (newPackagePolicy: NewPackagePolicy) => Promise<NewPackagePolicy>
 ];
 
 export type ExternalCallbacksStorage = Map<ExternalCallback[0], Set<ExternalCallback[1]>>;
@@ -120,9 +120,9 @@ export interface IngestManagerStartContract {
   esIndexPatternService: ESIndexPatternService;
   agentService: AgentService;
   /**
-   * Services for Ingest's package configs
+   * Services for Ingest's package policies
    */
-  packageConfigService: typeof packageConfigService;
+  packagePolicyService: typeof packagePolicyService;
   /**
    * Register callbacks for inclusion in ingest API processing
    * @param args
@@ -214,8 +214,8 @@ export class IngestManagerPlugin
     // Register rest of routes only if security is enabled
     if (this.security) {
       registerSetupRoutes(router, config);
-      registerAgentConfigRoutes(router);
-      registerPackageConfigRoutes(router);
+      registerAgentPolicyRoutes(router);
+      registerPackagePolicyRoutes(router);
       registerOutputRoutes(router);
       registerSettingsRoutes(router);
       registerDataStreamRoutes(router);
@@ -276,7 +276,7 @@ export class IngestManagerPlugin
         getAgentStatusById,
         authenticateAgentWithAccessToken,
       },
-      packageConfigService,
+      packagePolicyService,
       registerExternalCallback: (...args: ExternalCallback) => {
         return appContextService.addExternalCallback(...args);
       },
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts
index 4e4653ec023ce1..29829b1a4542cb 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts
@@ -6,45 +6,45 @@
 import { TypeOf } from '@kbn/config-schema';
 import { RequestHandler, ResponseHeaders } from 'src/core/server';
 import bluebird from 'bluebird';
-import { configToYaml } from '../../../common/services';
-import { appContextService, agentConfigService, packageConfigService } from '../../services';
+import { policyToYaml } from '../../../common/services';
+import { appContextService, agentPolicyService, packagePolicyService } from '../../services';
 import { listAgents } from '../../services/agents';
 import { AGENT_SAVED_OBJECT_TYPE } from '../../constants';
 import {
-  GetAgentConfigsRequestSchema,
-  GetOneAgentConfigRequestSchema,
-  CreateAgentConfigRequestSchema,
-  UpdateAgentConfigRequestSchema,
-  CopyAgentConfigRequestSchema,
-  DeleteAgentConfigRequestSchema,
-  GetFullAgentConfigRequestSchema,
-  AgentConfig,
+  GetAgentPoliciesRequestSchema,
+  GetOneAgentPolicyRequestSchema,
+  CreateAgentPolicyRequestSchema,
+  UpdateAgentPolicyRequestSchema,
+  CopyAgentPolicyRequestSchema,
+  DeleteAgentPolicyRequestSchema,
+  GetFullAgentPolicyRequestSchema,
+  AgentPolicy,
   DefaultPackages,
-  NewPackageConfig,
+  NewPackagePolicy,
 } from '../../types';
 import {
-  GetAgentConfigsResponse,
-  GetAgentConfigsResponseItem,
-  GetOneAgentConfigResponse,
-  CreateAgentConfigResponse,
-  UpdateAgentConfigResponse,
-  CopyAgentConfigResponse,
-  DeleteAgentConfigResponse,
-  GetFullAgentConfigResponse,
+  GetAgentPoliciesResponse,
+  GetAgentPoliciesResponseItem,
+  GetOneAgentPolicyResponse,
+  CreateAgentPolicyResponse,
+  UpdateAgentPolicyResponse,
+  CopyAgentPolicyResponse,
+  DeleteAgentPolicyResponse,
+  GetFullAgentPolicyResponse,
 } from '../../../common';
 
-export const getAgentConfigsHandler: RequestHandler<
+export const getAgentPoliciesHandler: RequestHandler<
   undefined,
-  TypeOf<typeof GetAgentConfigsRequestSchema.query>
+  TypeOf<typeof GetAgentPoliciesRequestSchema.query>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
-  const { full: withPackageConfigs = false, ...restOfQuery } = request.query;
+  const { full: withPackagePolicies = false, ...restOfQuery } = request.query;
   try {
-    const { items, total, page, perPage } = await agentConfigService.list(soClient, {
-      withPackageConfigs,
+    const { items, total, page, perPage } = await agentPolicyService.list(soClient, {
+      withPackagePolicies,
       ...restOfQuery,
     });
-    const body: GetAgentConfigsResponse = {
+    const body: GetAgentPoliciesResponse = {
       items,
       total,
       page,
@@ -54,13 +54,13 @@ export const getAgentConfigsHandler: RequestHandler<
 
     await bluebird.map(
       items,
-      (agentConfig: GetAgentConfigsResponseItem) =>
+      (agentPolicy: GetAgentPoliciesResponseItem) =>
         listAgents(soClient, {
           showInactive: false,
           perPage: 0,
           page: 1,
-          kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id:${agentConfig.id}`,
-        }).then(({ total: agentTotal }) => (agentConfig.agents = agentTotal)),
+          kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id:${agentPolicy.id}`,
+        }).then(({ total: agentTotal }) => (agentPolicy.agents = agentTotal)),
       { concurrency: 10 }
     );
 
@@ -73,15 +73,15 @@ export const getAgentConfigsHandler: RequestHandler<
   }
 };
 
-export const getOneAgentConfigHandler: RequestHandler<TypeOf<
-  typeof GetOneAgentConfigRequestSchema.params
+export const getOneAgentPolicyHandler: RequestHandler<TypeOf<
+  typeof GetOneAgentPolicyRequestSchema.params
 >> = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   try {
-    const agentConfig = await agentConfigService.get(soClient, request.params.agentConfigId);
-    if (agentConfig) {
-      const body: GetOneAgentConfigResponse = {
-        item: agentConfig,
+    const agentPolicy = await agentPolicyService.get(soClient, request.params.agentPolicyId);
+    if (agentPolicy) {
+      const body: GetOneAgentPolicyResponse = {
+        item: agentPolicy,
         success: true,
       };
       return response.ok({
@@ -90,7 +90,7 @@ export const getOneAgentConfigHandler: RequestHandler<TypeOf<
     } else {
       return response.customError({
         statusCode: 404,
-        body: { message: 'Agent config not found' },
+        body: { message: 'Agent policy not found' },
       });
     }
   } catch (e) {
@@ -101,10 +101,10 @@ export const getOneAgentConfigHandler: RequestHandler<TypeOf<
   }
 };
 
-export const createAgentConfigHandler: RequestHandler<
+export const createAgentPolicyHandler: RequestHandler<
   undefined,
-  TypeOf<typeof CreateAgentConfigRequestSchema.query>,
-  TypeOf<typeof CreateAgentConfigRequestSchema.body>
+  TypeOf<typeof CreateAgentPolicyRequestSchema.query>,
+  TypeOf<typeof CreateAgentPolicyRequestSchema.body>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   const callCluster = context.core.elasticsearch.legacy.client.callAsCurrentUser;
@@ -112,35 +112,35 @@ export const createAgentConfigHandler: RequestHandler<
   const withSysMonitoring = request.query.sys_monitoring ?? false;
   try {
     // eslint-disable-next-line prefer-const
-    let [agentConfig, newSysPackageConfig] = await Promise.all<
-      AgentConfig,
-      NewPackageConfig | undefined
+    let [agentPolicy, newSysPackagePolicy] = await Promise.all<
+      AgentPolicy,
+      NewPackagePolicy | undefined
     >([
-      agentConfigService.create(soClient, request.body, {
+      agentPolicyService.create(soClient, request.body, {
         user,
       }),
-      // If needed, retrieve System package information and build a new package config for the system package
-      // NOTE: we ignore failures in attempting to create package config, since config might have been created
+      // If needed, retrieve System package information and build a new package policy for the system package
+      // NOTE: we ignore failures in attempting to create package policy, since config might have been created
       // successfully
       withSysMonitoring
-        ? packageConfigService
-            .buildPackageConfigFromPackage(soClient, DefaultPackages.system)
+        ? packagePolicyService
+            .buildPackagePolicyFromPackage(soClient, DefaultPackages.system)
             .catch(() => undefined)
         : undefined,
     ]);
 
-    // Create the system monitoring package config and add it to agent config.
-    if (withSysMonitoring && newSysPackageConfig !== undefined && agentConfig !== undefined) {
-      newSysPackageConfig.config_id = agentConfig.id;
-      newSysPackageConfig.namespace = agentConfig.namespace;
-      await packageConfigService.create(soClient, callCluster, newSysPackageConfig, {
+    // Create the system monitoring package policy and add it to agent policy.
+    if (withSysMonitoring && newSysPackagePolicy !== undefined && agentPolicy !== undefined) {
+      newSysPackagePolicy.config_id = agentPolicy.id;
+      newSysPackagePolicy.namespace = agentPolicy.namespace;
+      await packagePolicyService.create(soClient, callCluster, newSysPackagePolicy, {
         user,
         bumpConfigRevision: false,
       });
     }
 
-    const body: CreateAgentConfigResponse = {
-      item: agentConfig,
+    const body: CreateAgentPolicyResponse = {
+      item: agentPolicy,
       success: true,
     };
 
@@ -155,23 +155,23 @@ export const createAgentConfigHandler: RequestHandler<
   }
 };
 
-export const updateAgentConfigHandler: RequestHandler<
-  TypeOf<typeof UpdateAgentConfigRequestSchema.params>,
+export const updateAgentPolicyHandler: RequestHandler<
+  TypeOf<typeof UpdateAgentPolicyRequestSchema.params>,
   unknown,
-  TypeOf<typeof UpdateAgentConfigRequestSchema.body>
+  TypeOf<typeof UpdateAgentPolicyRequestSchema.body>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   const user = await appContextService.getSecurity()?.authc.getCurrentUser(request);
   try {
-    const agentConfig = await agentConfigService.update(
+    const agentPolicy = await agentPolicyService.update(
       soClient,
-      request.params.agentConfigId,
+      request.params.agentPolicyId,
       request.body,
       {
         user: user || undefined,
       }
     );
-    const body: UpdateAgentConfigResponse = { item: agentConfig, success: true };
+    const body: UpdateAgentPolicyResponse = { item: agentPolicy, success: true };
     return response.ok({
       body,
     });
@@ -183,23 +183,23 @@ export const updateAgentConfigHandler: RequestHandler<
   }
 };
 
-export const copyAgentConfigHandler: RequestHandler<
-  TypeOf<typeof CopyAgentConfigRequestSchema.params>,
+export const copyAgentPolicyHandler: RequestHandler<
+  TypeOf<typeof CopyAgentPolicyRequestSchema.params>,
   unknown,
-  TypeOf<typeof CopyAgentConfigRequestSchema.body>
+  TypeOf<typeof CopyAgentPolicyRequestSchema.body>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   const user = await appContextService.getSecurity()?.authc.getCurrentUser(request);
   try {
-    const agentConfig = await agentConfigService.copy(
+    const agentPolicy = await agentPolicyService.copy(
       soClient,
-      request.params.agentConfigId,
+      request.params.agentPolicyId,
       request.body,
       {
         user: user || undefined,
       }
     );
-    const body: CopyAgentConfigResponse = { item: agentConfig, success: true };
+    const body: CopyAgentPolicyResponse = { item: agentPolicy, success: true };
     return response.ok({
       body,
     });
@@ -211,16 +211,16 @@ export const copyAgentConfigHandler: RequestHandler<
   }
 };
 
-export const deleteAgentConfigsHandler: RequestHandler<
+export const deleteAgentPoliciesHandler: RequestHandler<
   unknown,
   unknown,
-  TypeOf<typeof DeleteAgentConfigRequestSchema.body>
+  TypeOf<typeof DeleteAgentPolicyRequestSchema.body>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   try {
-    const body: DeleteAgentConfigResponse = await agentConfigService.delete(
+    const body: DeleteAgentPolicyResponse = await agentPolicyService.delete(
       soClient,
-      request.body.agentConfigId
+      request.body.agentPolicyId
     );
     return response.ok({
       body,
@@ -233,21 +233,21 @@ export const deleteAgentConfigsHandler: RequestHandler<
   }
 };
 
-export const getFullAgentConfig: RequestHandler<
-  TypeOf<typeof GetFullAgentConfigRequestSchema.params>,
-  TypeOf<typeof GetFullAgentConfigRequestSchema.query>
+export const getFullAgentPolicy: RequestHandler<
+  TypeOf<typeof GetFullAgentPolicyRequestSchema.params>,
+  TypeOf<typeof GetFullAgentPolicyRequestSchema.query>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
 
   try {
-    const fullAgentConfig = await agentConfigService.getFullConfig(
+    const fullAgentPolicy = await agentPolicyService.getFullConfig(
       soClient,
-      request.params.agentConfigId,
+      request.params.agentPolicyId,
       { standalone: request.query.standalone === true }
     );
-    if (fullAgentConfig) {
-      const body: GetFullAgentConfigResponse = {
-        item: fullAgentConfig,
+    if (fullAgentPolicy) {
+      const body: GetFullAgentPolicyResponse = {
+        item: fullAgentPolicy,
         success: true,
       };
       return response.ok({
@@ -256,7 +256,7 @@ export const getFullAgentConfig: RequestHandler<
     } else {
       return response.customError({
         statusCode: 404,
-        body: { message: 'Agent config not found' },
+        body: { message: 'Agent policy not found' },
       });
     }
   } catch (e) {
@@ -267,21 +267,21 @@ export const getFullAgentConfig: RequestHandler<
   }
 };
 
-export const downloadFullAgentConfig: RequestHandler<
-  TypeOf<typeof GetFullAgentConfigRequestSchema.params>,
-  TypeOf<typeof GetFullAgentConfigRequestSchema.query>
+export const downloadFullAgentPolicy: RequestHandler<
+  TypeOf<typeof GetFullAgentPolicyRequestSchema.params>,
+  TypeOf<typeof GetFullAgentPolicyRequestSchema.query>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   const {
-    params: { agentConfigId },
+    params: { agentPolicyId },
   } = request;
 
   try {
-    const fullAgentConfig = await agentConfigService.getFullConfig(soClient, agentConfigId, {
+    const fullAgentPolicy = await agentPolicyService.getFullConfig(soClient, agentPolicyId, {
       standalone: request.query.standalone === true,
     });
-    if (fullAgentConfig) {
-      const body = configToYaml(fullAgentConfig);
+    if (fullAgentPolicy) {
+      const body = policyToYaml(fullAgentPolicy);
       const headers: ResponseHeaders = {
         'content-type': 'text/x-yaml',
         'content-disposition': `attachment; filename="elastic-agent.yml"`,
@@ -293,7 +293,7 @@ export const downloadFullAgentConfig: RequestHandler<
     } else {
       return response.customError({
         statusCode: 404,
-        body: { message: 'Agent config not found' },
+        body: { message: 'Agent policy not found' },
       });
     }
   } catch (e) {
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent_config/index.ts b/x-pack/plugins/ingest_manager/server/routes/agent_config/index.ts
index 95c7c13377366f..7a6af61f51006c 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent_config/index.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent_config/index.ts
@@ -4,105 +4,105 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { IRouter } from 'src/core/server';
-import { PLUGIN_ID, AGENT_CONFIG_API_ROUTES } from '../../constants';
+import { PLUGIN_ID, AGENT_POLICY_API_ROUTES } from '../../constants';
 import {
-  GetAgentConfigsRequestSchema,
-  GetOneAgentConfigRequestSchema,
-  CreateAgentConfigRequestSchema,
-  UpdateAgentConfigRequestSchema,
-  CopyAgentConfigRequestSchema,
-  DeleteAgentConfigRequestSchema,
-  GetFullAgentConfigRequestSchema,
+  GetAgentPoliciesRequestSchema,
+  GetOneAgentPolicyRequestSchema,
+  CreateAgentPolicyRequestSchema,
+  UpdateAgentPolicyRequestSchema,
+  CopyAgentPolicyRequestSchema,
+  DeleteAgentPolicyRequestSchema,
+  GetFullAgentPolicyRequestSchema,
 } from '../../types';
 import {
-  getAgentConfigsHandler,
-  getOneAgentConfigHandler,
-  createAgentConfigHandler,
-  updateAgentConfigHandler,
-  copyAgentConfigHandler,
-  deleteAgentConfigsHandler,
-  getFullAgentConfig,
-  downloadFullAgentConfig,
+  getAgentPoliciesHandler,
+  getOneAgentPolicyHandler,
+  createAgentPolicyHandler,
+  updateAgentPolicyHandler,
+  copyAgentPolicyHandler,
+  deleteAgentPoliciesHandler,
+  getFullAgentPolicy,
+  downloadFullAgentPolicy,
 } from './handlers';
 
 export const registerRoutes = (router: IRouter) => {
   // List
   router.get(
     {
-      path: AGENT_CONFIG_API_ROUTES.LIST_PATTERN,
-      validate: GetAgentConfigsRequestSchema,
+      path: AGENT_POLICY_API_ROUTES.LIST_PATTERN,
+      validate: GetAgentPoliciesRequestSchema,
       options: { tags: [`access:${PLUGIN_ID}-read`] },
     },
-    getAgentConfigsHandler
+    getAgentPoliciesHandler
   );
 
   // Get one
   router.get(
     {
-      path: AGENT_CONFIG_API_ROUTES.INFO_PATTERN,
-      validate: GetOneAgentConfigRequestSchema,
+      path: AGENT_POLICY_API_ROUTES.INFO_PATTERN,
+      validate: GetOneAgentPolicyRequestSchema,
       options: { tags: [`access:${PLUGIN_ID}-read`] },
     },
-    getOneAgentConfigHandler
+    getOneAgentPolicyHandler
   );
 
   // Create
   router.post(
     {
-      path: AGENT_CONFIG_API_ROUTES.CREATE_PATTERN,
-      validate: CreateAgentConfigRequestSchema,
+      path: AGENT_POLICY_API_ROUTES.CREATE_PATTERN,
+      validate: CreateAgentPolicyRequestSchema,
       options: { tags: [`access:${PLUGIN_ID}-all`] },
     },
-    createAgentConfigHandler
+    createAgentPolicyHandler
   );
 
   // Update
   router.put(
     {
-      path: AGENT_CONFIG_API_ROUTES.UPDATE_PATTERN,
-      validate: UpdateAgentConfigRequestSchema,
+      path: AGENT_POLICY_API_ROUTES.UPDATE_PATTERN,
+      validate: UpdateAgentPolicyRequestSchema,
       options: { tags: [`access:${PLUGIN_ID}-all`] },
     },
-    updateAgentConfigHandler
+    updateAgentPolicyHandler
   );
 
   // Copy
   router.post(
     {
-      path: AGENT_CONFIG_API_ROUTES.COPY_PATTERN,
-      validate: CopyAgentConfigRequestSchema,
+      path: AGENT_POLICY_API_ROUTES.COPY_PATTERN,
+      validate: CopyAgentPolicyRequestSchema,
       options: { tags: [`access:${PLUGIN_ID}-all`] },
     },
-    copyAgentConfigHandler
+    copyAgentPolicyHandler
   );
 
   // Delete
   router.post(
     {
-      path: AGENT_CONFIG_API_ROUTES.DELETE_PATTERN,
-      validate: DeleteAgentConfigRequestSchema,
+      path: AGENT_POLICY_API_ROUTES.DELETE_PATTERN,
+      validate: DeleteAgentPolicyRequestSchema,
       options: { tags: [`access:${PLUGIN_ID}-all`] },
     },
-    deleteAgentConfigsHandler
+    deleteAgentPoliciesHandler
   );
 
-  // Get one full agent config
+  // Get one full agent policy
   router.get(
     {
-      path: AGENT_CONFIG_API_ROUTES.FULL_INFO_PATTERN,
-      validate: GetFullAgentConfigRequestSchema,
+      path: AGENT_POLICY_API_ROUTES.FULL_INFO_PATTERN,
+      validate: GetFullAgentPolicyRequestSchema,
       options: { tags: [`access:${PLUGIN_ID}-read`] },
     },
-    getFullAgentConfig
+    getFullAgentPolicy
   );
 
-  // Download one full agent config
+  // Download one full agent policy
   router.get(
     {
-      path: AGENT_CONFIG_API_ROUTES.FULL_INFO_DOWNLOAD_PATTERN,
-      validate: GetFullAgentConfigRequestSchema,
+      path: AGENT_POLICY_API_ROUTES.FULL_INFO_DOWNLOAD_PATTERN,
+      validate: GetFullAgentPolicyRequestSchema,
       options: { tags: [`access:${PLUGIN_ID}-read`] },
     },
-    downloadFullAgentConfig
+    downloadFullAgentPolicy
   );
 };
diff --git a/x-pack/plugins/ingest_manager/server/routes/index.ts b/x-pack/plugins/ingest_manager/server/routes/index.ts
index 87be3a80cea963..9dff60e63aac4c 100644
--- a/x-pack/plugins/ingest_manager/server/routes/index.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/index.ts
@@ -3,8 +3,8 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-export { registerRoutes as registerAgentConfigRoutes } from './agent_config';
-export { registerRoutes as registerPackageConfigRoutes } from './package_config';
+export { registerRoutes as registerAgentPolicyRoutes } from './agent_config';
+export { registerRoutes as registerPackagePolicyRoutes } from './package_config';
 export { registerRoutes as registerDataStreamRoutes } from './data_streams';
 export { registerRoutes as registerEPMRoutes } from './epm';
 export { registerRoutes as registerSetupRoutes } from './setup';
diff --git a/x-pack/plugins/ingest_manager/server/routes/package_config/handlers.test.ts b/x-pack/plugins/ingest_manager/server/routes/package_config/handlers.test.ts
index 85ecc5027d64d6..03a3b3ce176084 100644
--- a/x-pack/plugins/ingest_manager/server/routes/package_config/handlers.test.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/package_config/handlers.test.ts
@@ -7,23 +7,23 @@
 import { httpServerMock, httpServiceMock } from 'src/core/server/mocks';
 import { IRouter, KibanaRequest, Logger, RequestHandler, RouteConfig } from 'kibana/server';
 import { registerRoutes } from './index';
-import { PACKAGE_CONFIG_API_ROUTES } from '../../../common/constants';
+import { PACKAGE_POLICY_API_ROUTES } from '../../../common/constants';
 import { xpackMocks } from '../../../../../mocks';
 import { appContextService } from '../../services';
 import { createAppContextStartContractMock } from '../../mocks';
-import { PackageConfigServiceInterface, ExternalCallback } from '../..';
-import { CreatePackageConfigRequestSchema } from '../../types/rest_spec';
-import { packageConfigService } from '../../services';
+import { PackagePolicyServiceInterface, ExternalCallback } from '../..';
+import { CreatePackagePolicyRequestSchema } from '../../types/rest_spec';
+import { packagePolicyService } from '../../services';
 
-const packageConfigServiceMock = packageConfigService as jest.Mocked<PackageConfigServiceInterface>;
+const packagePolicyServiceMock = packagePolicyService as jest.Mocked<PackagePolicyServiceInterface>;
 
 jest.mock('../../services/package_config', (): {
-  packageConfigService: jest.Mocked<PackageConfigServiceInterface>;
+  packagePolicyService: jest.Mocked<PackagePolicyServiceInterface>;
 } => {
   return {
-    packageConfigService: {
+    packagePolicyService: {
       assignPackageStream: jest.fn((packageInfo, dataInputs) => Promise.resolve(dataInputs)),
-      buildPackageConfigFromPackage: jest.fn(),
+      buildPackagePolicyFromPackage: jest.fn(),
       bulkCreate: jest.fn(),
       create: jest.fn((soClient, callCluster, newData) =>
         Promise.resolve({
@@ -52,7 +52,7 @@ jest.mock('../../services/epm/packages', () => {
   };
 });
 
-describe('When calling package config', () => {
+describe('When calling package policy', () => {
   let routerMock: jest.Mocked<IRouter>;
   let routeHandler: RequestHandler<any, any, any>;
   let routeConfig: RouteConfig<any, any, any, any>;
@@ -77,12 +77,12 @@ describe('When calling package config', () => {
 
   describe('create api handler', () => {
     const getCreateKibanaRequest = (
-      newData?: typeof CreatePackageConfigRequestSchema.body
-    ): KibanaRequest<undefined, undefined, typeof CreatePackageConfigRequestSchema.body> => {
+      newData?: typeof CreatePackagePolicyRequestSchema.body
+    ): KibanaRequest<undefined, undefined, typeof CreatePackagePolicyRequestSchema.body> => {
       return httpServerMock.createKibanaRequest<
         undefined,
         undefined,
-        typeof CreatePackageConfigRequestSchema.body
+        typeof CreatePackagePolicyRequestSchema.body
       >({
         path: routeConfig.path,
         method: 'post',
@@ -102,7 +102,7 @@ describe('When calling package config', () => {
     // Set the routeConfig and routeHandler to the Create API
     beforeAll(() => {
       [routeConfig, routeHandler] = routerMock.post.mock.calls.find(([{ path }]) =>
-        path.startsWith(PACKAGE_CONFIG_API_ROUTES.CREATE_PATTERN)
+        path.startsWith(PACKAGE_POLICY_API_ROUTES.CREATE_PATTERN)
       )!;
     });
 
@@ -151,8 +151,8 @@ describe('When calling package config', () => {
       });
 
       beforeEach(() => {
-        appContextService.addExternalCallback('packageConfigCreate', callbackOne);
-        appContextService.addExternalCallback('packageConfigCreate', callbackTwo);
+        appContextService.addExternalCallback('packagePolicyCreate', callbackOne);
+        appContextService.addExternalCallback('packagePolicyCreate', callbackTwo);
       });
 
       afterEach(() => (callbackCallingOrder.length = 0));
@@ -164,7 +164,7 @@ describe('When calling package config', () => {
         expect(callbackCallingOrder).toEqual(['one', 'two']);
       });
 
-      it('should feed package config returned by last callback', async () => {
+      it('should feed package policy returned by last callback', async () => {
         const request = getCreateKibanaRequest();
         await routeHandler(context, request, response);
         expect(response.ok).toHaveBeenCalled();
@@ -213,7 +213,7 @@ describe('When calling package config', () => {
         const request = getCreateKibanaRequest();
         await routeHandler(context, request, response);
         expect(response.ok).toHaveBeenCalled();
-        expect(packageConfigServiceMock.create.mock.calls[0][2]).toEqual({
+        expect(packagePolicyServiceMock.create.mock.calls[0][2]).toEqual({
           config_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
           description: '',
           enabled: true,
@@ -268,8 +268,8 @@ describe('When calling package config', () => {
         });
 
         beforeEach(() => {
-          appContextService.addExternalCallback('packageConfigCreate', callbackThree);
-          appContextService.addExternalCallback('packageConfigCreate', callbackFour);
+          appContextService.addExternalCallback('packagePolicyCreate', callbackThree);
+          appContextService.addExternalCallback('packagePolicyCreate', callbackFour);
         });
 
         it('should skip over callback exceptions and still execute other callbacks', async () => {
@@ -285,16 +285,16 @@ describe('When calling package config', () => {
           await routeHandler(context, request, response);
           expect(response.ok).toHaveBeenCalled();
           expect(errorLogger.mock.calls).toEqual([
-            ['An external registered [packageConfigCreate] callback failed when executed'],
+            ['An external registered [packagePolicyCreate] callback failed when executed'],
             [new Error('callbackThree threw error on purpose')],
           ]);
         });
 
-        it('should create package config with last successful returned package config', async () => {
+        it('should create package policy with last successful returned package policy', async () => {
           const request = getCreateKibanaRequest();
           await routeHandler(context, request, response);
           expect(response.ok).toHaveBeenCalled();
-          expect(packageConfigServiceMock.create.mock.calls[0][2]).toEqual({
+          expect(packagePolicyServiceMock.create.mock.calls[0][2]).toEqual({
             config_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
             description: '',
             enabled: true,
diff --git a/x-pack/plugins/ingest_manager/server/routes/package_config/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/package_config/handlers.ts
index d2820cdbeb6c8a..d19a73604b4f06 100644
--- a/x-pack/plugins/ingest_manager/server/routes/package_config/handlers.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/package_config/handlers.ts
@@ -6,25 +6,25 @@
 import { TypeOf } from '@kbn/config-schema';
 import Boom from 'boom';
 import { RequestHandler, SavedObjectsErrorHelpers } from '../../../../../../src/core/server';
-import { appContextService, packageConfigService } from '../../services';
+import { appContextService, packagePolicyService } from '../../services';
 import { getPackageInfo } from '../../services/epm/packages';
 import {
-  GetPackageConfigsRequestSchema,
-  GetOnePackageConfigRequestSchema,
-  CreatePackageConfigRequestSchema,
-  UpdatePackageConfigRequestSchema,
-  DeletePackageConfigsRequestSchema,
-  NewPackageConfig,
+  GetPackagePoliciesRequestSchema,
+  GetOnePackagePolicyRequestSchema,
+  CreatePackagePolicyRequestSchema,
+  UpdatePackagePolicyRequestSchema,
+  DeletePackagePoliciesRequestSchema,
+  NewPackagePolicy,
 } from '../../types';
-import { CreatePackageConfigResponse, DeletePackageConfigsResponse } from '../../../common';
+import { CreatePackagePolicyResponse, DeletePackagePoliciesResponse } from '../../../common';
 
-export const getPackageConfigsHandler: RequestHandler<
+export const getPackagePoliciesHandler: RequestHandler<
   undefined,
-  TypeOf<typeof GetPackageConfigsRequestSchema.query>
+  TypeOf<typeof GetPackagePoliciesRequestSchema.query>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   try {
-    const { items, total, page, perPage } = await packageConfigService.list(
+    const { items, total, page, perPage } = await packagePolicyService.list(
       soClient,
       request.query
     );
@@ -45,20 +45,20 @@ export const getPackageConfigsHandler: RequestHandler<
   }
 };
 
-export const getOnePackageConfigHandler: RequestHandler<TypeOf<
-  typeof GetOnePackageConfigRequestSchema.params
+export const getOnePackagePolicyHandler: RequestHandler<TypeOf<
+  typeof GetOnePackagePolicyRequestSchema.params
 >> = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
-  const { packageConfigId } = request.params;
+  const { packagePolicyId } = request.params;
   const notFoundResponse = () =>
-    response.notFound({ body: { message: `Package config ${packageConfigId} not found` } });
+    response.notFound({ body: { message: `Package policy ${packagePolicyId} not found` } });
 
   try {
-    const packageConfig = await packageConfigService.get(soClient, packageConfigId);
-    if (packageConfig) {
+    const packagePolicy = await packagePolicyService.get(soClient, packagePolicyId);
+    if (packagePolicy) {
       return response.ok({
         body: {
-          item: packageConfig,
+          item: packagePolicy,
           success: true,
         },
       });
@@ -77,10 +77,10 @@ export const getOnePackageConfigHandler: RequestHandler<TypeOf<
   }
 };
 
-export const createPackageConfigHandler: RequestHandler<
+export const createPackagePolicyHandler: RequestHandler<
   undefined,
   undefined,
-  TypeOf<typeof CreatePackageConfigRequestSchema.body>
+  TypeOf<typeof CreatePackagePolicyRequestSchema.body>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   const callCluster = context.core.elasticsearch.legacy.client.callAsCurrentUser;
@@ -88,21 +88,21 @@ export const createPackageConfigHandler: RequestHandler<
   const logger = appContextService.getLogger();
   let newData = { ...request.body };
   try {
-    // If we have external callbacks, then process those now before creating the actual package config
-    const externalCallbacks = appContextService.getExternalCallbacks('packageConfigCreate');
+    // If we have external callbacks, then process those now before creating the actual package policy
+    const externalCallbacks = appContextService.getExternalCallbacks('packagePolicyCreate');
     if (externalCallbacks && externalCallbacks.size > 0) {
-      let updatedNewData: NewPackageConfig = newData;
+      let updatedNewData: NewPackagePolicy = newData;
 
       for (const callback of externalCallbacks) {
         try {
           // ensure that the returned value by the callback passes schema validation
-          updatedNewData = CreatePackageConfigRequestSchema.body.validate(
+          updatedNewData = CreatePackagePolicyRequestSchema.body.validate(
             await callback(updatedNewData)
           );
         } catch (error) {
           // Log the error, but keep going and process the other callbacks
           logger.error(
-            'An external registered [packageConfigCreate] callback failed when executed'
+            'An external registered [packagePolicyCreate] callback failed when executed'
           );
           logger.error(error);
         }
@@ -111,11 +111,11 @@ export const createPackageConfigHandler: RequestHandler<
       newData = updatedNewData;
     }
 
-    // Create package config
-    const packageConfig = await packageConfigService.create(soClient, callCluster, newData, {
+    // Create package policy
+    const packagePolicy = await packagePolicyService.create(soClient, callCluster, newData, {
       user,
     });
-    const body: CreatePackageConfigResponse = { item: packageConfig, success: true };
+    const body: CreatePackagePolicyResponse = { item: packagePolicy, success: true };
     return response.ok({
       body,
     });
@@ -128,42 +128,42 @@ export const createPackageConfigHandler: RequestHandler<
   }
 };
 
-export const updatePackageConfigHandler: RequestHandler<
-  TypeOf<typeof UpdatePackageConfigRequestSchema.params>,
+export const updatePackagePolicyHandler: RequestHandler<
+  TypeOf<typeof UpdatePackagePolicyRequestSchema.params>,
   unknown,
-  TypeOf<typeof UpdatePackageConfigRequestSchema.body>
+  TypeOf<typeof UpdatePackagePolicyRequestSchema.body>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   const user = (await appContextService.getSecurity()?.authc.getCurrentUser(request)) || undefined;
   try {
-    const packageConfig = await packageConfigService.get(soClient, request.params.packageConfigId);
+    const packagePolicy = await packagePolicyService.get(soClient, request.params.packagePolicyId);
 
-    if (!packageConfig) {
-      throw Boom.notFound('Package config not found');
+    if (!packagePolicy) {
+      throw Boom.notFound('Package policy not found');
     }
 
     const newData = { ...request.body };
-    const pkg = newData.package || packageConfig.package;
-    const inputs = newData.inputs || packageConfig.inputs;
+    const pkg = newData.package || packagePolicy.package;
+    const inputs = newData.inputs || packagePolicy.inputs;
     if (pkg && (newData.inputs || newData.package)) {
       const pkgInfo = await getPackageInfo({
         savedObjectsClient: soClient,
         pkgName: pkg.name,
         pkgVersion: pkg.version,
       });
-      newData.inputs = (await packageConfigService.assignPackageStream(pkgInfo, inputs)) as TypeOf<
-        typeof CreatePackageConfigRequestSchema.body
+      newData.inputs = (await packagePolicyService.assignPackageStream(pkgInfo, inputs)) as TypeOf<
+        typeof CreatePackagePolicyRequestSchema.body
       >['inputs'];
     }
 
-    const updatedPackageConfig = await packageConfigService.update(
+    const updatedPackagePolicy = await packagePolicyService.update(
       soClient,
-      request.params.packageConfigId,
+      request.params.packagePolicyId,
       newData,
       { user }
     );
     return response.ok({
-      body: { item: updatedPackageConfig, success: true },
+      body: { item: updatedPackagePolicy, success: true },
     });
   } catch (e) {
     return response.customError({
@@ -173,17 +173,17 @@ export const updatePackageConfigHandler: RequestHandler<
   }
 };
 
-export const deletePackageConfigHandler: RequestHandler<
+export const deletePackagePolicyHandler: RequestHandler<
   unknown,
   unknown,
-  TypeOf<typeof DeletePackageConfigsRequestSchema.body>
+  TypeOf<typeof DeletePackagePoliciesRequestSchema.body>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   const user = (await appContextService.getSecurity()?.authc.getCurrentUser(request)) || undefined;
   try {
-    const body: DeletePackageConfigsResponse = await packageConfigService.delete(
+    const body: DeletePackagePoliciesResponse = await packagePolicyService.delete(
       soClient,
-      request.body.packageConfigIds,
+      request.body.packagePolicyIds,
       { user }
     );
     return response.ok({
diff --git a/x-pack/plugins/ingest_manager/server/routes/package_config/index.ts b/x-pack/plugins/ingest_manager/server/routes/package_config/index.ts
index 1da045e0529975..e571896ebe82de 100644
--- a/x-pack/plugins/ingest_manager/server/routes/package_config/index.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/package_config/index.ts
@@ -4,70 +4,70 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { IRouter } from 'src/core/server';
-import { PLUGIN_ID, PACKAGE_CONFIG_API_ROUTES } from '../../constants';
+import { PLUGIN_ID, PACKAGE_POLICY_API_ROUTES } from '../../constants';
 import {
-  GetPackageConfigsRequestSchema,
-  GetOnePackageConfigRequestSchema,
-  CreatePackageConfigRequestSchema,
-  UpdatePackageConfigRequestSchema,
-  DeletePackageConfigsRequestSchema,
+  GetPackagePoliciesRequestSchema,
+  GetOnePackagePolicyRequestSchema,
+  CreatePackagePolicyRequestSchema,
+  UpdatePackagePolicyRequestSchema,
+  DeletePackagePoliciesRequestSchema,
 } from '../../types';
 import {
-  getPackageConfigsHandler,
-  getOnePackageConfigHandler,
-  createPackageConfigHandler,
-  updatePackageConfigHandler,
-  deletePackageConfigHandler,
+  getPackagePoliciesHandler,
+  getOnePackagePolicyHandler,
+  createPackagePolicyHandler,
+  updatePackagePolicyHandler,
+  deletePackagePolicyHandler,
 } from './handlers';
 
 export const registerRoutes = (router: IRouter) => {
   // List
   router.get(
     {
-      path: PACKAGE_CONFIG_API_ROUTES.LIST_PATTERN,
-      validate: GetPackageConfigsRequestSchema,
+      path: PACKAGE_POLICY_API_ROUTES.LIST_PATTERN,
+      validate: GetPackagePoliciesRequestSchema,
       options: { tags: [`access:${PLUGIN_ID}-read`] },
     },
-    getPackageConfigsHandler
+    getPackagePoliciesHandler
   );
 
   // Get one
   router.get(
     {
-      path: PACKAGE_CONFIG_API_ROUTES.INFO_PATTERN,
-      validate: GetOnePackageConfigRequestSchema,
+      path: PACKAGE_POLICY_API_ROUTES.INFO_PATTERN,
+      validate: GetOnePackagePolicyRequestSchema,
       options: { tags: [`access:${PLUGIN_ID}-read`] },
     },
-    getOnePackageConfigHandler
+    getOnePackagePolicyHandler
   );
 
   // Create
   router.post(
     {
-      path: PACKAGE_CONFIG_API_ROUTES.CREATE_PATTERN,
-      validate: CreatePackageConfigRequestSchema,
+      path: PACKAGE_POLICY_API_ROUTES.CREATE_PATTERN,
+      validate: CreatePackagePolicyRequestSchema,
       options: { tags: [`access:${PLUGIN_ID}-all`] },
     },
-    createPackageConfigHandler
+    createPackagePolicyHandler
   );
 
   // Update
   router.put(
     {
-      path: PACKAGE_CONFIG_API_ROUTES.UPDATE_PATTERN,
-      validate: UpdatePackageConfigRequestSchema,
+      path: PACKAGE_POLICY_API_ROUTES.UPDATE_PATTERN,
+      validate: UpdatePackagePolicyRequestSchema,
       options: { tags: [`access:${PLUGIN_ID}-all`] },
     },
-    updatePackageConfigHandler
+    updatePackagePolicyHandler
   );
 
   // Delete
   router.post(
     {
-      path: PACKAGE_CONFIG_API_ROUTES.DELETE_PATTERN,
-      validate: DeletePackageConfigsRequestSchema,
+      path: PACKAGE_POLICY_API_ROUTES.DELETE_PATTERN,
+      validate: DeletePackagePoliciesRequestSchema,
       options: { tags: [`access:${PLUGIN_ID}`] },
     },
-    deletePackageConfigHandler
+    deletePackagePolicyHandler
   );
 };
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
index eca2711363c854..6faeb70df939ef 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
@@ -8,8 +8,8 @@ import { SavedObjectsServiceSetup, SavedObjectsType } from 'kibana/server';
 import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
 import {
   OUTPUT_SAVED_OBJECT_TYPE,
-  AGENT_CONFIG_SAVED_OBJECT_TYPE,
-  PACKAGE_CONFIG_SAVED_OBJECT_TYPE,
+  AGENT_POLICY_SAVED_OBJECT_TYPE,
+  PACKAGE_POLICY_SAVED_OBJECT_TYPE,
   PACKAGES_SAVED_OBJECT_TYPE,
   AGENT_SAVED_OBJECT_TYPE,
   AGENT_EVENT_SAVED_OBJECT_TYPE,
@@ -113,8 +113,8 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
       },
     },
   },
-  [AGENT_CONFIG_SAVED_OBJECT_TYPE]: {
-    name: AGENT_CONFIG_SAVED_OBJECT_TYPE,
+  [AGENT_POLICY_SAVED_OBJECT_TYPE]: {
+    name: AGENT_POLICY_SAVED_OBJECT_TYPE,
     hidden: false,
     namespaceType: 'agnostic',
     management: {
@@ -176,8 +176,8 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
       },
     },
   },
-  [PACKAGE_CONFIG_SAVED_OBJECT_TYPE]: {
-    name: PACKAGE_CONFIG_SAVED_OBJECT_TYPE,
+  [PACKAGE_POLICY_SAVED_OBJECT_TYPE]: {
+    name: PACKAGE_POLICY_SAVED_OBJECT_TYPE,
     hidden: false,
     namespaceType: 'agnostic',
     management: {
diff --git a/x-pack/plugins/ingest_manager/server/services/agent_config.test.ts b/x-pack/plugins/ingest_manager/server/services/agent_config.test.ts
index 225251b061e58d..0a4c822bfc6d54 100644
--- a/x-pack/plugins/ingest_manager/server/services/agent_config.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agent_config.test.ts
@@ -5,7 +5,7 @@
  */
 
 import { savedObjectsClientMock } from 'src/core/server/mocks';
-import { agentConfigService } from './agent_config';
+import { agentPolicyService } from './agent_config';
 import { Output } from '../types';
 
 function getSavedObjectMock(configAttributes: any) {
@@ -41,13 +41,13 @@ jest.mock('./output', () => {
   };
 });
 
-describe('agent config', () => {
+describe('agent policy', () => {
   describe('getFullConfig', () => {
     it('should return a config without monitoring if not monitoring is not enabled', async () => {
       const soClient = getSavedObjectMock({
         revision: 1,
       });
-      const config = await agentConfigService.getFullConfig(soClient, 'config');
+      const config = await agentPolicyService.getFullConfig(soClient, 'config');
 
       expect(config).toMatchObject({
         id: 'config',
@@ -76,7 +76,7 @@ describe('agent config', () => {
         revision: 1,
         monitoring_enabled: ['logs'],
       });
-      const config = await agentConfigService.getFullConfig(soClient, 'config');
+      const config = await agentPolicyService.getFullConfig(soClient, 'config');
 
       expect(config).toMatchObject({
         id: 'config',
@@ -106,7 +106,7 @@ describe('agent config', () => {
         revision: 1,
         monitoring_enabled: ['metrics'],
       });
-      const config = await agentConfigService.getFullConfig(soClient, 'config');
+      const config = await agentPolicyService.getFullConfig(soClient, 'config');
 
       expect(config).toMatchObject({
         id: 'config',
diff --git a/x-pack/plugins/ingest_manager/server/services/agent_config.ts b/x-pack/plugins/ingest_manager/server/services/agent_config.ts
index 10b5d9aa0b2f8b..2dbe0001a6ed91 100644
--- a/x-pack/plugins/ingest_manager/server/services/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agent_config.ts
@@ -7,81 +7,81 @@ import { uniq } from 'lodash';
 import { SavedObjectsClientContract } from 'src/core/server';
 import { AuthenticatedUser } from '../../../security/server';
 import {
-  DEFAULT_AGENT_CONFIG,
-  AGENT_CONFIG_SAVED_OBJECT_TYPE,
+  DEFAULT_AGENT_POLICY,
+  AGENT_POLICY_SAVED_OBJECT_TYPE,
   AGENT_SAVED_OBJECT_TYPE,
 } from '../constants';
 import {
-  PackageConfig,
-  NewAgentConfig,
-  AgentConfig,
-  AgentConfigSOAttributes,
-  FullAgentConfig,
-  AgentConfigStatus,
+  PackagePolicy,
+  NewAgentPolicy,
+  AgentPolicy,
+  AgentPolicySOAttributes,
+  FullAgentPolicy,
+  AgentPolicyStatus,
   ListWithKuery,
 } from '../types';
-import { DeleteAgentConfigResponse, storedPackageConfigsToAgentInputs } from '../../common';
+import { DeleteAgentPolicyResponse, storedPackagePoliciesToAgentInputs } from '../../common';
 import { listAgents } from './agents';
-import { packageConfigService } from './package_config';
+import { packagePolicyService } from './package_config';
 import { outputService } from './output';
-import { agentConfigUpdateEventHandler } from './agent_config_update';
+import { agentPolicyUpdateEventHandler } from './agent_config_update';
 
-const SAVED_OBJECT_TYPE = AGENT_CONFIG_SAVED_OBJECT_TYPE;
+const SAVED_OBJECT_TYPE = AGENT_POLICY_SAVED_OBJECT_TYPE;
 
-class AgentConfigService {
-  private triggerAgentConfigUpdatedEvent = async (
+class AgentPolicyService {
+  private triggerAgentPolicyUpdatedEvent = async (
     soClient: SavedObjectsClientContract,
     action: string,
-    agentConfigId: string
+    agentPolicyId: string
   ) => {
-    return agentConfigUpdateEventHandler(soClient, action, agentConfigId);
+    return agentPolicyUpdateEventHandler(soClient, action, agentPolicyId);
   };
 
   private async _update(
     soClient: SavedObjectsClientContract,
     id: string,
-    agentConfig: Partial<AgentConfigSOAttributes>,
+    agentPolicy: Partial<AgentPolicySOAttributes>,
     user?: AuthenticatedUser,
     options: { bumpRevision: boolean } = { bumpRevision: true }
-  ): Promise<AgentConfig> {
-    const oldAgentConfig = await this.get(soClient, id, false);
+  ): Promise<AgentPolicy> {
+    const oldAgentPolicy = await this.get(soClient, id, false);
 
-    if (!oldAgentConfig) {
-      throw new Error('Agent config not found');
+    if (!oldAgentPolicy) {
+      throw new Error('Agent policy not found');
     }
 
     if (
-      oldAgentConfig.status === AgentConfigStatus.Inactive &&
-      agentConfig.status !== AgentConfigStatus.Active
+      oldAgentPolicy.status === AgentPolicyStatus.Inactive &&
+      agentPolicy.status !== AgentPolicyStatus.Active
     ) {
       throw new Error(
-        `Agent config ${id} cannot be updated because it is ${oldAgentConfig.status}`
+        `Agent policy ${id} cannot be updated because it is ${oldAgentPolicy.status}`
       );
     }
 
-    await soClient.update<AgentConfigSOAttributes>(SAVED_OBJECT_TYPE, id, {
-      ...agentConfig,
-      ...(options.bumpRevision ? { revision: oldAgentConfig.revision + 1 } : {}),
+    await soClient.update<AgentPolicySOAttributes>(SAVED_OBJECT_TYPE, id, {
+      ...agentPolicy,
+      ...(options.bumpRevision ? { revision: oldAgentPolicy.revision + 1 } : {}),
       updated_at: new Date().toISOString(),
       updated_by: user ? user.username : 'system',
     });
 
-    return (await this.get(soClient, id)) as AgentConfig;
+    return (await this.get(soClient, id)) as AgentPolicy;
   }
 
-  public async ensureDefaultAgentConfig(soClient: SavedObjectsClientContract) {
-    const configs = await soClient.find<AgentConfigSOAttributes>({
-      type: AGENT_CONFIG_SAVED_OBJECT_TYPE,
+  public async ensureDefaultAgentPolicy(soClient: SavedObjectsClientContract) {
+    const configs = await soClient.find<AgentPolicySOAttributes>({
+      type: AGENT_POLICY_SAVED_OBJECT_TYPE,
       searchFields: ['is_default'],
       search: 'true',
     });
 
     if (configs.total === 0) {
-      const newDefaultAgentConfig: NewAgentConfig = {
-        ...DEFAULT_AGENT_CONFIG,
+      const newDefaultAgentPolicy: NewAgentPolicy = {
+        ...DEFAULT_AGENT_POLICY,
       };
 
-      return this.create(soClient, newDefaultAgentConfig);
+      return this.create(soClient, newDefaultAgentPolicy);
     }
 
     return {
@@ -92,22 +92,22 @@ class AgentConfigService {
 
   public async create(
     soClient: SavedObjectsClientContract,
-    agentConfig: NewAgentConfig,
+    agentPolicy: NewAgentPolicy,
     options?: { id?: string; user?: AuthenticatedUser }
-  ): Promise<AgentConfig> {
-    const newSo = await soClient.create<AgentConfigSOAttributes>(
+  ): Promise<AgentPolicy> {
+    const newSo = await soClient.create<AgentPolicySOAttributes>(
       SAVED_OBJECT_TYPE,
       {
-        ...agentConfig,
+        ...agentPolicy,
         revision: 1,
         updated_at: new Date().toISOString(),
         updated_by: options?.user?.username || 'system',
-      } as AgentConfig,
+      } as AgentPolicy,
       options
     );
 
-    if (!agentConfig.is_default) {
-      await this.triggerAgentConfigUpdatedEvent(soClient, 'created', newSo.id);
+    if (!agentPolicy.is_default) {
+      await this.triggerAgentPolicyUpdatedEvent(soClient, 'created', newSo.id);
     }
 
     return { id: newSo.id, ...newSo.attributes };
@@ -116,46 +116,46 @@ class AgentConfigService {
   public async get(
     soClient: SavedObjectsClientContract,
     id: string,
-    withPackageConfigs: boolean = true
-  ): Promise<AgentConfig | null> {
-    const agentConfigSO = await soClient.get<AgentConfigSOAttributes>(SAVED_OBJECT_TYPE, id);
-    if (!agentConfigSO) {
+    withPackagePolicies: boolean = true
+  ): Promise<AgentPolicy | null> {
+    const agentPolicySO = await soClient.get<AgentPolicySOAttributes>(SAVED_OBJECT_TYPE, id);
+    if (!agentPolicySO) {
       return null;
     }
 
-    if (agentConfigSO.error) {
-      throw new Error(agentConfigSO.error.message);
+    if (agentPolicySO.error) {
+      throw new Error(agentPolicySO.error.message);
     }
 
-    const agentConfig = { id: agentConfigSO.id, ...agentConfigSO.attributes };
+    const agentPolicy = { id: agentPolicySO.id, ...agentPolicySO.attributes };
 
-    if (withPackageConfigs) {
-      agentConfig.package_configs =
-        (await packageConfigService.getByIDs(
+    if (withPackagePolicies) {
+      agentPolicy.package_configs =
+        (await packagePolicyService.getByIDs(
           soClient,
-          (agentConfigSO.attributes.package_configs as string[]) || []
+          (agentPolicySO.attributes.package_configs as string[]) || []
         )) || [];
     }
 
-    return agentConfig;
+    return agentPolicy;
   }
 
   public async list(
     soClient: SavedObjectsClientContract,
     options: ListWithKuery & {
-      withPackageConfigs?: boolean;
+      withPackagePolicies?: boolean;
     }
-  ): Promise<{ items: AgentConfig[]; total: number; page: number; perPage: number }> {
+  ): Promise<{ items: AgentPolicy[]; total: number; page: number; perPage: number }> {
     const {
       page = 1,
       perPage = 20,
       sortField = 'updated_at',
       sortOrder = 'desc',
       kuery,
-      withPackageConfigs = false,
+      withPackagePolicies = false,
     } = options;
 
-    const agentConfigsSO = await soClient.find<AgentConfigSOAttributes>({
+    const agentPoliciesSO = await soClient.find<AgentPolicySOAttributes>({
       type: SAVED_OBJECT_TYPE,
       sortField,
       sortOrder,
@@ -170,29 +170,29 @@ class AgentConfigService {
         : undefined,
     });
 
-    const agentConfigs = await Promise.all(
-      agentConfigsSO.saved_objects.map(async (agentConfigSO) => {
-        const agentConfig = {
-          id: agentConfigSO.id,
-          ...agentConfigSO.attributes,
+    const agentPolicies = await Promise.all(
+      agentPoliciesSO.saved_objects.map(async (agentPolicySO) => {
+        const agentPolicy = {
+          id: agentPolicySO.id,
+          ...agentPolicySO.attributes,
         };
-        if (withPackageConfigs) {
-          const agentConfigWithPackageConfigs = await this.get(
+        if (withPackagePolicies) {
+          const agentPolicyWithPackagePolicies = await this.get(
             soClient,
-            agentConfigSO.id,
-            withPackageConfigs
+            agentPolicySO.id,
+            withPackagePolicies
           );
-          if (agentConfigWithPackageConfigs) {
-            agentConfig.package_configs = agentConfigWithPackageConfigs.package_configs;
+          if (agentPolicyWithPackagePolicies) {
+            agentPolicy.package_configs = agentPolicyWithPackagePolicies.package_configs;
           }
         }
-        return agentConfig;
+        return agentPolicy;
       })
     );
 
     return {
-      items: agentConfigs,
-      total: agentConfigsSO.total,
+      items: agentPolicies,
+      total: agentPoliciesSO.total,
       page,
       perPage,
     };
@@ -201,76 +201,76 @@ class AgentConfigService {
   public async update(
     soClient: SavedObjectsClientContract,
     id: string,
-    agentConfig: Partial<AgentConfig>,
+    agentPolicy: Partial<AgentPolicy>,
     options?: { user?: AuthenticatedUser }
-  ): Promise<AgentConfig> {
-    return this._update(soClient, id, agentConfig, options?.user);
+  ): Promise<AgentPolicy> {
+    return this._update(soClient, id, agentPolicy, options?.user);
   }
 
   public async copy(
     soClient: SavedObjectsClientContract,
     id: string,
-    newAgentConfigProps: Pick<AgentConfig, 'name' | 'description'>,
+    newAgentPolicyProps: Pick<AgentPolicy, 'name' | 'description'>,
     options?: { user?: AuthenticatedUser }
-  ): Promise<AgentConfig> {
+  ): Promise<AgentPolicy> {
     // Copy base config
-    const baseAgentConfig = await this.get(soClient, id, true);
-    if (!baseAgentConfig) {
-      throw new Error('Agent config not found');
+    const baseAgentPolicy = await this.get(soClient, id, true);
+    if (!baseAgentPolicy) {
+      throw new Error('Agent policy not found');
     }
     // eslint-disable-next-line @typescript-eslint/naming-convention
-    const { namespace, monitoring_enabled } = baseAgentConfig;
-    const newAgentConfig = await this.create(
+    const { namespace, monitoring_enabled } = baseAgentPolicy;
+    const newAgentPolicy = await this.create(
       soClient,
       {
         namespace,
         monitoring_enabled,
-        ...newAgentConfigProps,
+        ...newAgentPolicyProps,
       },
       options
     );
 
-    // Copy all package configs
-    if (baseAgentConfig.package_configs.length) {
-      const newPackageConfigs = (baseAgentConfig.package_configs as PackageConfig[]).map(
-        (packageConfig: PackageConfig) => {
-          const { id: packageConfigId, version, ...newPackageConfig } = packageConfig;
-          return newPackageConfig;
+    // Copy all package policies
+    if (baseAgentPolicy.package_configs.length) {
+      const newPackagePolicies = (baseAgentPolicy.package_configs as PackagePolicy[]).map(
+        (packagePolicy: PackagePolicy) => {
+          const { id: packagePolicyId, version, ...newPackagePolicy } = packagePolicy;
+          return newPackagePolicy;
         }
       );
-      await packageConfigService.bulkCreate(soClient, newPackageConfigs, newAgentConfig.id, {
+      await packagePolicyService.bulkCreate(soClient, newPackagePolicies, newAgentPolicy.id, {
         ...options,
         bumpConfigRevision: false,
       });
     }
 
     // Get updated config
-    const updatedAgentConfig = await this.get(soClient, newAgentConfig.id, true);
-    if (!updatedAgentConfig) {
-      throw new Error('Copied agent config not found');
+    const updatedAgentPolicy = await this.get(soClient, newAgentPolicy.id, true);
+    if (!updatedAgentPolicy) {
+      throw new Error('Copied agent policy not found');
     }
 
-    return updatedAgentConfig;
+    return updatedAgentPolicy;
   }
 
   public async bumpRevision(
     soClient: SavedObjectsClientContract,
     id: string,
     options?: { user?: AuthenticatedUser }
-  ): Promise<AgentConfig> {
+  ): Promise<AgentPolicy> {
     return this._update(soClient, id, {}, options?.user);
   }
 
-  public async assignPackageConfigs(
+  public async assignPackagePolicies(
     soClient: SavedObjectsClientContract,
     id: string,
-    packageConfigIds: string[],
+    packagePolicyIds: string[],
     options: { user?: AuthenticatedUser; bumpRevision: boolean } = { bumpRevision: true }
-  ): Promise<AgentConfig> {
-    const oldAgentConfig = await this.get(soClient, id, false);
+  ): Promise<AgentPolicy> {
+    const oldAgentPolicy = await this.get(soClient, id, false);
 
-    if (!oldAgentConfig) {
-      throw new Error('Agent config not found');
+    if (!oldAgentPolicy) {
+      throw new Error('Agent policy not found');
     }
 
     return await this._update(
@@ -278,7 +278,7 @@ class AgentConfigService {
       id,
       {
         package_configs: uniq(
-          [...((oldAgentConfig.package_configs || []) as string[])].concat(packageConfigIds)
+          [...((oldAgentPolicy.package_configs || []) as string[])].concat(packagePolicyIds)
         ),
       },
       options?.user,
@@ -286,16 +286,16 @@ class AgentConfigService {
     );
   }
 
-  public async unassignPackageConfigs(
+  public async unassignPackagePolicies(
     soClient: SavedObjectsClientContract,
     id: string,
-    packageConfigIds: string[],
+    packagePolicyIds: string[],
     options?: { user?: AuthenticatedUser }
-  ): Promise<AgentConfig> {
-    const oldAgentConfig = await this.get(soClient, id, false);
+  ): Promise<AgentPolicy> {
+    const oldAgentPolicy = await this.get(soClient, id, false);
 
-    if (!oldAgentConfig) {
-      throw new Error('Agent config not found');
+    if (!oldAgentPolicy) {
+      throw new Error('Agent policy not found');
     }
 
     return await this._update(
@@ -303,8 +303,8 @@ class AgentConfigService {
       id,
       {
         package_configs: uniq(
-          [...((oldAgentConfig.package_configs || []) as string[])].filter(
-            (pkgConfigId) => !packageConfigIds.includes(pkgConfigId)
+          [...((oldAgentPolicy.package_configs || []) as string[])].filter(
+            (pkgConfigId) => !packagePolicyIds.includes(pkgConfigId)
           )
         ),
       },
@@ -312,15 +312,15 @@ class AgentConfigService {
     );
   }
 
-  public async getDefaultAgentConfigId(soClient: SavedObjectsClientContract) {
+  public async getDefaultAgentPolicyId(soClient: SavedObjectsClientContract) {
     const configs = await soClient.find({
-      type: AGENT_CONFIG_SAVED_OBJECT_TYPE,
+      type: AGENT_POLICY_SAVED_OBJECT_TYPE,
       searchFields: ['is_default'],
       search: 'true',
     });
 
     if (configs.saved_objects.length === 0) {
-      throw new Error('No default agent config');
+      throw new Error('No default agent policy');
     }
 
     return configs.saved_objects[0].id;
@@ -329,15 +329,15 @@ class AgentConfigService {
   public async delete(
     soClient: SavedObjectsClientContract,
     id: string
-  ): Promise<DeleteAgentConfigResponse> {
+  ): Promise<DeleteAgentPolicyResponse> {
     const config = await this.get(soClient, id, false);
     if (!config) {
-      throw new Error('Agent configuration not found');
+      throw new Error('Agent policy not found');
     }
 
-    const { id: defaultConfigId } = await this.ensureDefaultAgentConfig(soClient);
+    const { id: defaultConfigId } = await this.ensureDefaultAgentPolicy(soClient);
     if (id === defaultConfigId) {
-      throw new Error('The default agent configuration cannot be deleted');
+      throw new Error('The default agent policy cannot be deleted');
     }
 
     const { total } = await listAgents(soClient, {
@@ -348,16 +348,16 @@ class AgentConfigService {
     });
 
     if (total > 0) {
-      throw new Error('Cannot delete agent config that is assigned to agent(s)');
+      throw new Error('Cannot delete agent policy that is assigned to agent(s)');
     }
 
     if (config.package_configs && config.package_configs.length) {
-      await packageConfigService.delete(soClient, config.package_configs as string[], {
-        skipUnassignFromAgentConfigs: true,
+      await packagePolicyService.delete(soClient, config.package_configs as string[], {
+        skipUnassignFromAgentPolicies: true,
       });
     }
     await soClient.delete(SAVED_OBJECT_TYPE, id);
-    await this.triggerAgentConfigUpdatedEvent(soClient, 'deleted', id);
+    await this.triggerAgentPolicyUpdatedEvent(soClient, 'deleted', id);
     return {
       id,
       success: true,
@@ -368,7 +368,7 @@ class AgentConfigService {
     soClient: SavedObjectsClientContract,
     id: string,
     options?: { standalone: boolean }
-  ): Promise<FullAgentConfig | null> {
+  ): Promise<FullAgentPolicy | null> {
     let config;
 
     try {
@@ -389,7 +389,7 @@ class AgentConfigService {
     }
     const defaultOutput = await outputService.get(soClient, defaultOutputId);
 
-    const agentConfig: FullAgentConfig = {
+    const agentPolicy: FullAgentPolicy = {
       id: config.id,
       outputs: {
         // TEMPORARY as we only support a default output
@@ -412,10 +412,10 @@ class AgentConfigService {
 
             return outputs;
           },
-          {} as FullAgentConfig['outputs']
+          {} as FullAgentPolicy['outputs']
         ),
       },
-      inputs: storedPackageConfigsToAgentInputs(config.package_configs as PackageConfig[]),
+      inputs: storedPackagePoliciesToAgentInputs(config.package_configs as PackagePolicy[]),
       revision: config.revision,
       ...(config.monitoring_enabled && config.monitoring_enabled.length > 0
         ? {
@@ -435,8 +435,8 @@ class AgentConfigService {
           }),
     };
 
-    return agentConfig;
+    return agentPolicy;
   }
 }
 
-export const agentConfigService = new AgentConfigService();
+export const agentPolicyService = new AgentPolicyService();
diff --git a/x-pack/plugins/ingest_manager/server/services/agent_config_update.ts b/x-pack/plugins/ingest_manager/server/services/agent_config_update.ts
index 3d40d128afda8d..602241fc3f9138 100644
--- a/x-pack/plugins/ingest_manager/server/services/agent_config_update.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agent_config_update.ts
@@ -9,7 +9,7 @@ import { generateEnrollmentAPIKey, deleteEnrollmentApiKeyForConfigId } from './a
 import { unenrollForConfigId } from './agents';
 import { outputService } from './output';
 
-export async function agentConfigUpdateEventHandler(
+export async function agentPolicyUpdateEventHandler(
   soClient: SavedObjectsClientContract,
   action: string,
   configId: string
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/acks.ts b/x-pack/plugins/ingest_manager/server/services/agents/acks.ts
index 1dfe4e067dafe8..5ddb3f084f5e06 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/acks.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/acks.ts
@@ -18,7 +18,7 @@ import {
   AgentEventSOAttributes,
   AgentSOAttributes,
   AgentActionSOAttributes,
-  FullAgentConfig,
+  FullAgentPolicy,
 } from '../../types';
 import {
   AGENT_EVENT_SAVED_OBJECT_TYPE,
@@ -73,7 +73,7 @@ export async function acknowledgeAgentActions(
   const config = getLatestConfigIfUpdated(agent, actions);
 
   await soClient.bulkUpdate<AgentSOAttributes | AgentActionSOAttributes>([
-    ...(config ? [buildUpdateAgentConfig(agent.id, config)] : []),
+    ...(config ? [buildUpdateAgentPolicy(agent.id, config)] : []),
     ...buildUpdateAgentActionSentAt(actionIds),
   ]);
 
@@ -81,7 +81,7 @@ export async function acknowledgeAgentActions(
 }
 
 function getLatestConfigIfUpdated(agent: Agent, actions: AgentAction[]) {
-  return actions.reduce<null | FullAgentConfig>((acc, action) => {
+  return actions.reduce<null | FullAgentPolicy>((acc, action) => {
     if (action.type !== 'CONFIG_CHANGE') {
       return acc;
     }
@@ -97,7 +97,7 @@ function getLatestConfigIfUpdated(agent: Agent, actions: AgentAction[]) {
   }, null);
 }
 
-function buildUpdateAgentConfig(agentId: string, config: FullAgentConfig) {
+function buildUpdateAgentPolicy(agentId: string, config: FullAgentPolicy) {
   const packages = config.inputs.reduce<string[]>((acc, input) => {
     const packageName = input.meta?.package?.name;
     if (packageName && acc.indexOf(packageName) < 0) {
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
index 1547b6b5ea0530..987ae4e6fbe5c9 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
@@ -20,10 +20,10 @@ import {
   Agent,
   AgentAction,
   AgentSOAttributes,
-  AgentConfig,
-  FullAgentConfig,
+  AgentPolicy,
+  FullAgentPolicy,
 } from '../../../types';
-import { agentConfigService } from '../../agent_config';
+import { agentPolicyService } from '../../agent_config';
 import * as APIKeysService from '../../api_keys';
 import { AGENT_SAVED_OBJECT_TYPE, AGENT_UPDATE_ACTIONS_INTERVAL_MS } from '../../../constants';
 import { createAgentAction, getNewActionsSince } from '../actions';
@@ -49,14 +49,14 @@ function getInternalUserSOClient() {
   return appContextService.getInternalUserSOClient(fakeRequest);
 }
 
-function createAgentConfigSharedObservable(configId: string) {
+function createAgentPolicySharedObservable(configId: string) {
   const internalSOClient = getInternalUserSOClient();
   return timer(0, AGENT_UPDATE_ACTIONS_INTERVAL_MS).pipe(
     switchMap(() =>
-      from(agentConfigService.get(internalSOClient, configId) as Promise<AgentConfig>)
+      from(agentPolicyService.get(internalSOClient, configId) as Promise<AgentPolicy>)
     ),
     distinctUntilKeyChanged('revision'),
-    switchMap((data) => from(agentConfigService.getFullConfig(internalSOClient, configId))),
+    switchMap((data) => from(agentPolicyService.getFullConfig(internalSOClient, configId))),
     shareReplay({ refCount: true, bufferSize: 1 })
   );
 }
@@ -95,12 +95,12 @@ async function getOrCreateAgentDefaultOutputAPIKey(
   return outputAPIKey.key;
 }
 
-function shouldCreateAgentConfigAction(agent: Agent, config: FullAgentConfig | null): boolean {
+function shouldCreateAgentPolicyAction(agent: Agent, config: FullAgentPolicy | null): boolean {
   if (!config || !config.revision) {
     return false;
   }
-  const isAgentConfigOutdated = !agent.config_revision || agent.config_revision < config.revision;
-  if (!isAgentConfigOutdated) {
+  const isAgentPolicyOutdated = !agent.config_revision || agent.config_revision < config.revision;
+  if (!isAgentPolicyOutdated) {
     return false;
   }
 
@@ -110,7 +110,7 @@ function shouldCreateAgentConfigAction(agent: Agent, config: FullAgentConfig | n
 async function createAgentActionFromConfig(
   soClient: SavedObjectsClientContract,
   agent: Agent,
-  config: FullAgentConfig | null
+  config: FullAgentPolicy | null
 ) {
   // Deep clone !not supporting Date, and undefined value.
   const newConfig = JSON.parse(JSON.stringify(config));
@@ -131,12 +131,12 @@ async function createAgentActionFromConfig(
 
 export function agentCheckinStateNewActionsFactory() {
   // Shared Observables
-  const agentConfigs$ = new Map<string, Observable<FullAgentConfig | null>>();
+  const agentPolicies$ = new Map<string, Observable<FullAgentPolicy | null>>();
   const newActions$ = createNewActionsSharedObservable();
   // Rx operators
   const rateLimiter = createRateLimiter(
-    appContextService.getConfig()?.fleet.agentConfigRolloutRateLimitIntervalMs ?? 5000,
-    appContextService.getConfig()?.fleet.agentConfigRolloutRateLimitRequestPerInterval ?? 50
+    appContextService.getConfig()?.fleet.agentPolicyRolloutRateLimitIntervalMs ?? 5000,
+    appContextService.getConfig()?.fleet.agentPolicyRolloutRateLimitRequestPerInterval ?? 50
   );
 
   async function subscribeToNewActions(
@@ -148,17 +148,17 @@ export function agentCheckinStateNewActionsFactory() {
       throw new Error('Agent do not have a config');
     }
     const configId = agent.config_id;
-    if (!agentConfigs$.has(configId)) {
-      agentConfigs$.set(configId, createAgentConfigSharedObservable(configId));
+    if (!agentPolicies$.has(configId)) {
+      agentPolicies$.set(configId, createAgentPolicySharedObservable(configId));
     }
-    const agentConfig$ = agentConfigs$.get(configId);
-    if (!agentConfig$) {
+    const agentPolicy$ = agentPolicies$.get(configId);
+    if (!agentPolicy$) {
       throw new Error(`Invalid state no observable for config ${configId}`);
     }
 
-    const stream$ = agentConfig$.pipe(
+    const stream$ = agentPolicy$.pipe(
       timeout(appContextService.getConfig()?.fleet.pollingRequestTimeout || 0),
-      filter((config) => shouldCreateAgentConfigAction(agent, config)),
+      filter((config) => shouldCreateAgentPolicyAction(agent, config)),
       rateLimiter(),
       mergeMap((config) => createAgentActionFromConfig(soClient, agent, config)),
       merge(newActions$),
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts b/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts
index ecc2c987d04b66..3d0596227f4fe1 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts
@@ -8,16 +8,16 @@ import { SavedObjectsClientContract } from 'kibana/server';
 import Boom from 'boom';
 import { AGENT_SAVED_OBJECT_TYPE } from '../../constants';
 import { AgentSOAttributes } from '../../types';
-import { agentConfigService } from '../agent_config';
+import { agentPolicyService } from '../agent_config';
 
 export async function reassignAgent(
   soClient: SavedObjectsClientContract,
   agentId: string,
   newConfigId: string
 ) {
-  const config = await agentConfigService.get(soClient, newConfigId);
+  const config = await agentPolicyService.get(soClient, newConfigId);
   if (!config) {
-    throw Boom.notFound(`Agent Configuration not found: ${newConfigId}`);
+    throw Boom.notFound(`Agent policy not found: ${newConfigId}`);
   }
 
   await soClient.update<AgentSOAttributes>(AGENT_SAVED_OBJECT_TYPE, agentId, {
diff --git a/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts b/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts
index e1266ac5941642..dfe6e885578849 100644
--- a/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts
+++ b/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts
@@ -10,7 +10,7 @@ import { SavedObjectsClientContract, SavedObject } from 'src/core/server';
 import { EnrollmentAPIKey, EnrollmentAPIKeySOAttributes } from '../../types';
 import { ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE } from '../../constants';
 import { createAPIKey, invalidateAPIKey } from './security';
-import { agentConfigService } from '../agent_config';
+import { agentPolicyService } from '../agent_config';
 import { appContextService } from '../app_context';
 
 export async function listEnrollmentApiKeys(
@@ -111,7 +111,7 @@ export async function generateEnrollmentAPIKey(
   if (data.configId) {
     await validateConfigId(soClient, data.configId);
   }
-  const configId = data.configId ?? (await agentConfigService.getDefaultAgentConfigId(soClient));
+  const configId = data.configId ?? (await agentPolicyService.getDefaultAgentPolicyId(soClient));
   const name = providedKeyName ? `${providedKeyName} (${id})` : id;
   const key = await createAPIKey(soClient, name, {
     // Useless role to avoid to have the privilege of the user that created the key
@@ -150,10 +150,10 @@ export async function generateEnrollmentAPIKey(
 
 async function validateConfigId(soClient: SavedObjectsClientContract, configId: string) {
   try {
-    await agentConfigService.get(soClient, configId);
+    await agentPolicyService.get(soClient, configId);
   } catch (e) {
     if (e.isBoom && e.output.statusCode === 404) {
-      throw Boom.badRequest(`Agent config ${configId} does not exist`);
+      throw Boom.badRequest(`Agent policy ${configId} does not exist`);
     }
     throw e;
   }
diff --git a/x-pack/plugins/ingest_manager/server/services/config.ts b/x-pack/plugins/ingest_manager/server/services/config.ts
index 9043b1cc634a0d..23cd38cc123cef 100644
--- a/x-pack/plugins/ingest_manager/server/services/config.ts
+++ b/x-pack/plugins/ingest_manager/server/services/config.ts
@@ -7,7 +7,7 @@ import { Observable, Subscription } from 'rxjs';
 import { IngestManagerConfigType } from '../';
 
 /**
- * Kibana config observable service, *NOT* agent config
+ * Kibana config observable service, *NOT* agent policy
  */
 class ConfigService {
   private observable: Observable<IngestManagerConfigType> | null = null;
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/agent/agent.ts b/x-pack/plugins/ingest_manager/server/services/epm/agent/agent.ts
index 88c54d213554cb..eeadac6e168b1f 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/agent/agent.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/agent/agent.ts
@@ -6,11 +6,11 @@
 
 import Handlebars from 'handlebars';
 import { safeLoad, safeDump } from 'js-yaml';
-import { PackageConfigConfigRecord } from '../../../../common';
+import { PackagePolicyConfigRecord } from '../../../../common';
 
 const handlebars = Handlebars.create();
 
-export function createStream(variables: PackageConfigConfigRecord, streamTemplate: string) {
+export function createStream(variables: PackagePolicyConfigRecord, streamTemplate: string) {
   const { vars, yamlValues } = buildTemplateVariables(variables, streamTemplate);
 
   const template = handlebars.compile(streamTemplate, { noEscape: true });
@@ -54,7 +54,7 @@ function replaceVariablesInYaml(yamlVariables: { [k: string]: any }, yaml: any)
   return yaml;
 }
 
-function buildTemplateVariables(variables: PackageConfigConfigRecord, streamTemplate: string) {
+function buildTemplateVariables(variables: PackagePolicyConfigRecord, streamTemplate: string) {
   const yamlValues: { [k: string]: any } = {};
   const vars = Object.entries(variables).reduce((acc, [key, recordEntry]) => {
     // support variables with . like key.patterns
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/packages/get.ts b/x-pack/plugins/ingest_manager/server/services/epm/packages/get.ts
index 7093723806ea39..1688900fc1758f 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/packages/get.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/packages/get.ts
@@ -50,7 +50,7 @@ export async function getPackages(
   return packageList;
 }
 
-// Get package names for packages which cannot have more than one package config on an agent config
+// Get package names for packages which cannot have more than one package policy on an agent policy
 // Assume packages only export one config template for now
 export async function getLimitedPackages(options: {
   savedObjectsClient: SavedObjectsClientContract;
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/packages/remove.ts b/x-pack/plugins/ingest_manager/server/services/epm/packages/remove.ts
index 1e50c67d63c422..bc71ead34c3d4d 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/packages/remove.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/packages/remove.ts
@@ -6,13 +6,13 @@
 
 import { SavedObjectsClientContract } from 'src/core/server';
 import Boom from 'boom';
-import { PACKAGES_SAVED_OBJECT_TYPE, PACKAGE_CONFIG_SAVED_OBJECT_TYPE } from '../../../constants';
+import { PACKAGES_SAVED_OBJECT_TYPE, PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../constants';
 import { AssetReference, AssetType, ElasticsearchAssetType } from '../../../types';
 import { CallESAsCurrentUser } from '../../../types';
 import { getInstallation, savedObjectTypes } from './index';
 import { deletePipeline } from '../elasticsearch/ingest_pipeline/';
 import { installIndexPatterns } from '../kibana/index_pattern/install';
-import { packageConfigService, appContextService } from '../..';
+import { packagePolicyService, appContextService } from '../..';
 import { splitPkgKey } from '../registry';
 
 export async function removeInstallation(options: {
@@ -28,15 +28,15 @@ export async function removeInstallation(options: {
   if (installation.removable === false)
     throw Boom.badRequest(`${pkgName} is installed by default and cannot be removed`);
 
-  const { total } = await packageConfigService.list(savedObjectsClient, {
-    kuery: `${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.package.name:${pkgName}`,
+  const { total } = await packagePolicyService.list(savedObjectsClient, {
+    kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name:${pkgName}`,
     page: 0,
     perPage: 0,
   });
 
   if (total > 0)
     throw Boom.badRequest(
-      `unable to remove package with existing package config(s) in use by agent(s)`
+      `unable to remove package with existing package policy(s) in use by agent(s)`
     );
 
   // recreate or delete index patterns when a package is uninstalled
diff --git a/x-pack/plugins/ingest_manager/server/services/index.ts b/x-pack/plugins/ingest_manager/server/services/index.ts
index f6ca9e7bbbe71f..1af63a3935de07 100644
--- a/x-pack/plugins/ingest_manager/server/services/index.ts
+++ b/x-pack/plugins/ingest_manager/server/services/index.ts
@@ -61,8 +61,8 @@ export interface AgentService {
 }
 
 // Saved object services
-export { agentConfigService } from './agent_config';
-export { packageConfigService } from './package_config';
+export { agentPolicyService } from './agent_config';
+export { packagePolicyService } from './package_config';
 export { outputService } from './output';
 export { settingsService };
 
diff --git a/x-pack/plugins/ingest_manager/server/services/package_config.test.ts b/x-pack/plugins/ingest_manager/server/services/package_config.test.ts
index 28aa0d773d75b7..2da3f22b322d2e 100644
--- a/x-pack/plugins/ingest_manager/server/services/package_config.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/package_config.test.ts
@@ -5,9 +5,9 @@
  */
 
 import { savedObjectsClientMock } from 'src/core/server/mocks';
-import { createPackageConfigMock } from '../../common/mocks';
-import { packageConfigService } from './package_config';
-import { PackageInfo, PackageConfigSOAttributes } from '../types';
+import { createPackagePolicyMock } from '../../common/mocks';
+import { packagePolicyService } from './package_config';
+import { PackageInfo, PackagePolicySOAttributes } from '../types';
 import { SavedObjectsUpdateResponse } from 'src/core/server';
 
 async function mockedGetAssetsData(_a: any, _b: any, dataset: string) {
@@ -40,10 +40,10 @@ jest.mock('./epm/registry', () => {
   };
 });
 
-describe('Package config service', () => {
+describe('Package policy service', () => {
   describe('assignPackageStream', () => {
     it('should work with config variables from the stream', async () => {
-      const inputs = await packageConfigService.assignPackageStream(
+      const inputs = await packagePolicyService.assignPackageStream(
         ({
           datasets: [
             {
@@ -104,7 +104,7 @@ describe('Package config service', () => {
     });
 
     it('should work with config variables at the input level', async () => {
-      const inputs = await packageConfigService.assignPackageStream(
+      const inputs = await packagePolicyService.assignPackageStream(
         ({
           datasets: [
             {
@@ -173,21 +173,21 @@ describe('Package config service', () => {
         type: 'abcd',
         references: [],
         version: 'test',
-        attributes: createPackageConfigMock(),
+        attributes: createPackagePolicyMock(),
       });
       savedObjectsClient.update.mockImplementation(
         async (
           type: string,
           id: string
-        ): Promise<SavedObjectsUpdateResponse<PackageConfigSOAttributes>> => {
+        ): Promise<SavedObjectsUpdateResponse<PackagePolicySOAttributes>> => {
           throw savedObjectsClient.errors.createConflictError('abc', '123');
         }
       );
       await expect(
-        packageConfigService.update(
+        packagePolicyService.update(
           savedObjectsClient,
           'the-package-config-id',
-          createPackageConfigMock()
+          createPackagePolicyMock()
         )
       ).rejects.toThrow('Saved object [abc/123] conflict');
     });
diff --git a/x-pack/plugins/ingest_manager/server/services/package_config.ts b/x-pack/plugins/ingest_manager/server/services/package_config.ts
index 665c08316588c0..4322ee774b53f1 100644
--- a/x-pack/plugins/ingest_manager/server/services/package_config.ts
+++ b/x-pack/plugins/ingest_manager/server/services/package_config.ts
@@ -6,92 +6,92 @@
 import { SavedObjectsClientContract } from 'src/core/server';
 import { AuthenticatedUser } from '../../../security/server';
 import {
-  DeletePackageConfigsResponse,
-  PackageConfigInput,
-  PackageConfigInputStream,
+  DeletePackagePoliciesResponse,
+  PackagePolicyInput,
+  PackagePolicyInputStream,
   PackageInfo,
   ListWithKuery,
-  packageToPackageConfig,
+  packageToPackagePolicy,
   isPackageLimited,
-  doesAgentConfigAlreadyIncludePackage,
+  doesAgentPolicyAlreadyIncludePackage,
 } from '../../common';
-import { PACKAGE_CONFIG_SAVED_OBJECT_TYPE } from '../constants';
+import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../constants';
 import {
-  NewPackageConfig,
-  UpdatePackageConfig,
-  PackageConfig,
-  PackageConfigSOAttributes,
+  NewPackagePolicy,
+  UpdatePackagePolicy,
+  PackagePolicy,
+  PackagePolicySOAttributes,
   RegistryPackage,
   CallESAsCurrentUser,
 } from '../types';
-import { agentConfigService } from './agent_config';
+import { agentPolicyService } from './agent_config';
 import { outputService } from './output';
 import * as Registry from './epm/registry';
 import { getPackageInfo, getInstallation, ensureInstalledPackage } from './epm/packages';
 import { getAssetsData } from './epm/packages/assets';
 import { createStream } from './epm/agent/agent';
 
-const SAVED_OBJECT_TYPE = PACKAGE_CONFIG_SAVED_OBJECT_TYPE;
+const SAVED_OBJECT_TYPE = PACKAGE_POLICY_SAVED_OBJECT_TYPE;
 
 function getDataset(st: string) {
   return st.split('.')[1];
 }
 
-class PackageConfigService {
+class PackagePolicyService {
   public async create(
     soClient: SavedObjectsClientContract,
     callCluster: CallESAsCurrentUser,
-    packageConfig: NewPackageConfig,
+    packagePolicy: NewPackagePolicy,
     options?: { id?: string; user?: AuthenticatedUser; bumpConfigRevision?: boolean }
-  ): Promise<PackageConfig> {
-    // Check that its agent config does not have a package config with the same name
-    const parentAgentConfig = await agentConfigService.get(soClient, packageConfig.config_id);
-    if (!parentAgentConfig) {
-      throw new Error('Agent config not found');
+  ): Promise<PackagePolicy> {
+    // Check that its agent policy does not have a package policy with the same name
+    const parentAgentPolicy = await agentPolicyService.get(soClient, packagePolicy.config_id);
+    if (!parentAgentPolicy) {
+      throw new Error('Agent policy not found');
     } else {
       if (
-        (parentAgentConfig.package_configs as PackageConfig[]).find(
-          (siblingPackageConfig) => siblingPackageConfig.name === packageConfig.name
+        (parentAgentPolicy.package_configs as PackagePolicy[]).find(
+          (siblingPackagePolicy) => siblingPackagePolicy.name === packagePolicy.name
         )
       ) {
-        throw new Error('There is already a package with the same name on this agent config');
+        throw new Error('There is already a package with the same name on this agent policy');
       }
     }
 
     // Make sure the associated package is installed
-    if (packageConfig.package?.name) {
+    if (packagePolicy.package?.name) {
       const [, pkgInfo] = await Promise.all([
         ensureInstalledPackage({
           savedObjectsClient: soClient,
-          pkgName: packageConfig.package.name,
+          pkgName: packagePolicy.package.name,
           callCluster,
         }),
         getPackageInfo({
           savedObjectsClient: soClient,
-          pkgName: packageConfig.package.name,
-          pkgVersion: packageConfig.package.version,
+          pkgName: packagePolicy.package.name,
+          pkgVersion: packagePolicy.package.version,
         }),
       ]);
 
-      // Check if it is a limited package, and if so, check that the corresponding agent config does not
-      // already contain a package config for this package
+      // Check if it is a limited package, and if so, check that the corresponding agent policy does not
+      // already contain a package policy for this package
       if (isPackageLimited(pkgInfo)) {
-        const agentConfig = await agentConfigService.get(soClient, packageConfig.config_id, true);
-        if (agentConfig && doesAgentConfigAlreadyIncludePackage(agentConfig, pkgInfo.name)) {
+        const agentPolicy = await agentPolicyService.get(soClient, packagePolicy.config_id, true);
+        if (agentPolicy && doesAgentPolicyAlreadyIncludePackage(agentPolicy, pkgInfo.name)) {
           throw new Error(
-            `Unable to create package config. Package '${pkgInfo.name}' already exists on this agent config.`
+            `Unable to create package policy. Package '${pkgInfo.name}' already exists on this agent policy.`
           );
         }
       }
 
-      packageConfig.inputs = await this.assignPackageStream(pkgInfo, packageConfig.inputs);
+      packagePolicy.inputs = await this.assignPackageStream(pkgInfo, packagePolicy.inputs);
     }
 
     const isoDate = new Date().toISOString();
-    const newSo = await soClient.create<PackageConfigSOAttributes>(
+    const newSo = await soClient.create<PackagePolicySOAttributes>(
       SAVED_OBJECT_TYPE,
       {
-        ...packageConfig,
+        ...packagePolicy,
         revision: 1,
         created_at: isoDate,
         created_by: options?.user?.username ?? 'system',
@@ -101,8 +101,8 @@ class PackageConfigService {
       options
     );
 
-    // Assign it to the given agent config
-    await agentConfigService.assignPackageConfigs(soClient, packageConfig.config_id, [newSo.id], {
+    // Assign it to the given agent policy
+    await agentPolicyService.assignPackagePolicies(soClient, packagePolicy.config_id, [newSo.id], {
       user: options?.user,
       bumpRevision: options?.bumpConfigRevision ?? true,
     });
@@ -116,17 +116,17 @@ class PackageConfigService {
 
   public async bulkCreate(
     soClient: SavedObjectsClientContract,
-    packageConfigs: NewPackageConfig[],
+    packagePolicies: NewPackagePolicy[],
     configId: string,
     options?: { user?: AuthenticatedUser; bumpConfigRevision?: boolean }
-  ): Promise<PackageConfig[]> {
+  ): Promise<PackagePolicy[]> {
     const isoDate = new Date().toISOString();
     // eslint-disable-next-line @typescript-eslint/naming-convention
-    const { saved_objects } = await soClient.bulkCreate<PackageConfigSOAttributes>(
-      packageConfigs.map((packageConfig) => ({
+    const { saved_objects } = await soClient.bulkCreate<PackagePolicySOAttributes>(
+      packagePolicies.map((packagePolicy) => ({
         type: SAVED_OBJECT_TYPE,
         attributes: {
-          ...packageConfig,
+          ...packagePolicy,
           config_id: configId,
           revision: 1,
           created_at: isoDate,
@@ -140,8 +140,8 @@ class PackageConfigService {
     // Filter out invalid SOs
     const newSos = saved_objects.filter((so) => !so.error && so.attributes);
 
-    // Assign it to the given agent config
-    await agentConfigService.assignPackageConfigs(
+    // Assign it to the given agent policy
+    await agentPolicyService.assignPackagePolicies(
       soClient,
       configId,
       newSos.map((newSo) => newSo.id),
@@ -161,38 +161,38 @@ class PackageConfigService {
   public async get(
     soClient: SavedObjectsClientContract,
     id: string
-  ): Promise<PackageConfig | null> {
-    const packageConfigSO = await soClient.get<PackageConfigSOAttributes>(SAVED_OBJECT_TYPE, id);
-    if (!packageConfigSO) {
+  ): Promise<PackagePolicy | null> {
+    const packagePolicySO = await soClient.get<PackagePolicySOAttributes>(SAVED_OBJECT_TYPE, id);
+    if (!packagePolicySO) {
       return null;
     }
 
-    if (packageConfigSO.error) {
-      throw new Error(packageConfigSO.error.message);
+    if (packagePolicySO.error) {
+      throw new Error(packagePolicySO.error.message);
     }
 
     return {
-      id: packageConfigSO.id,
-      version: packageConfigSO.version,
-      ...packageConfigSO.attributes,
+      id: packagePolicySO.id,
+      version: packagePolicySO.version,
+      ...packagePolicySO.attributes,
     };
   }
 
   public async getByIDs(
     soClient: SavedObjectsClientContract,
     ids: string[]
-  ): Promise<PackageConfig[] | null> {
-    const packageConfigSO = await soClient.bulkGet<PackageConfigSOAttributes>(
+  ): Promise<PackagePolicy[] | null> {
+    const packagePolicySO = await soClient.bulkGet<PackagePolicySOAttributes>(
       ids.map((id) => ({
         id,
         type: SAVED_OBJECT_TYPE,
       }))
     );
-    if (!packageConfigSO) {
+    if (!packagePolicySO) {
       return null;
     }
 
-    return packageConfigSO.saved_objects.map((so) => ({
+    return packagePolicySO.saved_objects.map((so) => ({
       id: so.id,
       version: so.version,
       ...so.attributes,
@@ -202,10 +202,10 @@ class PackageConfigService {
   public async list(
     soClient: SavedObjectsClientContract,
     options: ListWithKuery
-  ): Promise<{ items: PackageConfig[]; total: number; page: number; perPage: number }> {
+  ): Promise<{ items: PackagePolicy[]; total: number; page: number; perPage: number }> {
     const { page = 1, perPage = 20, sortField = 'updated_at', sortOrder = 'desc', kuery } = options;
 
-    const packageConfigs = await soClient.find<PackageConfigSOAttributes>({
+    const packagePolicies = await soClient.find<PackagePolicySOAttributes>({
       type: SAVED_OBJECT_TYPE,
       sortField,
       sortOrder,
@@ -221,12 +221,12 @@ class PackageConfigService {
     });
 
     return {
-      items: packageConfigs.saved_objects.map((packageConfigSO) => ({
-        id: packageConfigSO.id,
-        version: packageConfigSO.version,
-        ...packageConfigSO.attributes,
+      items: packagePolicies.saved_objects.map((packagePolicySO) => ({
+        id: packagePolicySO.id,
+        version: packagePolicySO.version,
+        ...packagePolicySO.attributes,
       })),
-      total: packageConfigs.total,
+      total: packagePolicies.total,
       page,
       perPage,
     };
@@ -235,37 +235,37 @@ class PackageConfigService {
   public async update(
     soClient: SavedObjectsClientContract,
     id: string,
-    packageConfig: UpdatePackageConfig,
+    packagePolicy: UpdatePackagePolicy,
     options?: { user?: AuthenticatedUser }
-  ): Promise<PackageConfig> {
-    const oldPackageConfig = await this.get(soClient, id);
-    const { version, ...restOfPackageConfig } = packageConfig;
+  ): Promise<PackagePolicy> {
+    const oldPackagePolicy = await this.get(soClient, id);
+    const { version, ...restOfPackagePolicy } = packagePolicy;
 
-    if (!oldPackageConfig) {
-      throw new Error('Package config not found');
+    if (!oldPackagePolicy) {
+      throw new Error('Package policy not found');
     }
 
-    // Check that its agent config does not have a package config with the same name
-    const parentAgentConfig = await agentConfigService.get(soClient, packageConfig.config_id);
-    if (!parentAgentConfig) {
-      throw new Error('Agent config not found');
+    // Check that its agent policy does not have a package policy with the same name
+    const parentAgentPolicy = await agentPolicyService.get(soClient, packagePolicy.config_id);
+    if (!parentAgentPolicy) {
+      throw new Error('Agent policy not found');
     } else {
       if (
-        (parentAgentConfig.package_configs as PackageConfig[]).find(
-          (siblingPackageConfig) =>
-            siblingPackageConfig.id !== id && siblingPackageConfig.name === packageConfig.name
+        (parentAgentPolicy.package_configs as PackagePolicy[]).find(
+          (siblingPackagePolicy) =>
+            siblingPackagePolicy.id !== id && siblingPackagePolicy.name === packagePolicy.name
         )
       ) {
-        throw new Error('There is already a package with the same name on this agent config');
+        throw new Error('There is already a package with the same name on this agent policy');
       }
     }
 
-    await soClient.update<PackageConfigSOAttributes>(
+    await soClient.update<PackagePolicySOAttributes>(
       SAVED_OBJECT_TYPE,
       id,
       {
-        ...restOfPackageConfig,
-        revision: oldPackageConfig.revision + 1,
+        ...restOfPackagePolicy,
+        revision: oldPackagePolicy.revision + 1,
         updated_at: new Date().toISOString(),
         updated_by: options?.user?.username ?? 'system',
       },
@@ -274,32 +274,32 @@ class PackageConfigService {
       }
     );
 
-    // Bump revision of associated agent config
-    await agentConfigService.bumpRevision(soClient, packageConfig.config_id, {
+    // Bump revision of associated agent policy
+    await agentPolicyService.bumpRevision(soClient, packagePolicy.config_id, {
       user: options?.user,
     });
 
-    return (await this.get(soClient, id)) as PackageConfig;
+    return (await this.get(soClient, id)) as PackagePolicy;
   }
 
   public async delete(
     soClient: SavedObjectsClientContract,
     ids: string[],
-    options?: { user?: AuthenticatedUser; skipUnassignFromAgentConfigs?: boolean }
-  ): Promise<DeletePackageConfigsResponse> {
-    const result: DeletePackageConfigsResponse = [];
+    options?: { user?: AuthenticatedUser; skipUnassignFromAgentPolicies?: boolean }
+  ): Promise<DeletePackagePoliciesResponse> {
+    const result: DeletePackagePoliciesResponse = [];
 
     for (const id of ids) {
       try {
-        const oldPackageConfig = await this.get(soClient, id);
-        if (!oldPackageConfig) {
-          throw new Error('Package config not found');
+        const oldPackagePolicy = await this.get(soClient, id);
+        if (!oldPackagePolicy) {
+          throw new Error('Package policy not found');
         }
-        if (!options?.skipUnassignFromAgentConfigs) {
-          await agentConfigService.unassignPackageConfigs(
+        if (!options?.skipUnassignFromAgentPolicies) {
+          await agentPolicyService.unassignPackagePolicies(
             soClient,
-            oldPackageConfig.config_id,
-            [oldPackageConfig.id],
+            oldPackagePolicy.config_id,
+            [oldPackagePolicy.id],
             {
               user: options?.user,
             }
@@ -321,10 +321,10 @@ class PackageConfigService {
     return result;
   }
 
-  public async buildPackageConfigFromPackage(
+  public async buildPackagePolicyFromPackage(
     soClient: SavedObjectsClientContract,
     pkgName: string
-  ): Promise<NewPackageConfig | undefined> {
+  ): Promise<NewPackagePolicy | undefined> {
     const pkgInstall = await getInstallation({ savedObjectsClient: soClient, pkgName });
     if (pkgInstall) {
       const [pkgInfo, defaultOutputId] = await Promise.all([
@@ -339,15 +339,15 @@ class PackageConfigService {
         if (!defaultOutputId) {
           throw new Error('Default output is not set');
         }
-        return packageToPackageConfig(pkgInfo, '', defaultOutputId);
+        return packageToPackagePolicy(pkgInfo, '', defaultOutputId);
       }
     }
   }
 
   public async assignPackageStream(
     pkgInfo: PackageInfo,
-    inputs: PackageConfigInput[]
-  ): Promise<PackageConfigInput[]> {
+    inputs: PackagePolicyInput[]
+  ): Promise<PackagePolicyInput[]> {
     const registryPkgInfo = await Registry.fetchInfo(pkgInfo.name, pkgInfo.version);
     const inputsPromises = inputs.map((input) =>
       _assignPackageStreamToInput(registryPkgInfo, pkgInfo, input)
@@ -360,7 +360,7 @@ class PackageConfigService {
 async function _assignPackageStreamToInput(
   registryPkgInfo: RegistryPackage,
   pkgInfo: PackageInfo,
-  input: PackageConfigInput
+  input: PackagePolicyInput
 ) {
   const streamsPromises = input.streams.map((stream) =>
     _assignPackageStreamToStream(registryPkgInfo, pkgInfo, input, stream)
@@ -373,8 +373,8 @@ async function _assignPackageStreamToInput(
 async function _assignPackageStreamToStream(
   registryPkgInfo: RegistryPackage,
   pkgInfo: PackageInfo,
-  input: PackageConfigInput,
-  stream: PackageConfigInputStream
+  input: PackagePolicyInput,
+  stream: PackagePolicyInputStream
 ) {
   if (!stream.enabled) {
     return { ...stream, compiled_stream: undefined };
@@ -426,5 +426,5 @@ async function _assignPackageStreamToStream(
   return { ...stream };
 }
 
-export type PackageConfigServiceInterface = PackageConfigService;
-export const packageConfigService = new PackageConfigService();
+export type PackagePolicyServiceInterface = PackagePolicyService;
+export const packagePolicyService = new PackagePolicyService();
diff --git a/x-pack/plugins/ingest_manager/server/services/setup.ts b/x-pack/plugins/ingest_manager/server/services/setup.ts
index 4ef093d38879ab..7ecfd539b1bbf7 100644
--- a/x-pack/plugins/ingest_manager/server/services/setup.ts
+++ b/x-pack/plugins/ingest_manager/server/services/setup.ts
@@ -8,21 +8,21 @@ import url from 'url';
 import uuid from 'uuid';
 import { SavedObjectsClientContract } from 'src/core/server';
 import { CallESAsCurrentUser } from '../types';
-import { agentConfigService } from './agent_config';
+import { agentPolicyService } from './agent_config';
 import { outputService } from './output';
 import { ensureInstalledDefaultPackages } from './epm/packages/install';
 import { ensureDefaultIndices } from './epm/kibana/index_pattern/install';
 import {
-  packageToPackageConfig,
-  PackageConfig,
-  AgentConfig,
+  packageToPackagePolicy,
+  PackagePolicy,
+  AgentPolicy,
   Installation,
   Output,
-  DEFAULT_AGENT_CONFIGS_PACKAGES,
+  DEFAULT_AGENT_POLICIES_PACKAGES,
   decodeCloudId,
 } from '../../common';
 import { getPackageInfo } from './epm/packages';
-import { packageConfigService } from './package_config';
+import { packagePolicyService } from './package_config';
 import { generateEnrollmentAPIKey } from './api_keys';
 import { settingsService } from '.';
 import { appContextService } from './app_context';
@@ -55,7 +55,7 @@ export async function setupIngestManager(
       // packages installed by default
       ensureInstalledDefaultPackages(soClient, callCluster),
       outputService.ensureDefaultOutput(soClient),
-      agentConfigService.ensureDefaultAgentConfig(soClient),
+      agentPolicyService.ensureDefaultAgentPolicy(soClient),
       ensureDefaultIndices(callCluster),
       settingsService.getSettings(soClient).catch((e: any) => {
         if (e.isBoom && e.output.statusCode === 404) {
@@ -86,26 +86,26 @@ export async function setupIngestManager(
     ]);
 
     // ensure default packages are added to the default conifg
-    const configWithPackageConfigs = await agentConfigService.get(soClient, config.id, true);
-    if (!configWithPackageConfigs) {
+    const configWithPackagePolicies = await agentPolicyService.get(soClient, config.id, true);
+    if (!configWithPackagePolicies) {
       throw new Error('Config not found');
     }
     if (
-      configWithPackageConfigs.package_configs.length &&
-      typeof configWithPackageConfigs.package_configs[0] === 'string'
+      configWithPackagePolicies.package_configs.length &&
+      typeof configWithPackagePolicies.package_configs[0] === 'string'
     ) {
       throw new Error('Config not found');
     }
     for (const installedPackage of installedPackages) {
-      const packageShouldBeInstalled = DEFAULT_AGENT_CONFIGS_PACKAGES.some(
+      const packageShouldBeInstalled = DEFAULT_AGENT_POLICIES_PACKAGES.some(
         (packageName) => installedPackage.name === packageName
       );
       if (!packageShouldBeInstalled) {
         continue;
       }
 
-      const isInstalled = configWithPackageConfigs.package_configs.some(
-        (d: PackageConfig | string) => {
+      const isInstalled = configWithPackagePolicies.package_configs.some(
+        (d: PackagePolicy | string) => {
           return typeof d !== 'string' && d.package?.name === installedPackage.name;
         }
       );
@@ -115,7 +115,7 @@ export async function setupIngestManager(
           soClient,
           callCluster,
           installedPackage,
-          configWithPackageConfigs,
+          configWithPackagePolicies,
           defaultOutput
         );
       }
@@ -185,15 +185,15 @@ export async function setupFleet(
     fleet_enroll_password: password,
   });
 
-  const { items: agentConfigs } = await agentConfigService.list(soClient, {
+  const { items: agentPolicies } = await agentPolicyService.list(soClient, {
     perPage: 10000,
   });
 
   await Promise.all(
-    agentConfigs.map((agentConfig) => {
+    agentPolicies.map((agentPolicy) => {
       return generateEnrollmentAPIKey(soClient, {
         name: `Default`,
-        configId: agentConfig.id,
+        configId: agentPolicy.id,
       });
     })
   );
@@ -207,7 +207,7 @@ async function addPackageToConfig(
   soClient: SavedObjectsClientContract,
   callCluster: CallESAsCurrentUser,
   packageToInstall: Installation,
-  config: AgentConfig,
+  config: AgentPolicy,
   defaultOutput: Output
 ) {
   const packageInfo = await getPackageInfo({
@@ -216,14 +216,14 @@ async function addPackageToConfig(
     pkgVersion: packageToInstall.version,
   });
 
-  const newPackageConfig = packageToPackageConfig(
+  const newPackagePolicy = packageToPackagePolicy(
     packageInfo,
     config.id,
     defaultOutput.id,
     config.namespace
   );
 
-  await packageConfigService.create(soClient, callCluster, newPackageConfig, {
+  await packagePolicyService.create(soClient, callCluster, newPackagePolicy, {
     bumpConfigRevision: false,
   });
 }
diff --git a/x-pack/plugins/ingest_manager/server/types/index.tsx b/x-pack/plugins/ingest_manager/server/types/index.tsx
index 5d0683a37dc5e4..8e3219a8c08e03 100644
--- a/x-pack/plugins/ingest_manager/server/types/index.tsx
+++ b/x-pack/plugins/ingest_manager/server/types/index.tsx
@@ -17,18 +17,18 @@ export {
   AgentEventSOAttributes,
   AgentAction,
   AgentActionSOAttributes,
-  PackageConfig,
-  PackageConfigInput,
-  PackageConfigInputStream,
-  NewPackageConfig,
-  UpdatePackageConfig,
-  PackageConfigSOAttributes,
-  FullAgentConfigInput,
-  FullAgentConfig,
-  AgentConfig,
-  AgentConfigSOAttributes,
-  NewAgentConfig,
-  AgentConfigStatus,
+  PackagePolicy,
+  PackagePolicyInput,
+  PackagePolicyInputStream,
+  NewPackagePolicy,
+  UpdatePackagePolicy,
+  PackagePolicySOAttributes,
+  FullAgentPolicyInput,
+  FullAgentPolicy,
+  AgentPolicy,
+  AgentPolicySOAttributes,
+  NewAgentPolicy,
+  AgentPolicyStatus,
   DataStream,
   Output,
   NewOutput,
@@ -66,9 +66,9 @@ export {
 
 export type CallESAsCurrentUser = LegacyScopedClusterClient['callAsCurrentUser'];
 
-export type AgentConfigUpdateHandler = (
+export type AgentPolicyUpdateHandler = (
   action: 'created' | 'updated' | 'deleted',
-  agentConfigId: string
+  agentPolicyId: string
 ) => Promise<void>;
 
 export * from './models';
diff --git a/x-pack/plugins/ingest_manager/server/types/models/agent_config.ts b/x-pack/plugins/ingest_manager/server/types/models/agent_config.ts
index a9e14301cd7c3b..c83f8c93675c19 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/agent_config.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { schema } from '@kbn/config-schema';
-import { PackageConfigSchema } from './package_config';
-import { AgentConfigStatus } from '../../../common';
+import { PackagePolicySchema } from './package_config';
+import { AgentPolicyStatus } from '../../../common';
 
-const AgentConfigBaseSchema = {
+const AgentPolicyBaseSchema = {
   name: schema.string({ minLength: 1 }),
   namespace: schema.string({ minLength: 1 }),
   description: schema.maybe(schema.string()),
@@ -16,20 +16,20 @@ const AgentConfigBaseSchema = {
   ),
 };
 
-export const NewAgentConfigSchema = schema.object({
-  ...AgentConfigBaseSchema,
+export const NewAgentPolicySchema = schema.object({
+  ...AgentPolicyBaseSchema,
 });
 
-export const AgentConfigSchema = schema.object({
-  ...AgentConfigBaseSchema,
+export const AgentPolicySchema = schema.object({
+  ...AgentPolicyBaseSchema,
   id: schema.string(),
   status: schema.oneOf([
-    schema.literal(AgentConfigStatus.Active),
-    schema.literal(AgentConfigStatus.Inactive),
+    schema.literal(AgentPolicyStatus.Active),
+    schema.literal(AgentPolicyStatus.Inactive),
   ]),
   package_configs: schema.oneOf([
     schema.arrayOf(schema.string()),
-    schema.arrayOf(PackageConfigSchema),
+    schema.arrayOf(PackagePolicySchema),
   ]),
   updated_at: schema.string(),
   updated_by: schema.string(),
diff --git a/x-pack/plugins/ingest_manager/server/types/models/package_config.ts b/x-pack/plugins/ingest_manager/server/types/models/package_config.ts
index 9b7ffb4f781750..f81ad95bf1269b 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/package_config.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/package_config.ts
@@ -13,7 +13,7 @@ const ConfigRecordSchema = schema.recordOf(
   })
 );
 
-const PackageConfigBaseSchema = {
+const PackagePolicyBaseSchema = {
   name: schema.string(),
   description: schema.maybe(schema.string()),
   namespace: schema.string({ minLength: 1 }),
@@ -62,17 +62,17 @@ const PackageConfigBaseSchema = {
   ),
 };
 
-export const NewPackageConfigSchema = schema.object({
-  ...PackageConfigBaseSchema,
+export const NewPackagePolicySchema = schema.object({
+  ...PackagePolicyBaseSchema,
 });
 
-export const UpdatePackageConfigSchema = schema.object({
-  ...PackageConfigBaseSchema,
+export const UpdatePackagePolicySchema = schema.object({
+  ...PackagePolicyBaseSchema,
   version: schema.maybe(schema.string()),
 });
 
-export const PackageConfigSchema = schema.object({
-  ...PackageConfigBaseSchema,
+export const PackagePolicySchema = schema.object({
+  ...PackagePolicyBaseSchema,
   id: schema.string(),
   version: schema.maybe(schema.string()),
 });
diff --git a/x-pack/plugins/ingest_manager/server/types/rest_spec/agent_config.ts b/x-pack/plugins/ingest_manager/server/types/rest_spec/agent_config.ts
index 594bd141459c1d..bb02eb50a6ad4f 100644
--- a/x-pack/plugins/ingest_manager/server/types/rest_spec/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/server/types/rest_spec/agent_config.ts
@@ -4,50 +4,50 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { schema } from '@kbn/config-schema';
-import { NewAgentConfigSchema } from '../models';
+import { NewAgentPolicySchema } from '../models';
 import { ListWithKuerySchema } from './index';
 
-export const GetAgentConfigsRequestSchema = {
+export const GetAgentPoliciesRequestSchema = {
   query: ListWithKuerySchema.extends({
     full: schema.maybe(schema.boolean()),
   }),
 };
 
-export const GetOneAgentConfigRequestSchema = {
+export const GetOneAgentPolicyRequestSchema = {
   params: schema.object({
-    agentConfigId: schema.string(),
+    agentPolicyId: schema.string(),
   }),
 };
 
-export const CreateAgentConfigRequestSchema = {
-  body: NewAgentConfigSchema,
+export const CreateAgentPolicyRequestSchema = {
+  body: NewAgentPolicySchema,
   query: schema.object({
     sys_monitoring: schema.maybe(schema.boolean()),
   }),
 };
 
-export const UpdateAgentConfigRequestSchema = {
-  ...GetOneAgentConfigRequestSchema,
-  body: NewAgentConfigSchema,
+export const UpdateAgentPolicyRequestSchema = {
+  ...GetOneAgentPolicyRequestSchema,
+  body: NewAgentPolicySchema,
 };
 
-export const CopyAgentConfigRequestSchema = {
-  ...GetOneAgentConfigRequestSchema,
+export const CopyAgentPolicyRequestSchema = {
+  ...GetOneAgentPolicyRequestSchema,
   body: schema.object({
     name: schema.string({ minLength: 1 }),
     description: schema.maybe(schema.string()),
   }),
 };
 
-export const DeleteAgentConfigRequestSchema = {
+export const DeleteAgentPolicyRequestSchema = {
   body: schema.object({
-    agentConfigId: schema.string(),
+    agentPolicyId: schema.string(),
   }),
 };
 
-export const GetFullAgentConfigRequestSchema = {
+export const GetFullAgentPolicyRequestSchema = {
   params: schema.object({
-    agentConfigId: schema.string(),
+    agentPolicyId: schema.string(),
   }),
   query: schema.object({
     download: schema.maybe(schema.boolean()),
diff --git a/x-pack/plugins/ingest_manager/server/types/rest_spec/package_config.ts b/x-pack/plugins/ingest_manager/server/types/rest_spec/package_config.ts
index 630fb55f2654d0..9e7d191ae35f3b 100644
--- a/x-pack/plugins/ingest_manager/server/types/rest_spec/package_config.ts
+++ b/x-pack/plugins/ingest_manager/server/types/rest_spec/package_config.ts
@@ -4,30 +4,30 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { schema } from '@kbn/config-schema';
-import { NewPackageConfigSchema, UpdatePackageConfigSchema } from '../models';
+import { NewPackagePolicySchema, UpdatePackagePolicySchema } from '../models';
 import { ListWithKuerySchema } from './index';
 
-export const GetPackageConfigsRequestSchema = {
+export const GetPackagePoliciesRequestSchema = {
   query: ListWithKuerySchema,
 };
 
-export const GetOnePackageConfigRequestSchema = {
+export const GetOnePackagePolicyRequestSchema = {
   params: schema.object({
-    packageConfigId: schema.string(),
+    packagePolicyId: schema.string(),
   }),
 };
 
-export const CreatePackageConfigRequestSchema = {
-  body: NewPackageConfigSchema,
+export const CreatePackagePolicyRequestSchema = {
+  body: NewPackagePolicySchema,
 };
 
-export const UpdatePackageConfigRequestSchema = {
-  ...GetOnePackageConfigRequestSchema,
-  body: UpdatePackageConfigSchema,
+export const UpdatePackagePolicyRequestSchema = {
+  ...GetOnePackagePolicyRequestSchema,
+  body: UpdatePackagePolicySchema,
 };
 
-export const DeletePackageConfigsRequestSchema = {
+export const DeletePackagePoliciesRequestSchema = {
   body: schema.object({
-    packageConfigIds: schema.arrayOf(schema.string()),
+    packagePolicyIds: schema.arrayOf(schema.string()),
   }),
 };
diff --git a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
index 09f25fc074effe..b7c6fe5c8beb62 100644
--- a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
@@ -19,11 +19,11 @@ import {
 import { factory as policyFactory } from './models/policy_config';
 import { parentEntityId } from './models/event';
 import {
-  GetAgentConfigsResponseItem,
+  GetAgentPoliciesResponseItem,
   GetPackagesResponse,
 } from '../../../ingest_manager/common/types/rest_spec';
 import {
-  AgentConfigStatus,
+  AgentPolicyStatus,
   EsAssetReference,
   InstallationStatus,
   KibanaAssetReference,
@@ -1031,9 +1031,9 @@ export class EndpointDocGenerator {
   }
 
   /**
-   * Generates an Ingest `package config` that includes the Endpoint Policy data
+   * Generates an Ingest `package policy` that includes the Endpoint Policy data
    */
-  public generatePolicyPackageConfig(): PolicyData {
+  public generatePolicyPackagePolicy(): PolicyData {
     const created = new Date(Date.now() - 8.64e7).toISOString(); // 24h ago
     return {
       id: this.seededUUIDv4(),
@@ -1076,13 +1076,13 @@ export class EndpointDocGenerator {
   }
 
   /**
-   * Generate an Agent Configuration (ingest)
+   * Generate an Agent Policy (ingest)
    */
-  public generateAgentConfig(): GetAgentConfigsResponseItem {
+  public generateAgentPolicy(): GetAgentPoliciesResponseItem {
     return {
       id: this.seededUUIDv4(),
-      name: 'Agent Config',
-      status: AgentConfigStatus.Active,
+      name: 'Agent Policy',
+      status: AgentPolicyStatus.Active,
       description: 'Some description',
       namespace: 'default',
       monitoring_enabled: ['logs', 'metrics'],
diff --git a/x-pack/plugins/security_solution/common/endpoint/types.ts b/x-pack/plugins/security_solution/common/endpoint/types.ts
index 2a1c95caff3a3f..2b8de7ed16b08e 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types.ts
@@ -5,7 +5,7 @@
  */
 
 import { ApplicationStart } from 'kibana/public';
-import { NewPackageConfig, PackageConfig } from '../../../ingest_manager/common';
+import { NewPackagePolicy, PackagePolicy } from '../../../ingest_manager/common';
 import { ManifestSchema } from './schema/manifest';
 
 /**
@@ -831,14 +831,14 @@ export enum ProtectionModes {
 }
 
 /**
- * Endpoint Policy data, which extends Ingest's `PackageConfig` type
+ * Endpoint Policy data, which extends Ingest's `PackagePolicy` type
  */
-export type PolicyData = PackageConfig & NewPolicyData;
+export type PolicyData = PackagePolicy & NewPolicyData;
 
 /**
  * New policy data. Used when updating the policy record via ingest APIs
  */
-export type NewPolicyData = NewPackageConfig & {
+export type NewPolicyData = NewPackagePolicy & {
   inputs: [
     {
       type: 'endpoint';
diff --git a/x-pack/plugins/security_solution/public/common/hooks/endpoint/use_navigate_to_app_event_handler.ts b/x-pack/plugins/security_solution/public/common/hooks/endpoint/use_navigate_to_app_event_handler.ts
index cb4de29802e541..190009440529ca 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/endpoint/use_navigate_to_app_event_handler.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/endpoint/use_navigate_to_app_event_handler.ts
@@ -25,8 +25,8 @@ type EventHandlerCallback = MouseEventHandler<HTMLButtonElement | HTMLAnchorElem
  *
  * @example
  *
- * const handleOnClick = useNavigateToAppEventHandler('ingestManager', {path: '#/configs'})
- * return <EuiLink onClick={handleOnClick}>See configs</EuiLink>
+ * const handleOnClick = useNavigateToAppEventHandler('ingestManager', {path: '#/policies'})
+ * return <EuiLink onClick={handleOnClick}>See policies</EuiLink>
  */
 export const useNavigateToAppEventHandler = <S = unknown>(
   /** the app id - normally the value of the `id` in that plugin's `kibana.json`  */
diff --git a/x-pack/plugins/security_solution/public/common/mock/endpoint/dependencies_start_mock.ts b/x-pack/plugins/security_solution/public/common/mock/endpoint/dependencies_start_mock.ts
index 9cf99f2442aabc..5f8ab723df107a 100644
--- a/x-pack/plugins/security_solution/public/common/mock/endpoint/dependencies_start_mock.ts
+++ b/x-pack/plugins/security_solution/public/common/mock/endpoint/dependencies_start_mock.ts
@@ -6,7 +6,7 @@
 
 import {
   IngestManagerStart,
-  registerPackageConfigComponent,
+  registerPackagePolicyComponent,
 } from '../../../../../ingest_manager/public';
 import {
   dataPluginMock,
@@ -61,7 +61,7 @@ export const depsStartMock: () => DepsStartMock = () => {
     data: dataMock,
     ingestManager: {
       isInitialized: () => Promise.resolve(true),
-      registerPackageConfigComponent,
+      registerPackagePolicyComponent,
     },
   };
 };
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts
index fa2dbe084c1a42..8cffa22196d5a7 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts
@@ -18,11 +18,11 @@ import {
 } from './selectors';
 import { EndpointState } from '../types';
 import {
-  sendGetEndpointSpecificPackageConfigs,
+  sendGetEndpointSpecificPackagePolicies,
   sendGetEndpointSecurityPackage,
-  sendGetAgentConfigList,
+  sendGetAgentPolicyList,
 } from '../../policy/store/policy_list/services/ingest';
-import { AGENT_CONFIG_SAVED_OBJECT_TYPE } from '../../../../../../ingest_manager/common';
+import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '../../../../../../ingest_manager/common';
 
 export const endpointMiddlewareFactory: ImmutableMiddlewareFactory<EndpointState> = (coreStart) => {
   return ({ getState, dispatch }) => (next) => async (action) => {
@@ -105,7 +105,7 @@ export const endpointMiddlewareFactory: ImmutableMiddlewareFactory<EndpointState
         });
 
         try {
-          const policyDataResponse: GetPolicyListResponse = await sendGetEndpointSpecificPackageConfigs(
+          const policyDataResponse: GetPolicyListResponse = await sendGetEndpointSpecificPackagePolicies(
             http,
             {
               query: {
@@ -258,21 +258,21 @@ const getNonExistingPoliciesForEndpointsList = async (
     return;
   }
 
-  // We use the Agent Config API here, instead of the Package Config, because we can't use
-  // filter by ID of the Saved Object. Agent Config, however, keeps a reference (array) of
-  // Package Ids that it uses, thus if a reference exists there, then the package config (policy)
+  // We use the Agent Policy API here, instead of the Package Policy, because we can't use
+  // filter by ID of the Saved Object. Agent Policy, however, keeps a reference (array) of
+  // Package Ids that it uses, thus if a reference exists there, then the package policy (policy)
   // exists.
   const policiesFound = (
-    await sendGetAgentConfigList(http, {
+    await sendGetAgentPolicyList(http, {
       query: {
-        kuery: `${AGENT_CONFIG_SAVED_OBJECT_TYPE}.package_configs: (${policyIdsToCheck.join(
+        kuery: `${AGENT_POLICY_SAVED_OBJECT_TYPE}.package_configs: (${policyIdsToCheck.join(
           ' or '
         )})`,
       },
     })
-  ).items.reduce<EndpointState['nonExistingPolicies']>((list, agentConfig) => {
-    (agentConfig.package_configs as string[]).forEach((packageConfig) => {
-      list[packageConfig as string] = true;
+  ).items.reduce<EndpointState['nonExistingPolicies']>((list, agentPolicy) => {
+    (agentPolicy.package_configs as string[]).forEach((packagePolicy) => {
+      list[packagePolicy as string] = true;
     });
     return list;
   }, {});
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts
index 2f0b66624f379e..4ca986b50ce557 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts
@@ -19,7 +19,7 @@ import {
   INGEST_API_PACKAGE_CONFIGS,
 } from '../../policy/store/policy_list/services/ingest';
 import {
-  GetAgentConfigsResponse,
+  GetAgentPoliciesResponse,
   GetPackagesResponse,
 } from '../../../../../../ingest_manager/common/types/rest_spec';
 import { GetPolicyListResponse } from '../../policy/types';
@@ -76,13 +76,13 @@ export const mockEndpointDetailsApiResult = (): HostInfo => {
 const endpointListApiPathHandlerMocks = ({
   endpointsResults = mockEndpointResultList({ total: 3 }).hosts,
   epmPackages = [generator.generateEpmPackage()],
-  endpointPackageConfigs = [],
+  endpointPackagePolicies = [],
   policyResponse = generator.generatePolicyResponse(),
 }: {
   /** route handlers will be setup for each individual host in this array */
   endpointsResults?: HostResultList['hosts'];
   epmPackages?: GetPackagesResponse['response'];
-  endpointPackageConfigs?: GetPolicyListResponse['items'];
+  endpointPackagePolicies?: GetPolicyListResponse['items'];
   policyResponse?: HostPolicyResponse;
 } = {}) => {
   const apiHandlers = {
@@ -105,14 +105,14 @@ const endpointListApiPathHandlerMocks = ({
     },
 
     // Do policies referenced in endpoint list exist
-    // just returns 1 single agent config that includes all of the packageConfig IDs provided
-    [INGEST_API_AGENT_CONFIGS]: (): GetAgentConfigsResponse => {
-      const agentConfig = generator.generateAgentConfig();
-      (agentConfig.package_configs as string[]).push(
-        ...endpointPackageConfigs.map((packageConfig) => packageConfig.id)
+    // just returns 1 single agent policy that includes all of the packagePolicy IDs provided
+    [INGEST_API_AGENT_CONFIGS]: (): GetAgentPoliciesResponse => {
+      const agentPolicy = generator.generateAgentPolicy();
+      (agentPolicy.package_configs as string[]).push(
+        ...endpointPackagePolicies.map((packagePolicy) => packagePolicy.id)
       );
       return {
-        items: [agentConfig],
+        items: [agentPolicy],
         total: 10,
         success: true,
         perPage: 10,
@@ -125,13 +125,13 @@ const endpointListApiPathHandlerMocks = ({
       return { policy_response: policyResponse };
     },
 
-    // List of Policies (package configs) for onboarding
+    // List of Policies (package policies) for onboarding
     [INGEST_API_PACKAGE_CONFIGS]: (): GetPolicyListResponse => {
       return {
-        items: endpointPackageConfigs,
+        items: endpointPackagePolicies,
         page: 1,
         perPage: 10,
-        total: endpointPackageConfigs?.length,
+        total: endpointPackagePolicies?.length,
         success: true,
       };
     },
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details.tsx
index bd499ee6abb245..b76b7e51b2c1b0 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details.tsx
@@ -29,7 +29,7 @@ import { LinkToApp } from '../../../../../common/components/endpoint/link_to_app
 import { getEndpointDetailsPath } from '../../../../common/routing';
 import { SecurityPageName } from '../../../../../app/types';
 import { useFormatUrl } from '../../../../../common/components/link_to';
-import { AgentDetailsReassignConfigAction } from '../../../../../../../ingest_manager/public';
+import { AgentDetailsReassignPolicyAction } from '../../../../../../../ingest_manager/public';
 import { EndpointPolicyLink } from '../components/endpoint_policy_link';
 
 const HostIds = styled(EuiListGroupItem)`
@@ -103,7 +103,7 @@ export const EndpointDetails = memo(({ details }: { details: HostMetadata }) =>
   const agentDetailsWithFlyoutPath = `${agentDetailsAppPath}${openReassignFlyoutSearch}`;
   const agentDetailsWithFlyoutUrl = `${agentDetailsUrl}${openReassignFlyoutSearch}`;
   const handleReassignEndpointsClick = useNavigateToAppEventHandler<
-    AgentDetailsReassignConfigAction
+    AgentDetailsReassignPolicyAction
   >(ingestAppId, {
     path: agentDetailsWithFlyoutPath,
     state: {
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx
index 09df6d6ece042a..05e56a0daa5883 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx
@@ -72,7 +72,7 @@ describe('when on the list page', () => {
     beforeEach(async () => {
       setEndpointListApiMockImplementation(coreStart.http, {
         endpointsResults: [],
-        endpointPackageConfigs: mockPolicyResultList({ total: 3 }).items,
+        endpointPackagePolicies: mockPolicyResultList({ total: 3 }).items,
       });
     });
     afterEach(() => {
@@ -139,12 +139,12 @@ describe('when on the list page', () => {
           });
 
           // Make sure that the first policy id in the host result is not set as non-existent
-          const ingestPackageConfigs = mockPolicyResultList({ total: 1 }).items;
-          ingestPackageConfigs[0].id = firstPolicyID;
+          const ingestPackagePolicies = mockPolicyResultList({ total: 1 }).items;
+          ingestPackagePolicies[0].id = firstPolicyID;
 
           setEndpointListApiMockImplementation(coreStart.http, {
             endpointsResults: hostListData,
-            endpointPackageConfigs: ingestPackageConfigs,
+            endpointPackagePolicies: ingestPackagePolicies,
           });
         });
       });
@@ -331,12 +331,12 @@ describe('when on the list page', () => {
 
       agentId = hostDetails.metadata.elastic.agent.id;
 
-      const policy = docGenerator.generatePolicyPackageConfig();
+      const policy = docGenerator.generatePolicyPackagePolicy();
       policy.id = hostDetails.metadata.Endpoint.policy.applied.id;
 
       setEndpointListApiMockImplementation(coreStart.http, {
         endpointsResults: [hostDetails],
-        endpointPackageConfigs: [policy],
+        endpointPackagePolicies: [policy],
       });
 
       reactTestingLibrary.act(() => {
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
index a923d49012d70d..76140478359ab7 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
@@ -42,8 +42,8 @@ import { PolicyEmptyState, HostsEmptyState } from '../../../components/managemen
 import { FormattedDate } from '../../../../common/components/formatted_date';
 import { useNavigateToAppEventHandler } from '../../../../common/hooks/endpoint/use_navigate_to_app_event_handler';
 import {
-  CreatePackageConfigRouteState,
-  AgentConfigDetailsDeployAgentAction,
+  CreatePackagePolicyRouteState,
+  AgentPolicyDetailsDeployAgentAction,
 } from '../../../../../../ingest_manager/public';
 import { SecurityPageName } from '../../../../app/types';
 import { getEndpointListPath, getEndpointDetailsPath } from '../../../common/routing';
@@ -121,7 +121,7 @@ export const EndpointList = () => {
     [history, queryParams]
   );
 
-  const handleCreatePolicyClick = useNavigateToAppEventHandler<CreatePackageConfigRouteState>(
+  const handleCreatePolicyClick = useNavigateToAppEventHandler<CreatePackagePolicyRouteState>(
     'ingestManager',
     {
       path: `#/integrations${
@@ -142,9 +142,9 @@ export const EndpointList = () => {
   );
 
   const handleDeployEndpointsClick = useNavigateToAppEventHandler<
-    AgentConfigDetailsDeployAgentAction
+    AgentPolicyDetailsDeployAgentAction
   >('ingestManager', {
-    path: `#/configs/${selectedPolicyId}?openEnrollmentFlyout=true`,
+    path: `#/policies/${selectedPolicyId}?openEnrollmentFlyout=true`,
     state: {
       onDoneNavigateTo: [
         'securitySolution:administration',
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware.ts
index 1d9e3c2198b289..968a3c110664ce 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware.ts
@@ -14,9 +14,9 @@ import {
   getPolicyDataForUpdate,
 } from './selectors';
 import {
-  sendGetPackageConfig,
-  sendGetFleetAgentStatusForConfig,
-  sendPutPackageConfig,
+  sendGetPackagePolicy,
+  sendGetFleetAgentStatusForPolicy,
+  sendPutPackagePolicy,
 } from '../policy_list/services/ingest';
 import { NewPolicyData, PolicyData } from '../../../../../../common/endpoint/types';
 import { ImmutableMiddlewareFactory } from '../../../../../common/store';
@@ -35,7 +35,7 @@ export const policyDetailsMiddlewareFactory: ImmutableMiddlewareFactory<PolicyDe
       let policyItem: PolicyData;
 
       try {
-        policyItem = (await sendGetPackageConfig(http, id)).item;
+        policyItem = (await sendGetPackagePolicy(http, id)).item;
       } catch (error) {
         dispatch({
           type: 'serverFailedToReturnPolicyDetailsData',
@@ -54,7 +54,7 @@ export const policyDetailsMiddlewareFactory: ImmutableMiddlewareFactory<PolicyDe
       // Agent summary is secondary data, so its ok for it to come after the details
       // page is populated with the main content
       if (policyItem.config_id) {
-        const { results } = await sendGetFleetAgentStatusForConfig(http, policyItem.config_id);
+        const { results } = await sendGetFleetAgentStatusForPolicy(http, policyItem.config_id);
         dispatch({
           type: 'serverReturnedPolicyDetailsAgentSummaryData',
           payload: {
@@ -68,20 +68,20 @@ export const policyDetailsMiddlewareFactory: ImmutableMiddlewareFactory<PolicyDe
 
       let apiResponse: UpdatePolicyResponse;
       try {
-        apiResponse = await sendPutPackageConfig(http, id, updatedPolicyItem).catch(
+        apiResponse = await sendPutPackagePolicy(http, id, updatedPolicyItem).catch(
           (error: IHttpFetchError) => {
             if (!error.response || error.response.status !== 409) {
               return Promise.reject(error);
             }
             // Handle 409 error (version conflict) here, by using the latest document
-            // for the package config and adding the updated policy to it, ensuring that
+            // for the package policy and adding the updated policy to it, ensuring that
             // any recent updates to `manifest_artifacts` are retained.
-            return sendGetPackageConfig(http, id).then((packageConfig) => {
-              const latestUpdatedPolicyItem = packageConfig.item;
+            return sendGetPackagePolicy(http, id).then((packagePolicy) => {
+              const latestUpdatedPolicyItem = packagePolicy.item;
               latestUpdatedPolicyItem.inputs[0].config.policy =
                 updatedPolicyItem.inputs[0].config.policy;
 
-              return sendPutPackageConfig(
+              return sendPutPackagePolicy(
                 http,
                 id,
                 getPolicyDataForUpdate(latestUpdatedPolicyItem) as NewPolicyData
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors.ts
index d780828fc88339..c236b2841fc858 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors.ts
@@ -22,7 +22,7 @@ import { ManagementRoutePolicyDetailsParams } from '../../../../types';
 export const policyDetails = (state: Immutable<PolicyDetailsState>) => state.policyItem;
 
 /**
- * Given a Policy Data (package config) object, return back a new object with only the field
+ * Given a Policy Data (package policy) object, return back a new object with only the field
  * needed for an Update/Create API action
  * @param policy
  */
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/action.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/action.ts
index b04b2f085689e7..562cd6807f68a9 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/action.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/action.ts
@@ -33,7 +33,7 @@ interface UserClickedPolicyListDeleteButton {
 
 interface UserOpenedPolicyListDeleteModal {
   type: 'userOpenedPolicyListDeleteModal';
-  payload: { agentConfigId: string };
+  payload: { agentPolicyId: string };
 }
 
 interface ServerDeletedPolicyFailure {
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/index.test.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/index.test.ts
index 6ee6a4232f7cfb..48287b725b156e 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/index.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/index.test.ts
@@ -8,7 +8,7 @@ import { PolicyListState } from '../../types';
 import { Store, applyMiddleware, createStore } from 'redux';
 
 import { coreMock } from '../../../../../../../../../src/core/public/mocks';
-import { PACKAGE_CONFIG_SAVED_OBJECT_TYPE } from '../../../../../../../ingest_manager/common';
+import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../../../../../ingest_manager/common';
 
 import { policyListReducer } from './reducer';
 import { policyListMiddlewareFactory } from './middleware';
@@ -169,7 +169,7 @@ describe('policy list store concerns', () => {
     await waitForAction('serverReturnedPolicyListData');
     expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_CONFIGS, {
       query: {
-        kuery: `${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+        kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
         page: 1,
         perPage: 10,
       },
@@ -192,7 +192,7 @@ describe('policy list store concerns', () => {
       await waitForAction('serverReturnedPolicyListData');
       expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_CONFIGS, {
         query: {
-          kuery: `${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+          kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
           page: 1,
           perPage: 50,
         },
@@ -215,7 +215,7 @@ describe('policy list store concerns', () => {
       await waitForAction('serverReturnedPolicyListData');
       expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_CONFIGS, {
         query: {
-          kuery: `${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+          kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
           page: 1,
           perPage: 10,
         },
@@ -226,7 +226,7 @@ describe('policy list store concerns', () => {
       await waitForAction('serverReturnedPolicyListData');
       expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_CONFIGS, {
         query: {
-          kuery: `${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+          kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
           page: 1,
           perPage: 10,
         },
@@ -237,7 +237,7 @@ describe('policy list store concerns', () => {
       await waitForAction('serverReturnedPolicyListData');
       expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_CONFIGS, {
         query: {
-          kuery: `${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+          kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
           page: 11,
           perPage: 10,
         },
@@ -266,7 +266,7 @@ describe('policy list store concerns', () => {
       dispatchUserChangedUrl('?page_size=10&page_index=11');
       expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_CONFIGS, {
         query: {
-          kuery: `${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+          kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
           page: 12,
           perPage: 10,
         },
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/middleware.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/middleware.ts
index 6fe555113617d9..fddd242e092ade 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/middleware.ts
@@ -6,17 +6,17 @@
 
 import { GetPolicyListResponse, PolicyListState } from '../../types';
 import {
-  sendGetEndpointSpecificPackageConfigs,
-  sendDeletePackageConfig,
-  sendGetFleetAgentStatusForConfig,
+  sendGetEndpointSpecificPackagePolicies,
+  sendDeletePackagePolicy,
+  sendGetFleetAgentStatusForPolicy,
   sendGetEndpointSecurityPackage,
 } from './services/ingest';
 import { endpointPackageInfo, isOnPolicyListPage, urlSearchParams } from './selectors';
 import { ImmutableMiddlewareFactory } from '../../../../../common/store';
 import { initialPolicyListState } from './reducer';
 import {
-  DeletePackageConfigsResponse,
-  DeletePackageConfigsRequest,
+  DeletePackagePoliciesResponse,
+  DeletePackagePoliciesRequest,
   GetAgentStatusResponse,
 } from '../../../../../../../ingest_manager/common';
 
@@ -57,7 +57,7 @@ export const policyListMiddlewareFactory: ImmutableMiddlewareFactory<PolicyListS
       let response: GetPolicyListResponse;
 
       try {
-        response = await sendGetEndpointSpecificPackageConfigs(http, {
+        response = await sendGetEndpointSpecificPackagePolicies(http, {
           query: {
             perPage: pageSize,
             page: pageIndex + 1,
@@ -82,10 +82,10 @@ export const policyListMiddlewareFactory: ImmutableMiddlewareFactory<PolicyListS
       });
     } else if (action.type === 'userClickedPolicyListDeleteButton') {
       const { policyId } = action.payload;
-      const packageConfigIds: DeletePackageConfigsRequest['body']['packageConfigIds'] = [policyId];
-      let apiResponse: DeletePackageConfigsResponse;
+      const packagePolicyIds: DeletePackagePoliciesRequest['body']['packagePolicyIds'] = [policyId];
+      let apiResponse: DeletePackagePoliciesResponse;
       try {
-        apiResponse = await sendDeletePackageConfig(http, { body: { packageConfigIds } });
+        apiResponse = await sendDeletePackagePolicy(http, { body: { packagePolicyIds } });
       } catch (err) {
         dispatch({
           type: 'serverDeletedPolicyFailure',
@@ -102,10 +102,10 @@ export const policyListMiddlewareFactory: ImmutableMiddlewareFactory<PolicyListS
         },
       });
     } else if (action.type === 'userOpenedPolicyListDeleteModal') {
-      const { agentConfigId } = action.payload;
+      const { agentPolicyId } = action.payload;
       let apiResponse: GetAgentStatusResponse;
       try {
-        apiResponse = await sendGetFleetAgentStatusForConfig(http, agentConfigId);
+        apiResponse = await sendGetFleetAgentStatusForPolicy(http, agentPolicyId);
       } catch (err) {
         dispatch({
           type: 'serverReturnedPolicyAgentsSummaryForDeleteFailure',
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.test.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.test.ts
index 83cd8558306a0e..5861bd801a080b 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.test.ts
@@ -6,12 +6,12 @@
 
 import {
   INGEST_API_EPM_PACKAGES,
-  sendGetPackageConfig,
+  sendGetPackagePolicy,
   sendGetEndpointSecurityPackage,
-  sendGetEndpointSpecificPackageConfigs,
+  sendGetEndpointSpecificPackagePolicies,
 } from './ingest';
 import { httpServiceMock } from '../../../../../../../../../../src/core/public/mocks';
-import { PACKAGE_CONFIG_SAVED_OBJECT_TYPE } from '../../../../../../../../ingest_manager/common';
+import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../../../../../../ingest_manager/common';
 import { policyListApiPathHandlers } from '../test_mock_utils';
 
 describe('ingest service', () => {
@@ -21,22 +21,22 @@ describe('ingest service', () => {
     http = httpServiceMock.createStartContract();
   });
 
-  describe('sendGetEndpointSpecificPackageConfigs()', () => {
+  describe('sendGetEndpointSpecificPackagePolicies()', () => {
     it('auto adds kuery to api request', async () => {
-      await sendGetEndpointSpecificPackageConfigs(http);
+      await sendGetEndpointSpecificPackagePolicies(http);
       expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/package_configs', {
         query: {
-          kuery: `${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+          kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
         },
       });
     });
     it('supports additional KQL to be defined on input for query params', async () => {
-      await sendGetEndpointSpecificPackageConfigs(http, {
+      await sendGetEndpointSpecificPackagePolicies(http, {
         query: { kuery: 'someValueHere', page: 1, perPage: 10 },
       });
       expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/package_configs', {
         query: {
-          kuery: `someValueHere and ${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+          kuery: `someValueHere and ${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
           perPage: 10,
           page: 1,
         },
@@ -44,13 +44,13 @@ describe('ingest service', () => {
     });
   });
 
-  describe('sendGetPackageConfig()', () => {
+  describe('sendGetPackagePolicy()', () => {
     it('builds correct API path', async () => {
-      await sendGetPackageConfig(http, '123');
+      await sendGetPackagePolicy(http, '123');
       expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/package_configs/123', undefined);
     });
     it('supports http options', async () => {
-      await sendGetPackageConfig(http, '123', { query: { page: 1 } });
+      await sendGetPackagePolicy(http, '123', { query: { page: 1 } });
       expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/package_configs/123', {
         query: {
           page: 1,
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.ts
index 266faf9eae32c9..04d817d5399448 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.ts
@@ -6,14 +6,14 @@
 
 import { HttpFetchOptions, HttpStart } from 'kibana/public';
 import {
-  GetPackageConfigsRequest,
+  GetPackagePoliciesRequest,
   GetAgentStatusResponse,
-  DeletePackageConfigsResponse,
-  DeletePackageConfigsRequest,
-  PACKAGE_CONFIG_SAVED_OBJECT_TYPE,
+  DeletePackagePoliciesResponse,
+  DeletePackagePoliciesRequest,
+  PACKAGE_POLICY_SAVED_OBJECT_TYPE,
   GetPackagesResponse,
-  GetAgentConfigsRequest,
-  GetAgentConfigsResponse,
+  GetAgentPoliciesRequest,
+  GetAgentPoliciesResponse,
 } from '../../../../../../../../ingest_manager/common';
 import { GetPolicyListResponse, GetPolicyResponse, UpdatePolicyResponse } from '../../../types';
 import { NewPolicyData } from '../../../../../../../common/endpoint/types';
@@ -27,14 +27,14 @@ export const INGEST_API_EPM_PACKAGES = `${INGEST_API_ROOT}/epm/packages`;
 const INGEST_API_DELETE_PACKAGE_CONFIG = `${INGEST_API_PACKAGE_CONFIGS}/delete`;
 
 /**
- * Retrieves a list of endpoint specific package configs (those created with a `package.name` of
+ * Retrieves a list of endpoint specific package policies (those created with a `package.name` of
  * `endpoint`) from Ingest
  * @param http
  * @param options
  */
-export const sendGetEndpointSpecificPackageConfigs = (
+export const sendGetEndpointSpecificPackagePolicies = (
   http: HttpStart,
-  options: HttpFetchOptions & Partial<GetPackageConfigsRequest> = {}
+  options: HttpFetchOptions & Partial<GetPackagePoliciesRequest> = {}
 ): Promise<GetPolicyListResponse> => {
   return http.get<GetPolicyListResponse>(INGEST_API_PACKAGE_CONFIGS, {
     ...options,
@@ -42,82 +42,82 @@ export const sendGetEndpointSpecificPackageConfigs = (
       ...options.query,
       kuery: `${
         options?.query?.kuery ? `${options.query.kuery} and ` : ''
-      }${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+      }${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
     },
   });
 };
 
 /**
- * Retrieves a single package config based on ID from ingest
+ * Retrieves a single package policy based on ID from ingest
  * @param http
- * @param packageConfigId
+ * @param packagePolicyId
  * @param options
  */
-export const sendGetPackageConfig = (
+export const sendGetPackagePolicy = (
   http: HttpStart,
-  packageConfigId: string,
+  packagePolicyId: string,
   options?: HttpFetchOptions
 ) => {
-  return http.get<GetPolicyResponse>(`${INGEST_API_PACKAGE_CONFIGS}/${packageConfigId}`, options);
+  return http.get<GetPolicyResponse>(`${INGEST_API_PACKAGE_CONFIGS}/${packagePolicyId}`, options);
 };
 
 /**
- * Retrieves a single package config based on ID from ingest
+ * Retrieves a single package policy based on ID from ingest
  * @param http
  * @param body
  * @param options
  */
-export const sendDeletePackageConfig = (
+export const sendDeletePackagePolicy = (
   http: HttpStart,
-  body: DeletePackageConfigsRequest,
+  body: DeletePackagePoliciesRequest,
   options?: HttpFetchOptions
 ) => {
-  return http.post<DeletePackageConfigsResponse>(INGEST_API_DELETE_PACKAGE_CONFIG, {
+  return http.post<DeletePackagePoliciesResponse>(INGEST_API_DELETE_PACKAGE_CONFIG, {
     ...options,
     body: JSON.stringify(body.body),
   });
 };
 
 /**
- * Retrieve a list of Agent Configurations
+ * Retrieve a list of Agent Policies
  * @param http
  * @param options
  */
-export const sendGetAgentConfigList = (
+export const sendGetAgentPolicyList = (
   http: HttpStart,
-  options: HttpFetchOptions & GetAgentConfigsRequest
+  options: HttpFetchOptions & GetAgentPoliciesRequest
 ) => {
-  return http.get<GetAgentConfigsResponse>(INGEST_API_AGENT_CONFIGS, options);
+  return http.get<GetAgentPoliciesResponse>(INGEST_API_AGENT_CONFIGS, options);
 };
 
 /**
- * Updates a package config
+ * Updates a package policy
  *
  * @param http
- * @param packageConfigId
- * @param packageConfig
+ * @param packagePolicyId
+ * @param packagePolicy
  * @param options
  */
-export const sendPutPackageConfig = (
+export const sendPutPackagePolicy = (
   http: HttpStart,
-  packageConfigId: string,
-  packageConfig: NewPolicyData,
+  packagePolicyId: string,
+  packagePolicy: NewPolicyData,
   options: Exclude<HttpFetchOptions, 'body'> = {}
 ): Promise<UpdatePolicyResponse> => {
-  return http.put(`${INGEST_API_PACKAGE_CONFIGS}/${packageConfigId}`, {
+  return http.put(`${INGEST_API_PACKAGE_CONFIGS}/${packagePolicyId}`, {
     ...options,
-    body: JSON.stringify(packageConfig),
+    body: JSON.stringify(packagePolicy),
   });
 };
 
 /**
- * Get a status summary for all Agents that are currently assigned to a given agent configuration
+ * Get a status summary for all Agents that are currently assigned to a given agent policy
  *
  * @param http
  * @param configId
  * @param options
  */
-export const sendGetFleetAgentStatusForConfig = (
+export const sendGetFleetAgentStatusForPolicy = (
   http: HttpStart,
   /** the Agent (fleet) configuration id */
   configId: string,
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/test_mock_utils.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/test_mock_utils.ts
index 3c9d5fde9b826b..1c14c5c1f0eabc 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/test_mock_utils.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/test_mock_utils.ts
@@ -57,7 +57,7 @@ export const mockPolicyResultList: (options?: {
 
   const policies = [];
   for (let index = 0; index < actualCountToReturn; index++) {
-    policies.push(generator.generatePolicyPackageConfig());
+    policies.push(generator.generatePolicyPackagePolicy());
   }
   const mock: GetPolicyListResponse = {
     items: policies,
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/types.ts b/x-pack/plugins/security_solution/public/management/pages/policy/types.ts
index 4a870016326be8..c7d426da055084 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/types.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/types.ts
@@ -14,10 +14,10 @@ import {
 import { ServerApiError } from '../../../common/types';
 import {
   GetAgentStatusResponse,
-  GetOnePackageConfigResponse,
-  GetPackageConfigsResponse,
+  GetOnePackagePolicyResponse,
+  GetPackagePoliciesResponse,
   GetPackagesResponse,
-  UpdatePackageConfigResponse,
+  UpdatePackagePolicyResponse,
 } from '../../../../../ingest_manager/common';
 
 /**
@@ -44,7 +44,7 @@ export interface PolicyListState {
   isDeleting: boolean;
   /** Deletion status */
   deleteStatus?: boolean;
-  /** A summary of stats for the agents associated with a given Fleet Agent Configuration */
+  /** A summary of stats for the agents associated with a given Fleet Agent Policy */
   agentStatusSummary?: GetAgentStatusResponse['results'];
 }
 
@@ -59,7 +59,7 @@ export interface PolicyDetailsState {
   isLoading: boolean;
   /** current location of the application */
   location?: Immutable<AppLocation>;
-  /** A summary of stats for the agents associated with a given Fleet Agent Configuration */
+  /** A summary of stats for the agents associated with a given Fleet Agent Policy */
   agentStatusSummary?: GetAgentStatusResponse['results'];
   /** Status of an update to the policy  */
   updateStatus?: {
@@ -169,14 +169,14 @@ export type KeysByValueCriteria<O, Criteria> = {
 /** Returns an array of the policy OSes that have a malware protection field */
 export type MalwareProtectionOSes = KeysByValueCriteria<UIPolicyConfig, { malware: MalwareFields }>;
 
-export interface GetPolicyListResponse extends GetPackageConfigsResponse {
+export interface GetPolicyListResponse extends GetPackagePoliciesResponse {
   items: PolicyData[];
 }
 
-export interface GetPolicyResponse extends GetOnePackageConfigResponse {
+export interface GetPolicyResponse extends GetOnePackagePolicyResponse {
   item: PolicyData;
 }
 
-export interface UpdatePolicyResponse extends UpdatePackageConfigResponse {
+export interface UpdatePolicyResponse extends UpdatePackagePolicyResponse {
   item: PolicyData;
 }
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_package_config.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_package_config.tsx
index 2b08bfd2b282b1..c0f74e10e0d72e 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_package_config.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_package_config.tsx
@@ -9,27 +9,27 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiCallOut, EuiText, EuiSpacer } from '@elastic/eui';
 import { LinkToApp } from '../../../../../common/components/endpoint/link_to_app';
 import {
-  CustomConfigurePackageConfigContent,
-  CustomConfigurePackageConfigProps,
+  CustomConfigurePackagePolicyContent,
+  CustomConfigurePackagePolicyProps,
 } from '../../../../../../../ingest_manager/public';
 import { getPolicyDetailPath } from '../../../../common/routing';
 import { MANAGEMENT_APP_ID } from '../../../../common/constants';
 import { PolicyDetailsRouteState } from '../../../../../../common/endpoint/types';
 
 /**
- * Exports Endpoint-specific package config instructions
- * for use in the Ingest app create / edit package config
+ * Exports Endpoint-specific package policy instructions
+ * for use in the Ingest app create / edit package policy
  */
-export const ConfigureEndpointPackageConfig = memo<CustomConfigurePackageConfigContent>(
+export const ConfigureEndpointPackagePolicy = memo<CustomConfigurePackagePolicyContent>(
   ({
     from,
-    packageConfigId,
-    packageConfig: { config_id: agentConfigId },
-  }: CustomConfigurePackageConfigProps) => {
+    packagePolicyId,
+    packagePolicy: { config_id: agentPolicyId },
+  }: CustomConfigurePackagePolicyProps) => {
     let policyUrl = '';
-    if (from === 'edit' && packageConfigId) {
+    if (from === 'edit' && packagePolicyId) {
       // Cannot use formalUrl here since the code is called in Ingest, which does not use redux
-      policyUrl = getPolicyDetailPath(packageConfigId);
+      policyUrl = getPolicyDetailPath(packagePolicyId);
     }
 
     const policyDetailRouteState = useMemo((): undefined | PolicyDetailsRouteState => {
@@ -39,26 +39,26 @@ export const ConfigureEndpointPackageConfig = memo<CustomConfigurePackageConfigC
       const navigateTo: PolicyDetailsRouteState['onSaveNavigateTo'] &
         PolicyDetailsRouteState['onCancelNavigateTo'] = [
         'ingestManager',
-        { path: `#/configs/${agentConfigId}/edit-integration/${packageConfigId}` },
+        { path: `#/policies/${agentPolicyId}/edit-integration/${packagePolicyId}` },
       ];
       return {
         onSaveNavigateTo: navigateTo,
         onCancelNavigateTo: navigateTo,
       };
-    }, [agentConfigId, from, packageConfigId]);
+    }, [agentPolicyId, from, packagePolicyId]);
 
     return (
       <>
         <EuiSpacer size="m" />
         <EuiCallOut
-          data-test-subj={`endpointPackageConfig_${from === 'edit' ? 'edit' : 'create'}`}
+          data-test-subj={`endpointPackagePolicy_${from === 'edit' ? 'edit' : 'create'}`}
           iconType="iInCircle"
         >
           <EuiText size="s">
             <p>
               {from === 'edit' ? (
                 <FormattedMessage
-                  id="xpack.securitySolution.endpoint.ingestManager.editPackageConfig.endpointConfiguration"
+                  id="xpack.securitySolution.endpoint.ingestManager.editPackagePolicy.endpointConfiguration"
                   defaultMessage="Click {advancedConfigOptionsLink} to edit advanced configuration options."
                   values={{
                     advancedConfigOptionsLink: (
@@ -69,7 +69,7 @@ export const ConfigureEndpointPackageConfig = memo<CustomConfigurePackageConfigC
                         appState={policyDetailRouteState}
                       >
                         <FormattedMessage
-                          id="xpack.securitySolution.endpoint.ingestManager.editPackageConfig.endpointConfigurationLink"
+                          id="xpack.securitySolution.endpoint.ingestManager.editPackagePolicy.endpointConfigurationLink"
                           defaultMessage="here"
                         />
                       </LinkToApp>
@@ -78,8 +78,8 @@ export const ConfigureEndpointPackageConfig = memo<CustomConfigurePackageConfigC
                 />
               ) : (
                 <FormattedMessage
-                  id="xpack.securitySolution.endpoint.ingestManager.createPackageConfig.endpointConfiguration"
-                  defaultMessage="We'll save your integration with our recommended defaults. You can change this later by editing the Endpoint Security integration within your agent configuration."
+                  id="xpack.securitySolution.endpoint.ingestManager.createPackagePolicy.endpointConfiguration"
+                  defaultMessage="We'll save your integration with our recommended defaults. You can change this later by editing the Endpoint Security integration within your agent policy."
                 />
               )}
             </p>
@@ -90,4 +90,4 @@ export const ConfigureEndpointPackageConfig = memo<CustomConfigurePackageConfigC
   }
 );
 
-ConfigureEndpointPackageConfig.displayName = 'ConfigureEndpointPackageConfig';
+ConfigureEndpointPackagePolicy.displayName = 'ConfigureEndpointPackagePolicy';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx
index c934cfb94fc7e9..6b3e73dfe25cd7 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx
@@ -27,7 +27,7 @@ describe('Policy Details', () => {
   let middlewareSpy: AppContextTestRender['middlewareSpy'];
   let http: typeof coreStart.http;
   let render: (ui: Parameters<typeof mount>[0]) => ReturnType<typeof mount>;
-  let policyPackageConfig: ReturnType<typeof generator.generatePolicyPackageConfig>;
+  let policyPackagePolicy: ReturnType<typeof generator.generatePolicyPackagePolicy>;
   let policyView: ReturnType<typeof render>;
 
   beforeEach(() => {
@@ -77,8 +77,8 @@ describe('Policy Details', () => {
     let asyncActions: Promise<unknown> = Promise.resolve();
 
     beforeEach(() => {
-      policyPackageConfig = generator.generatePolicyPackageConfig();
-      policyPackageConfig.id = '1';
+      policyPackagePolicy = generator.generatePolicyPackagePolicy();
+      policyPackagePolicy.id = '1';
 
       const policyListApiHandlers = policyListApiPathHandlers();
 
@@ -89,12 +89,12 @@ describe('Policy Details', () => {
           if (path === '/api/ingest_manager/package_configs/1') {
             asyncActions = asyncActions.then<unknown>(async (): Promise<unknown> => sleep());
             return Promise.resolve({
-              item: policyPackageConfig,
+              item: policyPackagePolicy,
               success: true,
             });
           }
 
-          // GET Agent status for agent config
+          // GET Agent status for agent policy
           if (path === '/api/ingest_manager/fleet/agent-status') {
             asyncActions = asyncActions.then(async () => sleep());
             return Promise.resolve({
@@ -134,7 +134,7 @@ describe('Policy Details', () => {
 
       const pageTitle = pageHeaderLeft.find('[data-test-subj="pageViewHeaderLeftTitle"]');
       expect(pageTitle).toHaveLength(1);
-      expect(pageTitle.text()).toEqual(policyPackageConfig.name);
+      expect(pageTitle.text()).toEqual(policyPackagePolicy.name);
     });
     it('should navigate to list if back to link is clicked', async () => {
       policyView.update();
@@ -210,7 +210,7 @@ describe('Policy Details', () => {
           if (typeof path === 'string') {
             if (path === '/api/ingest_manager/package_configs/1') {
               return Promise.resolve({
-                item: policyPackageConfig,
+                item: policyPackagePolicy,
                 success: true,
               });
             }
@@ -234,7 +234,7 @@ describe('Policy Details', () => {
         );
         expect(warningCallout).toHaveLength(1);
         expect(warningCallout.text()).toEqual(
-          'This action will update 5 hostsSaving these changes will apply updates to all endpoints assigned to this agent configuration.'
+          'This action will update 5 hostsSaving these changes will apply updates to all endpoints assigned to this agent policy.'
         );
       });
       it('should close dialog if cancel button is clicked', () => {
@@ -265,7 +265,7 @@ describe('Policy Details', () => {
         });
       });
       it('should show an error notification toast if update fails', async () => {
-        policyPackageConfig.id = 'invalid';
+        policyPackagePolicy.id = 'invalid';
         modalConfirmButton.simulate('click');
 
         await asyncActions;
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx
index e54e684d788c08..5940a6bc516c26 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx
@@ -306,7 +306,7 @@ const ConfirmUpdate = React.memo<{
             >
               <FormattedMessage
                 id="xpack.securitySolution.endpoint.policy.details.updateConfirm.warningMessage"
-                defaultMessage="Saving these changes will apply updates to all endpoints assigned to this agent configuration."
+                defaultMessage="Saving these changes will apply updates to all endpoints assigned to this agent policy."
               />
             </EuiCallOut>
             <EuiSpacer size="xl" />
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.test.tsx
index 97eaceff91e9c4..330caaf985045d 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.test.tsx
@@ -51,7 +51,7 @@ describe.skip('when on the policies page', () => {
         middlewareSpy
           .waitForAction('serverReturnedPolicyListData')
           .then((action) => (firstPolicyID = action.payload.policyItems[0].id)),
-        // middlewareSpy.waitForAction('serverReturnedAgentConfigListData'),
+        // middlewareSpy.waitForAction('serverReturnedAgentPolicyListData'),
       ]);
       return renderResult;
     };
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx
index 39b77d259add1b..1de40e3146864f 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx
@@ -49,7 +49,7 @@ import { SecurityPageName } from '../../../../app/types';
 import { useFormatUrl } from '../../../../common/components/link_to';
 import { getPolicyDetailPath, getPoliciesPath } from '../../../common/routing';
 import { useNavigateToAppEventHandler } from '../../../../common/hooks/endpoint/use_navigate_to_app_event_handler';
-import { CreatePackageConfigRouteState } from '../../../../../../ingest_manager/public';
+import { CreatePackagePolicyRouteState } from '../../../../../../ingest_manager/public';
 import { MANAGEMENT_APP_ID } from '../../../common/constants';
 
 interface TableChangeCallbackArguments {
@@ -148,7 +148,7 @@ export const PolicyList = React.memo(() => {
     endpointPackageVersion,
   } = usePolicyListSelector(selector);
 
-  const handleCreatePolicyClick = useNavigateToAppEventHandler<CreatePackageConfigRouteState>(
+  const handleCreatePolicyClick = useNavigateToAppEventHandler<CreatePackagePolicyRouteState>(
     'ingestManager',
     {
       // We redirect to Ingest's Integaration page if we can't get the package version, and
@@ -224,11 +224,11 @@ export const PolicyList = React.memo(() => {
   );
 
   const handleDeleteOnClick = useCallback(
-    ({ policyId, agentConfigId }: { policyId: string; agentConfigId: string }) => {
+    ({ policyId, agentPolicyId }: { policyId: string; agentPolicyId: string }) => {
       dispatch({
         type: 'userOpenedPolicyListDeleteModal',
         payload: {
-          agentConfigId,
+          agentPolicyId,
         },
       });
       setPolicyIdToDelete(policyId);
@@ -338,18 +338,18 @@ export const PolicyList = React.memo(() => {
               return (
                 <TableRowActions
                   items={[
-                    <EuiContextMenuItem icon="link" key="agentConfigLink">
+                    <EuiContextMenuItem icon="link" key="agentPolicyLink">
                       <LinkToApp
-                        data-test-subj="agentConfigLink"
+                        data-test-subj="agentPolicyLink"
                         appId="ingestManager"
-                        appPath={`#/configs/${item.config_id}`}
-                        href={`${services.application.getUrlForApp('ingestManager')}#/configs/${
+                        appPath={`#/policies/${item.config_id}`}
+                        href={`${services.application.getUrlForApp('ingestManager')}#/policies/${
                           item.config_id
                         }`}
                       >
                         <FormattedMessage
-                          id="xpack.securitySolution.endpoint.policyList.agentConfigAction"
-                          defaultMessage="View Agent Configuration"
+                          id="xpack.securitySolution.endpoint.policyList.agentPolicyAction"
+                          defaultMessage="View Agent Policy"
                         />
                       </LinkToApp>
                     </EuiContextMenuItem>,
@@ -358,7 +358,7 @@ export const PolicyList = React.memo(() => {
                       icon="trash"
                       key="policyDeletAction"
                       onClick={() => {
-                        handleDeleteOnClick({ agentConfigId: item.config_id, policyId: item.id });
+                        handleDeleteOnClick({ agentPolicyId: item.config_id, policyId: item.id });
                       }}
                     >
                       <FormattedMessage
diff --git a/x-pack/plugins/security_solution/public/plugin.tsx b/x-pack/plugins/security_solution/public/plugin.tsx
index 98ea2efe8721ec..e5dd99ab675b3b 100644
--- a/x-pack/plugins/security_solution/public/plugin.tsx
+++ b/x-pack/plugins/security_solution/public/plugin.tsx
@@ -43,7 +43,7 @@ import {
   APP_CASES_PATH,
   APP_PATH,
 } from '../common/constants';
-import { ConfigureEndpointPackageConfig } from './management/pages/policy/view/ingest_manager_integration/configure_package_config';
+import { ConfigureEndpointPackagePolicy } from './management/pages/policy/view/ingest_manager_integration/configure_package_config';
 
 import { State, createStore, createInitialState } from './common/store';
 import { SecurityPageName } from './app/types';
@@ -325,9 +325,9 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
   public start(core: CoreStart, plugins: StartPlugins) {
     KibanaServices.init({ ...core, ...plugins, kibanaVersion: this.kibanaVersion });
     if (plugins.ingestManager) {
-      plugins.ingestManager.registerPackageConfigComponent(
+      plugins.ingestManager.registerPackagePolicyComponent(
         'endpoint',
-        ConfigureEndpointPackageConfig
+        ConfigureEndpointPackagePolicy
       );
     }
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts b/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts
index f51e8c6be10409..0ec0db9f32776f 100644
--- a/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts
@@ -10,7 +10,7 @@ import {
   SavedObjectsClientContract,
 } from 'src/core/server';
 import { AgentService, IngestManagerStartContract } from '../../../ingest_manager/server';
-import { getPackageConfigCreateCallback } from './ingest_integration';
+import { getPackagePolicyCreateCallback } from './ingest_integration';
 import { ManifestManager } from './services/artifacts';
 
 export type EndpointAppContextServiceStartContract = Partial<
@@ -38,8 +38,8 @@ export class EndpointAppContextService {
 
     if (this.manifestManager && dependencies.registerIngestCallback) {
       dependencies.registerIngestCallback(
-        'packageConfigCreate',
-        getPackageConfigCreateCallback(dependencies.logger, this.manifestManager)
+        'packagePolicyCreate',
+        getPackagePolicyCreateCallback(dependencies.logger, this.manifestManager)
       );
     }
   }
diff --git a/x-pack/plugins/security_solution/server/endpoint/ingest_integration.test.ts b/x-pack/plugins/security_solution/server/endpoint/ingest_integration.test.ts
index 03999715dfc710..73f2124736a79b 100644
--- a/x-pack/plugins/security_solution/server/endpoint/ingest_integration.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/ingest_integration.test.ts
@@ -5,13 +5,13 @@
  */
 
 import { loggingSystemMock } from 'src/core/server/mocks';
-import { createNewPackageConfigMock } from '../../../ingest_manager/common/mocks';
+import { createNewPackagePolicyMock } from '../../../ingest_manager/common/mocks';
 import { factory as policyConfigFactory } from '../../common/endpoint/models/policy_config';
 import {
   getManifestManagerMock,
   ManifestManagerMockType,
 } from './services/artifacts/manifest_manager/manifest_manager.mock';
-import { getPackageConfigCreateCallback } from './ingest_integration';
+import { getPackagePolicyCreateCallback } from './ingest_integration';
 
 describe('ingest_integration tests ', () => {
   describe('ingest_integration sanity checks', () => {
@@ -21,8 +21,8 @@ describe('ingest_integration tests ', () => {
         mockType: ManifestManagerMockType.InitialSystemState,
       });
 
-      const callback = getPackageConfigCreateCallback(logger, manifestManager);
-      const policyConfig = createNewPackageConfigMock(); // policy config without manifest
+      const callback = getPackagePolicyCreateCallback(logger, manifestManager);
+      const policyConfig = createNewPackagePolicyMock(); // policy config without manifest
       const newPolicyConfig = await callback(policyConfig); // policy config WITH manifest
 
       expect(newPolicyConfig.inputs[0]!.type).toEqual('endpoint');
@@ -61,8 +61,8 @@ describe('ingest_integration tests ', () => {
       manifestManager.pushArtifacts = jest.fn().mockResolvedValue([new Error('error updating')]);
       const lastComputed = await manifestManager.getLastComputedManifest();
 
-      const callback = getPackageConfigCreateCallback(logger, manifestManager);
-      const policyConfig = createNewPackageConfigMock();
+      const callback = getPackagePolicyCreateCallback(logger, manifestManager);
+      const policyConfig = createNewPackagePolicyMock();
       const newPolicyConfig = await callback(policyConfig);
 
       expect(newPolicyConfig.inputs[0]!.type).toEqual('endpoint');
@@ -81,8 +81,8 @@ describe('ingest_integration tests ', () => {
       expect(lastComputed).toEqual(null);
 
       manifestManager.buildNewManifest = jest.fn().mockRejectedValue(new Error('abcd'));
-      const callback = getPackageConfigCreateCallback(logger, manifestManager);
-      const policyConfig = createNewPackageConfigMock();
+      const callback = getPackagePolicyCreateCallback(logger, manifestManager);
+      const policyConfig = createNewPackagePolicyMock();
       const newPolicyConfig = await callback(policyConfig);
 
       expect(newPolicyConfig.inputs[0]!.type).toEqual('endpoint');
@@ -95,8 +95,8 @@ describe('ingest_integration tests ', () => {
       const lastComputed = await manifestManager.getLastComputedManifest();
 
       manifestManager.buildNewManifest = jest.fn().mockResolvedValue(lastComputed); // no diffs
-      const callback = getPackageConfigCreateCallback(logger, manifestManager);
-      const policyConfig = createNewPackageConfigMock();
+      const callback = getPackagePolicyCreateCallback(logger, manifestManager);
+      const policyConfig = createNewPackagePolicyMock();
       const newPolicyConfig = await callback(policyConfig);
 
       expect(newPolicyConfig.inputs[0]!.type).toEqual('endpoint');
diff --git a/x-pack/plugins/security_solution/server/endpoint/ingest_integration.ts b/x-pack/plugins/security_solution/server/endpoint/ingest_integration.ts
index 695267f3228579..489b146daeb432 100644
--- a/x-pack/plugins/security_solution/server/endpoint/ingest_integration.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/ingest_integration.ts
@@ -5,7 +5,7 @@
  */
 
 import { Logger } from '../../../../../src/core/server';
-import { NewPackageConfig } from '../../../ingest_manager/common/types/models';
+import { NewPackagePolicy } from '../../../ingest_manager/common/types/models';
 import { factory as policyConfigFactory } from '../../common/endpoint/models/policy_config';
 import { NewPolicyData } from '../../common/endpoint/types';
 import { ManifestManager } from './services/artifacts';
@@ -67,23 +67,23 @@ const getManifest = async (logger: Logger, manifestManager: ManifestManager): Pr
 };
 
 /**
- * Callback to handle creation of PackageConfigs in Ingest Manager
+ * Callback to handle creation of PackagePolicies in Ingest Manager
  */
-export const getPackageConfigCreateCallback = (
+export const getPackagePolicyCreateCallback = (
   logger: Logger,
   manifestManager: ManifestManager
-): ((newPackageConfig: NewPackageConfig) => Promise<NewPackageConfig>) => {
-  const handlePackageConfigCreate = async (
-    newPackageConfig: NewPackageConfig
-  ): Promise<NewPackageConfig> => {
-    // We only care about Endpoint package configs
-    if (newPackageConfig.package?.name !== 'endpoint') {
-      return newPackageConfig;
+): ((newPackagePolicy: NewPackagePolicy) => Promise<NewPackagePolicy>) => {
+  const handlePackagePolicyCreate = async (
+    newPackagePolicy: NewPackagePolicy
+  ): Promise<NewPackagePolicy> => {
+    // We only care about Endpoint package policies
+    if (newPackagePolicy.package?.name !== 'endpoint') {
+      return newPackagePolicy;
     }
 
     // We cast the type here so that any changes to the Endpoint specific data
     // follow the types/schema expected
-    let updatedPackageConfig = newPackageConfig as NewPolicyData;
+    let updatedPackagePolicy = newPackagePolicy as NewPolicyData;
 
     // Get most recent manifest
     const manifest = await getManifest(logger, manifestManager);
@@ -96,8 +96,8 @@ export const getPackageConfigCreateCallback = (
 
     // Until we get the Default Policy Configuration in the Endpoint package,
     // we will add it here manually at creation time.
-    updatedPackageConfig = {
-      ...newPackageConfig,
+    updatedPackagePolicy = {
+      ...newPackagePolicy,
       inputs: [
         {
           type: 'endpoint',
@@ -115,8 +115,8 @@ export const getPackageConfigCreateCallback = (
       ],
     };
 
-    return updatedPackageConfig;
+    return updatedPackagePolicy;
   };
 
-  return handlePackageConfigCreate;
+  return handlePackagePolicyCreate;
 };
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/mocks.ts
index 62fff4715b562a..61850bfb3bc7d3 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/mocks.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/mocks.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { PackageConfig } from '../../../../../ingest_manager/common';
-import { createPackageConfigMock } from '../../../../../ingest_manager/common/mocks';
+import { PackagePolicy } from '../../../../../ingest_manager/common';
+import { createPackagePolicyMock } from '../../../../../ingest_manager/common/mocks';
 import { InternalArtifactCompleteSchema } from '../../schemas/artifacts';
 import {
   getInternalArtifactMock,
@@ -69,9 +69,9 @@ export const getEmptyMockManifest = async (opts?: { compress: boolean }) => {
   return manifest;
 };
 
-export const createPackageConfigWithInitialManifestMock = (): PackageConfig => {
-  const packageConfig = createPackageConfigMock();
-  packageConfig.inputs[0].config!.artifact_manifest = {
+export const createPackagePolicyWithInitialManifestMock = (): PackagePolicy => {
+  const packagePolicy = createPackagePolicyMock();
+  packagePolicy.inputs[0].config!.artifact_manifest = {
     value: {
       artifacts: {
         'endpoint-exceptionlist-macos-v1': {
@@ -99,12 +99,12 @@ export const createPackageConfigWithInitialManifestMock = (): PackageConfig => {
       schema_version: 'v1',
     },
   };
-  return packageConfig;
+  return packagePolicy;
 };
 
-export const createPackageConfigWithManifestMock = (): PackageConfig => {
-  const packageConfig = createPackageConfigMock();
-  packageConfig.inputs[0].config!.artifact_manifest = {
+export const createPackagePolicyWithManifestMock = (): PackagePolicy => {
+  const packagePolicy = createPackagePolicyMock();
+  packagePolicy.inputs[0].config!.artifact_manifest = {
     value: {
       artifacts: {
         'endpoint-exceptionlist-macos-v1': {
@@ -133,5 +133,5 @@ export const createPackageConfigWithManifestMock = (): PackageConfig => {
     },
   };
 
-  return packageConfig;
+  return packagePolicy;
 };
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.ts
index 4f2dbdf7644e2b..02e57a71dcd945 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.ts
@@ -148,7 +148,7 @@ export class ManifestTask {
         }
       }
 
-      // Try dispatching to ingest-manager package configs
+      // Try dispatching to ingest-manager package policies
       const dispatchErrors = await manifestManager.tryDispatch(newManifest);
       if (dispatchErrors.length) {
         reportErrors(this.logger, dispatchErrors);
diff --git a/x-pack/plugins/security_solution/server/endpoint/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/mocks.ts
index 9ca447d53bf45c..b5f35a198fa9e5 100644
--- a/x-pack/plugins/security_solution/server/endpoint/mocks.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/mocks.ts
@@ -12,7 +12,7 @@ import {
   IngestManagerStartContract,
   ExternalCallback,
 } from '../../../ingest_manager/server';
-import { createPackageConfigServiceMock } from '../../../ingest_manager/server/mocks';
+import { createPackagePolicyServiceMock } from '../../../ingest_manager/server/mocks';
 import { createMockConfig } from '../lib/detection_engine/routes/__mocks__';
 import {
   EndpointAppContextService,
@@ -96,7 +96,7 @@ export const createMockIngestManagerStartContract = (
     },
     agentService: createMockAgentService(),
     registerExternalCallback: jest.fn((...args: ExternalCallback) => {}),
-    packageConfigService: createPackageConfigServiceMock(),
+    packagePolicyService: createPackagePolicyServiceMock(),
   };
 };
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.mock.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.mock.ts
index 34e18c5fe85fc8..27dd38047e7c36 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.mock.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.mock.ts
@@ -6,8 +6,8 @@
 
 import { savedObjectsClientMock, loggingSystemMock } from 'src/core/server/mocks';
 import { Logger } from 'src/core/server';
-import { PackageConfigServiceInterface } from '../../../../../../ingest_manager/server';
-import { createPackageConfigServiceMock } from '../../../../../../ingest_manager/server/mocks';
+import { PackagePolicyServiceInterface } from '../../../../../../ingest_manager/server';
+import { createPackagePolicyServiceMock } from '../../../../../../ingest_manager/server/mocks';
 import { ExceptionListClient } from '../../../../../../lists/server';
 import { listMock } from '../../../../../../lists/server/mocks';
 import LRU from 'lru-cache';
@@ -15,8 +15,8 @@ import { getArtifactClientMock } from '../artifact_client.mock';
 import { getManifestClientMock } from '../manifest_client.mock';
 import { ManifestManager } from './manifest_manager';
 import {
-  createPackageConfigWithManifestMock,
-  createPackageConfigWithInitialManifestMock,
+  createPackagePolicyWithManifestMock,
+  createPackagePolicyWithInitialManifestMock,
   getMockManifest,
   getMockArtifactsWithDiff,
   getEmptyMockArtifacts,
@@ -32,7 +32,7 @@ export const getManifestManagerMock = (opts?: {
   mockType?: ManifestManagerMockType;
   cache?: LRU<string, Buffer>;
   exceptionListClient?: ExceptionListClient;
-  packageConfigService?: jest.Mocked<PackageConfigServiceInterface>;
+  packagePolicyService?: jest.Mocked<PackagePolicyServiceInterface>;
   savedObjectsClient?: ReturnType<typeof savedObjectsClientMock.create>;
 }): ManifestManager => {
   let cache = new LRU<string, Buffer>({ max: 10, maxAge: 1000 * 60 * 60 });
@@ -45,16 +45,16 @@ export const getManifestManagerMock = (opts?: {
     exceptionListClient = opts.exceptionListClient;
   }
 
-  let packageConfigService = createPackageConfigServiceMock();
-  if (opts?.packageConfigService != null) {
-    packageConfigService = opts.packageConfigService;
+  let packagePolicyService = createPackagePolicyServiceMock();
+  if (opts?.packagePolicyService != null) {
+    packagePolicyService = opts.packagePolicyService;
   }
-  packageConfigService.list = jest.fn().mockResolvedValue({
+  packagePolicyService.list = jest.fn().mockResolvedValue({
     total: 1,
     items: [
-      { version: 'policy-1-version', ...createPackageConfigWithManifestMock() },
-      { version: 'policy-2-version', ...createPackageConfigWithInitialManifestMock() },
-      { version: 'policy-3-version', ...createPackageConfigWithInitialManifestMock() },
+      { version: 'policy-1-version', ...createPackagePolicyWithManifestMock() },
+      { version: 'policy-2-version', ...createPackagePolicyWithInitialManifestMock() },
+      { version: 'policy-3-version', ...createPackagePolicyWithInitialManifestMock() },
     ],
   });
 
@@ -97,7 +97,7 @@ export const getManifestManagerMock = (opts?: {
   const manifestManager = new ManifestManagerMock({
     artifactClient: getArtifactClientMock(savedObjectsClient),
     cache,
-    packageConfigService,
+    packagePolicyService,
     exceptionListClient,
     logger: loggingSystemMock.create().get() as jest.Mocked<Logger>,
     savedObjectsClient,
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.test.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.test.ts
index 8e0d55104fb7c5..bb6504de6e0a42 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.test.ts
@@ -6,7 +6,7 @@
 
 import { inflateSync } from 'zlib';
 import { savedObjectsClientMock } from 'src/core/server/mocks';
-import { createPackageConfigServiceMock } from '../../../../../../ingest_manager/server/mocks';
+import { createPackagePolicyServiceMock } from '../../../../../../ingest_manager/server/mocks';
 import { ArtifactConstants, ManifestConstants, isCompleteArtifact } from '../../../lib/artifacts';
 
 import { getManifestManagerMock, ManifestManagerMockType } from './manifest_manager.mock';
@@ -92,8 +92,8 @@ describe('manifest_manager', () => {
     });
 
     test('ManifestManager cannot dispatch incomplete (uncompressed) artifact', async () => {
-      const packageConfigService = createPackageConfigServiceMock();
-      const manifestManager = getManifestManagerMock({ packageConfigService });
+      const packagePolicyService = createPackagePolicyServiceMock();
+      const manifestManager = getManifestManagerMock({ packagePolicyService });
       const oldManifest = await manifestManager.getLastComputedManifest();
       const newManifest = await manifestManager.buildNewManifest(oldManifest!);
       const dispatchErrors = await manifestManager.tryDispatch(newManifest);
@@ -102,8 +102,8 @@ describe('manifest_manager', () => {
     });
 
     test('ManifestManager can dispatch manifest', async () => {
-      const packageConfigService = createPackageConfigServiceMock();
-      const manifestManager = getManifestManagerMock({ packageConfigService });
+      const packagePolicyService = createPackagePolicyServiceMock();
+      const manifestManager = getManifestManagerMock({ packagePolicyService });
       const oldManifest = await manifestManager.getLastComputedManifest();
       const newManifest = await manifestManager.buildNewManifest(oldManifest!);
       const diffs = newManifest.diff(oldManifest!);
@@ -117,10 +117,10 @@ describe('manifest_manager', () => {
       expect(dispatchErrors).toEqual([]);
 
       // 2 policies updated... 1 is already up-to-date
-      expect(packageConfigService.update.mock.calls.length).toEqual(2);
+      expect(packagePolicyService.update.mock.calls.length).toEqual(2);
 
       expect(
-        packageConfigService.update.mock.calls[0][2].inputs[0].config!.artifact_manifest.value
+        packagePolicyService.update.mock.calls[0][2].inputs[0].config!.artifact_manifest.value
       ).toEqual({
         manifest_version: '1.0.1',
         schema_version: 'v1',
@@ -150,8 +150,8 @@ describe('manifest_manager', () => {
     });
 
     test('ManifestManager fails to dispatch on conflict', async () => {
-      const packageConfigService = createPackageConfigServiceMock();
-      const manifestManager = getManifestManagerMock({ packageConfigService });
+      const packagePolicyService = createPackagePolicyServiceMock();
+      const manifestManager = getManifestManagerMock({ packagePolicyService });
       const oldManifest = await manifestManager.getLastComputedManifest();
       const newManifest = await manifestManager.buildNewManifest(oldManifest!);
       const diffs = newManifest.diff(oldManifest!);
@@ -160,7 +160,7 @@ describe('manifest_manager', () => {
 
       newManifest.bumpSemanticVersion();
 
-      packageConfigService.update.mockRejectedValueOnce({ status: 409 });
+      packagePolicyService.update.mockRejectedValueOnce({ status: 409 });
       const dispatchErrors = await manifestManager.tryDispatch(newManifest);
       expect(dispatchErrors).toEqual([{ status: 409 }]);
     });
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts
index 9d15b4464c1917..70557886e57c51 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts
@@ -6,7 +6,7 @@
 import semver from 'semver';
 import { Logger, SavedObjectsClientContract } from 'src/core/server';
 import LRU from 'lru-cache';
-import { PackageConfigServiceInterface } from '../../../../../../ingest_manager/server';
+import { PackagePolicyServiceInterface } from '../../../../../../ingest_manager/server';
 import { ExceptionListClient } from '../../../../../../lists/server';
 import { ManifestSchemaVersion } from '../../../../../common/endpoint/schema/common';
 import { manifestDispatchSchema } from '../../../../../common/endpoint/schema/manifest';
@@ -30,7 +30,7 @@ export interface ManifestManagerContext {
   savedObjectsClient: SavedObjectsClientContract;
   artifactClient: ArtifactClient;
   exceptionListClient: ExceptionListClient;
-  packageConfigService: PackageConfigServiceInterface;
+  packagePolicyService: PackagePolicyServiceInterface;
   logger: Logger;
   cache: LRU<string, Buffer>;
 }
@@ -47,7 +47,7 @@ export interface ManifestSnapshot {
 export class ManifestManager {
   protected artifactClient: ArtifactClient;
   protected exceptionListClient: ExceptionListClient;
-  protected packageConfigService: PackageConfigServiceInterface;
+  protected packagePolicyService: PackagePolicyServiceInterface;
   protected savedObjectsClient: SavedObjectsClientContract;
   protected logger: Logger;
   protected cache: LRU<string, Buffer>;
@@ -56,7 +56,7 @@ export class ManifestManager {
   constructor(context: ManifestManagerContext) {
     this.artifactClient = context.artifactClient;
     this.exceptionListClient = context.exceptionListClient;
-    this.packageConfigService = context.packageConfigService;
+    this.packagePolicyService = context.packagePolicyService;
     this.savedObjectsClient = context.savedObjectsClient;
     this.logger = context.logger;
     this.cache = context.cache;
@@ -217,7 +217,7 @@ export class ManifestManager {
   }
 
   /**
-   * Dispatches the manifest by writing it to the endpoint package config, if different
+   * Dispatches the manifest by writing it to the endpoint package policy, if different
    * from the manifest already in the config.
    *
    * @param manifest The Manifest to dispatch.
@@ -234,39 +234,39 @@ export class ManifestManager {
     const errors: Error[] = [];
 
     while (paging) {
-      const { items, total } = await this.packageConfigService.list(this.savedObjectsClient, {
+      const { items, total } = await this.packagePolicyService.list(this.savedObjectsClient, {
         page,
         perPage: 20,
         kuery: 'ingest-package-policies.package.name:endpoint',
       });
 
-      for (const packageConfig of items) {
+      for (const packagePolicy of items) {
         // eslint-disable-next-line @typescript-eslint/naming-convention
-        const { id, revision, updated_at, updated_by, ...newPackageConfig } = packageConfig;
-        if (newPackageConfig.inputs.length > 0 && newPackageConfig.inputs[0].config !== undefined) {
-          const oldManifest = newPackageConfig.inputs[0].config.artifact_manifest ?? {
+        const { id, revision, updated_at, updated_by, ...newPackagePolicy } = packagePolicy;
+        if (newPackagePolicy.inputs.length > 0 && newPackagePolicy.inputs[0].config !== undefined) {
+          const oldManifest = newPackagePolicy.inputs[0].config.artifact_manifest ?? {
             value: {},
           };
 
           const newManifestVersion = manifest.getSemanticVersion();
           if (semver.gt(newManifestVersion, oldManifest.value.manifest_version)) {
-            newPackageConfig.inputs[0].config.artifact_manifest = {
+            newPackagePolicy.inputs[0].config.artifact_manifest = {
               value: serializedManifest,
             };
 
             try {
-              await this.packageConfigService.update(this.savedObjectsClient, id, newPackageConfig);
+              await this.packagePolicyService.update(this.savedObjectsClient, id, newPackagePolicy);
               this.logger.debug(
-                `Updated package config ${id} with manifest version ${manifest.getSemanticVersion()}`
+                `Updated package policy ${id} with manifest version ${manifest.getSemanticVersion()}`
               );
             } catch (err) {
               errors.push(err);
             }
           } else {
-            this.logger.debug(`No change in package config: ${id}`);
+            this.logger.debug(`No change in package policy: ${id}`);
           }
         } else {
-          errors.push(new Error(`Package config ${id} has no config.`));
+          errors.push(new Error(`Package Policy ${id} has no config.`));
         }
       }
       paging = (page - 1) * 20 + items.length < total;
diff --git a/x-pack/plugins/security_solution/server/plugin.ts b/x-pack/plugins/security_solution/server/plugin.ts
index f2fad16d80414c..85764eaaee32d6 100644
--- a/x-pack/plugins/security_solution/server/plugin.ts
+++ b/x-pack/plugins/security_solution/server/plugin.ts
@@ -285,7 +285,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
         savedObjectsClient,
         artifactClient,
         exceptionListClient,
-        packageConfigService: plugins.ingestManager!.packageConfigService,
+        packagePolicyService: plugins.ingestManager!.packagePolicyService,
         logger: this.logger,
         cache: this.exceptionsCache,
       });
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index f2aeed63d6eea2..c7575a1a06e4e0 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -9150,53 +9150,53 @@
     "xpack.infra.waffle.unableToSelectMetricErrorTitle": "メトリックのオプションまたは値を選択できません",
     "xpack.infra.waffleTime.autoRefreshButtonLabel": "自動更新",
     "xpack.infra.waffleTime.stopRefreshingButtonLabel": "更新中止",
-    "xpack.ingestManager.agentConfig.confirmModalCalloutDescription": "選択されたエージェント構成{configName}が一部のエージェントで既に使用されていることをフリートが検出しました。このアクションの結果として、フリートはこの構成で使用されているすべてのエージェントに更新をデプロイします。",
-    "xpack.ingestManager.agentConfig.confirmModalCancelButtonLabel": "キャンセル",
-    "xpack.ingestManager.agentConfig.confirmModalConfirmButtonLabel": "変更を保存してデプロイ",
-    "xpack.ingestManager.agentConfig.confirmModalDescription": "このアクションは元に戻せません。続行していいですか？",
-    "xpack.ingestManager.agentConfig.confirmModalTitle": "変更を保存してデプロイ",
-    "xpack.ingestManager.agentConfig.linkedAgentCountText": "{count, plural, one {# エージェント} other {# エージェント}}",
-    "xpack.ingestManager.agentConfigActionMenu.buttonText": "アクション",
-    "xpack.ingestManager.agentConfigActionMenu.copyConfigActionText": "構成のコピー",
-    "xpack.ingestManager.agentConfigActionMenu.enrollAgentActionText": "エージェントの追加",
-    "xpack.ingestManager.agentConfigActionMenu.viewConfigText": "構成を表示",
-    "xpack.ingestManager.agentConfigForm.advancedOptionsToggleLabel": "高度なオプション",
-    "xpack.ingestManager.agentConfigForm.descriptionFieldLabel": "説明",
-    "xpack.ingestManager.agentConfigForm.descriptionFieldPlaceholder": "この構成がどのように使用されるか",
-    "xpack.ingestManager.agentConfigForm.monitoringDescription": "パフォーマンスのデバッグと追跡のために、エージェントに関するデータを収集します。",
-    "xpack.ingestManager.agentConfigForm.monitoringLabel": "アラート監視",
-    "xpack.ingestManager.agentConfigForm.monitoringLogsFieldLabel": "エージェントログを収集",
-    "xpack.ingestManager.agentConfigForm.monitoringMetricsFieldLabel": "エージェントメトリックを収集",
-    "xpack.ingestManager.agentConfigForm.nameFieldLabel": "名前",
-    "xpack.ingestManager.agentConfigForm.nameFieldPlaceholder": "名前を選択",
-    "xpack.ingestManager.agentConfigForm.nameRequiredErrorMessage": "エージェント構成名が必要です",
-    "xpack.ingestManager.agentConfigForm.namespaceFieldDescription": "この構成を使用する統合にデフォルトの名前空間を適用します。統合はその独自の名前空間を指定できます。",
-    "xpack.ingestManager.agentConfigForm.namespaceFieldLabel": "デフォルト名前空間",
-    "xpack.ingestManager.agentConfigForm.namespaceRequiredErrorMessage": "ネームスペースが必要です",
-    "xpack.ingestManager.agentConfigForm.systemMonitoringFieldLabel": "オプション",
-    "xpack.ingestManager.agentConfigForm.systemMonitoringText": "システムメトリックを収集",
-    "xpack.ingestManager.agentConfigForm.systemMonitoringTooltipText": "このオプションを有効にすると、システムメトリックと情報を収集する統合で構成をブートストラップできます。",
-    "xpack.ingestManager.agentConfigList.actionsColumnTitle": "アクション",
-    "xpack.ingestManager.agentConfigList.addButton": "エージェント構成を作成",
-    "xpack.ingestManager.agentConfigList.agentsColumnTitle": "エージェント",
-    "xpack.ingestManager.agentConfigList.clearFiltersLinkText": "フィルターを消去",
-    "xpack.ingestManager.agentConfigList.descriptionColumnTitle": "説明",
-    "xpack.ingestManager.agentConfigList.loadingAgentConfigsMessage": "エージェント構成を読み込み中...",
-    "xpack.ingestManager.agentConfigList.nameColumnTitle": "名前",
-    "xpack.ingestManager.agentConfigList.noAgentConfigsPrompt": "エージェント構成なし",
-    "xpack.ingestManager.agentConfigList.noFilteredAgentConfigsPrompt": "エージェント構成が見つかりません。 {clearFiltersLink}",
-    "xpack.ingestManager.agentConfigList.packageConfigsCountColumnTitle": "統合",
-    "xpack.ingestManager.agentConfigList.pageSubtitle": "エージェント構成を使用すると、エージェントとエージェントが収集するデータを管理できます。",
-    "xpack.ingestManager.agentConfigList.pageTitle": "エージェント構成",
-    "xpack.ingestManager.agentConfigList.reloadAgentConfigsButtonText": "再読み込み",
-    "xpack.ingestManager.agentConfigList.revisionNumber": "rev. {revNumber}",
-    "xpack.ingestManager.agentConfigList.updatedOnColumnTitle": "最終更新日:",
+    "xpack.ingestManager.agentPolicy.confirmModalCalloutDescription": "選択されたエージェント構成{policyName}が一部のエージェントで既に使用されていることをフリートが検出しました。このアクションの結果として、フリートはこの構成で使用されているすべてのエージェントに更新をデプロイします。",
+    "xpack.ingestManager.agentPolicy.confirmModalCancelButtonLabel": "キャンセル",
+    "xpack.ingestManager.agentPolicy.confirmModalConfirmButtonLabel": "変更を保存してデプロイ",
+    "xpack.ingestManager.agentPolicy.confirmModalDescription": "このアクションは元に戻せません。続行していいですか？",
+    "xpack.ingestManager.agentPolicy.confirmModalTitle": "変更を保存してデプロイ",
+    "xpack.ingestManager.agentPolicy.linkedAgentCountText": "{count, plural, one {# エージェント} other {# エージェント}}",
+    "xpack.ingestManager.agentPolicyActionMenu.buttonText": "アクション",
+    "xpack.ingestManager.agentPolicyActionMenu.copyPolicyActionText": "構成のコピー",
+    "xpack.ingestManager.agentPolicyActionMenu.enrollAgentActionText": "エージェントの追加",
+    "xpack.ingestManager.agentPolicyActionMenu.viewPolicyText": "構成を表示",
+    "xpack.ingestManager.agentPolicyForm.advancedOptionsToggleLabel": "高度なオプション",
+    "xpack.ingestManager.agentPolicyForm.descriptionFieldLabel": "説明",
+    "xpack.ingestManager.agentPolicyForm.descriptionFieldPlaceholder": "この構成がどのように使用されるか",
+    "xpack.ingestManager.agentPolicyForm.monitoringDescription": "パフォーマンスのデバッグと追跡のために、エージェントに関するデータを収集します。",
+    "xpack.ingestManager.agentPolicyForm.monitoringLabel": "アラート監視",
+    "xpack.ingestManager.agentPolicyForm.monitoringLogsFieldLabel": "エージェントログを収集",
+    "xpack.ingestManager.agentPolicyForm.monitoringMetricsFieldLabel": "エージェントメトリックを収集",
+    "xpack.ingestManager.agentPolicyForm.nameFieldLabel": "名前",
+    "xpack.ingestManager.agentPolicyForm.nameFieldPlaceholder": "名前を選択",
+    "xpack.ingestManager.agentPolicyForm.nameRequiredErrorMessage": "エージェント構成名が必要です",
+    "xpack.ingestManager.agentPolicyForm.namespaceFieldDescription": "この構成を使用する統合にデフォルトの名前空間を適用します。統合はその独自の名前空間を指定できます。",
+    "xpack.ingestManager.agentPolicyForm.namespaceFieldLabel": "デフォルト名前空間",
+    "xpack.ingestManager.agentPolicyForm.namespaceRequiredErrorMessage": "ネームスペースが必要です",
+    "xpack.ingestManager.agentPolicyForm.systemMonitoringFieldLabel": "オプション",
+    "xpack.ingestManager.agentPolicyForm.systemMonitoringText": "システムメトリックを収集",
+    "xpack.ingestManager.agentPolicyForm.systemMonitoringTooltipText": "このオプションを有効にすると、システムメトリックと情報を収集する統合で構成をブートストラップできます。",
+    "xpack.ingestManager.agentPolicyList.actionsColumnTitle": "アクション",
+    "xpack.ingestManager.agentPolicyList.addButton": "エージェント構成を作成",
+    "xpack.ingestManager.agentPolicyList.agentsColumnTitle": "エージェント",
+    "xpack.ingestManager.agentPolicyList.clearFiltersLinkText": "フィルターを消去",
+    "xpack.ingestManager.agentPolicyList.descriptionColumnTitle": "説明",
+    "xpack.ingestManager.agentPolicyList.loadingAgentPoliciesMessage": "エージェント構成を読み込み中...",
+    "xpack.ingestManager.agentPolicyList.nameColumnTitle": "名前",
+    "xpack.ingestManager.agentPolicyList.noAgentPoliciesPrompt": "エージェント構成なし",
+    "xpack.ingestManager.agentPolicyList.noFilteredAgentPoliciesPrompt": "エージェント構成が見つかりません。 {clearFiltersLink}",
+    "xpack.ingestManager.agentPolicyList.packagePoliciesCountColumnTitle": "統合",
+    "xpack.ingestManager.agentPolicyList.pageSubtitle": "エージェント構成を使用すると、エージェントとエージェントが収集するデータを管理できます。",
+    "xpack.ingestManager.agentPolicyList.pageTitle": "エージェント構成",
+    "xpack.ingestManager.agentPolicyList.reloadAgentPoliciesButtonText": "再読み込み",
+    "xpack.ingestManager.agentPolicyList.revisionNumber": "rev. {revNumber}",
+    "xpack.ingestManager.agentPolicyList.updatedOnColumnTitle": "最終更新日:",
     "xpack.ingestManager.agentDetails.actionsButton": "アクション",
-    "xpack.ingestManager.agentDetails.agentConfigurationLabel": "エージェント構成",
+    "xpack.ingestManager.agentDetails.agentPolicyLabel": "エージェント構成",
     "xpack.ingestManager.agentDetails.agentDetailsTitle": "エージェント'{id}'",
     "xpack.ingestManager.agentDetails.agentNotFoundErrorDescription": "エージェントID {agentId}が見つかりません",
     "xpack.ingestManager.agentDetails.agentNotFoundErrorTitle": "エージェントが見つかりません",
-    "xpack.ingestManager.agentDetails.configurationLabel": "構成",
+    "xpack.ingestManager.agentDetails.policyLabel": "構成",
     "xpack.ingestManager.agentDetails.hostIdLabel": "ホストID",
     "xpack.ingestManager.agentDetails.hostNameLabel": "ホスト名",
     "xpack.ingestManager.agentDetails.localMetadataSectionSubtitle": "メタデータを読み込み中",
@@ -9211,9 +9211,9 @@
     "xpack.ingestManager.agentDetails.viewAgentListTitle": "すべてのエージェントを表示",
     "xpack.ingestManager.agentEnrollment.cancelButtonLabel": "キャンセル",
     "xpack.ingestManager.agentEnrollment.continueButtonLabel": "続行",
-    "xpack.ingestManager.agentEnrollment.copyConfigurationButton": "クリップボードにコピー",
+    "xpack.ingestManager.agentEnrollment.copyPolicyButton": "クリップボードにコピー",
     "xpack.ingestManager.agentEnrollment.copyRunInstructionsButton": "クリップボードにコピー",
-    "xpack.ingestManager.agentEnrollment.downloadConfigurationButton": "構成のダウンロード",
+    "xpack.ingestManager.agentEnrollment.downloadPolicyButton": "構成のダウンロード",
     "xpack.ingestManager.agentEnrollment.downloadDescription": "ホストのコンピューターでElasticエージェントをダウンロードします。Elasticエージェントダウンロードページでは、エージェントバイナリと検証署名にアクセスできます。",
     "xpack.ingestManager.agentEnrollment.downloadLink": "elastic.co/downloadsに移動",
     "xpack.ingestManager.agentEnrollment.enrollFleetTabLabel": "フリートに登録",
@@ -9225,7 +9225,7 @@
     "xpack.ingestManager.agentEnrollment.standaloneDescription": "スタンドアロンモードで実行中のエージェントは、構成を変更したい場合には、手動で更新する必要があります。次の手順に従い、スタンドアロンモードでElasticエージェントをダウンロードし、セットアップしてください。",
     "xpack.ingestManager.agentEnrollment.stepCheckForDataDescription": "エージェントを起動した後、エージェントはデータの送信を開始します。Ingest Managerのデータセットページでは、このデータを確認できます。",
     "xpack.ingestManager.agentEnrollment.stepCheckForDataTitle": "データを確認",
-    "xpack.ingestManager.agentEnrollment.stepChooseAgentConfigTitle": "エージェント構成を選択",
+    "xpack.ingestManager.agentEnrollment.stepChooseAgentPolicyTitle": "エージェント構成を選択",
     "xpack.ingestManager.agentEnrollment.stepConfigureAgentDescription": "この構成をコピーし、Elasticエージェントがインストールされているシステムのファイル{fileName}に置きます。必ず、構成ファイルの{outputSection}セクションで{ESUsernameVariable}と{ESPasswordVariable}を修正し、実際のElasticsearch認証資格情報が使用されるようにしてください。",
     "xpack.ingestManager.agentEnrollment.stepConfigureAgentTitle": "エージェントの構成",
     "xpack.ingestManager.agentEnrollment.stepDownloadAgentTitle": "Elasticエージェントをダウンロード",
@@ -9243,7 +9243,7 @@
     "xpack.ingestManager.agentEventsList.timestampColumnTitle": "タイムスタンプ",
     "xpack.ingestManager.agentEventsList.typeColumnTitle": "タイプ",
     "xpack.ingestManager.agentEventSubtype.acknowledgedLabel": "認識",
-    "xpack.ingestManager.agentEventSubtype.configLabel": "構成",
+    "xpack.ingestManager.agentEventSubtype.policyLabel": "構成",
     "xpack.ingestManager.agentEventSubtype.dataDumpLabel": "データダンプ",
     "xpack.ingestManager.agentEventSubtype.failedLabel": "失敗",
     "xpack.ingestManager.agentEventSubtype.inProgressLabel": "進行中",
@@ -9269,8 +9269,8 @@
     "xpack.ingestManager.agentList.actionsColumnTitle": "アクション",
     "xpack.ingestManager.agentList.addButton": "エージェントの追加",
     "xpack.ingestManager.agentList.clearFiltersLinkText": "フィルターを消去",
-    "xpack.ingestManager.agentList.configColumnTitle": "エージェント構成",
-    "xpack.ingestManager.agentList.configFilterText": "エージェント構成",
+    "xpack.ingestManager.agentList.policyColumnTitle": "エージェント構成",
+    "xpack.ingestManager.agentList.policyFilterText": "エージェント構成",
     "xpack.ingestManager.agentList.enrollButton": "エージェントの追加",
     "xpack.ingestManager.agentList.hostColumnTitle": "ホスト",
     "xpack.ingestManager.agentList.lastCheckinTitle": "前回のアクティビティ",
@@ -9293,13 +9293,13 @@
     "xpack.ingestManager.agentListStatus.offlineLabel": "オフライン",
     "xpack.ingestManager.agentListStatus.onlineLabel": "オンライン",
     "xpack.ingestManager.agentListStatus.totalLabel": "エージェント",
-    "xpack.ingestManager.agentReassignConfig.cancelButtonLabel": "キャンセル",
-    "xpack.ingestManager.agentReassignConfig.configDescription": "選択したエージェント構成は、{count, plural, one {{countValue}個の統合} other {{countValue}個の統合}}のデータを収集します。",
-    "xpack.ingestManager.agentReassignConfig.continueButtonLabel": "構成を割り当て",
-    "xpack.ingestManager.agentReassignConfig.flyoutDescription": "選択したエージェントに割り当てる、新しいエージェント構成を選択します。",
-    "xpack.ingestManager.agentReassignConfig.flyoutTitle": "新しいエージェント構成を割り当て",
-    "xpack.ingestManager.agentReassignConfig.selectConfigLabel": "エージェント構成",
-    "xpack.ingestManager.agentReassignConfig.successSingleNotificationTitle": "新しいエージェント構成が再割り当てされました",
+    "xpack.ingestManager.agentReassignPolicy.cancelButtonLabel": "キャンセル",
+    "xpack.ingestManager.agentReassignPolicy.policyDescription": "選択したエージェント構成は、{count, plural, one {{countValue}個の統合} other {{countValue}個の統合}}のデータを収集します。",
+    "xpack.ingestManager.agentReassignPolicy.continueButtonLabel": "構成を割り当て",
+    "xpack.ingestManager.agentReassignPolicy.flyoutDescription": "選択したエージェントに割り当てる、新しいエージェント構成を選択します。",
+    "xpack.ingestManager.agentReassignPolicy.flyoutTitle": "新しいエージェント構成を割り当て",
+    "xpack.ingestManager.agentReassignPolicy.selectPolicyLabel": "エージェント構成",
+    "xpack.ingestManager.agentReassignPolicy.successSingleNotificationTitle": "新しいエージェント構成が再割り当てされました",
     "xpack.ingestManager.alphaMessageDescription": "Ingest Managerは本番環境用ではありません。",
     "xpack.ingestManager.alphaMessageLinkText": "詳細を参照してください。",
     "xpack.ingestManager.alphaMessageTitle": "ベータリリース",
@@ -9309,7 +9309,7 @@
     "xpack.ingestManager.alphaMessaging.forumLink": "ディスカッションフォーラム",
     "xpack.ingestManager.alphaMessaging.introText": "Ingest Managerは開発中であり、本番環境用ではありません。このベータリリースは、ユーザーがIngest Managerと新しいElasticエージェントをテストしてフィードバックを提供することを目的としています。このプラグインには、サポートSLAが適用されません。",
     "xpack.ingestManager.alphaMessging.closeFlyoutLabel": "閉じる",
-    "xpack.ingestManager.appNavigation.configurationsLinkText": "構成",
+    "xpack.ingestManager.appNavigation.policiesLinkText": "構成",
     "xpack.ingestManager.appNavigation.dataStreamsLinkText": "データセット",
     "xpack.ingestManager.appNavigation.epmLinkText": "統合",
     "xpack.ingestManager.appNavigation.fleetLinkText": "フリート",
@@ -9319,102 +9319,102 @@
     "xpack.ingestManager.appTitle": "Ingest Manager",
     "xpack.ingestManager.betaBadge.labelText": "ベータ",
     "xpack.ingestManager.betaBadge.tooltipText": "このプラグインは本番環境用ではありません。バグについてはディスカッションフォーラムで報告してください。",
-    "xpack.ingestManager.breadcrumbs.addPackageConfigPageTitle": "統合の追加",
+    "xpack.ingestManager.breadcrumbs.addPackagePolicyPageTitle": "統合の追加",
     "xpack.ingestManager.breadcrumbs.allIntegrationsPageTitle": "すべて",
     "xpack.ingestManager.breadcrumbs.appTitle": "Ingest Manager",
-    "xpack.ingestManager.breadcrumbs.configurationsPageTitle": "構成",
+    "xpack.ingestManager.breadcrumbs.policiesPageTitle": "構成",
     "xpack.ingestManager.breadcrumbs.datastreamsPageTitle": "データセット",
-    "xpack.ingestManager.breadcrumbs.editPackageConfigPageTitle": "統合の編集",
+    "xpack.ingestManager.breadcrumbs.editPackagePolicyPageTitle": "統合の編集",
     "xpack.ingestManager.breadcrumbs.fleetAgentsPageTitle": "エージェント",
     "xpack.ingestManager.breadcrumbs.fleetEnrollmentTokensPageTitle": "登録トークン",
     "xpack.ingestManager.breadcrumbs.fleetPageTitle": "フリート",
     "xpack.ingestManager.breadcrumbs.installedIntegrationsPageTitle": "インストール済み",
     "xpack.ingestManager.breadcrumbs.integrationsPageTitle": "統合",
     "xpack.ingestManager.breadcrumbs.overviewPageTitle": "概要",
-    "xpack.ingestManager.configDetails.addPackageConfigButtonText": "統合の追加",
-    "xpack.ingestManager.configDetails.configDetailsTitle": "構成「{id}」",
-    "xpack.ingestManager.configDetails.configNotFoundErrorTitle": "構成「{id}」が見つかりません",
-    "xpack.ingestManager.configDetails.packageConfigsTable.actionsColumnTitle": "アクション",
-    "xpack.ingestManager.configDetails.packageConfigsTable.deleteActionTitle": "統合の削除",
-    "xpack.ingestManager.configDetails.packageConfigsTable.descriptionColumnTitle": "説明",
-    "xpack.ingestManager.configDetails.packageConfigsTable.editActionTitle": "統合の編集",
-    "xpack.ingestManager.configDetails.packageConfigsTable.nameColumnTitle": "名前",
-    "xpack.ingestManager.configDetails.packageConfigsTable.namespaceColumnTitle": "名前空間",
-    "xpack.ingestManager.configDetails.packageConfigsTable.packageNameColumnTitle": "統合",
-    "xpack.ingestManager.configDetails.subTabs.packageConfigsTabText": "統合",
-    "xpack.ingestManager.configDetails.subTabs.settingsTabText": "設定",
-    "xpack.ingestManager.configDetails.summary.lastUpdated": "最終更新日:",
-    "xpack.ingestManager.configDetails.summary.package_configs": "統合",
-    "xpack.ingestManager.configDetails.summary.revision": "リビジョン",
-    "xpack.ingestManager.configDetails.summary.usedBy": "使用者",
-    "xpack.ingestManager.configDetails.unexceptedErrorTitle": "構成を読み込む間にエラーが発生しました",
-    "xpack.ingestManager.configDetails.viewAgentListTitle": "すべてのエージェント構成を表示",
-    "xpack.ingestManager.configDetails.yamlDownloadButtonLabel": "構成のダウンロード",
-    "xpack.ingestManager.configDetails.yamlFlyoutCloseButtonLabel": "閉じる",
-    "xpack.ingestManager.configDetails.yamlflyoutTitleWithName": "「{name}」エージェント構成の編集",
-    "xpack.ingestManager.configDetails.yamlflyoutTitleWithoutName": "エージェント構成",
-    "xpack.ingestManager.configDetailsPackageConfigs.createFirstButtonText": "統合の追加",
-    "xpack.ingestManager.configDetailsPackageConfigs.createFirstMessage": "この構成にはまだ統合がありません。",
-    "xpack.ingestManager.configDetailsPackageConfigs.createFirstTitle": "最初の統合を追加",
-    "xpack.ingestManager.configForm.deleteConfigActionText": "構成を削除",
-    "xpack.ingestManager.configForm.deleteConfigGroupDescription": "既存のデータは削除されません。",
-    "xpack.ingestManager.configForm.deleteConfigGroupTitle": "構成を削除",
-    "xpack.ingestManager.configForm.generalSettingsGroupDescription": "エージェント構成の名前と説明を選択してください。",
-    "xpack.ingestManager.configForm.generalSettingsGroupTitle": "一般設定",
-    "xpack.ingestManager.configForm.unableToDeleteDefaultConfigText": "既定の構成は削除できません。",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.cancelButtonLabel": "キャンセル",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.confirmButtonLabel": "構成をコピー",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.copyConfigPrompt": "新しいエージェント構成の名前と説明を選択してください。",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.copyConfigTitle": "「{name}」エージェント構成をコピー",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.defaultNewConfigName": "{name}（コピー）",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.newDescriptionLabel": "説明",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.newNameLabel": "新しい構成名",
-    "xpack.ingestManager.copyAgentConfig.failureNotificationTitle": "エージェント構成「{id}」のコピーエラー",
-    "xpack.ingestManager.copyAgentConfig.fatalErrorNotificationTitle": "エージェント構成のコピーエラー",
-    "xpack.ingestManager.copyAgentConfig.successNotificationTitle": "エージェント構成がコピーされました",
-    "xpack.ingestManager.createAgentConfig.cancelButtonLabel": "キャンセル",
-    "xpack.ingestManager.createAgentConfig.errorNotificationTitle": "エージェント構成を作成できません",
-    "xpack.ingestManager.createAgentConfig.flyoutTitle": "エージェント構成を作成",
-    "xpack.ingestManager.createAgentConfig.flyoutTitleDescription": "エージェント構成は、エージェントのグループ全体にわたる設定を管理する目的で使用されます。エージェント構成に統合を追加すると、エージェントで収集するデータを指定できます。エージェント構成の編集時には、フリートを使用して、指定したエージェントのグループに更新をデプロイできます。",
-    "xpack.ingestManager.createAgentConfig.submitButtonLabel": "エージェント構成を作成",
-    "xpack.ingestManager.createAgentConfig.successNotificationTitle": "エージェント構成「{name}」を作成しました",
-    "xpack.ingestManager.createPackageConfig.addedNotificationMessage": "フリートは'{agentConfigName}'構成で使用されているすべてのエージェントに更新をデプロイします。",
-    "xpack.ingestManager.createPackageConfig.addedNotificationTitle": "正常に「{packageConfigName}」を追加しました",
-    "xpack.ingestManager.createPackageConfig.agentConfigurationNameLabel": "エージェント構成",
-    "xpack.ingestManager.createPackageConfig.cancelButton": "キャンセル",
-    "xpack.ingestManager.createPackageConfig.cancelLinkText": "キャンセル",
-    "xpack.ingestManager.createPackageConfig.errorOnSaveText": "統合構成にはエラーがあります。保存前に修正してください。",
-    "xpack.ingestManager.createPackageConfig.pageDescriptionfromConfig": "選択したエージェント構成の統合を構成します。",
-    "xpack.ingestManager.createPackageConfig.pageDescriptionfromPackage": "次の手順に従い、この統合をエージェント構成に追加します。",
-    "xpack.ingestManager.createPackageConfig.pageTitle": "統合の追加",
-    "xpack.ingestManager.createPackageConfig.pageTitleWithPackageName": "{packageName}統合の追加",
-    "xpack.ingestManager.createPackageConfig.saveButton": "統合の保存",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.advancedOptionsToggleLinkText": "高度なオプション",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.errorCountText": "{count, plural, one {件のエラー} other {件のエラー}}",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.hideStreamsAriaLabel": "{type}入力を非表示",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.inputSettingsDescription": "次の設定は以下のすべての入力に適用されます。",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.inputSettingsTitle": "設定",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.inputVarFieldOptionalLabel": "オプション",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.integrationSettingsSectionDescription": "この統合の使用方法を識別できるように、名前と説明を選択してください。",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.integrationSettingsSectionTitle": "統合設定",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.noConfigOptionsMessage": "構成するものがありません",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.packageConfigDescriptionInputLabel": "説明",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.packageConfigNameInputLabel": "統合名",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.packageConfigNamespaceInputLabel": "名前空間",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.showStreamsAriaLabel": "{type}入力を表示",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.toggleAdvancedOptionsButtonText": "高度なオプション",
-    "xpack.ingestManager.createPackageConfig.stepConfigurePackageConfigTitle": "統合の構成",
-    "xpack.ingestManager.createPackageConfig.stepSelectAgentConfigTitle": "エージェント構成を選択する",
-    "xpack.ingestManager.createPackageConfig.StepSelectConfig.addButton": "新しいエージェント構成",
-    "xpack.ingestManager.createPackageConfig.StepSelectConfig.agentConfigAgentsCountText": "{count, plural, one {# エージェント} other {# エージェント}}",
-    "xpack.ingestManager.createPackageConfig.StepSelectConfig.errorLoadingAgentConfigsTitle": "エージェント構成の読み込みエラー",
-    "xpack.ingestManager.createPackageConfig.StepSelectConfig.errorLoadingPackageTitle": "パッケージ情報の読み込みエラー",
-    "xpack.ingestManager.createPackageConfig.StepSelectConfig.errorLoadingSelectedAgentConfigTitle": "選択したエージェント構成の読み込みエラー",
-    "xpack.ingestManager.createPackageConfig.stepSelectPackage.errorLoadingConfigTitle": "エージェント構成情報の読み込みエラー",
-    "xpack.ingestManager.createPackageConfig.stepSelectPackage.errorLoadingPackagesTitle": "統合の読み込みエラー",
-    "xpack.ingestManager.createPackageConfig.stepSelectPackage.errorLoadingSelectedPackageTitle": "選択した統合の読み込みエラー",
-    "xpack.ingestManager.createPackageConfig.stepSelectPackage.filterPackagesInputPlaceholder": "統合を検索",
-    "xpack.ingestManager.createPackageConfig.stepSelectPackageTitle": "統合を選択",
+    "xpack.ingestManager.policyDetails.addPackagePolicyButtonText": "統合の追加",
+    "xpack.ingestManager.policyDetails.policyDetailsTitle": "構成「{id}」",
+    "xpack.ingestManager.policyDetails.policyNotFoundErrorTitle": "構成「{id}」が見つかりません",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.actionsColumnTitle": "アクション",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.deleteActionTitle": "統合の削除",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.descriptionColumnTitle": "説明",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.editActionTitle": "統合の編集",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.nameColumnTitle": "名前",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.namespaceColumnTitle": "名前空間",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.packageNameColumnTitle": "統合",
+    "xpack.ingestManager.policyDetails.subTabs.packagePoliciesTabText": "統合",
+    "xpack.ingestManager.policyDetails.subTabs.settingsTabText": "設定",
+    "xpack.ingestManager.policyDetails.summary.lastUpdated": "最終更新日:",
+    "xpack.ingestManager.policyDetails.summary.integrations": "統合",
+    "xpack.ingestManager.policyDetails.summary.revision": "リビジョン",
+    "xpack.ingestManager.policyDetails.summary.usedBy": "使用者",
+    "xpack.ingestManager.policyDetails.unexceptedErrorTitle": "構成を読み込む間にエラーが発生しました",
+    "xpack.ingestManager.policyDetails.viewAgentListTitle": "すべてのエージェント構成を表示",
+    "xpack.ingestManager.policyDetails.yamlDownloadButtonLabel": "構成のダウンロード",
+    "xpack.ingestManager.policyDetails.yamlFlyoutCloseButtonLabel": "閉じる",
+    "xpack.ingestManager.policyDetails.yamlflyoutTitleWithName": "「{name}」エージェント構成の編集",
+    "xpack.ingestManager.policyDetails.yamlflyoutTitleWithoutName": "エージェント構成",
+    "xpack.ingestManager.policyDetailsPackagePolicies.createFirstButtonText": "統合の追加",
+    "xpack.ingestManager.policyDetailsPackagePolicies.createFirstMessage": "この構成にはまだ統合がありません。",
+    "xpack.ingestManager.policyDetailsPackagePolicies.createFirstTitle": "最初の統合を追加",
+    "xpack.ingestManager.policyForm.deletePolicyActionText": "構成を削除",
+    "xpack.ingestManager.policyForm.deletePolicyGroupDescription": "既存のデータは削除されません。",
+    "xpack.ingestManager.policyForm.deletePolicyGroupTitle": "構成を削除",
+    "xpack.ingestManager.policyForm.generalSettingsGroupDescription": "エージェント構成の名前と説明を選択してください。",
+    "xpack.ingestManager.policyForm.generalSettingsGroupTitle": "一般設定",
+    "xpack.ingestManager.policyForm.unableToDeleteDefaultPolicyText": "既定の構成は削除できません。",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.cancelButtonLabel": "キャンセル",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.confirmButtonLabel": "構成をコピー",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.copyPolicyPrompt": "新しいエージェント構成の名前と説明を選択してください。",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.copyPolicyTitle": "「{name}」エージェント構成をコピー",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.defaultNewPolicyName": "{name}（コピー）",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.newDescriptionLabel": "説明",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.newNameLabel": "新しい構成名",
+    "xpack.ingestManager.copyAgentPolicy.failureNotificationTitle": "エージェント構成「{id}」のコピーエラー",
+    "xpack.ingestManager.copyAgentPolicy.fatalErrorNotificationTitle": "エージェント構成のコピーエラー",
+    "xpack.ingestManager.copyAgentPolicy.successNotificationTitle": "エージェント構成がコピーされました",
+    "xpack.ingestManager.createAgentPolicy.cancelButtonLabel": "キャンセル",
+    "xpack.ingestManager.createAgentPolicy.errorNotificationTitle": "エージェント構成を作成できません",
+    "xpack.ingestManager.createAgentPolicy.flyoutTitle": "エージェント構成を作成",
+    "xpack.ingestManager.createAgentPolicy.flyoutTitleDescription": "エージェント構成は、エージェントのグループ全体にわたる設定を管理する目的で使用されます。エージェント構成に統合を追加すると、エージェントで収集するデータを指定できます。エージェント構成の編集時には、フリートを使用して、指定したエージェントのグループに更新をデプロイできます。",
+    "xpack.ingestManager.createAgentPolicy.submitButtonLabel": "エージェント構成を作成",
+    "xpack.ingestManager.createAgentPolicy.successNotificationTitle": "エージェント構成「{name}」を作成しました",
+    "xpack.ingestManager.createPackagePolicy.addedNotificationMessage": "フリートは'{agentPolicyName}'構成で使用されているすべてのエージェントに更新をデプロイします。",
+    "xpack.ingestManager.createPackagePolicy.addedNotificationTitle": "正常に「{packagePolicyName}」を追加しました",
+    "xpack.ingestManager.createPackagePolicy.agentPolicyNameLabel": "エージェント構成",
+    "xpack.ingestManager.createPackagePolicy.cancelButton": "キャンセル",
+    "xpack.ingestManager.createPackagePolicy.cancelLinkText": "キャンセル",
+    "xpack.ingestManager.createPackagePolicy.errorOnSaveText": "統合構成にはエラーがあります。保存前に修正してください。",
+    "xpack.ingestManager.createPackagePolicy.pageDescriptionfromPolicy": "選択したエージェント構成の統合を構成します。",
+    "xpack.ingestManager.createPackagePolicy.pageDescriptionfromPackage": "次の手順に従い、この統合をエージェント構成に追加します。",
+    "xpack.ingestManager.createPackagePolicy.pageTitle": "統合の追加",
+    "xpack.ingestManager.createPackagePolicy.pageTitleWithPackageName": "{packageName}統合の追加",
+    "xpack.ingestManager.createPackagePolicy.saveButton": "統合の保存",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.advancedOptionsToggleLinkText": "高度なオプション",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.errorCountText": "{count, plural, one {件のエラー} other {件のエラー}}",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.hideStreamsAriaLabel": "{type}入力を非表示",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.inputSettingsDescription": "次の設定は以下のすべての入力に適用されます。",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.inputSettingsTitle": "設定",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.inputVarFieldOptionalLabel": "オプション",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.integrationSettingsSectionDescription": "この統合の使用方法を識別できるように、名前と説明を選択してください。",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.integrationSettingsSectionTitle": "統合設定",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.noPolicyOptionsMessage": "構成するものがありません",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.packagePolicyDescriptionInputLabel": "説明",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.packagePolicyNameInputLabel": "統合名",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.packagePolicyNamespaceInputLabel": "名前空間",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.showStreamsAriaLabel": "{type}入力を表示",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.toggleAdvancedOptionsButtonText": "高度なオプション",
+    "xpack.ingestManager.createPackagePolicy.stepConfigurePackagePolicyTitle": "統合の構成",
+    "xpack.ingestManager.createPackagePolicy.stepSelectAgentPolicyTitle": "エージェント構成を選択する",
+    "xpack.ingestManager.createPackagePolicy.StepSelectPolicy.addButton": "新しいエージェント構成",
+    "xpack.ingestManager.createPackagePolicy.StepSelectPolicy.agentPolicyAgentsCountText": "{count, plural, one {# エージェント} other {# エージェント}}",
+    "xpack.ingestManager.createPackagePolicy.StepSelectPolicy.errorLoadingAgentPoliciesTitle": "エージェント構成の読み込みエラー",
+    "xpack.ingestManager.createPackagePolicy.StepSelectPolicy.errorLoadingPackageTitle": "パッケージ情報の読み込みエラー",
+    "xpack.ingestManager.createPackagePolicy.StepSelectPolicy.errorLoadingSelectedAgentPolicyTitle": "選択したエージェント構成の読み込みエラー",
+    "xpack.ingestManager.createPackagePolicy.stepSelectPackage.errorLoadingPolicyTitle": "エージェント構成情報の読み込みエラー",
+    "xpack.ingestManager.createPackagePolicy.stepSelectPackage.errorLoadingPackagesTitle": "統合の読み込みエラー",
+    "xpack.ingestManager.createPackagePolicy.stepSelectPackage.errorLoadingSelectedPackageTitle": "選択した統合の読み込みエラー",
+    "xpack.ingestManager.createPackagePolicy.stepSelectPackage.filterPackagesInputPlaceholder": "統合を検索",
+    "xpack.ingestManager.createPackagePolicy.stepSelectPackageTitle": "統合を選択",
     "xpack.ingestManager.dataStreamList.actionsColumnTitle": "アクション",
     "xpack.ingestManager.dataStreamList.datasetColumnTitle": "データセット",
     "xpack.ingestManager.dataStreamList.integrationColumnTitle": "統合",
@@ -9433,73 +9433,73 @@
     "xpack.ingestManager.dataStreamList.viewDashboardsActionText": "ダッシュボードを表示",
     "xpack.ingestManager.dataStreamList.viewDashboardsPanelTitle": "ダッシュボードを表示",
     "xpack.ingestManager.defaultSearchPlaceholderText": "検索",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.affectedAgentsMessage": "{agentsCount, plural, one {# エージェントは} other {# エージェントは}}このエージェント構成に割り当てられました。この構成を削除する前に、これらのエージェントの割り当てを解除します。",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.affectedAgentsTitle": "使用中の構成",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.cancelButtonLabel": "キャンセル",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.confirmButtonLabel": "構成を削除",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.deleteConfigTitle": "このエージェント構成を削除しますか？",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.irreversibleMessage": "この操作は元に戻すことができません。",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.loadingAgentsCountMessage": "影響があるエージェントの数を確認中...",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.loadingButtonLabel": "読み込み中...",
-    "xpack.ingestManager.deleteAgentConfig.failureSingleNotificationTitle": "エージェント構成「{id}」の削除エラー",
-    "xpack.ingestManager.deleteAgentConfig.fatalErrorNotificationTitle": "エージェント構成の削除エラー",
-    "xpack.ingestManager.deleteAgentConfig.successSingleNotificationTitle": "エージェント構成「{id}」を削除しました",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.affectedAgentsMessage": "{agentConfigName} が一部のエージェントですでに使用されていることをフリートが検出しました。",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.affectedAgentsTitle": "このアクションは {agentsCount} {agentsCount, plural, one {# エージェント} other {# エージェント}}に影響します",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.cancelButtonLabel": "キャンセル",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.confirmButtonLabel": "{agentConfigsCount, plural, one {個の統合} other {個の統合}}を削除",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.deleteMultipleTitle": "{count, plural, one {個の統合} other {個の統合}}を削除しますか?",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.generalMessage": "このアクションは元に戻せません。続行していいですか？",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.loadingAgentsCountMessage": "影響があるエージェントを確認中...",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.loadingButtonLabel": "読み込み中...",
-    "xpack.ingestManager.deletePackageConfig.failureMultipleNotificationTitle": "{count}個の統合の削除エラー",
-    "xpack.ingestManager.deletePackageConfig.failureSingleNotificationTitle": "統合「{id}」の削除エラー",
-    "xpack.ingestManager.deletePackageConfig.fatalErrorNotificationTitle": "統合の削除エラー",
-    "xpack.ingestManager.deletePackageConfig.successMultipleNotificationTitle": "{count}個の統合を削除しました",
-    "xpack.ingestManager.deletePackageConfig.successSingleNotificationTitle": "統合「{id}」を削除しました",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.affectedAgentsMessage": "{agentsCount, plural, one {# エージェントは} other {# エージェントは}}このエージェント構成に割り当てられました。この構成を削除する前に、これらのエージェントの割り当てを解除します。",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.affectedAgentsTitle": "使用中の構成",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.cancelButtonLabel": "キャンセル",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.confirmButtonLabel": "構成を削除",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.deletePolicyTitle": "このエージェント構成を削除しますか？",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.irreversibleMessage": "この操作は元に戻すことができません。",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.loadingAgentsCountMessage": "影響があるエージェントの数を確認中...",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.loadingButtonLabel": "読み込み中...",
+    "xpack.ingestManager.deleteAgentPolicy.failureSingleNotificationTitle": "エージェント構成「{id}」の削除エラー",
+    "xpack.ingestManager.deleteAgentPolicy.fatalErrorNotificationTitle": "エージェント構成の削除エラー",
+    "xpack.ingestManager.deleteAgentPolicy.successSingleNotificationTitle": "エージェント構成「{id}」を削除しました",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.affectedAgentsMessage": "{agentPolicyName} が一部のエージェントですでに使用されていることをフリートが検出しました。",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.affectedAgentsTitle": "このアクションは {agentsCount} {agentsCount, plural, one {# エージェント} other {# エージェント}}に影響します",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.cancelButtonLabel": "キャンセル",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.confirmButtonLabel": "{agentPoliciesCount, plural, one {個の統合} other {個の統合}}を削除",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.deleteMultipleTitle": "{count, plural, one {個の統合} other {個の統合}}を削除しますか?",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.generalMessage": "このアクションは元に戻せません。続行していいですか？",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.loadingAgentsCountMessage": "影響があるエージェントを確認中...",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.loadingButtonLabel": "読み込み中...",
+    "xpack.ingestManager.deletePackagePolicy.failureMultipleNotificationTitle": "{count}個の統合の削除エラー",
+    "xpack.ingestManager.deletePackagePolicy.failureSingleNotificationTitle": "統合「{id}」の削除エラー",
+    "xpack.ingestManager.deletePackagePolicy.fatalErrorNotificationTitle": "統合の削除エラー",
+    "xpack.ingestManager.deletePackagePolicy.successMultipleNotificationTitle": "{count}個の統合を削除しました",
+    "xpack.ingestManager.deletePackagePolicy.successSingleNotificationTitle": "統合「{id}」を削除しました",
     "xpack.ingestManager.disabledSecurityDescription": "Elastic Fleet を使用するには、Kibana と Elasticsearch でセキュリティを有効にする必要があります。",
     "xpack.ingestManager.disabledSecurityTitle": "セキュリティが有効ではありません",
-    "xpack.ingestManager.editAgentConfig.cancelButtonText": "キャンセル",
-    "xpack.ingestManager.editAgentConfig.errorNotificationTitle": "エージェント構成を作成できません",
-    "xpack.ingestManager.editAgentConfig.saveButtonText": "変更を保存",
-    "xpack.ingestManager.editAgentConfig.savingButtonText": "保存中…",
-    "xpack.ingestManager.editAgentConfig.successNotificationTitle": "正常に'{name}'設定を更新しました",
-    "xpack.ingestManager.editAgentConfig.unsavedChangesText": "保存されていない変更があります",
-    "xpack.ingestManager.editPackageConfig.cancelButton": "キャンセル",
-    "xpack.ingestManager.editPackageConfig.errorLoadingDataMessage": "この統合情報の読み込みエラーが発生しました",
-    "xpack.ingestManager.editPackageConfig.errorLoadingDataTitle": "データの読み込み中にエラーが発生",
-    "xpack.ingestManager.editPackageConfig.failedConflictNotificationMessage": "データが最新ではありません。最新の構成を取得するには、ページを更新してください。",
-    "xpack.ingestManager.editPackageConfig.failedNotificationTitle": "「{packageConfigName}」の更新エラー",
-    "xpack.ingestManager.editPackageConfig.pageDescription": "統合設定を修正し、選択したエージェント構成に変更をデプロイします。",
-    "xpack.ingestManager.editPackageConfig.pageTitle": "統合の編集",
-    "xpack.ingestManager.editPackageConfig.pageTitleWithPackageName": "{packageName}統合の編集",
-    "xpack.ingestManager.editPackageConfig.saveButton": "統合の保存",
-    "xpack.ingestManager.editPackageConfig.updatedNotificationMessage": "フリートは'{agentConfigName}'構成で使用されているすべてのエージェントに更新をデプロイします。",
-    "xpack.ingestManager.editPackageConfig.updatedNotificationTitle": "正常に「{packageConfigName}」を更新しました",
+    "xpack.ingestManager.editAgentPolicy.cancelButtonText": "キャンセル",
+    "xpack.ingestManager.editAgentPolicy.errorNotificationTitle": "エージェント構成を作成できません",
+    "xpack.ingestManager.editAgentPolicy.saveButtonText": "変更を保存",
+    "xpack.ingestManager.editAgentPolicy.savingButtonText": "保存中…",
+    "xpack.ingestManager.editAgentPolicy.successNotificationTitle": "正常に'{name}'設定を更新しました",
+    "xpack.ingestManager.editAgentPolicy.unsavedChangesText": "保存されていない変更があります",
+    "xpack.ingestManager.editPackagePolicy.cancelButton": "キャンセル",
+    "xpack.ingestManager.editPackagePolicy.errorLoadingDataMessage": "この統合情報の読み込みエラーが発生しました",
+    "xpack.ingestManager.editPackagePolicy.errorLoadingDataTitle": "データの読み込み中にエラーが発生",
+    "xpack.ingestManager.editPackagePolicy.failedConflictNotificationMessage": "データが最新ではありません。最新の構成を取得するには、ページを更新してください。",
+    "xpack.ingestManager.editPackagePolicy.failedNotificationTitle": "「{packagePolicyName}」の更新エラー",
+    "xpack.ingestManager.editPackagePolicy.pageDescription": "統合設定を修正し、選択したエージェント構成に変更をデプロイします。",
+    "xpack.ingestManager.editPackagePolicy.pageTitle": "統合の編集",
+    "xpack.ingestManager.editPackagePolicy.pageTitleWithPackageName": "{packageName}統合の編集",
+    "xpack.ingestManager.editPackagePolicy.saveButton": "統合の保存",
+    "xpack.ingestManager.editPackagePolicy.updatedNotificationMessage": "フリートは'{agentPolicyName}'構成で使用されているすべてのエージェントに更新をデプロイします。",
+    "xpack.ingestManager.editPackagePolicy.updatedNotificationTitle": "正常に「{packagePolicyName}」を更新しました",
     "xpack.ingestManager.enrollemntAPIKeyList.emptyMessage": "登録トークンが見つかりません。",
     "xpack.ingestManager.enrollemntAPIKeyList.loadingTokensMessage": "登録トークンを読み込んでいます...",
-    "xpack.ingestManager.enrollmentStepAgentConfig.configSelectAriaLabel": "エージェント構成",
-    "xpack.ingestManager.enrollmentStepAgentConfig.configSelectLabel": "エージェント構成",
-    "xpack.ingestManager.enrollmentStepAgentConfig.enrollmentTokenSelectLabel": "登録トークン",
-    "xpack.ingestManager.enrollmentStepAgentConfig.showAuthenticationSettingsButton": "認証設定",
+    "xpack.ingestManager.enrollmentStepAgentPolicy.policySelectAriaLabel": "エージェント構成",
+    "xpack.ingestManager.enrollmentStepAgentPolicy.policySelectLabel": "エージェント構成",
+    "xpack.ingestManager.enrollmentStepAgentPolicy.enrollmentTokenSelectLabel": "登録トークン",
+    "xpack.ingestManager.enrollmentStepAgentPolicy.showAuthenticationSettingsButton": "認証設定",
     "xpack.ingestManager.enrollmentTokenDeleteModal.cancelButton": "キャンセル",
     "xpack.ingestManager.enrollmentTokenDeleteModal.deleteButton": "削除",
     "xpack.ingestManager.enrollmentTokenDeleteModal.description": "{keyName}を削除してよろしいですか？",
     "xpack.ingestManager.enrollmentTokenDeleteModal.title": "登録トークンを削除",
     "xpack.ingestManager.enrollmentTokensList.actionsTitle": "アクション",
     "xpack.ingestManager.enrollmentTokensList.activeTitle": "アクティブ",
-    "xpack.ingestManager.enrollmentTokensList.configTitle": "エージェント構成",
+    "xpack.ingestManager.enrollmentTokensList.policyTitle": "エージェント構成",
     "xpack.ingestManager.enrollmentTokensList.createdAtTitle": "作成日時",
     "xpack.ingestManager.enrollmentTokensList.nameTitle": "名前",
     "xpack.ingestManager.enrollmentTokensList.newKeyButton": "新しい登録トークン",
     "xpack.ingestManager.enrollmentTokensList.pageDescription": "これは、エージェントを登録するために使用できる登録トークンのリストです。",
     "xpack.ingestManager.enrollmentTokensList.secretTitle": "シークレット",
-    "xpack.ingestManager.epm.addPackageConfigButtonText": "{packageName}の追加",
+    "xpack.ingestManager.epm.addPackagePolicyButtonText": "{packageName}の追加",
     "xpack.ingestManager.epm.browseAllButtonText": "すべての統合を参照",
     "xpack.ingestManager.epm.illustrationAltText": "統合の例",
     "xpack.ingestManager.epm.loadingIntegrationErrorTitle": "統合詳細の読み込みエラー",
     "xpack.ingestManager.epm.packageDetailsNav.overviewLinkText": "概要",
-    "xpack.ingestManager.epm.packageDetailsNav.packageConfigsLinkText": "使用",
+    "xpack.ingestManager.epm.packageDetailsNav.packagePoliciesLinkText": "使用",
     "xpack.ingestManager.epm.packageDetailsNav.settingsLinkText": "設定",
     "xpack.ingestManager.epm.pageSubtitle": "一般的なアプリやサービスの統合を参照する",
     "xpack.ingestManager.epm.pageTitle": "統合",
@@ -9578,7 +9578,7 @@
     "xpack.ingestManager.metadataForm.submitButtonText": "追加",
     "xpack.ingestManager.metadataForm.valueLabel": "値",
     "xpack.ingestManager.newEnrollmentKey.cancelButtonLabel": "キャンセル",
-    "xpack.ingestManager.newEnrollmentKey.configLabel": "構成",
+    "xpack.ingestManager.newEnrollmentKey.policyLabel": "構成",
     "xpack.ingestManager.newEnrollmentKey.flyoutTitle": "新しい登録トークンを作成",
     "xpack.ingestManager.newEnrollmentKey.keyCreatedToasts": "登録トークンが作成されました。",
     "xpack.ingestManager.newEnrollmentKey.nameLabel": "名前",
@@ -9589,17 +9589,17 @@
     "xpack.ingestManager.overviewAgentErrorTitle": "エラー",
     "xpack.ingestManager.overviewAgentOfflineTitle": "オフライン",
     "xpack.ingestManager.overviewAgentTotalTitle": "合計エージェント数",
-    "xpack.ingestManager.overviewConfigTotalTitle": "合計利用可能数",
+    "xpack.ingestManager.overviewPolicyTotalTitle": "合計利用可能数",
     "xpack.ingestManager.overviewDatastreamNamespacesTitle": "名前空間",
     "xpack.ingestManager.overviewDatastreamSizeTitle": "合計サイズ",
     "xpack.ingestManager.overviewDatastreamTotalTitle": "データセット",
     "xpack.ingestManager.overviewIntegrationsInstalledTitle": "インストール済み",
     "xpack.ingestManager.overviewIntegrationsTotalTitle": "合計利用可能数",
     "xpack.ingestManager.overviewIntegrationsUpdatesAvailableTitle": "更新が可能です",
-    "xpack.ingestManager.overviewPackageConfigTitle": "構成された統合",
-    "xpack.ingestManager.overviewPageConfigurationsPanelAction": "構成を表示",
-    "xpack.ingestManager.overviewPageConfigurationsPanelTitle": "エージェント構成",
-    "xpack.ingestManager.overviewPageConfigurationsPanelTooltip": "エージェント構成を使用すると、エージェントが収集するデータを管理できます。",
+    "xpack.ingestManager.overviewPackagePolicyTitle": "構成された統合",
+    "xpack.ingestManager.overviewPagePoliciesPanelAction": "構成を表示",
+    "xpack.ingestManager.overviewPagePoliciesPanelTitle": "エージェント構成",
+    "xpack.ingestManager.overviewPagePoliciesPanelTooltip": "エージェント構成を使用すると、エージェントが収集するデータを管理できます。",
     "xpack.ingestManager.overviewPageDataStreamsPanelAction": "データセットを表示",
     "xpack.ingestManager.overviewPageDataStreamsPanelTitle": "データセット",
     "xpack.ingestManager.overviewPageDataStreamsPanelTooltip": "エージェントが収集するデータはさまざまなデータセットに整理されます。",
@@ -9612,11 +9612,11 @@
     "xpack.ingestManager.overviewPageIntegrationsPanelTooltip": "Elastic Stackの統合を参照し、インストールします。統合をエージェント構成に追加し、データの送信を開始します。",
     "xpack.ingestManager.overviewPageSubtitle": "Elasticエージェントおよびエージェント構成の集中管理。",
     "xpack.ingestManager.overviewPageTitle": "Ingest Manager",
-    "xpack.ingestManager.packageConfigValidation.invalidArrayErrorMessage": "無効なフォーマット",
-    "xpack.ingestManager.packageConfigValidation.invalidYamlFormatErrorMessage": "YAML形式が無効です",
-    "xpack.ingestManager.packageConfigValidation.nameRequiredErrorMessage": "名前が必要です",
-    "xpack.ingestManager.packageConfigValidation.namespaceRequiredErrorMessage": "ネームスペースが必要です",
-    "xpack.ingestManager.packageConfigValidation.requiredErrorMessage": "{fieldName}が必要です",
+    "xpack.ingestManager.packagePolicyValidation.invalidArrayErrorMessage": "無効なフォーマット",
+    "xpack.ingestManager.packagePolicyValidation.invalidYamlFormatErrorMessage": "YAML形式が無効です",
+    "xpack.ingestManager.packagePolicyValidation.nameRequiredErrorMessage": "名前が必要です",
+    "xpack.ingestManager.packagePolicyValidation.namespaceRequiredErrorMessage": "ネームスペースが必要です",
+    "xpack.ingestManager.packagePolicyValidation.requiredErrorMessage": "{fieldName}が必要です",
     "xpack.ingestManager.permissionDeniedErrorMessage": "Ingest Managerにアクセスする権限がありません。Ingest Managerには{roleName}権限が必要です。",
     "xpack.ingestManager.permissionDeniedErrorTitle": "パーミッションが拒否されました",
     "xpack.ingestManager.permissionsRequestErrorMessageDescription": "Ingest Managerアクセス権の確認中に問題が発生しました",
@@ -16291,7 +16291,7 @@
     "xpack.securitySolution.endpoint.list.stepOneTitle": "ホストの保護で使用するポリシーを選択",
     "xpack.securitySolution.endpoint.list.stepTwo": "開始するために必要なコマンドが提供されます。",
     "xpack.securitySolution.endpoint.list.stepTwoTitle": "Ingest Manager経由でEndpoint Securityによって有効にされたエージェントを登録",
-    "xpack.securitySolution.endpoint.ingestManager.createPackageConfig.endpointConfiguration": "このエージェント構成を使用するすべてのエージェントは基本ポリシーを使用します。セキュリティアプリでこのポリシーを変更できます。Fleetはこれらの変更をエージェントにデプロイします。",
+    "xpack.securitySolution.endpoint.ingestManager.createPackagePolicy.endpointConfiguration": "このエージェント構成を使用するすべてのエージェントは基本ポリシーを使用します。セキュリティアプリでこのポリシーを変更できます。Fleetはこれらの変更をエージェントにデプロイします。",
     "xpack.securitySolution.endpoint.ingestToastMessage": "Ingest Managerが設定中に失敗しました。",
     "xpack.securitySolution.endpoint.ingestToastTitle": "アプリを初期化できませんでした",
     "xpack.securitySolution.endpoint.policy.details.backToListTitle": "ポリシーリストに戻る",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 82a6b128ad619d..48b1b358b0635a 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -9152,53 +9152,53 @@
     "xpack.infra.waffle.unableToSelectMetricErrorTitle": "无法选择指标选项或指标值。",
     "xpack.infra.waffleTime.autoRefreshButtonLabel": "自动刷新",
     "xpack.infra.waffleTime.stopRefreshingButtonLabel": "停止刷新",
-    "xpack.ingestManager.agentConfig.confirmModalCalloutDescription": "Fleet 检测到所选代理配置 {configName} 已由您的部分代理使用。由于此操作，Fleet 会将更新部署到使用此配置的所有代理。",
-    "xpack.ingestManager.agentConfig.confirmModalCancelButtonLabel": "取消",
-    "xpack.ingestManager.agentConfig.confirmModalConfirmButtonLabel": "保存并部署更改",
-    "xpack.ingestManager.agentConfig.confirmModalDescription": "此操作无法撤消。是否确定要继续？",
-    "xpack.ingestManager.agentConfig.confirmModalTitle": "保存并部署更改",
-    "xpack.ingestManager.agentConfig.linkedAgentCountText": "{count, plural, one {# 个代理} other {# 个代理}}",
-    "xpack.ingestManager.agentConfigActionMenu.buttonText": "操作",
-    "xpack.ingestManager.agentConfigActionMenu.copyConfigActionText": "复制配置",
-    "xpack.ingestManager.agentConfigActionMenu.enrollAgentActionText": "添加代理",
-    "xpack.ingestManager.agentConfigActionMenu.viewConfigText": "查看配置",
-    "xpack.ingestManager.agentConfigForm.advancedOptionsToggleLabel": "高级选项",
-    "xpack.ingestManager.agentConfigForm.descriptionFieldLabel": "描述",
-    "xpack.ingestManager.agentConfigForm.descriptionFieldPlaceholder": "此配置将如何使用？",
-    "xpack.ingestManager.agentConfigForm.monitoringDescription": "收集有关代理的数据，以排查和跟踪性能。",
-    "xpack.ingestManager.agentConfigForm.monitoringLabel": "代理监测",
-    "xpack.ingestManager.agentConfigForm.monitoringLogsFieldLabel": "收集代理日志",
-    "xpack.ingestManager.agentConfigForm.monitoringMetricsFieldLabel": "收集代理指标",
-    "xpack.ingestManager.agentConfigForm.nameFieldLabel": "名称",
-    "xpack.ingestManager.agentConfigForm.nameFieldPlaceholder": "选择名称",
-    "xpack.ingestManager.agentConfigForm.nameRequiredErrorMessage": "“代理配置名称”必填",
-    "xpack.ingestManager.agentConfigForm.namespaceFieldDescription": "将默认命名空间应用于使用此配置的集成。集成可以指定自己的命名空间。",
-    "xpack.ingestManager.agentConfigForm.namespaceFieldLabel": "默认命名空间",
-    "xpack.ingestManager.agentConfigForm.namespaceRequiredErrorMessage": "命名空间必填",
-    "xpack.ingestManager.agentConfigForm.systemMonitoringFieldLabel": "可选",
-    "xpack.ingestManager.agentConfigForm.systemMonitoringText": "收集系统指标",
-    "xpack.ingestManager.agentConfigForm.systemMonitoringTooltipText": "启用此选项可使用收集系统指标和信息的集成启动您的配置。",
-    "xpack.ingestManager.agentConfigList.actionsColumnTitle": "操作",
-    "xpack.ingestManager.agentConfigList.addButton": "创建代理配置",
-    "xpack.ingestManager.agentConfigList.agentsColumnTitle": "代理",
-    "xpack.ingestManager.agentConfigList.clearFiltersLinkText": "清除筛选",
-    "xpack.ingestManager.agentConfigList.descriptionColumnTitle": "描述",
-    "xpack.ingestManager.agentConfigList.loadingAgentConfigsMessage": "正在加载代理配置……",
-    "xpack.ingestManager.agentConfigList.nameColumnTitle": "名称",
-    "xpack.ingestManager.agentConfigList.noAgentConfigsPrompt": "无代理配置",
-    "xpack.ingestManager.agentConfigList.noFilteredAgentConfigsPrompt": "找不到代理配置。{clearFiltersLink}",
-    "xpack.ingestManager.agentConfigList.packageConfigsCountColumnTitle": "集成",
-    "xpack.ingestManager.agentConfigList.pageSubtitle": "使用代理配置管理代理和它们收集的数据。",
-    "xpack.ingestManager.agentConfigList.pageTitle": "代理配置",
-    "xpack.ingestManager.agentConfigList.reloadAgentConfigsButtonText": "重新加载",
-    "xpack.ingestManager.agentConfigList.revisionNumber": "修订 {revNumber}",
-    "xpack.ingestManager.agentConfigList.updatedOnColumnTitle": "最后更新时间",
+    "xpack.ingestManager.agentPolicy.confirmModalCalloutDescription": "Fleet 检测到所选代理配置 {policyName} 已由您的部分代理使用。由于此操作，Fleet 会将更新部署到使用此配置的所有代理。",
+    "xpack.ingestManager.agentPolicy.confirmModalCancelButtonLabel": "取消",
+    "xpack.ingestManager.agentPolicy.confirmModalConfirmButtonLabel": "保存并部署更改",
+    "xpack.ingestManager.agentPolicy.confirmModalDescription": "此操作无法撤消。是否确定要继续？",
+    "xpack.ingestManager.agentPolicy.confirmModalTitle": "保存并部署更改",
+    "xpack.ingestManager.agentPolicy.linkedAgentCountText": "{count, plural, one {# 个代理} other {# 个代理}}",
+    "xpack.ingestManager.agentPolicyActionMenu.buttonText": "操作",
+    "xpack.ingestManager.agentPolicyActionMenu.copyPolicyActionText": "复制配置",
+    "xpack.ingestManager.agentPolicyActionMenu.enrollAgentActionText": "添加代理",
+    "xpack.ingestManager.agentPolicyActionMenu.viewPolicyText": "查看配置",
+    "xpack.ingestManager.agentPolicyForm.advancedOptionsToggleLabel": "高级选项",
+    "xpack.ingestManager.agentPolicyForm.descriptionFieldLabel": "描述",
+    "xpack.ingestManager.agentPolicyForm.descriptionFieldPlaceholder": "此配置将如何使用？",
+    "xpack.ingestManager.agentPolicyForm.monitoringDescription": "收集有关代理的数据，以排查和跟踪性能。",
+    "xpack.ingestManager.agentPolicyForm.monitoringLabel": "代理监测",
+    "xpack.ingestManager.agentPolicyForm.monitoringLogsFieldLabel": "收集代理日志",
+    "xpack.ingestManager.agentPolicyForm.monitoringMetricsFieldLabel": "收集代理指标",
+    "xpack.ingestManager.agentPolicyForm.nameFieldLabel": "名称",
+    "xpack.ingestManager.agentPolicyForm.nameFieldPlaceholder": "选择名称",
+    "xpack.ingestManager.agentPolicyForm.nameRequiredErrorMessage": "“代理配置名称”必填",
+    "xpack.ingestManager.agentPolicyForm.namespaceFieldDescription": "将默认命名空间应用于使用此配置的集成。集成可以指定自己的命名空间。",
+    "xpack.ingestManager.agentPolicyForm.namespaceFieldLabel": "默认命名空间",
+    "xpack.ingestManager.agentPolicyForm.namespaceRequiredErrorMessage": "命名空间必填",
+    "xpack.ingestManager.agentPolicyForm.systemMonitoringFieldLabel": "可选",
+    "xpack.ingestManager.agentPolicyForm.systemMonitoringText": "收集系统指标",
+    "xpack.ingestManager.agentPolicyForm.systemMonitoringTooltipText": "启用此选项可使用收集系统指标和信息的集成启动您的配置。",
+    "xpack.ingestManager.agentPolicyList.actionsColumnTitle": "操作",
+    "xpack.ingestManager.agentPolicyList.addButton": "创建代理配置",
+    "xpack.ingestManager.agentPolicyList.agentsColumnTitle": "代理",
+    "xpack.ingestManager.agentPolicyList.clearFiltersLinkText": "清除筛选",
+    "xpack.ingestManager.agentPolicyList.descriptionColumnTitle": "描述",
+    "xpack.ingestManager.agentPolicyList.loadingAgentPoliciesMessage": "正在加载代理配置……",
+    "xpack.ingestManager.agentPolicyList.nameColumnTitle": "名称",
+    "xpack.ingestManager.agentPolicyList.noAgentPoliciesPrompt": "无代理配置",
+    "xpack.ingestManager.agentPolicyList.noFilteredAgentPoliciesPrompt": "找不到代理配置。{clearFiltersLink}",
+    "xpack.ingestManager.agentPolicyList.packagePoliciesCountColumnTitle": "集成",
+    "xpack.ingestManager.agentPolicyList.pageSubtitle": "使用代理配置管理代理和它们收集的数据。",
+    "xpack.ingestManager.agentPolicyList.pageTitle": "代理配置",
+    "xpack.ingestManager.agentPolicyList.reloadAgentPoliciesButtonText": "重新加载",
+    "xpack.ingestManager.agentPolicyList.revisionNumber": "修订 {revNumber}",
+    "xpack.ingestManager.agentPolicyList.updatedOnColumnTitle": "最后更新时间",
     "xpack.ingestManager.agentDetails.actionsButton": "操作",
-    "xpack.ingestManager.agentDetails.agentConfigurationLabel": "代理配置",
+    "xpack.ingestManager.agentDetails.agentPolicyLabel": "代理配置",
     "xpack.ingestManager.agentDetails.agentDetailsTitle": "代理“{id}”",
     "xpack.ingestManager.agentDetails.agentNotFoundErrorDescription": "找不到代理 ID {agentId}",
     "xpack.ingestManager.agentDetails.agentNotFoundErrorTitle": "未找到代理",
-    "xpack.ingestManager.agentDetails.configurationLabel": "配置",
+    "xpack.ingestManager.agentDetails.policyLabel": "配置",
     "xpack.ingestManager.agentDetails.hostIdLabel": "主机 ID",
     "xpack.ingestManager.agentDetails.hostNameLabel": "主机名",
     "xpack.ingestManager.agentDetails.localMetadataSectionSubtitle": "本地元数据",
@@ -9213,9 +9213,9 @@
     "xpack.ingestManager.agentDetails.viewAgentListTitle": "查看所有代理",
     "xpack.ingestManager.agentEnrollment.cancelButtonLabel": "取消",
     "xpack.ingestManager.agentEnrollment.continueButtonLabel": "继续",
-    "xpack.ingestManager.agentEnrollment.copyConfigurationButton": "复制到剪贴板",
+    "xpack.ingestManager.agentEnrollment.copyPolicyButton": "复制到剪贴板",
     "xpack.ingestManager.agentEnrollment.copyRunInstructionsButton": "复制到剪贴板",
-    "xpack.ingestManager.agentEnrollment.downloadConfigurationButton": "下载配置",
+    "xpack.ingestManager.agentEnrollment.downloadPolicyButton": "下载配置",
     "xpack.ingestManager.agentEnrollment.downloadDescription": "在主机计算机上下载 Elastic 代理。可以从 Elastic 代理下载页面访问代理二进制文件及其验证签名。",
     "xpack.ingestManager.agentEnrollment.downloadLink": "前往 elastic.co/downloads",
     "xpack.ingestManager.agentEnrollment.enrollFleetTabLabel": "注册到 Fleet",
@@ -9227,7 +9227,7 @@
     "xpack.ingestManager.agentEnrollment.standaloneDescription": "如果希望对以独立模式运行的代理进行配置更改，则需要手动更新。按照下面的说明下载并设置独立模式的 Elastic 代理。",
     "xpack.ingestManager.agentEnrollment.stepCheckForDataDescription": "启动代理后，代理应开始发送数据。您可以在采集管理器的数据集页面查看此数据。",
     "xpack.ingestManager.agentEnrollment.stepCheckForDataTitle": "检查数据",
-    "xpack.ingestManager.agentEnrollment.stepChooseAgentConfigTitle": "选择代理配置",
+    "xpack.ingestManager.agentEnrollment.stepChooseAgentPolicyTitle": "选择代理配置",
     "xpack.ingestManager.agentEnrollment.stepConfigureAgentDescription": "在安装 Elastic 代理的系统上复制此配置并将其放入名为 {fileName} 的文件中。切勿忘记修改配置文件中 {outputSection} 部分的{ESUsernameVariable} 和 {ESPasswordVariable}，以便其使用您的实际 Elasticsearch 凭据。",
     "xpack.ingestManager.agentEnrollment.stepConfigureAgentTitle": "配置代理",
     "xpack.ingestManager.agentEnrollment.stepDownloadAgentTitle": "下载 Elastic 代理",
@@ -9245,7 +9245,7 @@
     "xpack.ingestManager.agentEventsList.timestampColumnTitle": "时间戳",
     "xpack.ingestManager.agentEventsList.typeColumnTitle": "类型",
     "xpack.ingestManager.agentEventSubtype.acknowledgedLabel": "已确认",
-    "xpack.ingestManager.agentEventSubtype.configLabel": "配置",
+    "xpack.ingestManager.agentEventSubtype.policyLabel": "配置",
     "xpack.ingestManager.agentEventSubtype.dataDumpLabel": "数据转储",
     "xpack.ingestManager.agentEventSubtype.failedLabel": "失败",
     "xpack.ingestManager.agentEventSubtype.inProgressLabel": "进行中",
@@ -9271,8 +9271,8 @@
     "xpack.ingestManager.agentList.actionsColumnTitle": "操作",
     "xpack.ingestManager.agentList.addButton": "添加代理",
     "xpack.ingestManager.agentList.clearFiltersLinkText": "清除筛选",
-    "xpack.ingestManager.agentList.configColumnTitle": "代理配置",
-    "xpack.ingestManager.agentList.configFilterText": "代理配置",
+    "xpack.ingestManager.agentList.policyColumnTitle": "代理配置",
+    "xpack.ingestManager.agentList.policyFilterText": "代理配置",
     "xpack.ingestManager.agentList.enrollButton": "添加代理",
     "xpack.ingestManager.agentList.hostColumnTitle": "主机",
     "xpack.ingestManager.agentList.lastCheckinTitle": "上次活动",
@@ -9295,13 +9295,13 @@
     "xpack.ingestManager.agentListStatus.offlineLabel": "脱机",
     "xpack.ingestManager.agentListStatus.onlineLabel": "联机",
     "xpack.ingestManager.agentListStatus.totalLabel": "代理",
-    "xpack.ingestManager.agentReassignConfig.cancelButtonLabel": "取消",
-    "xpack.ingestManager.agentReassignConfig.configDescription": "选定代理配置将收集 {count, plural, one {{countValue} 个集成} other {{countValue} 个集成}}的数据：",
-    "xpack.ingestManager.agentReassignConfig.continueButtonLabel": "分配配置",
-    "xpack.ingestManager.agentReassignConfig.flyoutDescription": "选择要为选定代理分配的新代理配置。",
-    "xpack.ingestManager.agentReassignConfig.flyoutTitle": "分配新代理配置",
-    "xpack.ingestManager.agentReassignConfig.selectConfigLabel": "代理配置",
-    "xpack.ingestManager.agentReassignConfig.successSingleNotificationTitle": "代理配置已重新分配",
+    "xpack.ingestManager.agentReassignPolicy.cancelButtonLabel": "取消",
+    "xpack.ingestManager.agentReassignPolicy.policyDescription": "选定代理配置将收集 {count, plural, one {{countValue} 个集成} other {{countValue} 个集成}}的数据：",
+    "xpack.ingestManager.agentReassignPolicy.continueButtonLabel": "分配配置",
+    "xpack.ingestManager.agentReassignPolicy.flyoutDescription": "选择要为选定代理分配的新代理配置。",
+    "xpack.ingestManager.agentReassignPolicy.flyoutTitle": "分配新代理配置",
+    "xpack.ingestManager.agentReassignPolicy.selectPolicyLabel": "代理配置",
+    "xpack.ingestManager.agentReassignPolicy.successSingleNotificationTitle": "代理配置已重新分配",
     "xpack.ingestManager.alphaMessageDescription": "不推荐在生产环境中使用采集管理器。",
     "xpack.ingestManager.alphaMessageLinkText": "查看更多详情。",
     "xpack.ingestManager.alphaMessageTitle": "公测版",
@@ -9311,7 +9311,7 @@
     "xpack.ingestManager.alphaMessaging.forumLink": "讨论论坛",
     "xpack.ingestManager.alphaMessaging.introText": "采集管理器仍处于开发状态，不适用于生产环境。此公测版用于用户测试采集管理器和新 Elastic 代理并提供相关反馈。此插件不受支持 SLA 的约束。",
     "xpack.ingestManager.alphaMessging.closeFlyoutLabel": "关闭",
-    "xpack.ingestManager.appNavigation.configurationsLinkText": "配置",
+    "xpack.ingestManager.appNavigation.policiesLinkText": "配置",
     "xpack.ingestManager.appNavigation.dataStreamsLinkText": "数据集",
     "xpack.ingestManager.appNavigation.epmLinkText": "集成",
     "xpack.ingestManager.appNavigation.fleetLinkText": "Fleet",
@@ -9321,102 +9321,102 @@
     "xpack.ingestManager.appTitle": "Ingest Manager",
     "xpack.ingestManager.betaBadge.labelText": "公测版",
     "xpack.ingestManager.betaBadge.tooltipText": "不推荐在生产环境中使用此插件。请在我们讨论论坛中报告错误。",
-    "xpack.ingestManager.breadcrumbs.addPackageConfigPageTitle": "添加集成",
+    "xpack.ingestManager.breadcrumbs.addPackagePolicyPageTitle": "添加集成",
     "xpack.ingestManager.breadcrumbs.allIntegrationsPageTitle": "全部",
     "xpack.ingestManager.breadcrumbs.appTitle": "采集管理器",
-    "xpack.ingestManager.breadcrumbs.configurationsPageTitle": "配置",
+    "xpack.ingestManager.breadcrumbs.policiesPageTitle": "配置",
     "xpack.ingestManager.breadcrumbs.datastreamsPageTitle": "数据集",
-    "xpack.ingestManager.breadcrumbs.editPackageConfigPageTitle": "编辑集成",
+    "xpack.ingestManager.breadcrumbs.editPackagePolicyPageTitle": "编辑集成",
     "xpack.ingestManager.breadcrumbs.fleetAgentsPageTitle": "代理",
     "xpack.ingestManager.breadcrumbs.fleetEnrollmentTokensPageTitle": "注册令牌",
     "xpack.ingestManager.breadcrumbs.fleetPageTitle": "Fleet",
     "xpack.ingestManager.breadcrumbs.installedIntegrationsPageTitle": "已安装",
     "xpack.ingestManager.breadcrumbs.integrationsPageTitle": "集成",
     "xpack.ingestManager.breadcrumbs.overviewPageTitle": "概览",
-    "xpack.ingestManager.configDetails.addPackageConfigButtonText": "添加集成",
-    "xpack.ingestManager.configDetails.configDetailsTitle": "配置“{id}”",
-    "xpack.ingestManager.configDetails.configNotFoundErrorTitle": "未找到配置“{id}”",
-    "xpack.ingestManager.configDetails.packageConfigsTable.actionsColumnTitle": "操作",
-    "xpack.ingestManager.configDetails.packageConfigsTable.deleteActionTitle": "删除集成",
-    "xpack.ingestManager.configDetails.packageConfigsTable.descriptionColumnTitle": "描述",
-    "xpack.ingestManager.configDetails.packageConfigsTable.editActionTitle": "编辑集成",
-    "xpack.ingestManager.configDetails.packageConfigsTable.nameColumnTitle": "名称",
-    "xpack.ingestManager.configDetails.packageConfigsTable.namespaceColumnTitle": "命名空间",
-    "xpack.ingestManager.configDetails.packageConfigsTable.packageNameColumnTitle": "集成",
-    "xpack.ingestManager.configDetails.subTabs.packageConfigsTabText": "集成",
-    "xpack.ingestManager.configDetails.subTabs.settingsTabText": "设置",
-    "xpack.ingestManager.configDetails.summary.lastUpdated": "最后更新时间",
-    "xpack.ingestManager.configDetails.summary.package_configs": "集成",
-    "xpack.ingestManager.configDetails.summary.revision": "修订",
-    "xpack.ingestManager.configDetails.summary.usedBy": "使用者",
-    "xpack.ingestManager.configDetails.unexceptedErrorTitle": "加载配置时发生错误",
-    "xpack.ingestManager.configDetails.viewAgentListTitle": "查看所有代理配置",
-    "xpack.ingestManager.configDetails.yamlDownloadButtonLabel": "下载配置",
-    "xpack.ingestManager.configDetails.yamlFlyoutCloseButtonLabel": "关闭",
-    "xpack.ingestManager.configDetails.yamlflyoutTitleWithName": "“{name}”代理配置",
-    "xpack.ingestManager.configDetails.yamlflyoutTitleWithoutName": "代理配置",
-    "xpack.ingestManager.configDetailsPackageConfigs.createFirstButtonText": "添加集成",
-    "xpack.ingestManager.configDetailsPackageConfigs.createFirstMessage": "此配置尚未有任何集成。",
-    "xpack.ingestManager.configDetailsPackageConfigs.createFirstTitle": "添加您的首个集成",
-    "xpack.ingestManager.configForm.deleteConfigActionText": "删除配置",
-    "xpack.ingestManager.configForm.deleteConfigGroupDescription": "将不会删除现有数据。",
-    "xpack.ingestManager.configForm.deleteConfigGroupTitle": "删除配置",
-    "xpack.ingestManager.configForm.generalSettingsGroupDescription": "为您的代理配置选择名称和描述。",
-    "xpack.ingestManager.configForm.generalSettingsGroupTitle": "常规设置",
-    "xpack.ingestManager.configForm.unableToDeleteDefaultConfigText": "无法删除默认配置",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.cancelButtonLabel": "取消",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.confirmButtonLabel": "复制配置",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.copyConfigPrompt": "为您的新代理配置选择名称和描述。",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.copyConfigTitle": "复制“{name}”代理配置",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.defaultNewConfigName": "{name}（副本）",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.newDescriptionLabel": "描述",
-    "xpack.ingestManager.copyAgentConfig.confirmModal.newNameLabel": "新配置名称",
-    "xpack.ingestManager.copyAgentConfig.failureNotificationTitle": "复制代理配置“{id}”时出错",
-    "xpack.ingestManager.copyAgentConfig.fatalErrorNotificationTitle": "复制代理配置时出错",
-    "xpack.ingestManager.copyAgentConfig.successNotificationTitle": "代理配置已复制",
-    "xpack.ingestManager.createAgentConfig.cancelButtonLabel": "取消",
-    "xpack.ingestManager.createAgentConfig.errorNotificationTitle": "无法创建代理配置",
-    "xpack.ingestManager.createAgentConfig.flyoutTitle": "创建代理配置",
-    "xpack.ingestManager.createAgentConfig.flyoutTitleDescription": "代理配置用于管理整个代理组的设置。您可以将集成添加到代理配置以指定代理收集的数据。编辑代理配置时，可以使用 Fleet 将更新部署到指定的代理组。",
-    "xpack.ingestManager.createAgentConfig.submitButtonLabel": "创建代理配置",
-    "xpack.ingestManager.createAgentConfig.successNotificationTitle": "代理配置“{name}”已创建",
-    "xpack.ingestManager.createPackageConfig.addedNotificationMessage": "Fleet 会将更新部署到所有使用配置“{agentConfigName}”的代理",
-    "xpack.ingestManager.createPackageConfig.addedNotificationTitle": "已成功添加“{packageConfigName}”",
-    "xpack.ingestManager.createPackageConfig.agentConfigurationNameLabel": "代理配置",
-    "xpack.ingestManager.createPackageConfig.cancelButton": "取消",
-    "xpack.ingestManager.createPackageConfig.cancelLinkText": "取消",
-    "xpack.ingestManager.createPackageConfig.errorOnSaveText": "您的集成配置有错误。请在保存前进行修复。",
-    "xpack.ingestManager.createPackageConfig.pageDescriptionfromConfig": "配置选定代理配置的集成。",
-    "xpack.ingestManager.createPackageConfig.pageDescriptionfromPackage": "按照下面的说明将此集成添加到代理配置。",
-    "xpack.ingestManager.createPackageConfig.pageTitle": "添加集成",
-    "xpack.ingestManager.createPackageConfig.pageTitleWithPackageName": "添加 {packageName} 集成",
-    "xpack.ingestManager.createPackageConfig.saveButton": "保存集成",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.advancedOptionsToggleLinkText": "高级选项",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.errorCountText": "{count, plural, one {# 个错误} other {# 个错误}}",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.hideStreamsAriaLabel": "隐藏 {type} 输入",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.inputSettingsDescription": "以下设置适用于下面的所有输入。",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.inputSettingsTitle": "设置",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.inputVarFieldOptionalLabel": "可选",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.integrationSettingsSectionDescription": "选择有助于确定如何使用此集成的名称和描述。",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.integrationSettingsSectionTitle": "集成设置",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.noConfigOptionsMessage": "没有可配置的内容",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.packageConfigDescriptionInputLabel": "描述",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.packageConfigNameInputLabel": "集成名称",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.packageConfigNamespaceInputLabel": "命名空间",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.showStreamsAriaLabel": "显示 {type} 输入",
-    "xpack.ingestManager.createPackageConfig.stepConfigure.toggleAdvancedOptionsButtonText": "高级选项",
-    "xpack.ingestManager.createPackageConfig.stepConfigurePackageConfigTitle": "配置集成",
-    "xpack.ingestManager.createPackageConfig.stepSelectAgentConfigTitle": "选择代理配置",
-    "xpack.ingestManager.createPackageConfig.StepSelectConfig.addButton": "新建代理配置",
-    "xpack.ingestManager.createPackageConfig.StepSelectConfig.agentConfigAgentsCountText": "{count, plural, one {# 个代理} other {# 个代理}}",
-    "xpack.ingestManager.createPackageConfig.StepSelectConfig.errorLoadingAgentConfigsTitle": "加载代理配置时出错",
-    "xpack.ingestManager.createPackageConfig.StepSelectConfig.errorLoadingPackageTitle": "加载软件包信息时出错",
-    "xpack.ingestManager.createPackageConfig.StepSelectConfig.errorLoadingSelectedAgentConfigTitle": "加载选定代理配置时出错",
-    "xpack.ingestManager.createPackageConfig.stepSelectPackage.errorLoadingConfigTitle": "加载代理配置信息时出错",
-    "xpack.ingestManager.createPackageConfig.stepSelectPackage.errorLoadingPackagesTitle": "加载集成时出错",
-    "xpack.ingestManager.createPackageConfig.stepSelectPackage.errorLoadingSelectedPackageTitle": "加载选定集成时出错",
-    "xpack.ingestManager.createPackageConfig.stepSelectPackage.filterPackagesInputPlaceholder": "搜索集成",
-    "xpack.ingestManager.createPackageConfig.stepSelectPackageTitle": "选择集成",
+    "xpack.ingestManager.policyDetails.addPackagePolicyButtonText": "添加集成",
+    "xpack.ingestManager.policyDetails.policyDetailsTitle": "配置“{id}”",
+    "xpack.ingestManager.policyDetails.policyNotFoundErrorTitle": "未找到配置“{id}”",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.actionsColumnTitle": "操作",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.deleteActionTitle": "删除集成",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.descriptionColumnTitle": "描述",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.editActionTitle": "编辑集成",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.nameColumnTitle": "名称",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.namespaceColumnTitle": "命名空间",
+    "xpack.ingestManager.policyDetails.packagePoliciesTable.packageNameColumnTitle": "集成",
+    "xpack.ingestManager.policyDetails.subTabs.packagePoliciesTabText": "集成",
+    "xpack.ingestManager.policyDetails.subTabs.settingsTabText": "设置",
+    "xpack.ingestManager.policyDetails.summary.lastUpdated": "最后更新时间",
+    "xpack.ingestManager.policyDetails.summary.integrations": "集成",
+    "xpack.ingestManager.policyDetails.summary.revision": "修订",
+    "xpack.ingestManager.policyDetails.summary.usedBy": "使用者",
+    "xpack.ingestManager.policyDetails.unexceptedErrorTitle": "加载配置时发生错误",
+    "xpack.ingestManager.policyDetails.viewAgentListTitle": "查看所有代理配置",
+    "xpack.ingestManager.policyDetails.yamlDownloadButtonLabel": "下载配置",
+    "xpack.ingestManager.policyDetails.yamlFlyoutCloseButtonLabel": "关闭",
+    "xpack.ingestManager.policyDetails.yamlflyoutTitleWithName": "“{name}”代理配置",
+    "xpack.ingestManager.policyDetails.yamlflyoutTitleWithoutName": "代理配置",
+    "xpack.ingestManager.policyDetailsPackagePolicies.createFirstButtonText": "添加集成",
+    "xpack.ingestManager.policyDetailsPackagePolicies.createFirstMessage": "此配置尚未有任何集成。",
+    "xpack.ingestManager.policyDetailsPackagePolicies.createFirstTitle": "添加您的首个集成",
+    "xpack.ingestManager.policyForm.deletePolicyActionText": "删除配置",
+    "xpack.ingestManager.policyForm.deletePolicyGroupDescription": "将不会删除现有数据。",
+    "xpack.ingestManager.policyForm.deletePolicyGroupTitle": "删除配置",
+    "xpack.ingestManager.policyForm.generalSettingsGroupDescription": "为您的代理配置选择名称和描述。",
+    "xpack.ingestManager.policyForm.generalSettingsGroupTitle": "常规设置",
+    "xpack.ingestManager.policyForm.unableToDeleteDefaultPolicyText": "无法删除默认配置",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.cancelButtonLabel": "取消",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.confirmButtonLabel": "复制配置",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.copyPolicyPrompt": "为您的新代理配置选择名称和描述。",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.copyPolicyTitle": "复制“{name}”代理配置",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.defaultNewPolicyName": "{name}（副本）",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.newDescriptionLabel": "描述",
+    "xpack.ingestManager.copyAgentPolicy.confirmModal.newNameLabel": "新配置名称",
+    "xpack.ingestManager.copyAgentPolicy.failureNotificationTitle": "复制代理配置“{id}”时出错",
+    "xpack.ingestManager.copyAgentPolicy.fatalErrorNotificationTitle": "复制代理配置时出错",
+    "xpack.ingestManager.copyAgentPolicy.successNotificationTitle": "代理配置已复制",
+    "xpack.ingestManager.createAgentPolicy.cancelButtonLabel": "取消",
+    "xpack.ingestManager.createAgentPolicy.errorNotificationTitle": "无法创建代理配置",
+    "xpack.ingestManager.createAgentPolicy.flyoutTitle": "创建代理配置",
+    "xpack.ingestManager.createAgentPolicy.flyoutTitleDescription": "代理配置用于管理整个代理组的设置。您可以将集成添加到代理配置以指定代理收集的数据。编辑代理配置时，可以使用 Fleet 将更新部署到指定的代理组。",
+    "xpack.ingestManager.createAgentPolicy.submitButtonLabel": "创建代理配置",
+    "xpack.ingestManager.createAgentPolicy.successNotificationTitle": "代理配置“{name}”已创建",
+    "xpack.ingestManager.createPackagePolicy.addedNotificationMessage": "Fleet 会将更新部署到所有使用配置“{agentPolicyName}”的代理",
+    "xpack.ingestManager.createPackagePolicy.addedNotificationTitle": "已成功添加“{packagePolicyName}”",
+    "xpack.ingestManager.createPackagePolicy.agentPolicyNameLabel": "代理配置",
+    "xpack.ingestManager.createPackagePolicy.cancelButton": "取消",
+    "xpack.ingestManager.createPackagePolicy.cancelLinkText": "取消",
+    "xpack.ingestManager.createPackagePolicy.errorOnSaveText": "您的集成配置有错误。请在保存前进行修复。",
+    "xpack.ingestManager.createPackagePolicy.pageDescriptionfromPolicy": "配置选定代理配置的集成。",
+    "xpack.ingestManager.createPackagePolicy.pageDescriptionfromPackage": "按照下面的说明将此集成添加到代理配置。",
+    "xpack.ingestManager.createPackagePolicy.pageTitle": "添加集成",
+    "xpack.ingestManager.createPackagePolicy.pageTitleWithPackageName": "添加 {packageName} 集成",
+    "xpack.ingestManager.createPackagePolicy.saveButton": "保存集成",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.advancedOptionsToggleLinkText": "高级选项",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.errorCountText": "{count, plural, one {# 个错误} other {# 个错误}}",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.hideStreamsAriaLabel": "隐藏 {type} 输入",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.inputSettingsDescription": "以下设置适用于下面的所有输入。",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.inputSettingsTitle": "设置",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.inputVarFieldOptionalLabel": "可选",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.integrationSettingsSectionDescription": "选择有助于确定如何使用此集成的名称和描述。",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.integrationSettingsSectionTitle": "集成设置",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.noPolicyOptionsMessage": "没有可配置的内容",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.packagePolicyDescriptionInputLabel": "描述",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.packagePolicyNameInputLabel": "集成名称",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.packagePolicyNamespaceInputLabel": "命名空间",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.showStreamsAriaLabel": "显示 {type} 输入",
+    "xpack.ingestManager.createPackagePolicy.stepConfigure.toggleAdvancedOptionsButtonText": "高级选项",
+    "xpack.ingestManager.createPackagePolicy.stepConfigurePackagePolicyTitle": "配置集成",
+    "xpack.ingestManager.createPackagePolicy.stepSelectAgentPolicyTitle": "选择代理配置",
+    "xpack.ingestManager.createPackagePolicy.StepSelectPolicy.addButton": "新建代理配置",
+    "xpack.ingestManager.createPackagePolicy.StepSelectPolicy.agentPolicyAgentsCountText": "{count, plural, one {# 个代理} other {# 个代理}}",
+    "xpack.ingestManager.createPackagePolicy.StepSelectPolicy.errorLoadingAgentPoliciesTitle": "加载代理配置时出错",
+    "xpack.ingestManager.createPackagePolicy.StepSelectPolicy.errorLoadingPackageTitle": "加载软件包信息时出错",
+    "xpack.ingestManager.createPackagePolicy.StepSelectPolicy.errorLoadingSelectedAgentPolicyTitle": "加载选定代理配置时出错",
+    "xpack.ingestManager.createPackagePolicy.stepSelectPackage.errorLoadingPolicyTitle": "加载代理配置信息时出错",
+    "xpack.ingestManager.createPackagePolicy.stepSelectPackage.errorLoadingPackagesTitle": "加载集成时出错",
+    "xpack.ingestManager.createPackagePolicy.stepSelectPackage.errorLoadingSelectedPackageTitle": "加载选定集成时出错",
+    "xpack.ingestManager.createPackagePolicy.stepSelectPackage.filterPackagesInputPlaceholder": "搜索集成",
+    "xpack.ingestManager.createPackagePolicy.stepSelectPackageTitle": "选择集成",
     "xpack.ingestManager.dataStreamList.actionsColumnTitle": "操作",
     "xpack.ingestManager.dataStreamList.datasetColumnTitle": "数据集",
     "xpack.ingestManager.dataStreamList.integrationColumnTitle": "集成",
@@ -9435,73 +9435,73 @@
     "xpack.ingestManager.dataStreamList.viewDashboardsActionText": "查看仪表板",
     "xpack.ingestManager.dataStreamList.viewDashboardsPanelTitle": "查看仪表板",
     "xpack.ingestManager.defaultSearchPlaceholderText": "搜索",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.affectedAgentsMessage": "{agentsCount, plural, one {# 个代理} other {# 个代理}}已分配给此代理配置。在删除此配置之前请取消分配这些代理。",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.affectedAgentsTitle": "配置已被用",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.cancelButtonLabel": "取消",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.confirmButtonLabel": "删除配置",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.deleteConfigTitle": "删除此代理配置？",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.irreversibleMessage": "此操作无法撤消。",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.loadingAgentsCountMessage": "正在检查受影响代理数量……",
-    "xpack.ingestManager.deleteAgentConfig.confirmModal.loadingButtonLabel": "正在加载……",
-    "xpack.ingestManager.deleteAgentConfig.failureSingleNotificationTitle": "删除代理配置“{id}”时出错",
-    "xpack.ingestManager.deleteAgentConfig.fatalErrorNotificationTitle": "删除代理配置时出错",
-    "xpack.ingestManager.deleteAgentConfig.successSingleNotificationTitle": "已删除代理配置“{id}”",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.affectedAgentsMessage": "Fleet 已检测到 {agentConfigName} 已由您的部分代理使用。",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.affectedAgentsTitle": "此操作将影响 {agentsCount} 个{agentsCount, plural, one {代理} other {代理}}。",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.cancelButtonLabel": "取消",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.confirmButtonLabel": "删除{agentConfigsCount, plural, one {集成} other {集成}}",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.deleteMultipleTitle": "删除{count, plural, one {集成} other {# 个集成}}？",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.generalMessage": "此操作无法撤消。是否确定要继续？",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.loadingAgentsCountMessage": "正在检查受影响的代理……",
-    "xpack.ingestManager.deletePackageConfig.confirmModal.loadingButtonLabel": "正在加载……",
-    "xpack.ingestManager.deletePackageConfig.failureMultipleNotificationTitle": "删除 {count} 个集成时出错",
-    "xpack.ingestManager.deletePackageConfig.failureSingleNotificationTitle": "删除集成“{id}”时出错",
-    "xpack.ingestManager.deletePackageConfig.fatalErrorNotificationTitle": "删除集成时出错",
-    "xpack.ingestManager.deletePackageConfig.successMultipleNotificationTitle": "已删除 {count} 个集成",
-    "xpack.ingestManager.deletePackageConfig.successSingleNotificationTitle": "已删除集成“{id}”",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.affectedAgentsMessage": "{agentsCount, plural, one {# 个代理} other {# 个代理}}已分配给此代理配置。在删除此配置之前请取消分配这些代理。",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.affectedAgentsTitle": "配置已被用",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.cancelButtonLabel": "取消",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.confirmButtonLabel": "删除配置",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.deletePolicyTitle": "删除此代理配置？",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.irreversibleMessage": "此操作无法撤消。",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.loadingAgentsCountMessage": "正在检查受影响代理数量……",
+    "xpack.ingestManager.deleteAgentPolicy.confirmModal.loadingButtonLabel": "正在加载……",
+    "xpack.ingestManager.deleteAgentPolicy.failureSingleNotificationTitle": "删除代理配置“{id}”时出错",
+    "xpack.ingestManager.deleteAgentPolicy.fatalErrorNotificationTitle": "删除代理配置时出错",
+    "xpack.ingestManager.deleteAgentPolicy.successSingleNotificationTitle": "已删除代理配置“{id}”",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.affectedAgentsMessage": "Fleet 已检测到 {agentPolicyName} 已由您的部分代理使用。",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.affectedAgentsTitle": "此操作将影响 {agentsCount} 个{agentsCount, plural, one {代理} other {代理}}。",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.cancelButtonLabel": "取消",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.confirmButtonLabel": "删除{agentPoliciesCount, plural, one {集成} other {集成}}",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.deleteMultipleTitle": "删除{count, plural, one {集成} other {# 个集成}}？",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.generalMessage": "此操作无法撤消。是否确定要继续？",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.loadingAgentsCountMessage": "正在检查受影响的代理……",
+    "xpack.ingestManager.deletePackagePolicy.confirmModal.loadingButtonLabel": "正在加载……",
+    "xpack.ingestManager.deletePackagePolicy.failureMultipleNotificationTitle": "删除 {count} 个集成时出错",
+    "xpack.ingestManager.deletePackagePolicy.failureSingleNotificationTitle": "删除集成“{id}”时出错",
+    "xpack.ingestManager.deletePackagePolicy.fatalErrorNotificationTitle": "删除集成时出错",
+    "xpack.ingestManager.deletePackagePolicy.successMultipleNotificationTitle": "已删除 {count} 个集成",
+    "xpack.ingestManager.deletePackagePolicy.successSingleNotificationTitle": "已删除集成“{id}”",
     "xpack.ingestManager.disabledSecurityDescription": "必须在 Kibana 和 Elasticsearch 启用安全性，才能使用 Elastic Fleet。",
     "xpack.ingestManager.disabledSecurityTitle": "安全性未启用",
-    "xpack.ingestManager.editAgentConfig.cancelButtonText": "取消",
-    "xpack.ingestManager.editAgentConfig.errorNotificationTitle": "无法更新代理配置",
-    "xpack.ingestManager.editAgentConfig.saveButtonText": "保存更改",
-    "xpack.ingestManager.editAgentConfig.savingButtonText": "正在保存……",
-    "xpack.ingestManager.editAgentConfig.successNotificationTitle": "已成功更新“{name}”设置",
-    "xpack.ingestManager.editAgentConfig.unsavedChangesText": "您有未保存更改",
-    "xpack.ingestManager.editPackageConfig.cancelButton": "取消",
-    "xpack.ingestManager.editPackageConfig.errorLoadingDataMessage": "加载此集成信息时出错",
-    "xpack.ingestManager.editPackageConfig.errorLoadingDataTitle": "加载数据时出错",
-    "xpack.ingestManager.editPackageConfig.failedConflictNotificationMessage": "数据已过时。刷新页面以获取最新的配置。",
-    "xpack.ingestManager.editPackageConfig.failedNotificationTitle": "更新“{packageConfigName}”时出错",
-    "xpack.ingestManager.editPackageConfig.pageDescription": "修改集成设置并将更改部署到选定代理配置。",
-    "xpack.ingestManager.editPackageConfig.pageTitle": "编辑集成",
-    "xpack.ingestManager.editPackageConfig.pageTitleWithPackageName": "编辑 {packageName} 集成",
-    "xpack.ingestManager.editPackageConfig.saveButton": "保存集成",
-    "xpack.ingestManager.editPackageConfig.updatedNotificationMessage": "Fleet 会将更新部署到所有使用配置“{agentConfigName}”的代理",
-    "xpack.ingestManager.editPackageConfig.updatedNotificationTitle": "已成功更新“{packageConfigName}”",
+    "xpack.ingestManager.editAgentPolicy.cancelButtonText": "取消",
+    "xpack.ingestManager.editAgentPolicy.errorNotificationTitle": "无法更新代理配置",
+    "xpack.ingestManager.editAgentPolicy.saveButtonText": "保存更改",
+    "xpack.ingestManager.editAgentPolicy.savingButtonText": "正在保存……",
+    "xpack.ingestManager.editAgentPolicy.successNotificationTitle": "已成功更新“{name}”设置",
+    "xpack.ingestManager.editAgentPolicy.unsavedChangesText": "您有未保存更改",
+    "xpack.ingestManager.editPackagePolicy.cancelButton": "取消",
+    "xpack.ingestManager.editPackagePolicy.errorLoadingDataMessage": "加载此集成信息时出错",
+    "xpack.ingestManager.editPackagePolicy.errorLoadingDataTitle": "加载数据时出错",
+    "xpack.ingestManager.editPackagePolicy.failedConflictNotificationMessage": "数据已过时。刷新页面以获取最新的配置。",
+    "xpack.ingestManager.editPackagePolicy.failedNotificationTitle": "更新“{packagePolicyName}”时出错",
+    "xpack.ingestManager.editPackagePolicy.pageDescription": "修改集成设置并将更改部署到选定代理配置。",
+    "xpack.ingestManager.editPackagePolicy.pageTitle": "编辑集成",
+    "xpack.ingestManager.editPackagePolicy.pageTitleWithPackageName": "编辑 {packageName} 集成",
+    "xpack.ingestManager.editPackagePolicy.saveButton": "保存集成",
+    "xpack.ingestManager.editPackagePolicy.updatedNotificationMessage": "Fleet 会将更新部署到所有使用配置“{agentPolicyName}”的代理",
+    "xpack.ingestManager.editPackagePolicy.updatedNotificationTitle": "已成功更新“{packagePolicyName}”",
     "xpack.ingestManager.enrollemntAPIKeyList.emptyMessage": "未找到任何注册令牌。",
     "xpack.ingestManager.enrollemntAPIKeyList.loadingTokensMessage": "正在加载注册令牌......",
-    "xpack.ingestManager.enrollmentStepAgentConfig.configSelectAriaLabel": "代理配置",
-    "xpack.ingestManager.enrollmentStepAgentConfig.configSelectLabel": "代理配置",
-    "xpack.ingestManager.enrollmentStepAgentConfig.enrollmentTokenSelectLabel": "注册令牌",
-    "xpack.ingestManager.enrollmentStepAgentConfig.showAuthenticationSettingsButton": "身份验证设置",
+    "xpack.ingestManager.enrollmentStepAgentPolicy.policySelectAriaLabel": "代理配置",
+    "xpack.ingestManager.enrollmentStepAgentPolicy.policySelectLabel": "代理配置",
+    "xpack.ingestManager.enrollmentStepAgentPolicy.enrollmentTokenSelectLabel": "注册令牌",
+    "xpack.ingestManager.enrollmentStepAgentPolicy.showAuthenticationSettingsButton": "身份验证设置",
     "xpack.ingestManager.enrollmentTokenDeleteModal.cancelButton": "取消",
     "xpack.ingestManager.enrollmentTokenDeleteModal.deleteButton": "删除",
     "xpack.ingestManager.enrollmentTokenDeleteModal.description": "确定要删除 {keyName}。",
     "xpack.ingestManager.enrollmentTokenDeleteModal.title": "删除注册令牌",
     "xpack.ingestManager.enrollmentTokensList.actionsTitle": "操作",
     "xpack.ingestManager.enrollmentTokensList.activeTitle": "活动",
-    "xpack.ingestManager.enrollmentTokensList.configTitle": "代理配置",
+    "xpack.ingestManager.enrollmentTokensList.policyTitle": "代理配置",
     "xpack.ingestManager.enrollmentTokensList.createdAtTitle": "创建日期",
     "xpack.ingestManager.enrollmentTokensList.nameTitle": "名称",
     "xpack.ingestManager.enrollmentTokensList.newKeyButton": "新建注册令牌",
     "xpack.ingestManager.enrollmentTokensList.pageDescription": "这是可用于注册代理的注册令牌列表。",
     "xpack.ingestManager.enrollmentTokensList.secretTitle": "密钥",
-    "xpack.ingestManager.epm.addPackageConfigButtonText": "添加 {packageName}",
+    "xpack.ingestManager.epm.addPackagePolicyButtonText": "添加 {packageName}",
     "xpack.ingestManager.epm.browseAllButtonText": "浏览所有集成",
     "xpack.ingestManager.epm.illustrationAltText": "集成的图示",
     "xpack.ingestManager.epm.loadingIntegrationErrorTitle": "加载集成详情时出错",
     "xpack.ingestManager.epm.packageDetailsNav.overviewLinkText": "概览",
-    "xpack.ingestManager.epm.packageDetailsNav.packageConfigsLinkText": "使用情况",
+    "xpack.ingestManager.epm.packageDetailsNav.packagePoliciesLinkText": "使用情况",
     "xpack.ingestManager.epm.packageDetailsNav.settingsLinkText": "设置",
     "xpack.ingestManager.epm.pageSubtitle": "浏览集成以了解热门应用和服务。",
     "xpack.ingestManager.epm.pageTitle": "集成",
@@ -9580,7 +9580,7 @@
     "xpack.ingestManager.metadataForm.submitButtonText": "添加",
     "xpack.ingestManager.metadataForm.valueLabel": "值",
     "xpack.ingestManager.newEnrollmentKey.cancelButtonLabel": "取消",
-    "xpack.ingestManager.newEnrollmentKey.configLabel": "配置",
+    "xpack.ingestManager.newEnrollmentKey.policyLabel": "配置",
     "xpack.ingestManager.newEnrollmentKey.flyoutTitle": "创建新的注册令牌",
     "xpack.ingestManager.newEnrollmentKey.keyCreatedToasts": "注册令牌已创建。",
     "xpack.ingestManager.newEnrollmentKey.nameLabel": "名称",
@@ -9591,17 +9591,17 @@
     "xpack.ingestManager.overviewAgentErrorTitle": "错误",
     "xpack.ingestManager.overviewAgentOfflineTitle": "脱机",
     "xpack.ingestManager.overviewAgentTotalTitle": "代理总数",
-    "xpack.ingestManager.overviewConfigTotalTitle": "可用总计",
+    "xpack.ingestManager.overviewPolicyTotalTitle": "可用总计",
     "xpack.ingestManager.overviewDatastreamNamespacesTitle": "命名空间",
     "xpack.ingestManager.overviewDatastreamSizeTitle": "总大小",
     "xpack.ingestManager.overviewDatastreamTotalTitle": "数据集",
     "xpack.ingestManager.overviewIntegrationsInstalledTitle": "安装时间",
     "xpack.ingestManager.overviewIntegrationsTotalTitle": "可用总计",
     "xpack.ingestManager.overviewIntegrationsUpdatesAvailableTitle": "可用更新",
-    "xpack.ingestManager.overviewPackageConfigTitle": "已配置集成",
-    "xpack.ingestManager.overviewPageConfigurationsPanelAction": "查看配置",
-    "xpack.ingestManager.overviewPageConfigurationsPanelTitle": "代理配置",
-    "xpack.ingestManager.overviewPageConfigurationsPanelTooltip": "使用代理配置控制您的代理收集的数据。",
+    "xpack.ingestManager.overviewPackagePolicyTitle": "已配置集成",
+    "xpack.ingestManager.overviewPagePoliciesPanelAction": "查看配置",
+    "xpack.ingestManager.overviewPagePoliciesPanelTitle": "代理配置",
+    "xpack.ingestManager.overviewPagePoliciesPanelTooltip": "使用代理配置控制您的代理收集的数据。",
     "xpack.ingestManager.overviewPageDataStreamsPanelAction": "查看数据集",
     "xpack.ingestManager.overviewPageDataStreamsPanelTitle": "数据集",
     "xpack.ingestManager.overviewPageDataStreamsPanelTooltip": "您的代理收集的数据组织到各种数据集中。",
@@ -9614,11 +9614,11 @@
     "xpack.ingestManager.overviewPageIntegrationsPanelTooltip": "浏览并安装 Elastic Stack 的集成。将集成添加到您的代理配置以开始发送数据。",
     "xpack.ingestManager.overviewPageSubtitle": "Elastic 代理和代理配置的集中管理。",
     "xpack.ingestManager.overviewPageTitle": "Ingest Manager",
-    "xpack.ingestManager.packageConfigValidation.invalidArrayErrorMessage": "格式无效",
-    "xpack.ingestManager.packageConfigValidation.invalidYamlFormatErrorMessage": "YAML 格式无效",
-    "xpack.ingestManager.packageConfigValidation.nameRequiredErrorMessage": "“名称”必填",
-    "xpack.ingestManager.packageConfigValidation.namespaceRequiredErrorMessage": "命名空间必填",
-    "xpack.ingestManager.packageConfigValidation.requiredErrorMessage": "“{fieldName}”必填",
+    "xpack.ingestManager.packagePolicyValidation.invalidArrayErrorMessage": "格式无效",
+    "xpack.ingestManager.packagePolicyValidation.invalidYamlFormatErrorMessage": "YAML 格式无效",
+    "xpack.ingestManager.packagePolicyValidation.nameRequiredErrorMessage": "“名称”必填",
+    "xpack.ingestManager.packagePolicyValidation.namespaceRequiredErrorMessage": "命名空间必填",
+    "xpack.ingestManager.packagePolicyValidation.requiredErrorMessage": "“{fieldName}”必填",
     "xpack.ingestManager.permissionDeniedErrorMessage": "您无权访问 Ingest Manager。Ingest Manager 需要{roleName}权限。",
     "xpack.ingestManager.permissionDeniedErrorTitle": "权限被拒绝",
     "xpack.ingestManager.permissionsRequestErrorMessageDescription": "检查 Ingest Manager 权限时出现问题",
@@ -16296,7 +16296,7 @@
     "xpack.securitySolution.endpoint.list.stepOneTitle": "选择要用于保护主机的策略",
     "xpack.securitySolution.endpoint.list.stepTwo": "为了让您入门，将会为您提供必要的命令。",
     "xpack.securitySolution.endpoint.list.stepTwoTitle": "通过采集管理器注册启用 Endpoint Security 的代理",
-    "xpack.securitySolution.endpoint.ingestManager.createPackageConfig.endpointConfiguration": "使用此代理配置的任何代理都会使用基本策略。可以在 Security 应用中对此策略进行更改，Fleet 会将这些更改部署到代理。",
+    "xpack.securitySolution.endpoint.ingestManager.createPackagePolicy.endpointConfiguration": "使用此代理配置的任何代理都会使用基本策略。可以在 Security 应用中对此策略进行更改，Fleet 会将这些更改部署到代理。",
     "xpack.securitySolution.endpoint.ingestToastMessage": "采集管理器在其设置期间失败。",
     "xpack.securitySolution.endpoint.ingestToastTitle": "应用无法初始化",
     "xpack.securitySolution.endpoint.policy.details.backToListTitle": "返回到策略列表",
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
index 1119906ba5cfad..b6becf88f04a6a 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
@@ -14,7 +14,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
     'endpoint',
     'policy',
     'endpointPageUtils',
-    'ingestManagerCreatePackageConfig',
+    'ingestManagerCreatePackagePolicy',
   ]);
   const testSubjects = getService('testSubjects');
   const policyTestResources = getService('policyTestResources');
@@ -100,7 +100,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         await pageObjects.policy.confirmAndSave();
         await testSubjects.existOrFail('policyDetailsSuccessMessage');
 
-        const agentFullConfig = await policyTestResources.getFullAgentConfig(
+        const agentFullConfig = await policyTestResources.getFullAgentPolicy(
           policyInfo.agentConfig.id
         );
 
@@ -202,7 +202,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       beforeEach(async () => {
         // Create a policy and navigate to Ingest app
         policyInfo = await policyTestResources.createPolicy();
-        await pageObjects.ingestManagerCreatePackageConfig.navigateToAgentConfigEditPackageConfig(
+        await pageObjects.ingestManagerCreatePackagePolicy.navigateToAgentPolicyEditPackagePolicy(
           policyInfo.agentConfig.id,
           policyInfo.packageConfig.id
         );
@@ -227,12 +227,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         await pageObjects.policy.confirmAndSave();
 
         await testSubjects.existOrFail('policyDetailsSuccessMessage');
-        await pageObjects.ingestManagerCreatePackageConfig.ensureOnEditPageOrFail();
+        await pageObjects.ingestManagerCreatePackagePolicy.ensureOnEditPageOrFail();
       });
       it('should navigate back to Ingest Configuration Edit package page on click of cancel button', async () => {
         await (await testSubjects.find('editLinkToPolicyDetails')).click();
         await (await pageObjects.policy.findCancelButton()).click();
-        await pageObjects.ingestManagerCreatePackageConfig.ensureOnEditPageOrFail();
+        await pageObjects.ingestManagerCreatePackagePolicy.ensureOnEditPageOrFail();
       });
     });
   });
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts
index 0c5e15ed4104ca..5b35733eccc7c4 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts
@@ -13,7 +13,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
     'endpoint',
     'policy',
     'endpointPageUtils',
-    'ingestManagerCreatePackageConfig',
+    'ingestManagerCreatePackagePolicy',
   ]);
   const testSubjects = getService('testSubjects');
   const policyTestResources = getService('policyTestResources');
@@ -112,36 +112,36 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       });
 
       it('should redirect to ingest management integrations add package config', async () => {
-        await pageObjects.ingestManagerCreatePackageConfig.ensureOnCreatePageOrFail();
+        await pageObjects.ingestManagerCreatePackagePolicy.ensureOnCreatePageOrFail();
       });
 
       it('should redirect user back to Policy List if Cancel button is clicked', async () => {
-        await (await pageObjects.ingestManagerCreatePackageConfig.findCancelButton()).click();
+        await (await pageObjects.ingestManagerCreatePackagePolicy.findCancelButton()).click();
         await pageObjects.policy.ensureIsOnPolicyPage();
       });
 
       it('should redirect user back to Policy List if Back link is clicked', async () => {
-        await (await pageObjects.ingestManagerCreatePackageConfig.findBackLink()).click();
+        await (await pageObjects.ingestManagerCreatePackagePolicy.findBackLink()).click();
         await pageObjects.policy.ensureIsOnPolicyPage();
       });
 
       it('should display custom endpoint configuration message', async () => {
-        await pageObjects.ingestManagerCreatePackageConfig.selectAgentConfig();
-        const endpointConfig = await pageObjects.policy.findPackageConfigEndpointCustomConfiguration();
+        await pageObjects.ingestManagerCreatePackagePolicy.selectAgentPolicy();
+        const endpointConfig = await pageObjects.policy.findPackagePolicyEndpointCustomConfiguration();
         expect(endpointConfig).not.to.be(undefined);
       });
 
       it('should have empty value for package configuration name', async () => {
-        await pageObjects.ingestManagerCreatePackageConfig.selectAgentConfig();
-        expect(await pageObjects.ingestManagerCreatePackageConfig.getPackageConfigName()).to.be('');
+        await pageObjects.ingestManagerCreatePackagePolicy.selectAgentPolicy();
+        expect(await pageObjects.ingestManagerCreatePackagePolicy.getPackagePolicyName()).to.be('');
       });
 
       it('should redirect user back to Policy List after a successful save', async () => {
         const newPolicyName = `endpoint policy ${Date.now()}`;
-        await pageObjects.ingestManagerCreatePackageConfig.selectAgentConfig();
-        await pageObjects.ingestManagerCreatePackageConfig.setPackageConfigName(newPolicyName);
-        await (await pageObjects.ingestManagerCreatePackageConfig.findDSaveButton()).click();
-        await pageObjects.ingestManagerCreatePackageConfig.waitForSaveSuccessNotification();
+        await pageObjects.ingestManagerCreatePackagePolicy.selectAgentPolicy();
+        await pageObjects.ingestManagerCreatePackagePolicy.setPackagePolicyName(newPolicyName);
+        await (await pageObjects.ingestManagerCreatePackagePolicy.findDSaveButton()).click();
+        await pageObjects.ingestManagerCreatePackagePolicy.waitForSaveSuccessNotification();
         await pageObjects.policy.ensureIsOnPolicyPage();
         await policyTestResources.deletePolicyByName(newPolicyName);
       });
@@ -151,7 +151,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       it('should direct users to the ingest management integrations add package config', async () => {
         await pageObjects.policy.navigateToPolicyList();
         await (await pageObjects.policy.findOnboardingStartButton()).click();
-        await pageObjects.ingestManagerCreatePackageConfig.ensureOnCreatePageOrFail();
+        await pageObjects.ingestManagerCreatePackagePolicy.ensureOnCreatePageOrFail();
       });
     });
   });
diff --git a/x-pack/test/security_solution_endpoint/page_objects/index.ts b/x-pack/test/security_solution_endpoint/page_objects/index.ts
index 68e1ad00619c73..8cebcc4eb251ee 100644
--- a/x-pack/test/security_solution_endpoint/page_objects/index.ts
+++ b/x-pack/test/security_solution_endpoint/page_objects/index.ts
@@ -8,12 +8,12 @@ import { pageObjects as xpackFunctionalPageObjects } from '../../functional/page
 import { EndpointPageProvider } from './endpoint_page';
 import { EndpointPolicyPageProvider } from './policy_page';
 import { EndpointPageUtils } from './page_utils';
-import { IngestManagerCreatePackageConfig } from './ingest_manager_create_package_config_page';
+import { IngestManagerCreatePackagePolicy } from './ingest_manager_create_package_config_page';
 
 export const pageObjects = {
   ...xpackFunctionalPageObjects,
   endpoint: EndpointPageProvider,
   policy: EndpointPolicyPageProvider,
   endpointPageUtils: EndpointPageUtils,
-  ingestManagerCreatePackageConfig: IngestManagerCreatePackageConfig,
+  ingestManagerCreatePackagePolicy: IngestManagerCreatePackagePolicy,
 };
diff --git a/x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_config_page.ts b/x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_config_page.ts
index dfdb528b7362cd..4643cfce0910c1 100644
--- a/x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_config_page.ts
+++ b/x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_config_page.ts
@@ -6,7 +6,7 @@
 
 import { FtrProviderContext } from '../ftr_provider_context';
 
-export function IngestManagerCreatePackageConfig({
+export function IngestManagerCreatePackagePolicy({
   getService,
   getPageObjects,
 }: FtrProviderContext) {
@@ -19,28 +19,28 @@ export function IngestManagerCreatePackageConfig({
      * Validates that the page shown is the Package Config Create Page
      */
     async ensureOnCreatePageOrFail() {
-      await testSubjects.existOrFail('createPackageConfig_header');
+      await testSubjects.existOrFail('createPackagePolicy_header');
     },
 
     /**
      * Finds and returns the Cancel button on the sticky bottom bar
      */
     async findCancelButton() {
-      return await testSubjects.find('createPackageConfigCancelButton');
+      return await testSubjects.find('createPackagePolicyCancelButton');
     },
 
     /**
      * Finds and returns the Cancel back link at the top of the create page
      */
     async findBackLink() {
-      return await testSubjects.find('createPackageConfig_cancelBackLink');
+      return await testSubjects.find('createPackagePolicy_cancelBackLink');
     },
 
     /**
      * Finds and returns the save button on the sticky bottom bar
      */
     async findDSaveButton() {
-      return await testSubjects.find('createPackageConfigSaveButton');
+      return await testSubjects.find('createPackagePolicySaveButton');
     },
 
     /**
@@ -49,7 +49,7 @@ export function IngestManagerCreatePackageConfig({
      * Visual name of the configuration. if one is not provided, the first agent
      * configuration on the list will be chosen
      */
-    async selectAgentConfig(name?: string) {
+    async selectAgentPolicy(name?: string) {
       // if we have a name, then find the button with that `title` set.
       if (name) {
         await (
@@ -65,7 +65,7 @@ export function IngestManagerCreatePackageConfig({
     /**
      * Returns the package config name currently populated on the input field
      */
-    async getPackageConfigName() {
+    async getPackagePolicyName() {
       return testSubjects.getAttribute('packageConfigNameInput', 'value');
     },
 
@@ -73,7 +73,7 @@ export function IngestManagerCreatePackageConfig({
      * Set the name of the package config on the input field
      * @param name
      */
-    async setPackageConfigName(name: string) {
+    async setPackagePolicyName(name: string) {
       // Because of the bottom sticky bar, we need to scroll section 2 into view
       // so that `setValue()` enters the data on the input field.
       await testSubjects.scrollIntoView('dataCollectionSetupStep');
@@ -91,13 +91,13 @@ export function IngestManagerCreatePackageConfig({
      * Validates that the page shown is the Package Config Edit Page
      */
     async ensureOnEditPageOrFail() {
-      await testSubjects.existOrFail('editPackageConfig_header');
+      await testSubjects.existOrFail('editPackagePolicy_header');
     },
 
     /**
      * Navigates to the Ingest Agent configuration Edit Package Config page
      */
-    async navigateToAgentConfigEditPackageConfig(agentConfigId: string, packageConfigId: string) {
+    async navigateToAgentPolicyEditPackagePolicy(agentConfigId: string, packageConfigId: string) {
       await pageObjects.common.navigateToApp('ingestManager', {
         hash: `/configs/${agentConfigId}/edit-integration/${packageConfigId}`,
       });
diff --git a/x-pack/test/security_solution_endpoint/page_objects/policy_page.ts b/x-pack/test/security_solution_endpoint/page_objects/policy_page.ts
index 8ee42d40263818..97daf38bdba901 100644
--- a/x-pack/test/security_solution_endpoint/page_objects/policy_page.ts
+++ b/x-pack/test/security_solution_endpoint/page_objects/policy_page.ts
@@ -110,8 +110,8 @@ export function EndpointPolicyPageProvider({ getService, getPageObjects }: FtrPr
      * custom configuaration component
      * @param onEditPage
      */
-    async findPackageConfigEndpointCustomConfiguration(onEditPage: boolean = false) {
-      return await testSubjects.find(`endpointPackageConfig_${onEditPage ? 'edit' : 'create'}`);
+    async findPackagePolicyEndpointCustomConfiguration(onEditPage: boolean = false) {
+      return await testSubjects.find(`endpointPackagePolicy_${onEditPage ? 'edit' : 'create'}`);
     },
 
     /**
diff --git a/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts b/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
index df7d117e91dcbf..4522a2f073268f 100644
--- a/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
+++ b/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
@@ -5,15 +5,15 @@
  */
 import { FtrProviderContext } from '../ftr_provider_context';
 import {
-  CreateAgentConfigRequest,
-  CreateAgentConfigResponse,
-  CreatePackageConfigRequest,
-  CreatePackageConfigResponse,
-  PACKAGE_CONFIG_SAVED_OBJECT_TYPE,
-  DeleteAgentConfigRequest,
-  DeletePackageConfigsRequest,
-  GetPackageConfigsResponse,
-  GetFullAgentConfigResponse,
+  CreateAgentPolicyRequest,
+  CreateAgentPolicyResponse,
+  CreatePackagePolicyRequest,
+  CreatePackagePolicyResponse,
+  PACKAGE_POLICY_SAVED_OBJECT_TYPE,
+  DeleteAgentPolicyRequest,
+  DeletePackagePoliciesRequest,
+  GetPackagePoliciesResponse,
+  GetFullAgentPolicyResponse,
   GetPackagesResponse,
 } from '../../../plugins/ingest_manager/common';
 import { factory as policyConfigFactory } from '../../../plugins/security_solution/common/endpoint/models/policy_config';
@@ -33,11 +33,11 @@ const SECURITY_PACKAGES_ROUTE = `${INGEST_API_EPM_PACKAGES}?category=security`;
  */
 export interface PolicyTestResourceInfo {
   /** The Ingest agent configuration created */
-  agentConfig: Immutable<CreateAgentConfigResponse['item']>;
+  agentConfig: Immutable<CreateAgentPolicyResponse['item']>;
   /** The Ingest Package Config created and added to agent configuration.
    * This is where Endpoint Policy is stored.
    */
-  packageConfig: Immutable<CreatePackageConfigResponse['item']>;
+  packageConfig: Immutable<CreatePackagePolicyResponse['item']>;
   /**
    * Information about the endpoint package
    */
@@ -110,19 +110,19 @@ export function EndpointPolicyTestResourcesProvider({ getService }: FtrProviderC
      * Retrieves the full Agent configuration, which mirrors what the Elastic Agent would get
      * once they checkin.
      */
-    async getFullAgentConfig(agentConfigId: string): Promise<GetFullAgentConfigResponse['item']> {
-      let fullAgentConfig: GetFullAgentConfigResponse['item'];
+    async getFullAgentPolicy(agentConfigId: string): Promise<GetFullAgentPolicyResponse['item']> {
+      let fullAgentPolicy: GetFullAgentPolicyResponse['item'];
       try {
-        const apiResponse: { body: GetFullAgentConfigResponse } = await supertest
+        const apiResponse: { body: GetFullAgentPolicyResponse } = await supertest
           .get(`${INGEST_API_AGENT_CONFIGS}/${agentConfigId}/full`)
           .expect(200);
 
-        fullAgentConfig = apiResponse.body.item;
+        fullAgentPolicy = apiResponse.body.item;
       } catch (error) {
         return logSupertestApiErrorAndThrow('Unable to get full Agent Configuration', error);
       }
 
-      return fullAgentConfig!;
+      return fullAgentPolicy!;
     },
 
     /**
@@ -131,14 +131,14 @@ export function EndpointPolicyTestResourcesProvider({ getService }: FtrProviderC
      */
     async createPolicy(): Promise<PolicyTestResourceInfo> {
       // create agent config
-      let agentConfig: CreateAgentConfigResponse['item'];
+      let agentConfig: CreateAgentPolicyResponse['item'];
       try {
-        const newAgentconfigData: CreateAgentConfigRequest['body'] = {
+        const newAgentconfigData: CreateAgentPolicyRequest['body'] = {
           name: 'East Coast',
           description: 'East Coast call center',
           namespace: 'default',
         };
-        const { body: createResponse }: { body: CreateAgentConfigResponse } = await supertest
+        const { body: createResponse }: { body: CreateAgentPolicyResponse } = await supertest
           .post(INGEST_API_AGENT_CONFIGS)
           .set('kbn-xsrf', 'xxx')
           .send(newAgentconfigData)
@@ -152,9 +152,9 @@ export function EndpointPolicyTestResourcesProvider({ getService }: FtrProviderC
       const endpointPackageInfo = await retrieveEndpointPackageInfo();
 
       // create Package Config and associated it to agent config
-      let packageConfig: CreatePackageConfigResponse['item'];
+      let packageConfig: CreatePackagePolicyResponse['item'];
       try {
-        const newPackageConfigData: CreatePackageConfigRequest['body'] = {
+        const newPackagePolicyData: CreatePackagePolicyRequest['body'] = {
           name: 'Protect East Coast',
           description: 'Protect the worlds data - but in the East Coast',
           config_id: agentConfig!.id,
@@ -181,10 +181,10 @@ export function EndpointPolicyTestResourcesProvider({ getService }: FtrProviderC
         };
         const {
           body: createResponse,
-        }: { body: CreatePackageConfigResponse } = await supertest
+        }: { body: CreatePackagePolicyResponse } = await supertest
           .post(INGEST_API_PACKAGE_CONFIGS)
           .set('kbn-xsrf', 'xxx')
-          .send(newPackageConfigData)
+          .send(newPackagePolicyData)
           .expect(200);
         packageConfig = createResponse.item;
       } catch (error) {
@@ -198,13 +198,13 @@ export function EndpointPolicyTestResourcesProvider({ getService }: FtrProviderC
         async cleanup() {
           // Delete Package Config
           try {
-            const deletePackageConfigData: DeletePackageConfigsRequest['body'] = {
+            const deletePackagePolicyData: DeletePackagePoliciesRequest['body'] = {
               packageConfigIds: [packageConfig.id],
             };
             await supertest
               .post(INGEST_API_PACKAGE_CONFIGS_DELETE)
               .set('kbn-xsrf', 'xxx')
-              .send(deletePackageConfigData)
+              .send(deletePackagePolicyData)
               .expect(200);
           } catch (error) {
             logSupertestApiErrorAndThrow('Unable to delete Package Config via Ingest!', error);
@@ -212,13 +212,13 @@ export function EndpointPolicyTestResourcesProvider({ getService }: FtrProviderC
 
           // Delete Agent config
           try {
-            const deleteAgentConfigData: DeleteAgentConfigRequest['body'] = {
+            const deleteAgentPolicyData: DeleteAgentPolicyRequest['body'] = {
               agentConfigId: agentConfig.id,
             };
             await supertest
               .post(INGEST_API_AGENT_CONFIGS_DELETE)
               .set('kbn-xsrf', 'xxx')
-              .send(deleteAgentConfigData)
+              .send(deleteAgentPolicyData)
               .expect(200);
           } catch (error) {
             logSupertestApiErrorAndThrow('Unable to delete Agent Config via Ingest!', error);
@@ -232,14 +232,14 @@ export function EndpointPolicyTestResourcesProvider({ getService }: FtrProviderC
      * @param name
      */
     async deletePolicyByName(name: string) {
-      let packageConfigList: GetPackageConfigsResponse['items'];
+      let packageConfigList: GetPackagePoliciesResponse['items'];
       try {
         const {
           body: packageConfigsResponse,
-        }: { body: GetPackageConfigsResponse } = await supertest
+        }: { body: GetPackagePoliciesResponse } = await supertest
           .get(INGEST_API_PACKAGE_CONFIGS)
           .set('kbn-xsrf', 'xxx')
-          .query({ kuery: `${PACKAGE_CONFIG_SAVED_OBJECT_TYPE}.name: ${name}` })
+          .query({ kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.name: ${name}` })
           .send()
           .expect(200);
         packageConfigList = packageConfigsResponse.items;
@@ -259,13 +259,13 @@ export function EndpointPolicyTestResourcesProvider({ getService }: FtrProviderC
       }
 
       try {
-        const deletePackageConfigData: DeletePackageConfigsRequest['body'] = {
+        const deletePackagePolicyData: DeletePackagePoliciesRequest['body'] = {
           packageConfigIds: [packageConfigList[0].id],
         };
         await supertest
           .post(INGEST_API_PACKAGE_CONFIGS_DELETE)
           .set('kbn-xsrf', 'xxx')
-          .send(deletePackageConfigData)
+          .send(deletePackagePolicyData)
           .expect(200);
       } catch (error) {
         logSupertestApiErrorAndThrow('Unable to delete Package Config via Ingest!', error);

From 414d4ae1af3f4f5d9c8760319309d2d21e4e7438 Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Thu, 13 Aug 2020 15:01:20 -0700
Subject: [PATCH 02/24] Adjust server routes and param names, more var names
 and i18n fixes

---
 .../ingest_manager/common/constants/routes.ts |   4 +-
 .../common/openapi/spec_oas3.json             |  54 +++++-----
 .../common/types/rest_spec/agent.ts           |   4 +-
 .../types/rest_spec/enrollment_api_key.ts     |   2 +-
 .../components/confirm_deploy_modal.tsx       |   4 +-
 .../create_package_config_page/index.tsx      |   2 +-
 .../step_select_config.tsx                    |   2 +-
 .../components/settings/index.tsx             |   2 +-
 .../edit_package_config_page/index.tsx        |   2 +-
 .../agent_reassign_config_flyout/index.tsx    |   2 +-
 .../server/integration_tests/router.test.ts   |  22 ++--
 .../server/routes/agent/handlers.ts           |  10 +-
 .../server/routes/agent/index.ts              |   4 +-
 .../routes/enrollment_api_key/handler.ts      |   2 +-
 .../server/services/agent_config_update.ts    |  12 +--
 .../agents/checkin/state_new_actions.ts       |  18 ++--
 .../server/services/agents/enroll.ts          |   6 +-
 .../server/services/agents/reassign.ts        |   8 +-
 .../server/services/agents/update.ts          |   7 +-
 .../services/api_keys/enrollment_api_key.ts   |  23 ++--
 .../server/services/api_keys/index.ts         |   6 +-
 .../server/services/package_config.ts         |   6 +-
 .../ingest_manager/server/services/setup.ts   |   2 +-
 .../server/types/rest_spec/agent.ts           |   4 +-
 .../types/rest_spec/enrollment_api_key.ts     |   2 +-
 .../store/policy_list/services/ingest.test.ts |   8 +-
 .../store/policy_list/services/ingest.ts      |   8 +-
 .../pages/policy/view/policy_details.test.tsx |   6 +-
 .../translations/translations/ja-JP.json      |   2 +-
 .../translations/translations/zh-CN.json      |   2 +-
 .../apis/agent_config/agent_config.ts         |  16 +--
 .../apis/package_config/create.ts             |  40 +++----
 .../apis/package_config/get.ts                |  34 +++---
 .../apis/package_config/update.ts             |  42 ++++----
 .../apps/endpoint/endpoint_list.ts            |   2 +-
 .../apps/endpoint/policy_details.ts           |  40 +++----
 .../apps/endpoint/policy_list.ts              |  16 +--
 ...gest_manager_create_package_config_page.ts |  32 +++---
 .../page_objects/policy_page.ts               |   2 +-
 .../services/endpoint_policy.ts               | 100 +++++++++---------
 40 files changed, 282 insertions(+), 278 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/common/constants/routes.ts b/x-pack/plugins/ingest_manager/common/constants/routes.ts
index 35c974f619523c..551a0f7d601643 100644
--- a/x-pack/plugins/ingest_manager/common/constants/routes.ts
+++ b/x-pack/plugins/ingest_manager/common/constants/routes.ts
@@ -7,8 +7,8 @@
 export const API_ROOT = `/api/ingest_manager`;
 export const EPM_API_ROOT = `${API_ROOT}/epm`;
 export const DATA_STREAM_API_ROOT = `${API_ROOT}/data_streams`;
-export const PACKAGE_POLICY_API_ROOT = `${API_ROOT}/package_configs`;
-export const AGENT_POLICY_API_ROOT = `${API_ROOT}/agent_configs`;
+export const PACKAGE_POLICY_API_ROOT = `${API_ROOT}/package_policies`;
+export const AGENT_POLICY_API_ROOT = `${API_ROOT}/agent_policies`;
 export const FLEET_API_ROOT = `${API_ROOT}/fleet`;
 
 export const LIMITED_CONCURRENCY_ROUTE_TAG = 'ingest:limited-concurrency';
diff --git a/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json b/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
index 1c741b43491cf3..144caaae002df1 100644
--- a/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
+++ b/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
@@ -17,7 +17,7 @@
     }
   ],
   "paths": {
-    "/agent_configs": {
+    "/agent_policies": {
       "get": {
         "summary": "Agent policy - List",
         "tags": [],
@@ -80,7 +80,7 @@
             }
           }
         },
-        "operationId": "agent-config-list",
+        "operationId": "agent-policy-list",
         "parameters": [
           {
             "$ref": "#/components/parameters/pageSizeParam"
@@ -117,7 +117,7 @@
             }
           }
         },
-        "operationId": "post-agent_configs",
+        "operationId": "post-agent-policy",
         "requestBody": {
           "content": {
             "application/json": {
@@ -135,7 +135,7 @@
         ]
       }
     },
-    "/agent_configs/{agentPolicyId}": {
+    "/agent_policies/{agentPolicyId}": {
       "parameters": [
         {
           "schema": {
@@ -171,7 +171,7 @@
                     "value": {
                       "item": {
                         "id": "82da1fc0-8fbf-11ea-b2ce-01c4a6127154",
-                        "name": "Default config",
+                        "name": "Default policy",
                         "namespace": "default",
                         "description": "Default agent policy created by Kibana",
                         "status": "active",
@@ -716,7 +716,7 @@
             }
           }
         },
-        "operationId": "agent-config-info",
+        "operationId": "agent-policy-info",
         "description": "Get one agent policy",
         "parameters": []
       },
@@ -760,7 +760,7 @@
             }
           }
         },
-        "operationId": "put-agent_configs-agentPolicyId",
+        "operationId": "put-agent-policy-agentPolicyId",
         "requestBody": {
           "content": {
             "application/json": {
@@ -786,7 +786,7 @@
         ]
       }
     },
-    "/agent_configs/{agentPolicyId}/copy": {
+    "/agent_policies/{agentPolicyId}/copy": {
       "parameters": [
         {
           "schema": {
@@ -798,8 +798,8 @@
         }
       ],
       "post": {
-        "summary": "Agent policy - copy one config",
-        "operationId": "agent-config-copy",
+        "summary": "Agent policy - copy one policy",
+        "operationId": "agent-policy-copy",
         "responses": {
           "200": {
             "description": "OK",
@@ -844,10 +844,10 @@
         "description": "Copies one agent policy"
       }
     },
-    "/agent_configs/delete": {
+    "/agent_policies/delete": {
       "post": {
         "summary": "Agent policy - Delete",
-        "operationId": "post-agent_config-delete",
+        "operationId": "post-agent-policy-delete",
         "responses": {
           "200": {
             "description": "OK",
@@ -922,7 +922,7 @@
       },
       "parameters": []
     },
-    "/package_configs": {
+    "/package_policies": {
       "get": {
         "summary": "PackagePolicies - List",
         "tags": [],
@@ -1237,7 +1237,7 @@
         ]
       }
     },
-    "/package_configs/{packagePolicyId}": {
+    "/package_policies/{packagePolicyId}": {
       "get": {
         "summary": "PackagePolicies - Info",
         "tags": [],
@@ -3562,22 +3562,22 @@
         }
       }
     },
-    "/fleet/config/{configId}/agent-status": {
-      "parameters": [
-        {
-          "schema": {
-            "type": "string"
-          },
-          "name": "configId",
-          "in": "path",
-          "required": true
-        }
-      ],
+    "/fleet/agent-status": {
       "get": {
-        "summary": "Fleet - Agent - Status for config",
+        "summary": "Fleet - Agent - Status for policy",
         "tags": [],
         "responses": {},
-        "operationId": "get-fleet-config-configId-agent-status"
+        "operationId": "get-fleet-agent-status",
+        "parameters": [
+          {
+            "schema": {
+              "type": "string"
+            },
+            "name": "policyId",
+            "in": "query",
+            "required": false
+          }
+        ]
       }
     },
     "/fleet/enrollment-api-keys": {
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/agent.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/agent.ts
index 7ec5a8d68311f7..e796aaee13600f 100644
--- a/x-pack/plugins/ingest_manager/common/types/rest_spec/agent.ts
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/agent.ts
@@ -118,7 +118,7 @@ export interface PutAgentReassignRequest {
   params: {
     agentId: string;
   };
-  body: { config_id: string };
+  body: { agent_policy_id: string };
 }
 
 export interface PutAgentReassignResponse {
@@ -161,7 +161,7 @@ export interface UpdateAgentRequest {
 
 export interface GetAgentStatusRequest {
   query: {
-    configId?: string;
+    policyId?: string;
   };
 }
 
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/enrollment_api_key.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/enrollment_api_key.ts
index 851e6571c0dd2a..dae3e3cd392364 100644
--- a/x-pack/plugins/ingest_manager/common/types/rest_spec/enrollment_api_key.ts
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/enrollment_api_key.ts
@@ -47,7 +47,7 @@ export interface DeleteEnrollmentAPIKeyResponse {
 export interface PostEnrollmentAPIKeyRequest {
   body: {
     name?: string;
-    config_id: string;
+    agent_policy_id: string;
     expiration?: string;
   };
 }
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/confirm_deploy_modal.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/confirm_deploy_modal.tsx
index 9f215be5860984..964b34055b6525 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/confirm_deploy_modal.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/confirm_deploy_modal.tsx
@@ -54,11 +54,11 @@ export const ConfirmDeployConfigModal: React.FunctionComponent<{
           <div className="eui-textBreakWord">
             <FormattedMessage
               id="xpack.ingestManager.agentPolicy.confirmModalCalloutDescription"
-              defaultMessage="Fleet has detected that the selected agent policy, {configName}, is already in use by
+              defaultMessage="Fleet has detected that the selected agent policy, {policyName}, is already in use by
             some of your agents. As a result of this action, Fleet will deploy updates to all agents
             that use this policy."
               values={{
-                configName: <b>{agentPolicy.name}</b>,
+                policyName: <b>{agentPolicy.name}</b>,
               }}
             />
           </div>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx
index 73e876985de7f0..576fa578e1f8ba 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx
@@ -90,7 +90,7 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
   useEffect(() => {
     const getAgentCount = async () => {
       if (agentPolicyId) {
-        const { data } = await sendGetAgentStatus({ configId: agentPolicyId });
+        const { data } = await sendGetAgentStatus({ policyId: agentPolicyId });
         if (data?.results.total) {
           setAgentCount(data.results.total);
         }
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_config.tsx
index 2fd5f7afaf03ba..5938a7f5d652a2 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_config.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_config.tsx
@@ -94,7 +94,7 @@ export const StepSelectConfig: React.FunctionComponent<{
   const agentPolicies = agentPoliciesData?.items || [];
   const agentPoliciesById = agentPolicies.reduce(
     (acc: { [key: string]: GetAgentPoliciesResponseItem }, policy) => {
-      acc[policy.id] = agentPolicy;
+      acc[policy.id] = policy;
       return acc;
     },
     {}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/settings/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/settings/index.tsx
index 1e5eb8abf08d37..69c859271601d2 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/settings/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/settings/index.tsx
@@ -114,7 +114,7 @@ export const ConfigSettingsView = memo<{ agentPolicy: AgentPolicy }>(
       // Retrieve agent count if fleet is enabled
       if (isFleetEnabled) {
         setIsLoading(true);
-        const { data } = await sendGetAgentStatus({ configId: agentPolicy.id });
+        const { data } = await sendGetAgentStatus({ policyId: agentPolicy.id });
         if (data?.results.total) {
           setAgentCount(data.results.total);
         } else {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx
index a125b3a4346ef0..df08a0d2739857 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx
@@ -147,7 +147,7 @@ export const EditPackagePolicyPage: React.FunctionComponent = () => {
   const [agentCount, setAgentCount] = useState<number>(0);
   useEffect(() => {
     const getAgentCount = async () => {
-      const { data } = await sendGetAgentStatus({ configId: policyId });
+      const { data } = await sendGetAgentStatus({ policyId });
       if (data?.results.total) {
         setAgentCount(data.results.total);
       }
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx
index 9588200b243c90..273ff297da60d8 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx
@@ -51,7 +51,7 @@ export const AgentReassignConfigFlyout: React.FunctionComponent<Props> = ({ onCl
         throw new Error('No selected agent policy id');
       }
       const res = await sendPutAgentReassign(agent.id, {
-        config_id: selectedAgentPolicyId,
+        agent_policy_id: selectedAgentPolicyId,
       });
       if (res.error) {
         throw res.error;
diff --git a/x-pack/plugins/ingest_manager/server/integration_tests/router.test.ts b/x-pack/plugins/ingest_manager/server/integration_tests/router.test.ts
index 62a97b5ded72e4..60ef6851bd9965 100644
--- a/x-pack/plugins/ingest_manager/server/integration_tests/router.test.ts
+++ b/x-pack/plugins/ingest_manager/server/integration_tests/router.test.ts
@@ -43,11 +43,11 @@ describe('ingestManager', () => {
     afterAll(async () => await root.shutdown());
 
     it('does not have agent policy api', async () => {
-      await kbnTestServer.request.get(root, '/api/ingest_manager/agent_configs').expect(404);
+      await kbnTestServer.request.get(root, '/api/ingest_manager/agent_policies').expect(404);
     });
 
     it('does not have package policies api', async () => {
-      await kbnTestServer.request.get(root, '/api/ingest_manager/package_configs').expect(404);
+      await kbnTestServer.request.get(root, '/api/ingest_manager/package_policies').expect(404);
     });
 
     it('does not have EPM api', async () => {
@@ -76,11 +76,11 @@ describe('ingestManager', () => {
     afterAll(async () => await root.shutdown());
 
     it('has agent policy api', async () => {
-      await kbnTestServer.request.get(root, '/api/ingest_manager/agent_configs').expect(200);
+      await kbnTestServer.request.get(root, '/api/ingest_manager/agent_policies').expect(200);
     });
 
     it('has package policies api', async () => {
-      await kbnTestServer.request.get(root, '/api/ingest_manager/package_configs').expect(200);
+      await kbnTestServer.request.get(root, '/api/ingest_manager/package_policies').expect(200);
     });
 
     it('does not have EPM api', async () => {
@@ -92,7 +92,7 @@ describe('ingestManager', () => {
     });
   });
 
-  // For now, only the manager routes (/agent_configs & /package_configs) are added
+  // For now, only the manager routes (/agent_policies & /package_policies) are added
   // EPM and ingest will be conditionally added when we enable these lines
   // https://github.com/jfsiii/kibana/blob/f73b54ebb7e0f6fc00efd8a6800a01eb2d9fb772/x-pack/plugins/ingest_manager/server/plugin.ts#L84
   // adding tests to confirm the Fleet & EPM routes are never added
@@ -115,11 +115,11 @@ describe('ingestManager', () => {
     afterAll(async () => await root.shutdown());
 
     it('has agent policy api', async () => {
-      await kbnTestServer.request.get(root, '/api/ingest_manager/agent_configs').expect(200);
+      await kbnTestServer.request.get(root, '/api/ingest_manager/agent_policies').expect(200);
     });
 
     it('has package policies api', async () => {
-      await kbnTestServer.request.get(root, '/api/ingest_manager/package_configs').expect(200);
+      await kbnTestServer.request.get(root, '/api/ingest_manager/package_policies').expect(200);
     });
 
     it('does have EPM api', async () => {
@@ -149,11 +149,11 @@ describe('ingestManager', () => {
     afterAll(async () => await root.shutdown());
 
     it('has agent policy api', async () => {
-      await kbnTestServer.request.get(root, '/api/ingest_manager/agent_configs').expect(200);
+      await kbnTestServer.request.get(root, '/api/ingest_manager/agent_policies').expect(200);
     });
 
     it('has package policies api', async () => {
-      await kbnTestServer.request.get(root, '/api/ingest_manager/package_configs').expect(200);
+      await kbnTestServer.request.get(root, '/api/ingest_manager/package_policies').expect(200);
     });
 
     it('does not have EPM api', async () => {
@@ -184,11 +184,11 @@ describe('ingestManager', () => {
     afterAll(async () => await root.shutdown());
 
     it('has agent policy api', async () => {
-      await kbnTestServer.request.get(root, '/api/ingest_manager/agent_configs').expect(200);
+      await kbnTestServer.request.get(root, '/api/ingest_manager/agent_policies').expect(200);
     });
 
     it('has package policies api', async () => {
-      await kbnTestServer.request.get(root, '/api/ingest_manager/package_configs').expect(200);
+      await kbnTestServer.request.get(root, '/api/ingest_manager/package_policies').expect(200);
     });
 
     it('does have EPM api', async () => {
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts
index 6cfe3d5b762663..52d75924ffa8bb 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts
@@ -310,7 +310,11 @@ export const putAgentsReassignHandler: RequestHandler<
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   try {
-    await AgentService.reassignAgent(soClient, request.params.agentId, request.body.config_id);
+    await AgentService.reassignAgent(
+      soClient,
+      request.params.agentId,
+      request.body.agent_policy_id
+    );
 
     const body: PutAgentReassignResponse = {
       success: true,
@@ -324,14 +328,14 @@ export const putAgentsReassignHandler: RequestHandler<
   }
 };
 
-export const getAgentStatusForConfigHandler: RequestHandler<
+export const getAgentStatusForAgentPolicyHandler: RequestHandler<
   undefined,
   TypeOf<typeof GetAgentStatusRequestSchema.query>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   try {
     // TODO change path
-    const results = await AgentService.getAgentStatusForConfig(soClient, request.query.configId);
+    const results = await AgentService.getAgentStatusForConfig(soClient, request.query.policyId);
 
     const body: GetAgentStatusResponse = { results, success: true };
 
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent/index.ts b/x-pack/plugins/ingest_manager/server/routes/agent/index.ts
index b85d96186f2338..06eaf574b22c18 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent/index.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent/index.ts
@@ -33,7 +33,7 @@ import {
   getAgentEventsHandler,
   postAgentCheckinHandler,
   postAgentEnrollHandler,
-  getAgentStatusForConfigHandler,
+  getAgentStatusForAgentPolicyHandler,
   putAgentsReassignHandler,
 } from './handlers';
 import { postAgentAcksHandlerBuilder } from './acks_handlers';
@@ -165,6 +165,6 @@ export const registerRoutes = (router: IRouter) => {
       validate: GetAgentStatusRequestSchema,
       options: { tags: [`access:${PLUGIN_ID}-read`] },
     },
-    getAgentStatusForConfigHandler
+    getAgentStatusForAgentPolicyHandler
   );
 };
diff --git a/x-pack/plugins/ingest_manager/server/routes/enrollment_api_key/handler.ts b/x-pack/plugins/ingest_manager/server/routes/enrollment_api_key/handler.ts
index 94fc6de6096139..8c7937640a515f 100644
--- a/x-pack/plugins/ingest_manager/server/routes/enrollment_api_key/handler.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/enrollment_api_key/handler.ts
@@ -51,7 +51,7 @@ export const postEnrollmentApiKeyHandler: RequestHandler<
     const apiKey = await APIKeyService.generateEnrollmentAPIKey(soClient, {
       name: request.body.name,
       expiration: request.body.expiration,
-      configId: request.body.config_id,
+      agentPolicyId: request.body.agent_policy_id,
     });
 
     const body: PostEnrollmentAPIKeyResponse = { item: apiKey, success: true, action: 'created' };
diff --git a/x-pack/plugins/ingest_manager/server/services/agent_config_update.ts b/x-pack/plugins/ingest_manager/server/services/agent_config_update.ts
index 602241fc3f9138..3c743dd957f62e 100644
--- a/x-pack/plugins/ingest_manager/server/services/agent_config_update.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agent_config_update.ts
@@ -5,14 +5,14 @@
  */
 
 import { SavedObjectsClientContract } from 'src/core/server';
-import { generateEnrollmentAPIKey, deleteEnrollmentApiKeyForConfigId } from './api_keys';
-import { unenrollForConfigId } from './agents';
+import { generateEnrollmentAPIKey, deleteEnrollmentApiKeyForAgentPolicyId } from './api_keys';
+import { unenrollForAgentPolicyId } from './agents';
 import { outputService } from './output';
 
 export async function agentPolicyUpdateEventHandler(
   soClient: SavedObjectsClientContract,
   action: string,
-  configId: string
+  agentPolicyId: string
 ) {
   const adminUser = await outputService.getAdminUser(soClient);
   // If no admin user fleet is not enabled just skip this hook
@@ -22,12 +22,12 @@ export async function agentPolicyUpdateEventHandler(
 
   if (action === 'created') {
     await generateEnrollmentAPIKey(soClient, {
-      configId,
+      agentPolicyId,
     });
   }
 
   if (action === 'deleted') {
-    await unenrollForConfigId(soClient, configId);
-    await deleteEnrollmentApiKeyForConfigId(soClient, configId);
+    await unenrollForAgentPolicyId(soClient, agentPolicyId);
+    await deleteEnrollmentApiKeyForAgentPolicyId(soClient, agentPolicyId);
   }
 }
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
index 987ae4e6fbe5c9..4bbb89b739c209 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
@@ -49,14 +49,14 @@ function getInternalUserSOClient() {
   return appContextService.getInternalUserSOClient(fakeRequest);
 }
 
-function createAgentPolicySharedObservable(configId: string) {
+function createAgentPolicySharedObservable(agentPolicyId: string) {
   const internalSOClient = getInternalUserSOClient();
   return timer(0, AGENT_UPDATE_ACTIONS_INTERVAL_MS).pipe(
     switchMap(() =>
-      from(agentPolicyService.get(internalSOClient, configId) as Promise<AgentPolicy>)
+      from(agentPolicyService.get(internalSOClient, agentPolicyId) as Promise<AgentPolicy>)
     ),
     distinctUntilKeyChanged('revision'),
-    switchMap((data) => from(agentPolicyService.getFullConfig(internalSOClient, configId))),
+    switchMap((data) => from(agentPolicyService.getFullConfig(internalSOClient, agentPolicyId))),
     shareReplay({ refCount: true, bufferSize: 1 })
   );
 }
@@ -145,15 +145,15 @@ export function agentCheckinStateNewActionsFactory() {
     options?: { signal: AbortSignal }
   ): Promise<AgentAction[]> {
     if (!agent.config_id) {
-      throw new Error('Agent do not have a config');
+      throw new Error('Agent does not have a config');
     }
-    const configId = agent.config_id;
-    if (!agentPolicies$.has(configId)) {
-      agentPolicies$.set(configId, createAgentPolicySharedObservable(configId));
+    const agentPolicyId = agent.config_id;
+    if (!agentPolicies$.has(agentPolicyId)) {
+      agentPolicies$.set(agentPolicyId, createAgentPolicySharedObservable(agentPolicyId));
     }
-    const agentPolicy$ = agentPolicies$.get(configId);
+    const agentPolicy$ = agentPolicies$.get(agentPolicyId);
     if (!agentPolicy$) {
-      throw new Error(`Invalid state no observable for config ${configId}`);
+      throw new Error(`Invalid state, no observable for policy ${agentPolicyId}`);
     }
 
     const stream$ = agentPolicy$.pipe(
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/enroll.ts b/x-pack/plugins/ingest_manager/server/services/agents/enroll.ts
index b63b1c13e4df9d..9d851a5e769fd8 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/enroll.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/enroll.ts
@@ -16,7 +16,7 @@ import { appContextService } from '../app_context';
 export async function enroll(
   soClient: SavedObjectsClientContract,
   type: AgentType,
-  configId: string,
+  agentPolicyId: string,
   metadata?: { local: any; userProvided: any },
   sharedId?: string
 ): Promise<Agent> {
@@ -33,7 +33,7 @@ export async function enroll(
   const agentData: AgentSOAttributes = {
     shared_id: sharedId,
     active: true,
-    config_id: configId,
+    config_id: agentPolicyId,
     type,
     enrolled_at: enrolledAt,
     user_provided_metadata: metadata?.userProvided ?? {},
@@ -64,7 +64,7 @@ export async function enroll(
     );
   }
 
-  const accessAPIKey = await APIKeyService.generateAccessApiKey(soClient, agent.id, configId);
+  const accessAPIKey = await APIKeyService.generateAccessApiKey(soClient, agent.id);
 
   await soClient.update<AgentSOAttributes>(AGENT_SAVED_OBJECT_TYPE, agent.id, {
     access_api_key_id: accessAPIKey.id,
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts b/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts
index 3d0596227f4fe1..bc414b92b7b818 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts
@@ -13,15 +13,15 @@ import { agentPolicyService } from '../agent_config';
 export async function reassignAgent(
   soClient: SavedObjectsClientContract,
   agentId: string,
-  newConfigId: string
+  newAgentPolicyId: string
 ) {
-  const config = await agentPolicyService.get(soClient, newConfigId);
+  const config = await agentPolicyService.get(soClient, newAgentPolicyId);
   if (!config) {
-    throw Boom.notFound(`Agent policy not found: ${newConfigId}`);
+    throw Boom.notFound(`Agent policy not found: ${newAgentPolicyId}`);
   }
 
   await soClient.update<AgentSOAttributes>(AGENT_SAVED_OBJECT_TYPE, agentId, {
-    config_id: newConfigId,
+    config_id: newAgentPolicyId,
     config_revision: null,
   });
 }
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/update.ts b/x-pack/plugins/ingest_manager/server/services/agents/update.ts
index 11ad76fe81784a..56350bddb61a8d 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/update.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/update.ts
@@ -9,12 +9,15 @@ import { listAgents } from './crud';
 import { AGENT_SAVED_OBJECT_TYPE } from '../../constants';
 import { unenrollAgent } from './unenroll';
 
-export async function unenrollForConfigId(soClient: SavedObjectsClientContract, configId: string) {
+export async function unenrollForAgentPolicyId(
+  soClient: SavedObjectsClientContract,
+  policyId: string
+) {
   let hasMore = true;
   let page = 1;
   while (hasMore) {
     const { agents } = await listAgents(soClient, {
-      kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id:"${configId}"`,
+      kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id:"${policyId}"`,
       page: page++,
       perPage: 1000,
       showInactive: true,
diff --git a/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts b/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts
index dfe6e885578849..1f5346e1dd4a84 100644
--- a/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts
+++ b/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts
@@ -75,9 +75,9 @@ export async function deleteEnrollmentApiKey(soClient: SavedObjectsClientContrac
   });
 }
 
-export async function deleteEnrollmentApiKeyForConfigId(
+export async function deleteEnrollmentApiKeyForAgentPolicyId(
   soClient: SavedObjectsClientContract,
-  configId: string
+  agentPolicyId: string
 ) {
   let hasMore = true;
   let page = 1;
@@ -85,7 +85,7 @@ export async function deleteEnrollmentApiKeyForConfigId(
     const { items } = await listEnrollmentApiKeys(soClient, {
       page: page++,
       perPage: 100,
-      kuery: `${ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE}.config_id:${configId}`,
+      kuery: `${ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE}.config_id:${agentPolicyId}`,
     });
 
     if (items.length === 0) {
@@ -103,15 +103,16 @@ export async function generateEnrollmentAPIKey(
   data: {
     name?: string;
     expiration?: string;
-    configId?: string;
+    agentPolicyId?: string;
   }
 ) {
   const id = uuid.v4();
   const { name: providedKeyName } = data;
-  if (data.configId) {
-    await validateConfigId(soClient, data.configId);
+  if (data.agentPolicyId) {
+    await validateAgentPolicyId(soClient, data.agentPolicyId);
   }
-  const configId = data.configId ?? (await agentPolicyService.getDefaultAgentPolicyId(soClient));
+  const agentPolicyId =
+    data.agentPolicyId ?? (await agentPolicyService.getDefaultAgentPolicyId(soClient));
   const name = providedKeyName ? `${providedKeyName} (${id})` : id;
   const key = await createAPIKey(soClient, name, {
     // Useless role to avoid to have the privilege of the user that created the key
@@ -140,7 +141,7 @@ export async function generateEnrollmentAPIKey(
       api_key_id: key.id,
       api_key: apiKey,
       name,
-      config_id: configId,
+      config_id: agentPolicyId,
       created_at: new Date().toISOString(),
     }
   );
@@ -148,12 +149,12 @@ export async function generateEnrollmentAPIKey(
   return getEnrollmentAPIKey(soClient, so.id);
 }
 
-async function validateConfigId(soClient: SavedObjectsClientContract, configId: string) {
+async function validateAgentPolicyId(soClient: SavedObjectsClientContract, agentPolicyId: string) {
   try {
-    await agentPolicyService.get(soClient, configId);
+    await agentPolicyService.get(soClient, agentPolicyId);
   } catch (e) {
     if (e.isBoom && e.output.statusCode === 404) {
-      throw Boom.badRequest(`Agent policy ${configId} does not exist`);
+      throw Boom.badRequest(`Agent policy ${agentPolicyId} does not exist`);
     }
     throw e;
   }
diff --git a/x-pack/plugins/ingest_manager/server/services/api_keys/index.ts b/x-pack/plugins/ingest_manager/server/services/api_keys/index.ts
index 9e8f1fac4e02bf..2e0ccdbcfdca60 100644
--- a/x-pack/plugins/ingest_manager/server/services/api_keys/index.ts
+++ b/x-pack/plugins/ingest_manager/server/services/api_keys/index.ts
@@ -38,11 +38,7 @@ export async function generateOutputApiKey(
   return { key: `${key.id}:${key.api_key}`, id: key.id };
 }
 
-export async function generateAccessApiKey(
-  soClient: SavedObjectsClientContract,
-  agentId: string,
-  configId: string
-) {
+export async function generateAccessApiKey(soClient: SavedObjectsClientContract, agentId: string) {
   const key = await createAPIKey(soClient, agentId, {
     // Useless role to avoid to have the privilege of the user that created the key
     'fleet-apikey-access': {
diff --git a/x-pack/plugins/ingest_manager/server/services/package_config.ts b/x-pack/plugins/ingest_manager/server/services/package_config.ts
index 4322ee774b53f1..29131bb696c462 100644
--- a/x-pack/plugins/ingest_manager/server/services/package_config.ts
+++ b/x-pack/plugins/ingest_manager/server/services/package_config.ts
@@ -117,7 +117,7 @@ class PackagePolicyService {
   public async bulkCreate(
     soClient: SavedObjectsClientContract,
     packagePolicies: NewPackagePolicy[],
-    configId: string,
+    agentPolicyId: string,
     options?: { user?: AuthenticatedUser; bumpConfigRevision?: boolean }
   ): Promise<PackagePolicy[]> {
     const isoDate = new Date().toISOString();
@@ -127,7 +127,7 @@ class PackagePolicyService {
         type: SAVED_OBJECT_TYPE,
         attributes: {
           ...packagePolicy,
-          config_id: configId,
+          config_id: agentPolicyId,
           revision: 1,
           created_at: isoDate,
           created_by: options?.user?.username ?? 'system',
@@ -143,7 +143,7 @@ class PackagePolicyService {
     // Assign it to the given agent policy
     await agentPolicyService.assignPackagePolicies(
       soClient,
-      configId,
+      agentPolicyId,
       newSos.map((newSo) => newSo.id),
       {
         user: options?.user,
diff --git a/x-pack/plugins/ingest_manager/server/services/setup.ts b/x-pack/plugins/ingest_manager/server/services/setup.ts
index 7ecfd539b1bbf7..51b96d5fcfb9f0 100644
--- a/x-pack/plugins/ingest_manager/server/services/setup.ts
+++ b/x-pack/plugins/ingest_manager/server/services/setup.ts
@@ -193,7 +193,7 @@ export async function setupFleet(
     agentPolicies.map((agentPolicy) => {
       return generateEnrollmentAPIKey(soClient, {
         name: `Default`,
-        configId: agentPolicy.id,
+        agentPolicyId: agentPolicy.id,
       });
     })
   );
diff --git a/x-pack/plugins/ingest_manager/server/types/rest_spec/agent.ts b/x-pack/plugins/ingest_manager/server/types/rest_spec/agent.ts
index 3e9209efcac047..4fb930e663098f 100644
--- a/x-pack/plugins/ingest_manager/server/types/rest_spec/agent.ts
+++ b/x-pack/plugins/ingest_manager/server/types/rest_spec/agent.ts
@@ -85,7 +85,7 @@ export const PutAgentReassignRequestSchema = {
     agentId: schema.string(),
   }),
   body: schema.object({
-    config_id: schema.string(),
+    agent_policy_id: schema.string(),
   }),
 };
 
@@ -117,6 +117,6 @@ export const UpdateAgentRequestSchema = {
 
 export const GetAgentStatusRequestSchema = {
   query: schema.object({
-    configId: schema.maybe(schema.string()),
+    policyId: schema.maybe(schema.string()),
   }),
 };
diff --git a/x-pack/plugins/ingest_manager/server/types/rest_spec/enrollment_api_key.ts b/x-pack/plugins/ingest_manager/server/types/rest_spec/enrollment_api_key.ts
index ff342bd1657702..62353a3eca19cf 100644
--- a/x-pack/plugins/ingest_manager/server/types/rest_spec/enrollment_api_key.ts
+++ b/x-pack/plugins/ingest_manager/server/types/rest_spec/enrollment_api_key.ts
@@ -29,7 +29,7 @@ export const DeleteEnrollmentAPIKeyRequestSchema = {
 export const PostEnrollmentAPIKeyRequestSchema = {
   body: schema.object({
     name: schema.maybe(schema.string()),
-    config_id: schema.string(),
+    agent_policy_id: schema.string(),
     expiration: schema.maybe(schema.string()),
   }),
 };
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.test.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.test.ts
index 5861bd801a080b..1441aec86e12ec 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.test.ts
@@ -24,7 +24,7 @@ describe('ingest service', () => {
   describe('sendGetEndpointSpecificPackagePolicies()', () => {
     it('auto adds kuery to api request', async () => {
       await sendGetEndpointSpecificPackagePolicies(http);
-      expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/package_configs', {
+      expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/package_policies', {
         query: {
           kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
         },
@@ -34,7 +34,7 @@ describe('ingest service', () => {
       await sendGetEndpointSpecificPackagePolicies(http, {
         query: { kuery: 'someValueHere', page: 1, perPage: 10 },
       });
-      expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/package_configs', {
+      expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/package_policies', {
         query: {
           kuery: `someValueHere and ${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
           perPage: 10,
@@ -47,11 +47,11 @@ describe('ingest service', () => {
   describe('sendGetPackagePolicy()', () => {
     it('builds correct API path', async () => {
       await sendGetPackagePolicy(http, '123');
-      expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/package_configs/123', undefined);
+      expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/package_policies/123', undefined);
     });
     it('supports http options', async () => {
       await sendGetPackagePolicy(http, '123', { query: { page: 1 } });
-      expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/package_configs/123', {
+      expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/package_policies/123', {
         query: {
           page: 1,
         },
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.ts
index 04d817d5399448..7f0ab36b72234d 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.ts
@@ -19,8 +19,8 @@ import { GetPolicyListResponse, GetPolicyResponse, UpdatePolicyResponse } from '
 import { NewPolicyData } from '../../../../../../../common/endpoint/types';
 
 const INGEST_API_ROOT = `/api/ingest_manager`;
-export const INGEST_API_PACKAGE_CONFIGS = `${INGEST_API_ROOT}/package_configs`;
-export const INGEST_API_AGENT_CONFIGS = `${INGEST_API_ROOT}/agent_configs`;
+export const INGEST_API_PACKAGE_CONFIGS = `${INGEST_API_ROOT}/package_policies`;
+export const INGEST_API_AGENT_CONFIGS = `${INGEST_API_ROOT}/agent_policies`;
 const INGEST_API_FLEET = `${INGEST_API_ROOT}/fleet`;
 const INGEST_API_FLEET_AGENT_STATUS = `${INGEST_API_FLEET}/agent-status`;
 export const INGEST_API_EPM_PACKAGES = `${INGEST_API_ROOT}/epm/packages`;
@@ -120,13 +120,13 @@ export const sendPutPackagePolicy = (
 export const sendGetFleetAgentStatusForPolicy = (
   http: HttpStart,
   /** the Agent (fleet) configuration id */
-  configId: string,
+  policyId: string,
   options: Exclude<HttpFetchOptions, 'query'> = {}
 ): Promise<GetAgentStatusResponse> => {
   return http.get(INGEST_API_FLEET_AGENT_STATUS, {
     ...options,
     query: {
-      configId,
+      policyId,
     },
   });
 };
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx
index 6b3e73dfe25cd7..6b4474170da5cb 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx
@@ -86,7 +86,7 @@ describe('Policy Details', () => {
         const [path] = args;
         if (typeof path === 'string') {
           // GET datasouce
-          if (path === '/api/ingest_manager/package_configs/1') {
+          if (path === '/api/ingest_manager/package_policies/1') {
             asyncActions = asyncActions.then<unknown>(async (): Promise<unknown> => sleep());
             return Promise.resolve({
               item: policyPackagePolicy,
@@ -208,7 +208,7 @@ describe('Policy Details', () => {
           asyncActions = asyncActions.then(async () => sleep());
           const [path] = args;
           if (typeof path === 'string') {
-            if (path === '/api/ingest_manager/package_configs/1') {
+            if (path === '/api/ingest_manager/package_policies/1') {
               return Promise.resolve({
                 item: policyPackagePolicy,
                 success: true,
@@ -253,7 +253,7 @@ describe('Policy Details', () => {
 
         // API should be called
         await asyncActions;
-        expect(http.put.mock.calls[0][0]).toEqual(`/api/ingest_manager/package_configs/1`);
+        expect(http.put.mock.calls[0][0]).toEqual(`/api/ingest_manager/package_policies/1`);
         policyView.update();
 
         // Toast notification should be shown
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index c7575a1a06e4e0..35859876fe9a06 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -16340,7 +16340,7 @@
     "xpack.securitySolution.endpoint.policyDetailType": "タイプ",
     "xpack.securitySolution.endpoint.policyList.actionButtonText": "Endpoint Securityを追加",
     "xpack.securitySolution.endpoint.policyList.actionMenu": "開く",
-    "xpack.securitySolution.endpoint.policyList.agentConfigAction": "エージェント構成を表示",
+    "xpack.securitySolution.endpoint.policyList.agentPolicyAction": "エージェント構成を表示",
     "xpack.securitySolution.endpoint.policyList.beta": "ベータ",
     "xpack.securitySolution.endpoint.policyList.createdAt": "作成日時",
     "xpack.securitySolution.endpoint.policyList.createdBy": "作成者",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 48b1b358b0635a..c06230652a4a61 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -16346,7 +16346,7 @@
     "xpack.securitySolution.endpoint.policyDetailType": "类型",
     "xpack.securitySolution.endpoint.policyList.actionButtonText": "添加 Endpoint Security",
     "xpack.securitySolution.endpoint.policyList.actionMenu": "打开",
-    "xpack.securitySolution.endpoint.policyList.agentConfigAction": "查看代理配置",
+    "xpack.securitySolution.endpoint.policyList.agentPolicyAction": "查看代理配置",
     "xpack.securitySolution.endpoint.policyList.beta": "公测版",
     "xpack.securitySolution.endpoint.policyList.createdAt": "创建日期",
     "xpack.securitySolution.endpoint.policyList.createdBy": "创建者",
diff --git a/x-pack/test/ingest_manager_api_integration/apis/agent_config/agent_config.ts b/x-pack/test/ingest_manager_api_integration/apis/agent_config/agent_config.ts
index 6526dc63e212cc..7a1044f170c5bc 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/agent_config/agent_config.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/agent_config/agent_config.ts
@@ -12,10 +12,10 @@ export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
 
   describe('ingest_manager_agent_configs', () => {
-    describe('POST /api/ingest_manager/agent_configs', () => {
+    describe('POST /api/ingest_manager/agent_policies', () => {
       it('should work with valid values', async () => {
         const { body: apiResponse } = await supertest
-          .post(`/api/ingest_manager/agent_configs`)
+          .post(`/api/ingest_manager/agent_policies`)
           .set('kbn-xsrf', 'xxxx')
           .send({
             name: 'TEST',
@@ -28,7 +28,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       it('should return a 400 with an invalid namespace', async () => {
         await supertest
-          .post(`/api/ingest_manager/agent_configs`)
+          .post(`/api/ingest_manager/agent_policies`)
           .set('kbn-xsrf', 'xxxx')
           .send({
             name: 'TEST',
@@ -38,7 +38,7 @@ export default function ({ getService }: FtrProviderContext) {
       });
     });
 
-    describe('POST /api/ingest_manager/agent_configs/{agentConfigId}/copy', () => {
+    describe('POST /api/ingest_manager/agent_policies/{agentConfigId}/copy', () => {
       before(async () => {
         await esArchiver.loadIfNeeded('fleet/agents');
       });
@@ -52,7 +52,7 @@ export default function ({ getService }: FtrProviderContext) {
         const {
           body: { success, item },
         } = await supertest
-          .post(`/api/ingest_manager/agent_configs/${TEST_CONFIG_ID}/copy`)
+          .post(`/api/ingest_manager/agent_policies/${TEST_CONFIG_ID}/copy`)
           .set('kbn-xsrf', 'xxxx')
           .send({
             name: 'Copied config',
@@ -76,7 +76,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       it('should return a 500 with invalid source config', async () => {
         await supertest
-          .post(`/api/ingest_manager/agent_configs/INVALID_CONFIG_ID/copy`)
+          .post(`/api/ingest_manager/agent_policies/INVALID_CONFIG_ID/copy`)
           .set('kbn-xsrf', 'xxxx')
           .send({
             name: 'Copied config',
@@ -87,7 +87,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       it('should return a 400 with invalid payload', async () => {
         await supertest
-          .post(`/api/ingest_manager/agent_configs/${TEST_CONFIG_ID}/copy`)
+          .post(`/api/ingest_manager/agent_policies/${TEST_CONFIG_ID}/copy`)
           .set('kbn-xsrf', 'xxxx')
           .send({})
           .expect(400);
@@ -95,7 +95,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       it('should return a 400 with invalid name', async () => {
         await supertest
-          .post(`/api/ingest_manager/agent_configs/${TEST_CONFIG_ID}/copy`)
+          .post(`/api/ingest_manager/agent_policies/${TEST_CONFIG_ID}/copy`)
           .set('kbn-xsrf', 'xxxx')
           .send({
             name: '',
diff --git a/x-pack/test/ingest_manager_api_integration/apis/package_config/create.ts b/x-pack/test/ingest_manager_api_integration/apis/package_config/create.ts
index a2c2b99364d509..7ac450434fc530 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/package_config/create.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/package_config/create.ts
@@ -18,30 +18,30 @@ export default function ({ getService }: FtrProviderContext) {
   // because `this` has to point to the Mocha context
   // see https://mochajs.org/#arrow-functions
 
-  describe('Package Config - create', async function () {
-    let agentConfigId: string;
+  describe('Package Policy - create', async function () {
+    let agentPolicyId: string;
 
     before(async function () {
-      const { body: agentConfigResponse } = await supertest
-        .post(`/api/ingest_manager/agent_configs`)
+      const { body: agentPolicyResponse } = await supertest
+        .post(`/api/ingest_manager/agent_policies`)
         .set('kbn-xsrf', 'xxxx')
         .send({
-          name: 'Test config',
+          name: 'Test policy',
           namespace: 'default',
         });
-      agentConfigId = agentConfigResponse.item.id;
+      agentPolicyId = agentPolicyResponse.item.id;
     });
 
     it('should work with valid values', async function () {
       if (server.enabled) {
         const { body: apiResponse } = await supertest
-          .post(`/api/ingest_manager/package_configs`)
+          .post(`/api/ingest_manager/package_policies`)
           .set('kbn-xsrf', 'xxxx')
           .send({
             name: 'filetest-1',
             description: '',
             namespace: 'default',
-            config_id: agentConfigId,
+            config_id: agentPolicyId,
             enabled: true,
             output_id: '',
             inputs: [],
@@ -62,13 +62,13 @@ export default function ({ getService }: FtrProviderContext) {
     it('should return a 400 with an invalid namespace', async function () {
       if (server.enabled) {
         await supertest
-          .post(`/api/ingest_manager/package_configs`)
+          .post(`/api/ingest_manager/package_policies`)
           .set('kbn-xsrf', 'xxxx')
           .send({
             name: 'filetest-1',
             description: '',
             namespace: '',
-            config_id: agentConfigId,
+            config_id: agentPolicyId,
             enabled: true,
             output_id: '',
             inputs: [],
@@ -84,16 +84,16 @@ export default function ({ getService }: FtrProviderContext) {
       }
     });
 
-    it('should not allow multiple limited packages on the same agent config', async function () {
+    it('should not allow multiple limited packages on the same agent policy', async function () {
       if (server.enabled) {
         await supertest
-          .post(`/api/ingest_manager/package_configs`)
+          .post(`/api/ingest_manager/package_policies`)
           .set('kbn-xsrf', 'xxxx')
           .send({
             name: 'endpoint-1',
             description: '',
             namespace: 'default',
-            config_id: agentConfigId,
+            config_id: agentPolicyId,
             enabled: true,
             output_id: '',
             inputs: [],
@@ -105,13 +105,13 @@ export default function ({ getService }: FtrProviderContext) {
           })
           .expect(200);
         await supertest
-          .post(`/api/ingest_manager/package_configs`)
+          .post(`/api/ingest_manager/package_policies`)
           .set('kbn-xsrf', 'xxxx')
           .send({
             name: 'endpoint-2',
             description: '',
             namespace: 'default',
-            config_id: agentConfigId,
+            config_id: agentPolicyId,
             enabled: true,
             output_id: '',
             inputs: [],
@@ -127,16 +127,16 @@ export default function ({ getService }: FtrProviderContext) {
       }
     });
 
-    it('should return a 500 if there is another package config with the same name', async function () {
+    it('should return a 500 if there is another package policy with the same name', async function () {
       if (server.enabled) {
         await supertest
-          .post(`/api/ingest_manager/package_configs`)
+          .post(`/api/ingest_manager/package_policies`)
           .set('kbn-xsrf', 'xxxx')
           .send({
             name: 'same-name-test-1',
             description: '',
             namespace: 'default',
-            config_id: agentConfigId,
+            config_id: agentPolicyId,
             enabled: true,
             output_id: '',
             inputs: [],
@@ -148,13 +148,13 @@ export default function ({ getService }: FtrProviderContext) {
           })
           .expect(200);
         await supertest
-          .post(`/api/ingest_manager/package_configs`)
+          .post(`/api/ingest_manager/package_policies`)
           .set('kbn-xsrf', 'xxxx')
           .send({
             name: 'same-name-test-1',
             description: '',
             namespace: 'default',
-            config_id: agentConfigId,
+            config_id: agentPolicyId,
             enabled: true,
             output_id: '',
             inputs: [],
diff --git a/x-pack/test/ingest_manager_api_integration/apis/package_config/get.ts b/x-pack/test/ingest_manager_api_integration/apis/package_config/get.ts
index 94b7543d982add..0e838346cbb2b8 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/package_config/get.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/package_config/get.ts
@@ -18,32 +18,32 @@ export default function (providerContext: FtrProviderContext) {
   // because `this` has to point to the Mocha context
   // see https://mochajs.org/#arrow-functions
 
-  describe('Package Config - get by id', async function () {
+  describe('Package Policy - get by id', async function () {
     skipIfNoDockerRegistry(providerContext);
-    let agentConfigId: string;
-    let packageConfigId: string;
+    let agentPolicyId: string;
+    let packagePolicyId: string;
 
     before(async function () {
       if (!server.enabled) {
         return;
       }
-      const { body: agentConfigResponse } = await supertest
-        .post(`/api/ingest_manager/agent_configs`)
+      const { body: agentPolicyResponse } = await supertest
+        .post(`/api/ingest_manager/agent_policies`)
         .set('kbn-xsrf', 'xxxx')
         .send({
-          name: 'Test config',
+          name: 'Test policy',
           namespace: 'default',
         });
-      agentConfigId = agentConfigResponse.item.id;
+      agentPolicyId = agentPolicyResponse.item.id;
 
-      const { body: packageConfigResponse } = await supertest
-        .post(`/api/ingest_manager/package_configs`)
+      const { body: packagePolicyResponse } = await supertest
+        .post(`/api/ingest_manager/package_policies`)
         .set('kbn-xsrf', 'xxxx')
         .send({
           name: 'filetest-1',
           description: '',
           namespace: 'default',
-          config_id: agentConfigId,
+          config_id: agentPolicyId,
           enabled: true,
           output_id: '',
           inputs: [],
@@ -53,7 +53,7 @@ export default function (providerContext: FtrProviderContext) {
             version: '0.1.0',
           },
         });
-      packageConfigId = packageConfigResponse.item.id;
+      packagePolicyId = packagePolicyResponse.item.id;
     });
 
     after(async function () {
@@ -62,28 +62,28 @@ export default function (providerContext: FtrProviderContext) {
       }
 
       await supertest
-        .post(`/api/ingest_manager/agent_configs/delete`)
+        .post(`/api/ingest_manager/agent_policies/delete`)
         .set('kbn-xsrf', 'xxxx')
-        .send({ agentConfigId })
+        .send({ agentPolicyId })
         .expect(200);
 
       await supertest
-        .post(`/api/ingest_manager/package_configs/delete`)
+        .post(`/api/ingest_manager/package_policies/delete`)
         .set('kbn-xsrf', 'xxxx')
-        .send({ packageConfigIds: [packageConfigId] })
+        .send({ packagePolicyIds: [packagePolicyId] })
         .expect(200);
     });
 
     it('should succeed with a valid id', async function () {
       const { body: apiResponse } = await supertest
-        .get(`/api/ingest_manager/package_configs/${packageConfigId}`)
+        .get(`/api/ingest_manager/package_policies/${packagePolicyId}`)
         .expect(200);
 
       expect(apiResponse.success).to.be(true);
     });
 
     it('should return a 404 with an invalid id', async function () {
-      await supertest.get(`/api/ingest_manager/package_configs/IS_NOT_PRESENT`).expect(404);
+      await supertest.get(`/api/ingest_manager/package_policies/IS_NOT_PRESENT`).expect(404);
     });
   });
 }
diff --git a/x-pack/test/ingest_manager_api_integration/apis/package_config/update.ts b/x-pack/test/ingest_manager_api_integration/apis/package_config/update.ts
index 7b0ad4f524bad6..13c27795bfc30f 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/package_config/update.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/package_config/update.ts
@@ -18,33 +18,33 @@ export default function (providerContext: FtrProviderContext) {
   // because `this` has to point to the Mocha context
   // see https://mochajs.org/#arrow-functions
 
-  describe('Package Config - update', async function () {
+  describe('Package Policy - update', async function () {
     skipIfNoDockerRegistry(providerContext);
-    let agentConfigId: string;
-    let packageConfigId: string;
-    let packageConfigId2: string;
+    let agentPolicyId: string;
+    let packagePolicyId: string;
+    let packagePolicyId2: string;
 
     before(async function () {
       if (!server.enabled) {
         return;
       }
-      const { body: agentConfigResponse } = await supertest
-        .post(`/api/ingest_manager/agent_configs`)
+      const { body: agentPolicyResponse } = await supertest
+        .post(`/api/ingest_manager/agent_policies`)
         .set('kbn-xsrf', 'xxxx')
         .send({
-          name: 'Test config',
+          name: 'Test policy',
           namespace: 'default',
         });
-      agentConfigId = agentConfigResponse.item.id;
+      agentPolicyId = agentPolicyResponse.item.id;
 
-      const { body: packageConfigResponse } = await supertest
-        .post(`/api/ingest_manager/package_configs`)
+      const { body: packagePolicyResponse } = await supertest
+        .post(`/api/ingest_manager/package_policies`)
         .set('kbn-xsrf', 'xxxx')
         .send({
           name: 'filetest-1',
           description: '',
           namespace: 'default',
-          config_id: agentConfigId,
+          config_id: agentPolicyId,
           enabled: true,
           output_id: '',
           inputs: [],
@@ -54,16 +54,16 @@ export default function (providerContext: FtrProviderContext) {
             version: '0.1.0',
           },
         });
-      packageConfigId = packageConfigResponse.item.id;
+      packagePolicyId = packagePolicyResponse.item.id;
 
-      const { body: packageConfigResponse2 } = await supertest
-        .post(`/api/ingest_manager/package_configs`)
+      const { body: packagePolicyResponse2 } = await supertest
+        .post(`/api/ingest_manager/package_policies`)
         .set('kbn-xsrf', 'xxxx')
         .send({
           name: 'filetest-2',
           description: '',
           namespace: 'default',
-          config_id: agentConfigId,
+          config_id: agentPolicyId,
           enabled: true,
           output_id: '',
           inputs: [],
@@ -73,18 +73,18 @@ export default function (providerContext: FtrProviderContext) {
             version: '0.1.0',
           },
         });
-      packageConfigId2 = packageConfigResponse2.item.id;
+      packagePolicyId2 = packagePolicyResponse2.item.id;
     });
 
     it('should work with valid values', async function () {
       const { body: apiResponse } = await supertest
-        .put(`/api/ingest_manager/package_configs/${packageConfigId}`)
+        .put(`/api/ingest_manager/package_policies/${packagePolicyId}`)
         .set('kbn-xsrf', 'xxxx')
         .send({
           name: 'filetest-1',
           description: '',
           namespace: 'updated_namespace',
-          config_id: agentConfigId,
+          config_id: agentPolicyId,
           enabled: true,
           output_id: '',
           inputs: [],
@@ -99,15 +99,15 @@ export default function (providerContext: FtrProviderContext) {
       expect(apiResponse.success).to.be(true);
     });
 
-    it('should return a 500 if there is another package config with the same name', async function () {
+    it('should return a 500 if there is another package policy with the same name', async function () {
       await supertest
-        .put(`/api/ingest_manager/package_configs/${packageConfigId2}`)
+        .put(`/api/ingest_manager/package_policies/${packagePolicyId2}`)
         .set('kbn-xsrf', 'xxxx')
         .send({
           name: 'filetest-1',
           description: '',
           namespace: 'updated_namespace',
-          config_id: agentConfigId,
+          config_id: agentPolicyId,
           enabled: true,
           output_id: '',
           inputs: [],
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
index 0037c39b8fed2c..13300a954d9b73 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
@@ -125,7 +125,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         });
 
         // The integration does not work properly yet.  Skipping this test for now.
-        it.skip('navigates to ingest fleet when the Reassign Configuration link is clicked', async () => {
+        it.skip('navigates to ingest fleet when the Reassign Policy link is clicked', async () => {
           await (await testSubjects.find('hostnameCellLink')).click();
           await (await testSubjects.find('endpointDetailsLinkToIngest')).click();
           await testSubjects.existOrFail('fleetAgentListTable');
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
index b6becf88f04a6a..6065a2d6b3f683 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
@@ -27,7 +27,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         await pageObjects.policy.navigateToPolicyDetails('invalid-id');
         await testSubjects.existOrFail('policyDetailsIdNotFoundMessage');
         expect(await testSubjects.getVisibleText('policyDetailsIdNotFoundMessage')).to.equal(
-          'Package config invalid-id not found'
+          'Package Policy invalid-id not found'
         );
       });
     });
@@ -37,7 +37,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       before(async () => {
         policyInfo = await policyTestResources.createPolicy();
-        await pageObjects.policy.navigateToPolicyDetails(policyInfo.packageConfig.id);
+        await pageObjects.policy.navigateToPolicyDetails(policyInfo.packagePolicy.id);
       });
 
       after(async () => {
@@ -48,7 +48,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it('should display policy view', async () => {
         expect(await testSubjects.getVisibleText('pageViewHeaderLeftTitle')).to.equal(
-          policyInfo.packageConfig.name
+          policyInfo.packagePolicy.name
         );
       });
     });
@@ -58,7 +58,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       beforeEach(async () => {
         policyInfo = await policyTestResources.createPolicy();
-        await pageObjects.policy.navigateToPolicyDetails(policyInfo.packageConfig.id);
+        await pageObjects.policy.navigateToPolicyDetails(policyInfo.packagePolicy.id);
       });
 
       afterEach(async () => {
@@ -73,7 +73,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
         await testSubjects.existOrFail('policyDetailsSuccessMessage');
         expect(await testSubjects.getVisibleText('policyDetailsSuccessMessage')).to.equal(
-          `Integration ${policyInfo.packageConfig.name} has been updated.`
+          `Integration ${policyInfo.packagePolicy.name} has been updated.`
         );
       });
       it('should persist update on the screen', async () => {
@@ -82,15 +82,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
         await testSubjects.existOrFail('policyDetailsSuccessMessage');
         await pageObjects.endpoint.navigateToEndpointList();
-        await pageObjects.policy.navigateToPolicyDetails(policyInfo.packageConfig.id);
+        await pageObjects.policy.navigateToPolicyDetails(policyInfo.packagePolicy.id);
 
         expect(await (await testSubjects.find('policyWindowsEvent_process')).isSelected()).to.equal(
           false
         );
       });
-      it('should have updated policy data in overall agent configuration', async () => {
+      it('should have updated policy data in overall Agent Policy', async () => {
         // This test ensures that updates made to the Endpoint Policy are carried all the way through
-        // to the generated Agent Configuration that is dispatch down to the Elastic Agent.
+        // to the generated Agent Policy that is dispatch down to the Elastic Agent.
 
         await Promise.all([
           pageObjects.endpointPageUtils.clickOnEuiCheckbox('policyWindowsEvent_file'),
@@ -100,14 +100,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         await pageObjects.policy.confirmAndSave();
         await testSubjects.existOrFail('policyDetailsSuccessMessage');
 
-        const agentFullConfig = await policyTestResources.getFullAgentPolicy(
-          policyInfo.agentConfig.id
+        const agentFullPolicy = await policyTestResources.getFullAgentPolicy(
+          policyInfo.agentPolicy.id
         );
 
-        expect(agentFullConfig).to.eql({
+        expect(agentFullPolicy).to.eql({
           inputs: [
             {
-              id: policyInfo.packageConfig.id,
+              id: policyInfo.packagePolicy.id,
               data_stream: { namespace: 'default' },
               name: 'Protect East Coast',
               meta: {
@@ -145,9 +145,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
                 },
                 // The manifest version could have changed when the Policy was updated because the
                 // policy details page ensures that a save action applies the udpated policy on top
-                // of the latest Package Config. So we just ignore the check against this value by
-                // forcing it to be the same as the value returned in the full agent config.
-                manifest_version: agentFullConfig.inputs[0].artifact_manifest.manifest_version,
+                // of the latest Package Policy. So we just ignore the check against this value by
+                // forcing it to be the same as the value returned in the full agent policy.
+                manifest_version: agentFullPolicy.inputs[0].artifact_manifest.manifest_version,
                 schema_version: 'v1',
               },
               policy: {
@@ -179,7 +179,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
               use_output: 'default',
             },
           ],
-          id: policyInfo.agentConfig.id,
+          id: policyInfo.agentPolicy.id,
           outputs: {
             default: {
               hosts: ['http://localhost:9200'],
@@ -197,14 +197,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         });
       });
     });
-    describe('when on Ingest Configurations Edit Package Config page', async () => {
+    describe('when on Ingest Policy Edit Package Policy page', async () => {
       let policyInfo: PolicyTestResourceInfo;
       beforeEach(async () => {
         // Create a policy and navigate to Ingest app
         policyInfo = await policyTestResources.createPolicy();
         await pageObjects.ingestManagerCreatePackagePolicy.navigateToAgentPolicyEditPackagePolicy(
-          policyInfo.agentConfig.id,
-          policyInfo.packageConfig.id
+          policyInfo.agentPolicy.id,
+          policyInfo.packagePolicy.id
         );
       });
       afterEach(async () => {
@@ -229,7 +229,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         await testSubjects.existOrFail('policyDetailsSuccessMessage');
         await pageObjects.ingestManagerCreatePackagePolicy.ensureOnEditPageOrFail();
       });
-      it('should navigate back to Ingest Configuration Edit package page on click of cancel button', async () => {
+      it('should navigate back to Ingest Policy Edit package page on click of cancel button', async () => {
         await (await testSubjects.find('editLinkToPolicyDetails')).click();
         await (await pageObjects.policy.findCancelButton()).click();
         await pageObjects.ingestManagerCreatePackagePolicy.ensureOnEditPageOrFail();
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts
index 5b35733eccc7c4..d230b9d624d01b 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts
@@ -78,7 +78,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
           'Protect East Coastrev. 1',
           'elastic',
           'elastic',
-          `v${policyInfo.packageConfig.package?.version}`,
+          `v${policyInfo.packagePolicy.package?.version}`,
           '',
         ]);
         [policyRow[2], policyRow[4]].forEach((relativeDate) => {
@@ -86,11 +86,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         });
       });
 
-      it('should show agent config action as a link', async () => {
+      it('should show agent policy action as a link', async () => {
         await (await pageObjects.policy.findFirstActionsButton()).click();
-        const agentConfigLink = await testSubjects.find('agentConfigLink');
-        expect(await agentConfigLink.getAttribute('href')).to.match(
-          new RegExp(`\/ingestManager#\/configs\/${policyInfo.agentConfig.id}$`)
+        const agentPolicyLink = await testSubjects.find('agentPolicyLink');
+        expect(await agentPolicyLink.getAttribute('href')).to.match(
+          new RegExp(`\/ingestManager#\/policies\/${policyInfo.agentPolicy.id}$`)
         );
         // Close action menu
         await (await pageObjects.policy.findFirstActionsButton()).click();
@@ -111,7 +111,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         await (await pageObjects.policy.findHeaderCreateNewButton()).click();
       });
 
-      it('should redirect to ingest management integrations add package config', async () => {
+      it('should redirect to ingest management integrations add package policy', async () => {
         await pageObjects.ingestManagerCreatePackagePolicy.ensureOnCreatePageOrFail();
       });
 
@@ -131,7 +131,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         expect(endpointConfig).not.to.be(undefined);
       });
 
-      it('should have empty value for package configuration name', async () => {
+      it('should have empty value for package policy name', async () => {
         await pageObjects.ingestManagerCreatePackagePolicy.selectAgentPolicy();
         expect(await pageObjects.ingestManagerCreatePackagePolicy.getPackagePolicyName()).to.be('');
       });
@@ -148,7 +148,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
     });
 
     describe('and user clicks on page header create button', () => {
-      it('should direct users to the ingest management integrations add package config', async () => {
+      it('should direct users to the ingest management integrations add package policy', async () => {
         await pageObjects.policy.navigateToPolicyList();
         await (await pageObjects.policy.findOnboardingStartButton()).click();
         await pageObjects.ingestManagerCreatePackagePolicy.ensureOnCreatePageOrFail();
diff --git a/x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_config_page.ts b/x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_config_page.ts
index 4643cfce0910c1..13b1f8c9d9842b 100644
--- a/x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_config_page.ts
+++ b/x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_config_page.ts
@@ -16,7 +16,7 @@ export function IngestManagerCreatePackagePolicy({
 
   return {
     /**
-     * Validates that the page shown is the Package Config Create Page
+     * Validates that the page shown is the Package Policy Create Page
      */
     async ensureOnCreatePageOrFail() {
       await testSubjects.existOrFail('createPackagePolicy_header');
@@ -44,62 +44,62 @@ export function IngestManagerCreatePackagePolicy({
     },
 
     /**
-     * Selects an agent configuration on the form
+     * Selects an agent policy on the form
      * @param name
-     * Visual name of the configuration. if one is not provided, the first agent
-     * configuration on the list will be chosen
+     * Visual name of the policy. if one is not provided, the first agent
+     * policy on the list will be chosen
      */
     async selectAgentPolicy(name?: string) {
       // if we have a name, then find the button with that `title` set.
       if (name) {
         await (
-          await find.byCssSelector(`[data-test-subj="agentConfigItem"][title="${name}"]`)
+          await find.byCssSelector(`[data-test-subj="agentPolicyItem"][title="${name}"]`)
         ).click();
       }
-      // Else, just select the first agent configuration that is present
+      // Else, just select the first agent policy that is present
       else {
-        await (await testSubjects.find('agentConfigItem')).click();
+        await (await testSubjects.find('agentPolicyItem')).click();
       }
     },
 
     /**
-     * Returns the package config name currently populated on the input field
+     * Returns the package Policy name currently populated on the input field
      */
     async getPackagePolicyName() {
-      return testSubjects.getAttribute('packageConfigNameInput', 'value');
+      return testSubjects.getAttribute('packagePolicyNameInput', 'value');
     },
 
     /**
-     * Set the name of the package config on the input field
+     * Set the name of the package Policy on the input field
      * @param name
      */
     async setPackagePolicyName(name: string) {
       // Because of the bottom sticky bar, we need to scroll section 2 into view
       // so that `setValue()` enters the data on the input field.
       await testSubjects.scrollIntoView('dataCollectionSetupStep');
-      await testSubjects.setValue('packageConfigNameInput', name);
+      await testSubjects.setValue('packagePolicyNameInput', name);
     },
 
     /**
      * Waits for the save Notification toast to be visible
      */
     async waitForSaveSuccessNotification() {
-      await testSubjects.existOrFail('packageConfigCreateSuccessToast');
+      await testSubjects.existOrFail('packagePolicyCreateSuccessToast');
     },
 
     /**
-     * Validates that the page shown is the Package Config Edit Page
+     * Validates that the page shown is the Package Policy Edit Page
      */
     async ensureOnEditPageOrFail() {
       await testSubjects.existOrFail('editPackagePolicy_header');
     },
 
     /**
-     * Navigates to the Ingest Agent configuration Edit Package Config page
+     * Navigates to the Ingest Agent configuration Edit Package Policy page
      */
-    async navigateToAgentPolicyEditPackagePolicy(agentConfigId: string, packageConfigId: string) {
+    async navigateToAgentPolicyEditPackagePolicy(agentPolicyId: string, packagePolicyId: string) {
       await pageObjects.common.navigateToApp('ingestManager', {
-        hash: `/configs/${agentConfigId}/edit-integration/${packageConfigId}`,
+        hash: `/policies/${agentPolicyId}/edit-integration/${packagePolicyId}`,
       });
       await this.ensureOnEditPageOrFail();
     },
diff --git a/x-pack/test/security_solution_endpoint/page_objects/policy_page.ts b/x-pack/test/security_solution_endpoint/page_objects/policy_page.ts
index 97daf38bdba901..9c1fa0c6e86b21 100644
--- a/x-pack/test/security_solution_endpoint/page_objects/policy_page.ts
+++ b/x-pack/test/security_solution_endpoint/page_objects/policy_page.ts
@@ -106,7 +106,7 @@ export function EndpointPolicyPageProvider({ getService, getPageObjects }: FtrPr
     },
 
     /**
-     * Used when looking a the Ingest create/edit package config pages. Finds the endpoint
+     * Used when looking a the Ingest create/edit package policy pages. Finds the endpoint
      * custom configuaration component
      * @param onEditPage
      */
diff --git a/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts b/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
index 4522a2f073268f..694c28a68d6099 100644
--- a/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
+++ b/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
@@ -20,10 +20,10 @@ import { factory as policyConfigFactory } from '../../../plugins/security_soluti
 import { Immutable } from '../../../plugins/security_solution/common/endpoint/types';
 
 const INGEST_API_ROOT = '/api/ingest_manager';
-const INGEST_API_AGENT_CONFIGS = `${INGEST_API_ROOT}/agent_configs`;
-const INGEST_API_AGENT_CONFIGS_DELETE = `${INGEST_API_AGENT_CONFIGS}/delete`;
-const INGEST_API_PACKAGE_CONFIGS = `${INGEST_API_ROOT}/package_configs`;
-const INGEST_API_PACKAGE_CONFIGS_DELETE = `${INGEST_API_PACKAGE_CONFIGS}/delete`;
+const INGEST_API_AGENT_POLICIES = `${INGEST_API_ROOT}/agent_policies`;
+const INGEST_API_AGENT_POLICIES_DELETE = `${INGEST_API_AGENT_POLICIES}/delete`;
+const INGEST_API_PACKAGE_POLICIES = `${INGEST_API_ROOT}/package_policies`;
+const INGEST_API_PACKAGE_POLICIES_DELETE = `${INGEST_API_PACKAGE_POLICIES}/delete`;
 const INGEST_API_EPM_PACKAGES = `${INGEST_API_ROOT}/epm/packages`;
 
 const SECURITY_PACKAGES_ROUTE = `${INGEST_API_EPM_PACKAGES}?category=security`;
@@ -32,17 +32,17 @@ const SECURITY_PACKAGES_ROUTE = `${INGEST_API_EPM_PACKAGES}?category=security`;
  * Holds information about the test resources created to support an Endpoint Policy
  */
 export interface PolicyTestResourceInfo {
-  /** The Ingest agent configuration created */
-  agentConfig: Immutable<CreateAgentPolicyResponse['item']>;
-  /** The Ingest Package Config created and added to agent configuration.
+  /** The Ingest agent policy created */
+  agentPolicy: Immutable<CreateAgentPolicyResponse['item']>;
+  /** The Ingest Package Policy created and added to agent policy.
    * This is where Endpoint Policy is stored.
    */
-  packageConfig: Immutable<CreatePackagePolicyResponse['item']>;
+  packagePolicy: Immutable<CreatePackagePolicyResponse['item']>;
   /**
    * Information about the endpoint package
    */
   packageInfo: Immutable<GetPackagesResponse['response'][0]>;
-  /** will clean up (delete) the objects created (agent config + Package Config) */
+  /** will clean up (delete) the objects created (Agent Policy + Package Policy) */
   cleanup: () => Promise<void>;
 }
 
@@ -64,7 +64,7 @@ export function EndpointPolicyTestResourcesProvider({ getService }: FtrProviderC
     // EPM does not currently have an API to get the "lastest" information for a page given its name,
     // so we'll retrieve a list of packages for a category of Security, and will then find the
     // endpoint package info. in the list. The request is kicked off here, but handled below after
-    // agent config creation so that they can be executed concurrently
+    // Agent Policy creation so that they can be executed concurrently
     let apiRequest: Promise<GetPackagesResponse['response'][0] | undefined>;
 
     return () => {
@@ -107,57 +107,57 @@ export function EndpointPolicyTestResourcesProvider({ getService }: FtrProviderC
 
   return {
     /**
-     * Retrieves the full Agent configuration, which mirrors what the Elastic Agent would get
+     * Retrieves the full Agent policy, which mirrors what the Elastic Agent would get
      * once they checkin.
      */
-    async getFullAgentPolicy(agentConfigId: string): Promise<GetFullAgentPolicyResponse['item']> {
+    async getFullAgentPolicy(agentPolicyId: string): Promise<GetFullAgentPolicyResponse['item']> {
       let fullAgentPolicy: GetFullAgentPolicyResponse['item'];
       try {
         const apiResponse: { body: GetFullAgentPolicyResponse } = await supertest
-          .get(`${INGEST_API_AGENT_CONFIGS}/${agentConfigId}/full`)
+          .get(`${INGEST_API_AGENT_POLICIES}/${agentPolicyId}/full`)
           .expect(200);
 
         fullAgentPolicy = apiResponse.body.item;
       } catch (error) {
-        return logSupertestApiErrorAndThrow('Unable to get full Agent Configuration', error);
+        return logSupertestApiErrorAndThrow('Unable to get full Agent policy', error);
       }
 
       return fullAgentPolicy!;
     },
 
     /**
-     * Creates an Ingest Agent Configuration and adds to it the Endpoint Package Config that
+     * Creates an Ingest Agent policy and adds to it the Endpoint Package Policy that
      * stores the Policy configuration data
      */
     async createPolicy(): Promise<PolicyTestResourceInfo> {
-      // create agent config
-      let agentConfig: CreateAgentPolicyResponse['item'];
+      // create Agent Policy
+      let agentPolicy: CreateAgentPolicyResponse['item'];
       try {
-        const newAgentconfigData: CreateAgentPolicyRequest['body'] = {
+        const newAgentPolicyData: CreateAgentPolicyRequest['body'] = {
           name: 'East Coast',
           description: 'East Coast call center',
           namespace: 'default',
         };
         const { body: createResponse }: { body: CreateAgentPolicyResponse } = await supertest
-          .post(INGEST_API_AGENT_CONFIGS)
+          .post(INGEST_API_AGENT_POLICIES)
           .set('kbn-xsrf', 'xxx')
-          .send(newAgentconfigData)
+          .send(newAgentPolicyData)
           .expect(200);
-        agentConfig = createResponse.item;
+        agentPolicy = createResponse.item;
       } catch (error) {
-        return logSupertestApiErrorAndThrow(`Unable to create Agent Config via Ingest!`, error);
+        return logSupertestApiErrorAndThrow(`Unable to create Agent Policy via Ingest!`, error);
       }
 
       // Retrieve the Endpoint package information
       const endpointPackageInfo = await retrieveEndpointPackageInfo();
 
-      // create Package Config and associated it to agent config
-      let packageConfig: CreatePackagePolicyResponse['item'];
+      // create Package Policy and associated it to Agent Policy
+      let packagePolicy: CreatePackagePolicyResponse['item'];
       try {
         const newPackagePolicyData: CreatePackagePolicyRequest['body'] = {
           name: 'Protect East Coast',
           description: 'Protect the worlds data - but in the East Coast',
-          config_id: agentConfig!.id,
+          config_id: agentPolicy!.id,
           enabled: true,
           output_id: '',
           inputs: [
@@ -182,93 +182,93 @@ export function EndpointPolicyTestResourcesProvider({ getService }: FtrProviderC
         const {
           body: createResponse,
         }: { body: CreatePackagePolicyResponse } = await supertest
-          .post(INGEST_API_PACKAGE_CONFIGS)
+          .post(INGEST_API_PACKAGE_POLICIES)
           .set('kbn-xsrf', 'xxx')
           .send(newPackagePolicyData)
           .expect(200);
-        packageConfig = createResponse.item;
+        packagePolicy = createResponse.item;
       } catch (error) {
-        return logSupertestApiErrorAndThrow(`Unable to create Package Config via Ingest!`, error);
+        return logSupertestApiErrorAndThrow(`Unable to create Package Policy via Ingest!`, error);
       }
 
       return {
-        agentConfig,
-        packageConfig,
+        agentPolicy,
+        packagePolicy,
         packageInfo: endpointPackageInfo!,
         async cleanup() {
-          // Delete Package Config
+          // Delete Package Policy
           try {
             const deletePackagePolicyData: DeletePackagePoliciesRequest['body'] = {
-              packageConfigIds: [packageConfig.id],
+              packagePolicyIds: [packagePolicy.id],
             };
             await supertest
-              .post(INGEST_API_PACKAGE_CONFIGS_DELETE)
+              .post(INGEST_API_PACKAGE_POLICIES_DELETE)
               .set('kbn-xsrf', 'xxx')
               .send(deletePackagePolicyData)
               .expect(200);
           } catch (error) {
-            logSupertestApiErrorAndThrow('Unable to delete Package Config via Ingest!', error);
+            logSupertestApiErrorAndThrow('Unable to delete Package Policy via Ingest!', error);
           }
 
-          // Delete Agent config
+          // Delete Agent Policy
           try {
             const deleteAgentPolicyData: DeleteAgentPolicyRequest['body'] = {
-              agentConfigId: agentConfig.id,
+              agentPolicyId: agentPolicy.id,
             };
             await supertest
-              .post(INGEST_API_AGENT_CONFIGS_DELETE)
+              .post(INGEST_API_AGENT_POLICIES_DELETE)
               .set('kbn-xsrf', 'xxx')
               .send(deleteAgentPolicyData)
               .expect(200);
           } catch (error) {
-            logSupertestApiErrorAndThrow('Unable to delete Agent Config via Ingest!', error);
+            logSupertestApiErrorAndThrow('Unable to delete Agent Policy via Ingest!', error);
           }
         },
       };
     },
 
     /**
-     * Deletes a policy (Package Config) by using the policy name
+     * Deletes a policy (Package Policy) by using the policy name
      * @param name
      */
     async deletePolicyByName(name: string) {
-      let packageConfigList: GetPackagePoliciesResponse['items'];
+      let packagePolicyList: GetPackagePoliciesResponse['items'];
       try {
         const {
-          body: packageConfigsResponse,
+          body: packagePoliciesResponse,
         }: { body: GetPackagePoliciesResponse } = await supertest
-          .get(INGEST_API_PACKAGE_CONFIGS)
+          .get(INGEST_API_PACKAGE_POLICIES)
           .set('kbn-xsrf', 'xxx')
           .query({ kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.name: ${name}` })
           .send()
           .expect(200);
-        packageConfigList = packageConfigsResponse.items;
+        packagePolicyList = packagePoliciesResponse.items;
       } catch (error) {
         return logSupertestApiErrorAndThrow(
-          `Unable to get list of Package Configs with name=${name}`,
+          `Unable to get list of Package Policies with name=${name}`,
           error
         );
       }
 
-      if (packageConfigList.length === 0) {
+      if (packagePolicyList.length === 0) {
         throw new Error(`Policy named '${name}' was not found!`);
       }
 
-      if (packageConfigList.length > 1) {
-        throw new Error(`Found ${packageConfigList.length} Policies - was expecting only one!`);
+      if (packagePolicyList.length > 1) {
+        throw new Error(`Found ${packagePolicyList.length} Policies - was expecting only one!`);
       }
 
       try {
         const deletePackagePolicyData: DeletePackagePoliciesRequest['body'] = {
-          packageConfigIds: [packageConfigList[0].id],
+          packagePolicyIds: [packagePolicyList[0].id],
         };
         await supertest
-          .post(INGEST_API_PACKAGE_CONFIGS_DELETE)
+          .post(INGEST_API_PACKAGE_POLICIES_DELETE)
           .set('kbn-xsrf', 'xxx')
           .send(deletePackagePolicyData)
           .expect(200);
       } catch (error) {
-        logSupertestApiErrorAndThrow('Unable to delete Package Config via Ingest!', error);
+        logSupertestApiErrorAndThrow('Unable to delete Package Policy via Ingest!', error);
       }
     },
   };

From 1095337a03ccdfa78d37b23320e4df8332cf0e9c Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Thu, 13 Aug 2020 15:06:57 -0700
Subject: [PATCH 03/24] Fix test

---
 .../security_solution_endpoint/apps/endpoint/policy_details.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
index 6065a2d6b3f683..45f844ee6fb9d8 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
@@ -27,7 +27,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         await pageObjects.policy.navigateToPolicyDetails('invalid-id');
         await testSubjects.existOrFail('policyDetailsIdNotFoundMessage');
         expect(await testSubjects.getVisibleText('policyDetailsIdNotFoundMessage')).to.equal(
-          'Package Policy invalid-id not found'
+          'Package policy invalid-id not found'
         );
       });
     });

From 1a469bbc4a915dc5dfb6c9637c118a244d53833f Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Thu, 13 Aug 2020 15:55:39 -0700
Subject: [PATCH 04/24] More var renaming

---
 .../common/services/package_to_config.test.ts |  2 +-
 .../ingest_manager/dev_docs/definitions.md    |  5 +-
 x-pack/plugins/ingest_manager/dev_docs/epm.md | 22 ++++----
 .../fleet_agents_interactions_detailed.md     |  8 +--
 .../dev_docs/schema/agent_checkin.mml         |  4 +-
 .../ingest_manager/hooks/use_breadcrumbs.tsx  | 12 ++---
 .../applications/ingest_manager/index.tsx     |  2 +-
 .../ingest_manager/layouts/default.tsx        |  2 +-
 .../components/config_yaml_flyout.tsx         |  6 +--
 .../components/confirm_deploy_modal.tsx       |  2 +-
 .../sections/agent_config/components/index.ts |  2 +-
 .../components/layout.tsx                     |  2 +-
 .../create_package_config_page/index.tsx      | 14 ++---
 .../validate_package_config.ts.test.ts        |  2 +-
 .../components/settings/index.tsx             |  4 +-
 .../agent_config/details_page/index.tsx       |  4 +-
 .../edit_package_config_page/index.tsx        |  4 +-
 .../sections/fleet/agent_list_page/index.tsx  | 18 +++----
 .../config_selection.tsx                      | 14 ++---
 .../components/new_enrollment_key_flyout.tsx  | 10 ++--
 .../ingest_manager/sections/index.tsx         |  2 +-
 .../components/configuration_section.tsx      |  2 +-
 .../sections/overview/index.tsx               |  4 +-
 .../server/collectors/package_collectors.ts   |  5 +-
 .../server/routes/agent_config/handlers.ts    |  2 +-
 .../server/services/agent_config.test.ts      | 28 +++++-----
 .../server/services/agent_config.ts           | 54 +++++++++----------
 .../server/services/agents/acks.test.ts       |  4 +-
 .../server/services/agents/acks.ts            | 12 ++---
 .../agents/checkin/state_new_actions.ts       | 30 ++++++-----
 .../server/services/agents/reassign.ts        |  4 +-
 .../server/services/agents/status.ts          | 14 ++---
 .../server/services/package_config.test.ts    |  2 +-
 .../ingest_manager/server/services/setup.ts   | 32 ++++++-----
 34 files changed, 170 insertions(+), 164 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts b/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts
index 21196644ea23c2..943f5c04dfa0a9 100644
--- a/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts
+++ b/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts
@@ -6,7 +6,7 @@
 import { PackageInfo, InstallationStatus } from '../types';
 import { packageToPackagePolicy, packageToPackagePolicyInputs } from './package_to_config';
 
-describe('Ingest Manager - packageToConfig', () => {
+describe('Ingest Manager - packageToPackagePolicy', () => {
   const mockPackage: PackageInfo = {
     name: 'mock-package',
     title: 'Mock package',
diff --git a/x-pack/plugins/ingest_manager/dev_docs/definitions.md b/x-pack/plugins/ingest_manager/dev_docs/definitions.md
index 7c318451d57972..be5aeb923e903b 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/definitions.md
+++ b/x-pack/plugins/ingest_manager/dev_docs/definitions.md
@@ -20,7 +20,7 @@ ingesting data and the setup of Elasticsearch.
 
 ## Elastic Agent
 
-A single, unified agent that users can deploy to hosts or containers. It controls which data is collected from the host or containers and where the data is sent. It will run Beats, Endpoint or other monitoring programs as needed. It can operate standalone or pull a configuration policy from Fleet.
+A single, unified agent that users can deploy to hosts or containers. It controls which data is collected from the host or containers and where the data is sent. It will run Beats, Endpoint or other monitoring programs as needed. It can operate standalone or pull an agent policy from Fleet.
 
 ## Elastic Package Registry
 
@@ -29,8 +29,7 @@ More details about the registry can be found [here](https://github.com/elastic/p
 
 ## Fleet
 
-Fleet is the part of the Ingest Manager UI in Kibana that handles the part of enrolling Elastic Agents,
-managing agents and sending configurations to the Elastic Agent.
+Fleet is the part of the Ingest Manager UI in Kibana that handles the part of enrolling Elastic Agents, managing agents and sending policies to the Elastic Agent.
 
 ## Indexing Strategy
 
diff --git a/x-pack/plugins/ingest_manager/dev_docs/epm.md b/x-pack/plugins/ingest_manager/dev_docs/epm.md
index abcab718f7ab9a..20209d09e6cc21 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/epm.md
+++ b/x-pack/plugins/ingest_manager/dev_docs/epm.md
@@ -5,26 +5,26 @@ Overall documentation of Ingest Management is now maintained in the `elastic/sta
 
 When upgrading a package between a bugfix or a minor version, no breaking changes should happen. Upgrading a package has the following effect:
 
-* Removal of existing dashboards
-* Installation of new dashboards
-* Write new ingest pipelines with the version
-* Write new Elasticsearch alias templates
-* Trigger a rollover for all the affected indices
+- Removal of existing dashboards
+- Installation of new dashboards
+- Write new ingest pipelines with the version
+- Write new Elasticsearch alias templates
+- Trigger a rollover for all the affected indices
 
-The new ingest pipeline is expected to still work with the data coming from older configurations. In most cases this means some of the fields can be missing. For this to work, each event must contain the version of config / package it is coming from to make such a decision.
+The new ingest pipeline is expected to still work with the data coming from older policies. In most cases this means some of the fields can be missing. For this to work, each event must contain the version of policy / package it is coming from to make such a decision.
 
 In case of a breaking change in the data structure, the new ingest pipeline is also expected to deal with this change. In case there are breaking changes which cannot be dealt with in an ingest pipeline, a new package has to be created.
 
-Each package lists its minimal required agent version. In case there are agents enrolled with an older version, the user is notified to upgrade these agents as otherwise the new configs cannot be rolled out.
+Each package lists its minimal required agent version. In case there are agents enrolled with an older version, the user is notified to upgrade these agents as otherwise the new policies cannot be rolled out.
 
 # Generated assets
 
-When a package is installed or upgraded, certain Kibana and Elasticsearch assets are generated from . These follow the naming conventions explained above (see "indexing strategy") and contain configuration for the elastic stack that makes ingesting and displaying data work with as little user interaction as possible.
+When a package is installed or upgraded, certain Kibana and Elasticsearch assets are generated from . These follow the naming conventions explained above (see "indexing strategy") and contain configuration for the Elastic stack that makes ingesting and displaying data work with as little user interaction as possible.
 
 ## Elasticsearch Index Templates
 
 ### Generation
 
-* Index templates are generated from `YAML` files contained in the package.
-* There is one index template per dataset.
-* For the generation of an index template, all `yml` files contained in the package subdirectory `dataset/DATASET_NAME/fields/` are used.
\ No newline at end of file
+- Index templates are generated from `YAML` files contained in the package.
+- There is one index template per dataset.
+- For the generation of an index template, all `yml` files contained in the package subdirectory `dataset/DATASET_NAME/fields/` are used.
diff --git a/x-pack/plugins/ingest_manager/dev_docs/fleet_agents_interactions_detailed.md b/x-pack/plugins/ingest_manager/dev_docs/fleet_agents_interactions_detailed.md
index c87294c1aae143..52a1dde37cd079 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/fleet_agents_interactions_detailed.md
+++ b/x-pack/plugins/ingest_manager/dev_docs/fleet_agents_interactions_detailed.md
@@ -5,7 +5,7 @@
 Fleet workflow:
 
 - an agent enroll to fleet using an enrollment token.
-- Every n seconds agent is polling the checkin API to send events and check for new configuration
+- Every n seconds agent is polling the checkin API to send events and check for new policy
 
 ### Agent enrollment
 
@@ -13,7 +13,7 @@ An agent must enroll using the REST Api provided by fleet.
 When an agent enroll Fleet:
 
 - verify the Enrollment token is a valid ES API key
-- retrieve the Saved Object (SO) associated to this api key id (this SO contains the configuration|policy id)
+- retrieve the Saved Object (SO) associated to this api key id (this SO contains the agent policy id)
 - create an ES ApiKey unique to the agent for accessing kibana during checkin
 - create an ES ApiKey per output to send logs and metrics to the output
 - Save the new agent in a SO with keys encrypted inside the agent SO object
@@ -22,7 +22,7 @@ When an agent enroll Fleet:
 
 ### Agent checkin
 
-Agent are going to poll the checkin API to send events and check for new configration. To checkin agent are going to use the REST Api provided by fleet.
+Agent are going to poll the checkin API to send events and check for new policy. To checkin agent are going to use the REST Api provided by fleet.
 
 When an agent checkin fleet:
 
@@ -46,4 +46,4 @@ An agent can acknowledge one or multiple actions by calling `POST /api/ingest_ma
 
 ### Agent policy update
 
-When a configuration is updated, every SO agent running this configuration is updated with a timestamp of the latest config.
+When a policy is updated, every SO agent running this policy is updated with a timestamp of the latest policy.
diff --git a/x-pack/plugins/ingest_manager/dev_docs/schema/agent_checkin.mml b/x-pack/plugins/ingest_manager/dev_docs/schema/agent_checkin.mml
index 4f2eab1ce06276..377c6a30fa230e 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/schema/agent_checkin.mml
+++ b/x-pack/plugins/ingest_manager/dev_docs/schema/agent_checkin.mml
@@ -12,8 +12,8 @@ sequenceDiagram
   Note right of SavedObjects: encrypted SO here
   end
 
-  alt If configuration updated since last checkin
-    Fleet API->>SavedObjects: getAgentPolicy(configId)
+  alt If policy updated since last checkin
+    Fleet API->>SavedObjects: getAgentPolicy(agentPolicyId)
 
     opt If there is not API Key for default output
       Fleet API->>Elasticsearch: createAgentESApiKey()
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_breadcrumbs.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_breadcrumbs.tsx
index 387c2b7d594dda..6ef1351dc5b603 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_breadcrumbs.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_breadcrumbs.tsx
@@ -88,7 +88,7 @@ const breadcrumbGetters: {
       }),
     },
   ],
-  policy_details: ({ configName }) => [
+  policy_details: ({ policyName }) => [
     BASE_BREADCRUMB,
     {
       href: pagePathGetters.policies(),
@@ -96,9 +96,9 @@ const breadcrumbGetters: {
         defaultMessage: 'Policies',
       }),
     },
-    { text: configName },
+    { text: policyName },
   ],
-  add_integration_from_policy: ({ configName, policyId }) => [
+  add_integration_from_policy: ({ policyName, policyId }) => [
     BASE_BREADCRUMB,
     {
       href: pagePathGetters.policies(),
@@ -108,7 +108,7 @@ const breadcrumbGetters: {
     },
     {
       href: pagePathGetters.policy_details({ policyId }),
-      text: configName,
+      text: policyName,
     },
     {
       text: i18n.translate('xpack.ingestManager.breadcrumbs.addPackagePolicyPageTitle', {
@@ -134,7 +134,7 @@ const breadcrumbGetters: {
       }),
     },
   ],
-  edit_integration: ({ configName, policyId }) => [
+  edit_integration: ({ policyName, policyId }) => [
     BASE_BREADCRUMB,
     {
       href: pagePathGetters.policies(),
@@ -144,7 +144,7 @@ const breadcrumbGetters: {
     },
     {
       href: pagePathGetters.policy_details({ policyId }),
-      text: configName,
+      text: policyName,
     },
     {
       text: i18n.translate('xpack.ingestManager.breadcrumbs.editPackagePolicyPageTitle', {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/index.tsx
index cc0b7226a99424..5520a50463db44 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/index.tsx
@@ -191,7 +191,7 @@ const IngestManagerRoutes = memo<{ history: AppMountParameters['history']; basep
                     </DefaultLayout>
                   </Route>
                   <Route path={PAGE_ROUTING_PATHS.policies}>
-                    <DefaultLayout section="agent_config">
+                    <DefaultLayout section="agent_policy">
                       <AgentPolicyApp />
                     </DefaultLayout>
                   </Route>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
index 8244461da73260..3a68cb948eb2d5 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
@@ -77,7 +77,7 @@ export const DefaultLayout: React.FunctionComponent<Props> = ({
                       defaultMessage="Integrations"
                     />
                   </EuiTab>
-                  <EuiTab isSelected={section === 'agent_config'} href={getHref('policies_list')}>
+                  <EuiTab isSelected={section === 'agent_policy'} href={getHref('policies_list')}>
                     <FormattedMessage
                       id="xpack.ingestManager.appNavigation.policiesLinkText"
                       defaultMessage="Policies"
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_yaml_flyout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_yaml_flyout.tsx
index 6c559eeb9dd17a..350dc075a3ae11 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_yaml_flyout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_yaml_flyout.tsx
@@ -33,7 +33,7 @@ export const AgentPolicyYamlFlyout = memo<{ policyId: string; onClose: () => voi
   ({ policyId, onClose }) => {
     const core = useCore();
     const { isLoading: isLoadingYaml, data: yamlData } = useGetOneAgentPolicyFull(policyId);
-    const { data: configData } = useGetOneAgentPolicy(policyId);
+    const { data: agentPolicyData } = useGetOneAgentPolicy(policyId);
 
     const body =
       isLoadingYaml && !yamlData ? (
@@ -53,11 +53,11 @@ export const AgentPolicyYamlFlyout = memo<{ policyId: string; onClose: () => voi
         <EuiFlyoutHeader hasBorder aria-labelledby="IngestManagerAgentPolicyYamlFlyoutTitle">
           <EuiTitle size="m">
             <h2 id="IngestManagerAgentPolicyYamlFlyoutTitle">
-              {configData?.item ? (
+              {agentPolicyData?.item ? (
                 <FormattedMessage
                   id="xpack.ingestManager.policyDetails.yamlflyoutTitleWithName"
                   defaultMessage="'{name}' agent policy"
-                  values={{ name: configData.item.name }}
+                  values={{ name: agentPolicyData.item.name }}
                 />
               ) : (
                 <FormattedMessage
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/confirm_deploy_modal.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/confirm_deploy_modal.tsx
index 964b34055b6525..d1a9b4812bfe0e 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/confirm_deploy_modal.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/confirm_deploy_modal.tsx
@@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 import { AgentPolicy } from '../../../types';
 
-export const ConfirmDeployConfigModal: React.FunctionComponent<{
+export const ConfirmDeployAgentPolicyModal: React.FunctionComponent<{
   onConfirm: () => void;
   onCancel: () => void;
   agentCount: number;
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/index.ts
index 5266176ff296e9..7fabcddbadb87f 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/index.ts
@@ -7,6 +7,6 @@ export { AgentPolicyForm, agentPolicyFormValidation } from './config_form';
 export { AgentPolicyDeleteProvider } from './config_delete_provider';
 export { PackagePolicyDeleteProvider } from './package_config_delete_provider';
 export { LinkedAgentCount } from './linked_agent_count';
-export { ConfirmDeployConfigModal } from './confirm_deploy_modal';
+export { ConfirmDeployAgentPolicyModal } from './confirm_deploy_modal';
 export { DangerEuiContextMenuItem } from './danger_eui_context_menu_item';
 export { AgentPolicyActionMenu } from './actions_menu';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/layout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/layout.tsx
index 5eb45a3bfb74e9..3bcf0aab9a5c83 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/layout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/layout.tsx
@@ -111,7 +111,7 @@ export const CreatePackagePolicyPageLayout: React.FunctionComponent<{
       ) : (
         <FormattedMessage
           id="xpack.ingestManager.createPackagePolicy.pageDescriptionfromPackage"
-          defaultMessage="Follow the instructions below to add this integration to an agent configuraiton."
+          defaultMessage="Follow the instructions below to add this integration to an agent policy."
         />
       );
     }, [from]);
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx
index 576fa578e1f8ba..6666de1b5cc4ba 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx
@@ -33,7 +33,7 @@ import {
   sendGetAgentStatus,
 } from '../../../hooks';
 import { Loading } from '../../../components';
-import { ConfirmDeployConfigModal } from '../components';
+import { ConfirmDeployAgentPolicyModal } from '../components';
 import { CreatePackagePolicyPageLayout } from './components';
 import { CreatePackagePolicyFrom, PackagePolicyFormState } from './types';
 import {
@@ -379,7 +379,7 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
   return (
     <CreatePackagePolicyPageLayout {...layoutProps} data-test-subj="createPackagePolicy">
       {formState === 'CONFIRM' && agentPolicy && (
-        <ConfirmDeployConfigModal
+        <ConfirmDeployAgentPolicyModal
           agentCount={agentCount}
           agentPolicy={agentPolicy}
           onConfirm={onSubmit}
@@ -394,7 +394,7 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
             />
           )
         : agentPolicy && (
-            <ConfigurationBreadcrumb configName={agentPolicy.name} policyId={agentPolicy.id} />
+            <PolicyBreadcrumb policyName={agentPolicy.name} policyId={agentPolicy.id} />
           )}
       <StepsWithLessPadding steps={steps} />
       <EuiSpacer size="l" />
@@ -457,11 +457,11 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
   );
 };
 
-const ConfigurationBreadcrumb: React.FunctionComponent<{
-  configName: string;
+const PolicyBreadcrumb: React.FunctionComponent<{
+  policyName: string;
   policyId: string;
-}> = ({ configName, policyId }) => {
-  useBreadcrumbs('add_integration_from_policy', { configName, policyId });
+}> = ({ policyName, policyId }) => {
+  useBreadcrumbs('add_integration_from_policy', { policyName, policyId });
   return null;
 };
 
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts.test.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts.test.ts
index 7073c915c296a4..1480c817415ace 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts.test.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts.test.ts
@@ -144,7 +144,7 @@ describe('Ingest Manager - validatePackagePolicy()', () => {
   const validPackagePolicy: NewPackagePolicy = {
     name: 'pkgPolicy1-1',
     namespace: 'default',
-    config_id: 'test-config',
+    config_id: 'test-policy',
     enabled: true,
     output_id: 'test-output',
     inputs: [
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/settings/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/settings/index.tsx
index 69c859271601d2..98fe97c82641cc 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/settings/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/settings/index.tsx
@@ -21,7 +21,7 @@ import {
 import {
   AgentPolicyForm,
   agentPolicyFormValidation,
-  ConfirmDeployConfigModal,
+  ConfirmDeployAgentPolicyModal,
 } from '../../../components';
 import { useConfigRefresh } from '../../hooks';
 
@@ -128,7 +128,7 @@ export const ConfigSettingsView = memo<{ agentPolicy: AgentPolicy }>(
     return (
       <FormWrapper>
         {agentCount ? (
-          <ConfirmDeployConfigModal
+          <ConfirmDeployAgentPolicyModal
             agentCount={agentCount}
             agentPolicy={agentPolicy}
             onConfirm={() => {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx
index acc8b723e759dc..6b3ff2d055bf5c 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx
@@ -78,7 +78,7 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
               {(agentPolicy && agentPolicy.name) || (
                 <FormattedMessage
                   id="xpack.ingestManager.policyDetails.policyDetailsTitle"
-                  defaultMessage="Config '{id}'"
+                  defaultMessage="Policy '{id}'"
                   values={{
                     id: policyId,
                   }}
@@ -258,7 +258,7 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
             />
           }
           error={i18n.translate('xpack.ingestManager.policyDetails.policyNotFoundErrorTitle', {
-            defaultMessage: "Config '{id}' not found",
+            defaultMessage: "Policy '{id}' not found",
             values: {
               id: policyId,
             },
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx
index df08a0d2739857..0c7507978457f2 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx
@@ -28,7 +28,7 @@ import {
   sendGetPackageInfoByKey,
 } from '../../../hooks';
 import { Loading, Error } from '../../../components';
-import { ConfirmDeployConfigModal } from '../components';
+import { ConfirmDeployAgentPolicyModal } from '../components';
 import { CreatePackagePolicyPageLayout } from '../create_package_config_page/components';
 import {
   PackagePolicyValidationResults,
@@ -337,7 +337,7 @@ export const EditPackagePolicyPage: React.FunctionComponent = () => {
         <>
           <Breadcrumb configName={agentPolicy.name} policyId={policyId} />
           {formState === 'CONFIRM' && (
-            <ConfirmDeployConfigModal
+            <ConfirmDeployAgentPolicyModal
               agentCount={agentCount}
               agentPolicy={agentPolicy}
               onConfirm={onSubmit}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
index 52e9cdd638b6ae..429c7dea5cb741 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
@@ -78,7 +78,7 @@ const RowActions = React.memo<{ agent: Agent; onReassignClick: () => void; refre
           <EuiContextMenuItem
             icon="inspect"
             href={getHref('fleet_agent_details', { agentId: agent.id })}
-            key="viewConfig"
+            key="viewAgent"
           >
             <FormattedMessage
               id="xpack.ingestManager.agentList.viewActionText"
@@ -91,7 +91,7 @@ const RowActions = React.memo<{ agent: Agent; onReassignClick: () => void; refre
               onReassignClick();
             }}
             disabled={!agent.active}
-            key="reassignConfig"
+            key="reassignPolicy"
           >
             <FormattedMessage
               id="xpack.ingestManager.agentList.reassignActionText"
@@ -165,12 +165,12 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
   }, [setSearch, setSelectedAgentPolicies, setSelectedStatus]);
 
   // Add a agent policy id to current search
-  const addConfigFilter = (policyId: string) => {
+  const addAgentPolicyFilter = (policyId: string) => {
     setSelectedAgentPolicies([...selectedAgentPolicies, policyId]);
   };
 
   // Remove a agent policy id from current search
-  const removeConfigFilter = (policyId: string) => {
+  const removeAgentPolicyFilter = (policyId: string) => {
     setSelectedAgentPolicies(
       selectedAgentPolicies.filter((agentPolicy) => agentPolicy !== policyId)
     );
@@ -272,16 +272,16 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
         defaultMessage: 'Agent policy',
       }),
       render: (policyId: string, agent: Agent) => {
-        const configName = agentPolicies.find((p) => p.id === policyId)?.name;
+        const policyName = agentPolicies.find((p) => p.id === policyId)?.name;
         return (
           <EuiFlexGroup gutterSize="s" alignItems="center" style={{ minWidth: 0 }}>
             <EuiFlexItem grow={false} className="eui-textTruncate">
               <EuiLink
                 href={getHref('policy_details', { policyId })}
                 className="eui-textTruncate"
-                title={configName || policyId}
+                title={policyName || policyId}
               >
-                {configName || policyId}
+                {policyName || policyId}
               </EuiLink>
             </EuiFlexItem>
             {agent.config_revision && (
@@ -485,9 +485,9 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
                         key={index}
                         onClick={() => {
                           if (selectedAgentPolicies.includes(agentPolicy.id)) {
-                            removeConfigFilter(agentPolicy.id);
+                            removeAgentPolicyFilter(agentPolicy.id);
                           } else {
-                            addConfigFilter(agentPolicy.id);
+                            addAgentPolicyFilter(agentPolicy.id);
                           }
                         }}
                       >
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx
index ca4831bd1df6f0..9dec3a22c1015d 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx
@@ -40,7 +40,7 @@ export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
   }>({});
 
   useEffect(
-    function triggerOnConfigChangeEffect() {
+    function triggerOnAgentPolicyChangeEffect() {
       if (onConfigChange && selectedState.agentPolicyId) {
         onConfigChange(selectedState.agentPolicyId);
       }
@@ -62,7 +62,7 @@ export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
   );
 
   useEffect(
-    function useDefaultConfigEffect() {
+    function useDefaultAgentPolicyEffect() {
       if (agentPolicies && agentPolicies.length && !selectedState.agentPolicyId) {
         if (agentPolicies.length === 1) {
           setSelectedState({
@@ -72,11 +72,11 @@ export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
           return;
         }
 
-        const defaultConfig = agentPolicies.find((agentPolicy) => agentPolicy.is_default);
-        if (defaultConfig) {
+        const defaultAgentPolicy = agentPolicies.find((agentPolicy) => agentPolicy.is_default);
+        if (defaultAgentPolicy) {
           setSelectedState({
             ...selectedState,
-            agentPolicyId: defaultConfig.id,
+            agentPolicyId: defaultAgentPolicy.id,
           });
         }
       }
@@ -85,7 +85,7 @@ export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
   );
 
   useEffect(
-    function useEnrollmentKeysForConfigEffect() {
+    function useEnrollmentKeysForAgentPolicyEffect() {
       if (!withKeySelection) {
         return;
       }
@@ -123,7 +123,7 @@ export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
   );
 
   useEffect(
-    function useDefaultEnrollmentKeyForConfigEffect() {
+    function useDefaultEnrollmentKeyForAgentPolicyEffect() {
       if (!withKeySelection) {
         return;
       }
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/components/new_enrollment_key_flyout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/components/new_enrollment_key_flyout.tsx
index 8f32e912aa0cb8..aa276a11c5e862 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/components/new_enrollment_key_flyout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/components/new_enrollment_key_flyout.tsx
@@ -26,13 +26,13 @@ import { useInput, useCore, sendRequest } from '../../../../hooks';
 import { enrollmentAPIKeyRouteService } from '../../../../services';
 
 function useCreateApiKeyForm(
-  configDefaultValue: string | undefined,
+  policyIdDefaultValue: string | undefined,
   onSuccess: (keyId: string) => void
 ) {
   const { notifications } = useCore();
   const [isLoading, setIsLoading] = useState(false);
   const apiKeyNameInput = useInput('');
-  const policyIdInput = useInput(configDefaultValue);
+  const policyIdInput = useInput(policyIdDefaultValue);
 
   const onSubmit = async (event: React.FormEvent) => {
     event.preventDefault();
@@ -80,8 +80,8 @@ export const NewEnrollmentTokenFlyout: React.FunctionComponent<Props> = ({
   onClose,
   agentPolicies = [],
 }) => {
-  const configDefaultValue = agentPolicies.find((agentPolicy) => agentPolicy.is_default)?.id;
-  const form = useCreateApiKeyForm(configDefaultValue, () => {
+  const policyIdDefaultValue = agentPolicies.find((agentPolicy) => agentPolicy.is_default)?.id;
+  const form = useCreateApiKeyForm(policyIdDefaultValue, () => {
     onClose();
   });
 
@@ -108,7 +108,7 @@ export const NewEnrollmentTokenFlyout: React.FunctionComponent<Props> = ({
         >
           <EuiSelect
             required={true}
-            defaultValue={configDefaultValue}
+            defaultValue={policyIdDefaultValue}
             {...form.policyIdInput.props}
             options={agentPolicies.map((agentPolicy) => ({
               value: agentPolicy.id,
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/index.tsx
index 97a89260b4ab09..e2e723444cc116 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/index.tsx
@@ -9,4 +9,4 @@ export { AgentPolicyApp } from './agent_config';
 export { DataStreamApp } from './data_stream';
 export { FleetApp } from './fleet';
 
-export type Section = 'overview' | 'epm' | 'agent_config' | 'fleet' | 'data_stream';
+export type Section = 'overview' | 'epm' | 'agent_policy' | 'fleet' | 'data_stream';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/configuration_section.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/configuration_section.tsx
index 0b4d3f393678ba..617be92b3b1fe3 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/configuration_section.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/configuration_section.tsx
@@ -19,7 +19,7 @@ import { useLink, useGetPackagePolicies } from '../../../hooks';
 import { AgentPolicy } from '../../../types';
 import { Loading } from '../../fleet/components';
 
-export const OverviewConfigurationSection: React.FC<{ agentPolicies: AgentPolicy[] }> = ({
+export const OverviewPolicySection: React.FC<{ agentPolicies: AgentPolicy[] }> = ({
   agentPolicies,
 }) => {
   const { getHref } = useLink();
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
index 945eb22aa59bec..95db77612e5bfb 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
@@ -19,7 +19,7 @@ import { WithHeaderLayout } from '../../layouts';
 import { useGetAgentPolicies, useBreadcrumbs } from '../../hooks';
 import { AgentEnrollmentFlyout } from '../fleet/components';
 import { OverviewAgentSection } from './components/agent_section';
-import { OverviewConfigurationSection } from './components/configuration_section';
+import { OverviewPolicySection } from './components/configuration_section';
 import { OverviewIntegrationSection } from './components/integration_section';
 import { OverviewDatastreamSection } from './components/datastream_section';
 
@@ -100,7 +100,7 @@ export const IngestManagerOverview: React.FunctionComponent = () => {
 
       <EuiFlexGrid gutterSize="l" columns={2}>
         <OverviewIntegrationSection />
-        <OverviewConfigurationSection agentPolicies={agentPolicies} />
+        <OverviewPolicySection agentPolicies={agentPolicies} />
         <OverviewAgentSection />
         <OverviewDatastreamSection />
       </EuiFlexGrid>
diff --git a/x-pack/plugins/ingest_manager/server/collectors/package_collectors.ts b/x-pack/plugins/ingest_manager/server/collectors/package_collectors.ts
index 8a88f4e61c2faf..18c5d34cdd8c78 100644
--- a/x-pack/plugins/ingest_manager/server/collectors/package_collectors.ts
+++ b/x-pack/plugins/ingest_manager/server/collectors/package_collectors.ts
@@ -29,15 +29,14 @@ export const getPackageUsage = async (soClient?: SavedObjectsClient): Promise<Pa
   // Once we provide detailed telemetry on agent policies, this logic should probably be moved
   // to the (then to be created) agent policy collector, so we only query and loop over these
   // objects once.
-
-  const packagesInConfigs = agentPolicies.items.map((agentPolicy) => {
+  const packagesInAgentPolicies = agentPolicies.items.map((agentPolicy) => {
     const packagePolicies: NewPackagePolicy[] = agentPolicy.package_configs as NewPackagePolicy[];
     return packagePolicies
       .map((packagePolicy) => packagePolicy.package?.name)
       .filter((packageName): packageName is string => packageName !== undefined);
   });
 
-  const enabledPackages = _.uniq(_.flatten(packagesInConfigs));
+  const enabledPackages = _.uniq(_.flatten(packagesInAgentPolicies));
 
   return packagesSavedObjects.saved_objects.map((p) => {
     return {
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts
index 29829b1a4542cb..6e12393c58756b 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts
@@ -120,7 +120,7 @@ export const createAgentPolicyHandler: RequestHandler<
         user,
       }),
       // If needed, retrieve System package information and build a new package policy for the system package
-      // NOTE: we ignore failures in attempting to create package policy, since config might have been created
+      // NOTE: we ignore failures in attempting to create package policy, since agent policy might have been created
       // successfully
       withSysMonitoring
         ? packagePolicyService
diff --git a/x-pack/plugins/ingest_manager/server/services/agent_config.test.ts b/x-pack/plugins/ingest_manager/server/services/agent_config.test.ts
index 0a4c822bfc6d54..f5a8d704d45a54 100644
--- a/x-pack/plugins/ingest_manager/server/services/agent_config.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agent_config.test.ts
@@ -8,7 +8,7 @@ import { savedObjectsClientMock } from 'src/core/server/mocks';
 import { agentPolicyService } from './agent_config';
 import { Output } from '../types';
 
-function getSavedObjectMock(configAttributes: any) {
+function getSavedObjectMock(agentPolicyAttributes: any) {
   const mock = savedObjectsClientMock.create();
 
   mock.get.mockImplementation(async (type: string, id: string) => {
@@ -16,7 +16,7 @@ function getSavedObjectMock(configAttributes: any) {
       type,
       id,
       references: [],
-      attributes: configAttributes,
+      attributes: agentPolicyAttributes,
     };
   });
 
@@ -43,14 +43,14 @@ jest.mock('./output', () => {
 
 describe('agent policy', () => {
   describe('getFullConfig', () => {
-    it('should return a config without monitoring if not monitoring is not enabled', async () => {
+    it('should return a policy without monitoring if not monitoring is not enabled', async () => {
       const soClient = getSavedObjectMock({
         revision: 1,
       });
-      const config = await agentPolicyService.getFullConfig(soClient, 'config');
+      const agentPolicy = await agentPolicyService.getFullConfig(soClient, 'agent-policy');
 
-      expect(config).toMatchObject({
-        id: 'config',
+      expect(agentPolicy).toMatchObject({
+        id: 'agent-policy',
         outputs: {
           default: {
             type: 'elasticsearch',
@@ -71,15 +71,15 @@ describe('agent policy', () => {
       });
     });
 
-    it('should return a config with monitoring if monitoring is enabled for logs', async () => {
+    it('should return a policy with monitoring if monitoring is enabled for logs', async () => {
       const soClient = getSavedObjectMock({
         revision: 1,
         monitoring_enabled: ['logs'],
       });
-      const config = await agentPolicyService.getFullConfig(soClient, 'config');
+      const agentPolicy = await agentPolicyService.getFullConfig(soClient, 'agent-policy');
 
-      expect(config).toMatchObject({
-        id: 'config',
+      expect(agentPolicy).toMatchObject({
+        id: 'agent-policy',
         outputs: {
           default: {
             type: 'elasticsearch',
@@ -101,15 +101,15 @@ describe('agent policy', () => {
       });
     });
 
-    it('should return a config with monitoring if monitoring is enabled for metrics', async () => {
+    it('should return a policy with monitoring if monitoring is enabled for metrics', async () => {
       const soClient = getSavedObjectMock({
         revision: 1,
         monitoring_enabled: ['metrics'],
       });
-      const config = await agentPolicyService.getFullConfig(soClient, 'config');
+      const agentPolicy = await agentPolicyService.getFullConfig(soClient, 'agent-policy');
 
-      expect(config).toMatchObject({
-        id: 'config',
+      expect(agentPolicy).toMatchObject({
+        id: 'agent-policy',
         outputs: {
           default: {
             type: 'elasticsearch',
diff --git a/x-pack/plugins/ingest_manager/server/services/agent_config.ts b/x-pack/plugins/ingest_manager/server/services/agent_config.ts
index 2dbe0001a6ed91..d4585aab83c9de 100644
--- a/x-pack/plugins/ingest_manager/server/services/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agent_config.ts
@@ -70,13 +70,13 @@ class AgentPolicyService {
   }
 
   public async ensureDefaultAgentPolicy(soClient: SavedObjectsClientContract) {
-    const configs = await soClient.find<AgentPolicySOAttributes>({
+    const agentPolicies = await soClient.find<AgentPolicySOAttributes>({
       type: AGENT_POLICY_SAVED_OBJECT_TYPE,
       searchFields: ['is_default'],
       search: 'true',
     });
 
-    if (configs.total === 0) {
+    if (agentPolicies.total === 0) {
       const newDefaultAgentPolicy: NewAgentPolicy = {
         ...DEFAULT_AGENT_POLICY,
       };
@@ -85,8 +85,8 @@ class AgentPolicyService {
     }
 
     return {
-      id: configs.saved_objects[0].id,
-      ...configs.saved_objects[0].attributes,
+      id: agentPolicies.saved_objects[0].id,
+      ...agentPolicies.saved_objects[0].attributes,
     };
   }
 
@@ -213,7 +213,7 @@ class AgentPolicyService {
     newAgentPolicyProps: Pick<AgentPolicy, 'name' | 'description'>,
     options?: { user?: AuthenticatedUser }
   ): Promise<AgentPolicy> {
-    // Copy base config
+    // Copy base agent policy
     const baseAgentPolicy = await this.get(soClient, id, true);
     if (!baseAgentPolicy) {
       throw new Error('Agent policy not found');
@@ -244,7 +244,7 @@ class AgentPolicyService {
       });
     }
 
-    // Get updated config
+    // Get updated agent policy
     const updatedAgentPolicy = await this.get(soClient, newAgentPolicy.id, true);
     if (!updatedAgentPolicy) {
       throw new Error('Copied agent policy not found');
@@ -304,7 +304,7 @@ class AgentPolicyService {
       {
         package_configs: uniq(
           [...((oldAgentPolicy.package_configs || []) as string[])].filter(
-            (pkgConfigId) => !packagePolicyIds.includes(pkgConfigId)
+            (packagePolicyId) => !packagePolicyIds.includes(packagePolicyId)
           )
         ),
       },
@@ -313,30 +313,30 @@ class AgentPolicyService {
   }
 
   public async getDefaultAgentPolicyId(soClient: SavedObjectsClientContract) {
-    const configs = await soClient.find({
+    const agentPolicies = await soClient.find({
       type: AGENT_POLICY_SAVED_OBJECT_TYPE,
       searchFields: ['is_default'],
       search: 'true',
     });
 
-    if (configs.saved_objects.length === 0) {
+    if (agentPolicies.saved_objects.length === 0) {
       throw new Error('No default agent policy');
     }
 
-    return configs.saved_objects[0].id;
+    return agentPolicies.saved_objects[0].id;
   }
 
   public async delete(
     soClient: SavedObjectsClientContract,
     id: string
   ): Promise<DeleteAgentPolicyResponse> {
-    const config = await this.get(soClient, id, false);
-    if (!config) {
+    const agentPolicy = await this.get(soClient, id, false);
+    if (!agentPolicy) {
       throw new Error('Agent policy not found');
     }
 
-    const { id: defaultConfigId } = await this.ensureDefaultAgentPolicy(soClient);
-    if (id === defaultConfigId) {
+    const { id: defaultAgentPolicyId } = await this.ensureDefaultAgentPolicy(soClient);
+    if (id === defaultAgentPolicyId) {
       throw new Error('The default agent policy cannot be deleted');
     }
 
@@ -351,8 +351,8 @@ class AgentPolicyService {
       throw new Error('Cannot delete agent policy that is assigned to agent(s)');
     }
 
-    if (config.package_configs && config.package_configs.length) {
-      await packagePolicyService.delete(soClient, config.package_configs as string[], {
+    if (agentPolicy.package_configs && agentPolicy.package_configs.length) {
+      await packagePolicyService.delete(soClient, agentPolicy.package_configs as string[], {
         skipUnassignFromAgentPolicies: true,
       });
     }
@@ -369,17 +369,17 @@ class AgentPolicyService {
     id: string,
     options?: { standalone: boolean }
   ): Promise<FullAgentPolicy | null> {
-    let config;
+    let agentPolicy;
 
     try {
-      config = await this.get(soClient, id);
+      agentPolicy = await this.get(soClient, id);
     } catch (err) {
       if (!err.isBoom || err.output.statusCode !== 404) {
         throw err;
       }
     }
 
-    if (!config) {
+    if (!agentPolicy) {
       return null;
     }
 
@@ -389,8 +389,8 @@ class AgentPolicyService {
     }
     const defaultOutput = await outputService.get(soClient, defaultOutputId);
 
-    const agentPolicy: FullAgentPolicy = {
-      id: config.id,
+    const fullAgentPolicy: FullAgentPolicy = {
+      id: agentPolicy.id,
       outputs: {
         // TEMPORARY as we only support a default output
         ...[defaultOutput].reduce(
@@ -415,16 +415,16 @@ class AgentPolicyService {
           {} as FullAgentPolicy['outputs']
         ),
       },
-      inputs: storedPackagePoliciesToAgentInputs(config.package_configs as PackagePolicy[]),
-      revision: config.revision,
-      ...(config.monitoring_enabled && config.monitoring_enabled.length > 0
+      inputs: storedPackagePoliciesToAgentInputs(agentPolicy.package_configs as PackagePolicy[]),
+      revision: agentPolicy.revision,
+      ...(agentPolicy.monitoring_enabled && agentPolicy.monitoring_enabled.length > 0
         ? {
             agent: {
               monitoring: {
                 use_output: defaultOutput.name,
                 enabled: true,
-                logs: config.monitoring_enabled.indexOf('logs') >= 0,
-                metrics: config.monitoring_enabled.indexOf('metrics') >= 0,
+                logs: agentPolicy.monitoring_enabled.indexOf('logs') >= 0,
+                metrics: agentPolicy.monitoring_enabled.indexOf('metrics') >= 0,
               },
             },
           }
@@ -435,7 +435,7 @@ class AgentPolicyService {
           }),
     };
 
-    return agentPolicy;
+    return fullAgentPolicy;
   }
 }
 
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts b/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
index 6ea59c9a76a497..23f8d0ff673813 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
@@ -93,7 +93,7 @@ describe('test agent acks services', () => {
     ]);
   });
 
-  it('should update config field on the agent if a config change is acknowledged', async () => {
+  it('should update config field on the agent if a policy change is acknowledged', async () => {
     const mockSavedObjectsClient = savedObjectsClientMock.create();
     const mockStartEncryptedSOPlugin = encryptedSavedObjectsMock.createStart();
     appContextService.start(({
@@ -235,7 +235,7 @@ describe('test agent acks services', () => {
     `);
   });
 
-  it('should not update config field on the agent if a config change for an old revision is acknowledged', async () => {
+  it('should not update config field on the agent if a policy change for an old revision is acknowledged', async () => {
     const mockSavedObjectsClient = savedObjectsClientMock.create();
     const mockStartEncryptedSOPlugin = encryptedSavedObjectsMock.createStart();
     appContextService.start(({
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/acks.ts b/x-pack/plugins/ingest_manager/server/services/agents/acks.ts
index 5ddb3f084f5e06..6f90a3abf522ba 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/acks.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/acks.ts
@@ -70,17 +70,17 @@ export async function acknowledgeAgentActions(
     await forceUnenrollAgent(soClient, agent.id);
   }
 
-  const config = getLatestConfigIfUpdated(agent, actions);
+  const agentPolicy = getLatestAgentPolicyIfUpdated(agent, actions);
 
   await soClient.bulkUpdate<AgentSOAttributes | AgentActionSOAttributes>([
-    ...(config ? [buildUpdateAgentPolicy(agent.id, config)] : []),
+    ...(agentPolicy ? [buildUpdateAgentPolicy(agent.id, agentPolicy)] : []),
     ...buildUpdateAgentActionSentAt(actionIds),
   ]);
 
   return actions;
 }
 
-function getLatestConfigIfUpdated(agent: Agent, actions: AgentAction[]) {
+function getLatestAgentPolicyIfUpdated(agent: Agent, actions: AgentAction[]) {
   return actions.reduce<null | FullAgentPolicy>((acc, action) => {
     if (action.type !== 'CONFIG_CHANGE') {
       return acc;
@@ -97,8 +97,8 @@ function getLatestConfigIfUpdated(agent: Agent, actions: AgentAction[]) {
   }, null);
 }
 
-function buildUpdateAgentPolicy(agentId: string, config: FullAgentPolicy) {
-  const packages = config.inputs.reduce<string[]>((acc, input) => {
+function buildUpdateAgentPolicy(agentId: string, agentPolicy: FullAgentPolicy) {
+  const packages = agentPolicy.inputs.reduce<string[]>((acc, input) => {
     const packageName = input.meta?.package?.name;
     if (packageName && acc.indexOf(packageName) < 0) {
       return [packageName, ...acc];
@@ -110,7 +110,7 @@ function buildUpdateAgentPolicy(agentId: string, config: FullAgentPolicy) {
     type: AGENT_SAVED_OBJECT_TYPE,
     id: agentId,
     attributes: {
-      config_revision: config.revision,
+      config_revision: agentPolicy.revision,
       packages,
     },
   };
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
index 4bbb89b739c209..d53079d1b762e6 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
@@ -95,11 +95,12 @@ async function getOrCreateAgentDefaultOutputAPIKey(
   return outputAPIKey.key;
 }
 
-function shouldCreateAgentPolicyAction(agent: Agent, config: FullAgentPolicy | null): boolean {
-  if (!config || !config.revision) {
+function shouldCreateAgentPolicyAction(agent: Agent, agentPolicy: FullAgentPolicy | null): boolean {
+  if (!agentPolicy || !agentPolicy.revision) {
     return false;
   }
-  const isAgentPolicyOutdated = !agent.config_revision || agent.config_revision < config.revision;
+  const isAgentPolicyOutdated =
+    !agent.config_revision || agent.config_revision < agentPolicy.revision;
   if (!isAgentPolicyOutdated) {
     return false;
   }
@@ -110,23 +111,26 @@ function shouldCreateAgentPolicyAction(agent: Agent, config: FullAgentPolicy | n
 async function createAgentActionFromConfig(
   soClient: SavedObjectsClientContract,
   agent: Agent,
-  config: FullAgentPolicy | null
+  policy: FullAgentPolicy | null
 ) {
   // Deep clone !not supporting Date, and undefined value.
-  const newConfig = JSON.parse(JSON.stringify(config));
+  const newAgentPolicy = JSON.parse(JSON.stringify(policy));
 
-  // Mutate the config to set the api token for this agent
-  newConfig.outputs.default.api_key = await getOrCreateAgentDefaultOutputAPIKey(soClient, agent);
+  // Mutate the policy to set the api token for this agent
+  newAgentPolicy.outputs.default.api_key = await getOrCreateAgentDefaultOutputAPIKey(
+    soClient,
+    agent
+  );
 
-  const configChangeAction = await createAgentAction(soClient, {
+  const policyChangeAction = await createAgentAction(soClient, {
     agent_id: agent.id,
     type: 'CONFIG_CHANGE',
-    data: { config: newConfig } as any,
+    data: { config: newAgentPolicy } as any,
     created_at: new Date().toISOString(),
     sent_at: undefined,
   });
 
-  return [configChangeAction];
+  return [policyChangeAction];
 }
 
 export function agentCheckinStateNewActionsFactory() {
@@ -145,7 +149,7 @@ export function agentCheckinStateNewActionsFactory() {
     options?: { signal: AbortSignal }
   ): Promise<AgentAction[]> {
     if (!agent.config_id) {
-      throw new Error('Agent does not have a config');
+      throw new Error('Agent does not have a policy');
     }
     const agentPolicyId = agent.config_id;
     if (!agentPolicies$.has(agentPolicyId)) {
@@ -158,9 +162,9 @@ export function agentCheckinStateNewActionsFactory() {
 
     const stream$ = agentPolicy$.pipe(
       timeout(appContextService.getConfig()?.fleet.pollingRequestTimeout || 0),
-      filter((config) => shouldCreateAgentPolicyAction(agent, config)),
+      filter((agentPolicy) => shouldCreateAgentPolicyAction(agent, agentPolicy)),
       rateLimiter(),
-      mergeMap((config) => createAgentActionFromConfig(soClient, agent, config)),
+      mergeMap((agentPolicy) => createAgentActionFromConfig(soClient, agent, agentPolicy)),
       merge(newActions$),
       mergeMap(async (data) => {
         if (!data) {
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts b/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts
index bc414b92b7b818..f207b5027ecf4e 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts
@@ -15,8 +15,8 @@ export async function reassignAgent(
   agentId: string,
   newAgentPolicyId: string
 ) {
-  const config = await agentPolicyService.get(soClient, newAgentPolicyId);
-  if (!config) {
+  const agentPolicy = await agentPolicyService.get(soClient, newAgentPolicyId);
+  if (!agentPolicy) {
     throw Boom.notFound(`Agent policy not found: ${newAgentPolicyId}`);
   }
 
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/status.ts b/x-pack/plugins/ingest_manager/server/services/agents/status.ts
index 86336714a511ee..1c7f727e782368 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/status.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/status.ts
@@ -23,7 +23,7 @@ export const getAgentStatus = AgentStatusKueryHelper.getAgentStatus;
 
 export async function getAgentStatusForConfig(
   soClient: SavedObjectsClientContract,
-  configId?: string
+  agentPolicyId?: string
 ) {
   const [all, online, error, offline] = await Promise.all(
     [
@@ -36,17 +36,17 @@ export async function getAgentStatusForConfig(
         showInactive: false,
         perPage: 0,
         page: 1,
-        kuery: configId
+        kuery: agentPolicyId
           ? kuery
-            ? `(${kuery}) and (${AGENT_SAVED_OBJECT_TYPE}.config_id:"${configId}")`
-            : `${AGENT_SAVED_OBJECT_TYPE}.config_id:"${configId}"`
+            ? `(${kuery}) and (${AGENT_SAVED_OBJECT_TYPE}.config_id:"${agentPolicyId}")`
+            : `${AGENT_SAVED_OBJECT_TYPE}.config_id:"${agentPolicyId}"`
           : kuery,
       })
     )
   );
 
   return {
-    events: await getEventsCount(soClient, configId),
+    events: await getEventsCount(soClient, agentPolicyId),
     total: all.total,
     online: online.total,
     error: error.total,
@@ -55,11 +55,11 @@ export async function getAgentStatusForConfig(
   };
 }
 
-async function getEventsCount(soClient: SavedObjectsClientContract, configId?: string) {
+async function getEventsCount(soClient: SavedObjectsClientContract, agentPolicyId?: string) {
   const { total } = await soClient.find({
     type: AGENT_EVENT_SAVED_OBJECT_TYPE,
     searchFields: ['config_id'],
-    search: configId,
+    search: agentPolicyId,
     perPage: 0,
     page: 1,
     sortField: 'timestamp',
diff --git a/x-pack/plugins/ingest_manager/server/services/package_config.test.ts b/x-pack/plugins/ingest_manager/server/services/package_config.test.ts
index 2da3f22b322d2e..76ea9c6df45b40 100644
--- a/x-pack/plugins/ingest_manager/server/services/package_config.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/package_config.test.ts
@@ -186,7 +186,7 @@ describe('Package policy service', () => {
       await expect(
         packagePolicyService.update(
           savedObjectsClient,
-          'the-package-config-id',
+          'the-package-policy-id',
           createPackagePolicyMock()
         )
       ).rejects.toThrow('Saved object [abc/123] conflict');
diff --git a/x-pack/plugins/ingest_manager/server/services/setup.ts b/x-pack/plugins/ingest_manager/server/services/setup.ts
index 51b96d5fcfb9f0..554e0c4c712684 100644
--- a/x-pack/plugins/ingest_manager/server/services/setup.ts
+++ b/x-pack/plugins/ingest_manager/server/services/setup.ts
@@ -51,7 +51,7 @@ export async function setupIngestManager(
     });
   }
   try {
-    const [installedPackages, defaultOutput, config] = await Promise.all([
+    const [installedPackages, defaultOutput, defaultAgentPolicy] = await Promise.all([
       // packages installed by default
       ensureInstalledDefaultPackages(soClient, callCluster),
       outputService.ensureDefaultOutput(soClient),
@@ -86,15 +86,19 @@ export async function setupIngestManager(
     ]);
 
     // ensure default packages are added to the default conifg
-    const configWithPackagePolicies = await agentPolicyService.get(soClient, config.id, true);
-    if (!configWithPackagePolicies) {
-      throw new Error('Config not found');
+    const agentPolicyWithPackagePolicies = await agentPolicyService.get(
+      soClient,
+      defaultAgentPolicy.id,
+      true
+    );
+    if (!agentPolicyWithPackagePolicies) {
+      throw new Error('Policy not found');
     }
     if (
-      configWithPackagePolicies.package_configs.length &&
-      typeof configWithPackagePolicies.package_configs[0] === 'string'
+      agentPolicyWithPackagePolicies.package_configs.length &&
+      typeof agentPolicyWithPackagePolicies.package_configs[0] === 'string'
     ) {
-      throw new Error('Config not found');
+      throw new Error('Policy not found');
     }
     for (const installedPackage of installedPackages) {
       const packageShouldBeInstalled = DEFAULT_AGENT_POLICIES_PACKAGES.some(
@@ -104,18 +108,18 @@ export async function setupIngestManager(
         continue;
       }
 
-      const isInstalled = configWithPackagePolicies.package_configs.some(
+      const isInstalled = agentPolicyWithPackagePolicies.package_configs.some(
         (d: PackagePolicy | string) => {
           return typeof d !== 'string' && d.package?.name === installedPackage.name;
         }
       );
 
       if (!isInstalled) {
-        await addPackageToConfig(
+        await addPackageToAgentPolicy(
           soClient,
           callCluster,
           installedPackage,
-          configWithPackagePolicies,
+          agentPolicyWithPackagePolicies,
           defaultOutput
         );
       }
@@ -203,11 +207,11 @@ function generateRandomPassword() {
   return Buffer.from(uuid.v4()).toString('base64');
 }
 
-async function addPackageToConfig(
+async function addPackageToAgentPolicy(
   soClient: SavedObjectsClientContract,
   callCluster: CallESAsCurrentUser,
   packageToInstall: Installation,
-  config: AgentPolicy,
+  agentPolicy: AgentPolicy,
   defaultOutput: Output
 ) {
   const packageInfo = await getPackageInfo({
@@ -218,9 +222,9 @@ async function addPackageToConfig(
 
   const newPackagePolicy = packageToPackagePolicy(
     packageInfo,
-    config.id,
+    agentPolicy.id,
     defaultOutput.id,
-    config.namespace
+    agentPolicy.namespace
   );
 
   await packagePolicyService.create(soClient, callCluster, newPackagePolicy, {

From 1f4b9e18ee6aea0530a9d22a18658b77c91c4255 Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Thu, 13 Aug 2020 16:02:29 -0700
Subject: [PATCH 05/24] Rest of server-side var renaming

---
 .../ingest_manager/server/collectors/agent_collectors.ts  | 4 +++-
 .../ingest_manager/server/routes/agent/handlers.ts        | 5 ++++-
 .../ingest_manager/server/routes/agent_config/handlers.ts | 6 +++---
 .../ingest_manager/server/services/agent_config.test.ts   | 8 ++++----
 .../ingest_manager/server/services/agent_config.ts        | 4 ++--
 .../server/services/agents/checkin/state_new_actions.ts   | 4 +++-
 .../ingest_manager/server/services/agents/status.ts       | 2 +-
 .../ingest_manager/server/services/package_config.ts      | 8 ++++----
 x-pack/plugins/ingest_manager/server/services/setup.ts    | 2 +-
 9 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/server/collectors/agent_collectors.ts b/x-pack/plugins/ingest_manager/server/collectors/agent_collectors.ts
index 920b3362971718..fe5e5fa735b24d 100644
--- a/x-pack/plugins/ingest_manager/server/collectors/agent_collectors.ts
+++ b/x-pack/plugins/ingest_manager/server/collectors/agent_collectors.ts
@@ -23,7 +23,9 @@ export const getAgentUsage = async (soClient?: SavedObjectsClient): Promise<Agen
       offline: 0,
     };
   }
-  const { total, online, error, offline } = await AgentService.getAgentStatusForConfig(soClient);
+  const { total, online, error, offline } = await AgentService.getAgentStatusForAgentPolicy(
+    soClient
+  );
   return {
     total,
     online,
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts
index 52d75924ffa8bb..439cee9334ee66 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts
@@ -335,7 +335,10 @@ export const getAgentStatusForAgentPolicyHandler: RequestHandler<
   const soClient = context.core.savedObjects.client;
   try {
     // TODO change path
-    const results = await AgentService.getAgentStatusForConfig(soClient, request.query.policyId);
+    const results = await AgentService.getAgentStatusForAgentPolicy(
+      soClient,
+      request.query.policyId
+    );
 
     const body: GetAgentStatusResponse = { results, success: true };
 
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts
index 6e12393c58756b..6f6f501229c299 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts
@@ -135,7 +135,7 @@ export const createAgentPolicyHandler: RequestHandler<
       newSysPackagePolicy.namespace = agentPolicy.namespace;
       await packagePolicyService.create(soClient, callCluster, newSysPackagePolicy, {
         user,
-        bumpConfigRevision: false,
+        bumpRevision: false,
       });
     }
 
@@ -240,7 +240,7 @@ export const getFullAgentPolicy: RequestHandler<
   const soClient = context.core.savedObjects.client;
 
   try {
-    const fullAgentPolicy = await agentPolicyService.getFullConfig(
+    const fullAgentPolicy = await agentPolicyService.getFullAgentPolicy(
       soClient,
       request.params.agentPolicyId,
       { standalone: request.query.standalone === true }
@@ -277,7 +277,7 @@ export const downloadFullAgentPolicy: RequestHandler<
   } = request;
 
   try {
-    const fullAgentPolicy = await agentPolicyService.getFullConfig(soClient, agentPolicyId, {
+    const fullAgentPolicy = await agentPolicyService.getFullAgentPolicy(soClient, agentPolicyId, {
       standalone: request.query.standalone === true,
     });
     if (fullAgentPolicy) {
diff --git a/x-pack/plugins/ingest_manager/server/services/agent_config.test.ts b/x-pack/plugins/ingest_manager/server/services/agent_config.test.ts
index f5a8d704d45a54..4835f2b9c6bf81 100644
--- a/x-pack/plugins/ingest_manager/server/services/agent_config.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agent_config.test.ts
@@ -42,12 +42,12 @@ jest.mock('./output', () => {
 });
 
 describe('agent policy', () => {
-  describe('getFullConfig', () => {
+  describe('getFullAgentPolicy', () => {
     it('should return a policy without monitoring if not monitoring is not enabled', async () => {
       const soClient = getSavedObjectMock({
         revision: 1,
       });
-      const agentPolicy = await agentPolicyService.getFullConfig(soClient, 'agent-policy');
+      const agentPolicy = await agentPolicyService.getFullAgentPolicy(soClient, 'agent-policy');
 
       expect(agentPolicy).toMatchObject({
         id: 'agent-policy',
@@ -76,7 +76,7 @@ describe('agent policy', () => {
         revision: 1,
         monitoring_enabled: ['logs'],
       });
-      const agentPolicy = await agentPolicyService.getFullConfig(soClient, 'agent-policy');
+      const agentPolicy = await agentPolicyService.getFullAgentPolicy(soClient, 'agent-policy');
 
       expect(agentPolicy).toMatchObject({
         id: 'agent-policy',
@@ -106,7 +106,7 @@ describe('agent policy', () => {
         revision: 1,
         monitoring_enabled: ['metrics'],
       });
-      const agentPolicy = await agentPolicyService.getFullConfig(soClient, 'agent-policy');
+      const agentPolicy = await agentPolicyService.getFullAgentPolicy(soClient, 'agent-policy');
 
       expect(agentPolicy).toMatchObject({
         id: 'agent-policy',
diff --git a/x-pack/plugins/ingest_manager/server/services/agent_config.ts b/x-pack/plugins/ingest_manager/server/services/agent_config.ts
index d4585aab83c9de..41d4240d85a310 100644
--- a/x-pack/plugins/ingest_manager/server/services/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agent_config.ts
@@ -240,7 +240,7 @@ class AgentPolicyService {
       );
       await packagePolicyService.bulkCreate(soClient, newPackagePolicies, newAgentPolicy.id, {
         ...options,
-        bumpConfigRevision: false,
+        bumpRevision: false,
       });
     }
 
@@ -364,7 +364,7 @@ class AgentPolicyService {
     };
   }
 
-  public async getFullConfig(
+  public async getFullAgentPolicy(
     soClient: SavedObjectsClientContract,
     id: string,
     options?: { standalone: boolean }
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
index d53079d1b762e6..8951776aae4078 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
@@ -56,7 +56,9 @@ function createAgentPolicySharedObservable(agentPolicyId: string) {
       from(agentPolicyService.get(internalSOClient, agentPolicyId) as Promise<AgentPolicy>)
     ),
     distinctUntilKeyChanged('revision'),
-    switchMap((data) => from(agentPolicyService.getFullConfig(internalSOClient, agentPolicyId))),
+    switchMap((data) =>
+      from(agentPolicyService.getFullAgentPolicy(internalSOClient, agentPolicyId))
+    ),
     shareReplay({ refCount: true, bufferSize: 1 })
   );
 }
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/status.ts b/x-pack/plugins/ingest_manager/server/services/agents/status.ts
index 1c7f727e782368..afc2d5802bae3c 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/status.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/status.ts
@@ -21,7 +21,7 @@ export async function getAgentStatusById(
 
 export const getAgentStatus = AgentStatusKueryHelper.getAgentStatus;
 
-export async function getAgentStatusForConfig(
+export async function getAgentStatusForAgentPolicy(
   soClient: SavedObjectsClientContract,
   agentPolicyId?: string
 ) {
diff --git a/x-pack/plugins/ingest_manager/server/services/package_config.ts b/x-pack/plugins/ingest_manager/server/services/package_config.ts
index 29131bb696c462..60b18d272d56be 100644
--- a/x-pack/plugins/ingest_manager/server/services/package_config.ts
+++ b/x-pack/plugins/ingest_manager/server/services/package_config.ts
@@ -42,7 +42,7 @@ class PackagePolicyService {
     soClient: SavedObjectsClientContract,
     callCluster: CallESAsCurrentUser,
     packagePolicy: NewPackagePolicy,
-    options?: { id?: string; user?: AuthenticatedUser; bumpConfigRevision?: boolean }
+    options?: { id?: string; user?: AuthenticatedUser; bumpRevision?: boolean }
   ): Promise<PackagePolicy> {
     // Check that its agent policy does not have a package policy with the same name
     const parentAgentPolicy = await agentPolicyService.get(soClient, packagePolicy.config_id);
@@ -104,7 +104,7 @@ class PackagePolicyService {
     // Assign it to the given agent policy
     await agentPolicyService.assignPackagePolicies(soClient, packagePolicy.config_id, [newSo.id], {
       user: options?.user,
-      bumpRevision: options?.bumpConfigRevision ?? true,
+      bumpRevision: options?.bumpRevision ?? true,
     });
 
     return {
@@ -118,7 +118,7 @@ class PackagePolicyService {
     soClient: SavedObjectsClientContract,
     packagePolicies: NewPackagePolicy[],
     agentPolicyId: string,
-    options?: { user?: AuthenticatedUser; bumpConfigRevision?: boolean }
+    options?: { user?: AuthenticatedUser; bumpRevision?: boolean }
   ): Promise<PackagePolicy[]> {
     const isoDate = new Date().toISOString();
     // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -147,7 +147,7 @@ class PackagePolicyService {
       newSos.map((newSo) => newSo.id),
       {
         user: options?.user,
-        bumpRevision: options?.bumpConfigRevision ?? true,
+        bumpRevision: options?.bumpRevision ?? true,
       }
     );
 
diff --git a/x-pack/plugins/ingest_manager/server/services/setup.ts b/x-pack/plugins/ingest_manager/server/services/setup.ts
index 554e0c4c712684..dc3595c5b35478 100644
--- a/x-pack/plugins/ingest_manager/server/services/setup.ts
+++ b/x-pack/plugins/ingest_manager/server/services/setup.ts
@@ -228,6 +228,6 @@ async function addPackageToAgentPolicy(
   );
 
   await packagePolicyService.create(soClient, callCluster, newPackagePolicy, {
-    bumpConfigRevision: false,
+    bumpRevision: false,
   });
 }

From a451d315c5049c7f667cbcc0eb85c770b8107aee Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Thu, 13 Aug 2020 16:20:45 -0700
Subject: [PATCH 06/24] Rest of client side var renaming

---
 .../create_package_config_page/index.tsx       | 16 ++++++++--------
 .../step_configure_package.tsx                 |  2 +-
 .../step_select_config.tsx                     | 18 +++++++++---------
 .../details_page/components/index.ts           |  4 ++--
 .../components/package_configs/index.tsx       |  2 +-
 .../package_configs/package_configs_table.tsx  |  8 ++++----
 .../details_page/components/settings/index.tsx |  8 ++++----
 .../agent_config/details_page/hooks/index.ts   |  2 +-
 .../details_page/hooks/use_config.tsx          |  6 +++---
 .../agent_config/details_page/index.tsx        | 12 ++++++------
 .../edit_package_config_page/index.tsx         | 12 ++++++------
 .../sections/agent_config/list_page/index.tsx  |  1 -
 .../components/actions_menu.tsx                |  6 +++---
 .../sections/fleet/agent_list_page/index.tsx   |  4 ++--
 .../config_selection.tsx                       | 10 +++++-----
 .../agent_enrollment_flyout/steps.tsx          |  2 +-
 .../agent_reassign_config_flyout/index.tsx     |  5 ++++-
 17 files changed, 60 insertions(+), 58 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx
index 6666de1b5cc4ba..644004a2ab0203 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx
@@ -42,8 +42,8 @@ import {
   validationHasErrors,
 } from './services';
 import { StepSelectPackage } from './step_select_package';
-import { StepSelectConfig } from './step_select_config';
-import { StepConfigurePackage } from './step_configure_package';
+import { StepSelectAgentPolicy } from './step_select_config';
+import { StepConfigurePackagePolicy } from './step_configure_package';
 import { StepDefinePackagePolicy } from './step_define_package_config';
 import { useIntraAppState } from '../../../hooks/use_intra_app_state';
 
@@ -285,9 +285,9 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
     packageInfo,
   };
 
-  const stepSelectConfig = useMemo(
+  const stepSelectAgentPolicy = useMemo(
     () => (
-      <StepSelectConfig
+      <StepSelectAgentPolicy
         pkgkey={pkgkey}
         updatePackageInfo={updatePackageInfo}
         agentPolicy={agentPolicy}
@@ -311,7 +311,7 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
     [policyId, updateAgentPolicy, packageInfo, updatePackageInfo]
   );
 
-  const stepConfigurePackage = useMemo(
+  const stepConfigurePackagePolicy = useMemo(
     () =>
       isLoadingSecondStep ? (
         <Loading />
@@ -324,7 +324,7 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
             updatePackagePolicy={updatePackagePolicy}
             validationResults={validationResults!}
           />
-          <StepConfigurePackage
+          <StepConfigurePackagePolicy
             packageInfo={packageInfo}
             packagePolicy={packagePolicy}
             updatePackagePolicy={updatePackagePolicy}
@@ -355,7 +355,7 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
               defaultMessage: 'Select an agent policy',
             }
           ),
-          children: stepSelectConfig,
+          children: stepSelectAgentPolicy,
         }
       : {
           title: i18n.translate('xpack.ingestManager.createPackagePolicy.stepSelectPackageTitle', {
@@ -372,7 +372,7 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
       ),
       status: !packageInfo || !agentPolicy || isLoadingSecondStep ? 'disabled' : undefined,
       'data-test-subj': 'dataCollectionSetupStep',
-      children: stepConfigurePackage,
+      children: stepConfigurePackagePolicy,
     },
   ];
 
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_configure_package.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_configure_package.tsx
index e24a797bd352ac..b77153daee2fc5 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_configure_package.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_configure_package.tsx
@@ -33,7 +33,7 @@ const findStreamsForInputType = (
   return streams;
 };
 
-export const StepConfigurePackage: React.FunctionComponent<{
+export const StepConfigurePackagePolicy: React.FunctionComponent<{
   from?: CreatePackagePolicyFrom;
   packageInfo: PackageInfo;
   packagePolicy: NewPackagePolicy;
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_config.tsx
index 5938a7f5d652a2..9f48be54f866d7 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_config.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_config.tsx
@@ -49,7 +49,7 @@ const AgentPolicyDescriptionColumn = styled(EuiFlexItem)`
   overflow: hidden;
 `;
 
-export const StepSelectConfig: React.FunctionComponent<{
+export const StepSelectAgentPolicy: React.FunctionComponent<{
   pkgkey: string;
   updatePackageInfo: (packageInfo: PackageInfo | undefined) => void;
   agentPolicy: AgentPolicy | undefined;
@@ -62,7 +62,7 @@ export const StepSelectConfig: React.FunctionComponent<{
   const [selectedPolicyId, setSelectedPolicyId] = useState<string | undefined>(
     agentPolicy ? agentPolicy.id : undefined
   );
-  const [selectedConfigError, setSelectedConfigError] = useState<Error>();
+  const [selectedAgentPolicyError, setSelectedAgentPolicyError] = useState<Error>();
 
   // Create new agent policy flyout state
   const hasWriteCapabilites = useCapabilities().write;
@@ -114,14 +114,14 @@ export const StepSelectConfig: React.FunctionComponent<{
         setIsLoadingSecondStep(true);
         const { data, error } = await sendGetOneAgentPolicy(selectedPolicyId);
         if (error) {
-          setSelectedConfigError(error);
+          setSelectedAgentPolicyError(error);
           updateAgentPolicy(undefined);
         } else if (data && data.item) {
-          setSelectedConfigError(undefined);
+          setSelectedAgentPolicyError(undefined);
           updateAgentPolicy(data.item);
         }
       } else {
-        setSelectedConfigError(undefined);
+        setSelectedAgentPolicyError(undefined);
         updateAgentPolicy(undefined);
       }
       setIsLoadingSecondStep(false);
@@ -146,7 +146,7 @@ export const StepSelectConfig: React.FunctionComponent<{
       })
     : [];
 
-  const selectedConfigOption = agentPolicyOptions.find(
+  const selectedAgentPolicyOption = agentPolicyOptions.find(
     (option) => option.value === selectedPolicyId
   );
 
@@ -289,7 +289,7 @@ export const StepSelectConfig: React.FunctionComponent<{
                   </EuiFlexGroup>
                 );
               }}
-              selectedOptions={selectedConfigOption ? [selectedConfigOption] : []}
+              selectedOptions={selectedAgentPolicyOption ? [selectedAgentPolicyOption] : []}
               onChange={(options) => {
                 const selectedOption = options[0] || undefined;
                 if (selectedOption) {
@@ -304,7 +304,7 @@ export const StepSelectConfig: React.FunctionComponent<{
           </AgentPolicyWrapper>
         </EuiFlexItem>
         {/* Display selected agent policy error if there is one */}
-        {selectedConfigError ? (
+        {selectedAgentPolicyError ? (
           <EuiFlexItem>
             <Error
               title={
@@ -313,7 +313,7 @@ export const StepSelectConfig: React.FunctionComponent<{
                   defaultMessage="Error loading selected agent policy"
                 />
               }
-              error={selectedConfigError}
+              error={selectedAgentPolicyError}
             />
           </EuiFlexItem>
         ) : null}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/index.ts
index 17556b13fd1180..f30d02c42680cb 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/index.ts
@@ -4,5 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 export { PackagePoliciesTable } from './package_configs/package_configs_table';
-export { ConfigPackagePoliciesView } from './package_configs';
-export { ConfigSettingsView } from './settings';
+export { PackagePoliciesView } from './package_configs';
+export { SettingsView } from './settings';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/index.tsx
index fa5f6c054b63d9..55f80af5e2d8c2 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/index.tsx
@@ -9,7 +9,7 @@ import { AgentPolicy, PackagePolicy } from '../../../../../types';
 import { NoPackagePolicies } from './no_package_configs';
 import { PackagePoliciesTable } from './package_configs_table';
 
-export const ConfigPackagePoliciesView = memo<{ agentPolicy: AgentPolicy }>(({ agentPolicy }) => {
+export const PackagePoliciesView = memo<{ agentPolicy: AgentPolicy }>(({ agentPolicy }) => {
   if (agentPolicy.package_configs.length === 0) {
     return <NoPackagePolicies policyId={agentPolicy.id} />;
   }
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/package_configs_table.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/package_configs_table.tsx
index 0d1c85ec644298..fa9ce249354297 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/package_configs_table.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/package_configs_table.tsx
@@ -19,7 +19,7 @@ import { AgentPolicy, PackagePolicy } from '../../../../../types';
 import { PackageIcon, ContextMenuActions } from '../../../../../components';
 import { PackagePolicyDeleteProvider, DangerEuiContextMenuItem } from '../../../components';
 import { useCapabilities, useLink } from '../../../../../hooks';
-import { useConfigRefresh } from '../../hooks';
+import { useAgentPolicyRefresh } from '../../hooks';
 
 interface InMemoryPackagePolicy extends PackagePolicy {
   inputTypes: string[];
@@ -51,7 +51,7 @@ export const PackagePoliciesTable: React.FunctionComponent<Props> = ({
 }) => {
   const { getHref } = useLink();
   const hasWriteCapabilities = useCapabilities().write;
-  const refreshConfig = useConfigRefresh();
+  const refreshAgentPolicy = useAgentPolicyRefresh();
 
   // With the package policies provided on input, generate the list of package policies
   // used in the InMemoryTable (flattens some values for search) as well as
@@ -215,7 +215,7 @@ export const PackagePoliciesTable: React.FunctionComponent<Props> = ({
                           disabled={!hasWriteCapabilities}
                           icon="trash"
                           onClick={() => {
-                            deletePackagePoliciesPrompt([packagePolicy.id], refreshConfig);
+                            deletePackagePoliciesPrompt([packagePolicy.id], refreshAgentPolicy);
                           }}
                         >
                           <FormattedMessage
@@ -233,7 +233,7 @@ export const PackagePoliciesTable: React.FunctionComponent<Props> = ({
         ],
       },
     ],
-    [agentPolicy, getHref, hasWriteCapabilities, refreshConfig]
+    [agentPolicy, getHref, hasWriteCapabilities, refreshAgentPolicy]
   );
 
   return (
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/settings/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/settings/index.tsx
index 98fe97c82641cc..766bdc2e2c1930 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/settings/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/settings/index.tsx
@@ -23,7 +23,7 @@ import {
   agentPolicyFormValidation,
   ConfirmDeployAgentPolicyModal,
 } from '../../../components';
-import { useConfigRefresh } from '../../hooks';
+import { useAgentPolicyRefresh } from '../../hooks';
 
 const FormWrapper = styled.div`
   max-width: 800px;
@@ -31,7 +31,7 @@ const FormWrapper = styled.div`
   margin-left: auto;
 `;
 
-export const ConfigSettingsView = memo<{ agentPolicy: AgentPolicy }>(
+export const SettingsView = memo<{ agentPolicy: AgentPolicy }>(
   ({ agentPolicy: originalAgentPolicy }) => {
     const {
       notifications,
@@ -44,7 +44,7 @@ export const ConfigSettingsView = memo<{ agentPolicy: AgentPolicy }>(
     const history = useHistory();
     const { getPath } = useLink();
     const hasWriteCapabilites = useCapabilities().write;
-    const refreshConfig = useConfigRefresh();
+    const refreshAgentPolicy = useAgentPolicyRefresh();
     const [isNavDrawerLocked, setIsNavDrawerLocked] = useState(false);
     const [agentPolicy, setAgentPolicy] = useState<AgentPolicy>({
       ...originalAgentPolicy,
@@ -89,7 +89,7 @@ export const ConfigSettingsView = memo<{ agentPolicy: AgentPolicy }>(
               values: { name: agentPolicy.name },
             })
           );
-          refreshConfig();
+          refreshAgentPolicy();
           setHasChanges(false);
         } else {
           notifications.toasts.addDanger(
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/index.ts
index 76c6d64eb9e07a..4bdf49d5764ea1 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 export { useGetAgentStatus, AgentStatusRefreshContext } from './use_agent_status';
-export { ConfigRefreshContext, useConfigRefresh } from './use_config';
+export { AgentPolicyRefreshContext, useAgentPolicyRefresh } from './use_config';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/use_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/use_config.tsx
index b61986e7abb4fd..83004af7a79eea 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/use_config.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/use_config.tsx
@@ -5,8 +5,8 @@
  */
 import React from 'react';
 
-export const ConfigRefreshContext = React.createContext({ refresh: () => {} });
+export const AgentPolicyRefreshContext = React.createContext({ refresh: () => {} });
 
-export function useConfigRefresh() {
-  return React.useContext(ConfigRefreshContext).refresh;
+export function useAgentPolicyRefresh() {
+  return React.useContext(AgentPolicyRefreshContext).refresh;
 }
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx
index 6b3ff2d055bf5c..67057a13bd21a4 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx
@@ -25,9 +25,9 @@ import { PAGE_ROUTING_PATHS } from '../../../constants';
 import { useGetOneAgentPolicy, useLink, useBreadcrumbs, useCore } from '../../../hooks';
 import { Loading, Error } from '../../../components';
 import { WithHeaderLayout } from '../../../layouts';
-import { ConfigRefreshContext, useGetAgentStatus, AgentStatusRefreshContext } from './hooks';
+import { AgentPolicyRefreshContext, useGetAgentStatus, AgentStatusRefreshContext } from './hooks';
 import { LinkedAgentCount, AgentPolicyActionMenu } from '../components';
-import { ConfigPackagePoliciesView, ConfigSettingsView } from './components';
+import { PackagePoliciesView, SettingsView } from './components';
 import { useIntraAppState } from '../../../hooks/use_intra_app_state';
 
 const Divider = styled.div`
@@ -271,7 +271,7 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
   }, [agentPolicy, policyId, error, isLoading, redirectToAgentPolicyList]);
 
   return (
-    <ConfigRefreshContext.Provider value={{ refresh: refreshAgentPolicy }}>
+    <AgentPolicyRefreshContext.Provider value={{ refresh: refreshAgentPolicy }}>
       <AgentStatusRefreshContext.Provider value={{ refresh: refreshAgentStatus }}>
         <WithHeaderLayout
           leftColumn={headerLeftContent}
@@ -281,7 +281,7 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
           {content}
         </WithHeaderLayout>
       </AgentStatusRefreshContext.Provider>
-    </ConfigRefreshContext.Provider>
+    </AgentPolicyRefreshContext.Provider>
   );
 };
 
@@ -294,13 +294,13 @@ const AgentPolicyDetailsContent: React.FunctionComponent<{ agentPolicy: AgentPol
       <Route
         path={PAGE_ROUTING_PATHS.policy_details_settings}
         render={() => {
-          return <ConfigSettingsView agentPolicy={agentPolicy} />;
+          return <SettingsView agentPolicy={agentPolicy} />;
         }}
       />
       <Route
         path={PAGE_ROUTING_PATHS.policy_details}
         render={() => {
-          return <ConfigPackagePoliciesView agentPolicy={agentPolicy} />;
+          return <PackagePoliciesView agentPolicy={agentPolicy} />;
         }}
       />
     </Switch>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx
index 0c7507978457f2..97c3cf06570f76 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx
@@ -39,7 +39,7 @@ import {
   PackagePolicyFormState,
   CreatePackagePolicyFrom,
 } from '../create_package_config_page/types';
-import { StepConfigurePackage } from '../create_package_config_page/step_configure_package';
+import { StepConfigurePackagePolicy } from '../create_package_config_page/step_configure_package';
 import { StepDefinePackagePolicy } from '../create_package_config_page/step_define_package_config';
 
 export const EditPackagePolicyPage: React.FunctionComponent = () => {
@@ -292,7 +292,7 @@ export const EditPackagePolicyPage: React.FunctionComponent = () => {
             validationResults={validationResults!}
           />
 
-          <StepConfigurePackage
+          <StepConfigurePackagePolicy
             from={'edit'}
             packageInfo={packageInfo}
             packagePolicy={packagePolicy}
@@ -335,7 +335,7 @@ export const EditPackagePolicyPage: React.FunctionComponent = () => {
         />
       ) : (
         <>
-          <Breadcrumb configName={agentPolicy.name} policyId={policyId} />
+          <Breadcrumb policyName={agentPolicy.name} policyId={policyId} />
           {formState === 'CONFIRM' && (
             <ConfirmDeployAgentPolicyModal
               agentCount={agentCount}
@@ -400,10 +400,10 @@ export const EditPackagePolicyPage: React.FunctionComponent = () => {
   );
 };
 
-const Breadcrumb: React.FunctionComponent<{ configName: string; policyId: string }> = ({
-  configName,
+const Breadcrumb: React.FunctionComponent<{ policyName: string; policyId: string }> = ({
+  policyName,
   policyId,
 }) => {
-  useBreadcrumbs('edit_integration', { configName, policyId });
+  useBreadcrumbs('edit_integration', { policyName, policyId });
   return null;
 };
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/index.tsx
index e5c02b609657e0..0c1e278d5cba71 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/index.tsx
@@ -72,7 +72,6 @@ const AgentPolicyListPageLayout: React.FunctionComponent = ({ children }) => (
 export const AgentPolicyListPage: React.FunctionComponent<{}> = () => {
   useBreadcrumbs('policies_list');
   const { getHref, getPath } = useLink();
-  // Config information
   const hasWriteCapabilites = useCapabilities().write;
   const {
     fleet: { enabled: isFleetEnabled },
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/actions_menu.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/actions_menu.tsx
index 815a608481c14b..636ff7a5ff9896 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/actions_menu.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/actions_menu.tsx
@@ -9,7 +9,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { Agent } from '../../../../types';
 import { useCapabilities } from '../../../../hooks';
 import { ContextMenuActions } from '../../../../components';
-import { AgentUnenrollProvider, AgentReassignConfigFlyout } from '../../components';
+import { AgentUnenrollProvider, AgentReassignAgentPolicyFlyout } from '../../components';
 import { useAgentRefresh } from '../hooks';
 
 export const AgentDetailsActionMenu: React.FunctionComponent<{
@@ -34,7 +34,7 @@ export const AgentDetailsActionMenu: React.FunctionComponent<{
     <>
       {isReassignFlyoutOpen && (
         <EuiPortal>
-          <AgentReassignConfigFlyout agent={agent} onClose={onClose} />
+          <AgentReassignAgentPolicyFlyout agent={agent} onClose={onClose} />
         </EuiPortal>
       )}
       <ContextMenuActions
@@ -54,7 +54,7 @@ export const AgentDetailsActionMenu: React.FunctionComponent<{
               setIsReassignFlyoutOpen(true);
             }}
             disabled={!agent.active}
-            key="reassignConfig"
+            key="reassignPolicy"
           >
             <FormattedMessage
               id="xpack.ingestManager.agentList.reassignActionText"
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
index 429c7dea5cb741..2826f8217f459d 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
@@ -37,7 +37,7 @@ import {
 import { SearchBar, ContextMenuActions } from '../../../components';
 import { AgentStatusKueryHelper } from '../../../services';
 import { AGENT_SAVED_OBJECT_TYPE } from '../../../constants';
-import { AgentReassignConfigFlyout, AgentHealth, AgentUnenrollProvider } from '../components';
+import { AgentReassignAgentPolicyFlyout, AgentHealth, AgentUnenrollProvider } from '../components';
 
 const REFRESH_INTERVAL_MS = 5000;
 
@@ -390,7 +390,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
       ) : null}
       {agentToReassign && (
         <EuiPortal>
-          <AgentReassignConfigFlyout
+          <AgentReassignAgentPolicyFlyout
             agent={agentToReassign}
             onClose={() => {
               setAgentToReassignId(undefined);
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx
index 9dec3a22c1015d..b2226626ab4f73 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx
@@ -14,7 +14,7 @@ import { AgentPolicyPackageBadges } from '../agent_config_package_badges';
 
 type Props = {
   agentPolicies?: AgentPolicy[];
-  onConfigChange?: (key: string) => void;
+  onAgentPolicyChange?: (key: string) => void;
 } & (
   | {
       withKeySelection: true;
@@ -27,7 +27,7 @@ type Props = {
 
 export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
   const { notifications } = useCore();
-  const { withKeySelection, agentPolicies, onConfigChange } = props;
+  const { withKeySelection, agentPolicies, onAgentPolicyChange } = props;
   const onKeyChange = props.withKeySelection && props.onKeyChange;
 
   const [isAuthenticationSettingsOpen, setIsAuthenticationSettingsOpen] = useState(false);
@@ -41,11 +41,11 @@ export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
 
   useEffect(
     function triggerOnAgentPolicyChangeEffect() {
-      if (onConfigChange && selectedState.agentPolicyId) {
-        onConfigChange(selectedState.agentPolicyId);
+      if (onAgentPolicyChange && selectedState.agentPolicyId) {
+        onAgentPolicyChange(selectedState.agentPolicyId);
       }
     },
-    [selectedState.agentPolicyId, onConfigChange]
+    [selectedState.agentPolicyId, onAgentPolicyChange]
   );
 
   useEffect(
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/steps.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/steps.tsx
index 92f0bde55aa89c..2b2e93616a4530 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/steps.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/steps.tsx
@@ -59,7 +59,7 @@ export const AgentPolicySelectionStep = ({
         agentPolicies={agentPolicies}
         withKeySelection={setSelectedAPIKeyId ? true : false}
         onKeyChange={setSelectedAPIKeyId}
-        onConfigChange={setSelectedPolicyId}
+        onAgentPolicyChange={setSelectedPolicyId}
       />
     ),
   };
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx
index 273ff297da60d8..f088a7d9c99697 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx
@@ -30,7 +30,10 @@ interface Props {
   agent: Agent;
 }
 
-export const AgentReassignConfigFlyout: React.FunctionComponent<Props> = ({ onClose, agent }) => {
+export const AgentReassignAgentPolicyFlyout: React.FunctionComponent<Props> = ({
+  onClose,
+  agent,
+}) => {
   const { notifications } = useCore();
   const [selectedAgentPolicyId, setSelectedAgentPolicyId] = useState<string | undefined>(
     agent.config_id

From 69737178636b2e1d9fa900c0b5531e2468109ccb Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Thu, 13 Aug 2020 17:20:06 -0700
Subject: [PATCH 07/24] Rename agent SO attributes and add migrations

---
 .../common/openapi/spec_oas3.json             |  2 +-
 .../common/types/models/agent.ts              |  4 +--
 .../components/agent_details.tsx              |  6 ++---
 .../fleet/agent_details_page/index.tsx        |  8 +++---
 .../sections/fleet/agent_list_page/index.tsx  | 13 ++++-----
 .../agent_reassign_config_flyout/index.tsx    |  4 +--
 .../server/saved_objects/index.ts             | 13 +++++----
 .../saved_objects/migrations/to_v7_10_0.ts    | 27 +++++++++++++++++++
 .../server/services/agents/acks.test.ts       |  4 +--
 .../server/services/agents/acks.ts            |  6 ++---
 .../server/services/agents/checkin/index.ts   |  2 +-
 .../agents/checkin/state_new_actions.ts       |  6 ++---
 .../server/services/agents/enroll.ts          |  2 +-
 .../server/services/agents/reassign.ts        |  4 +--
 .../server/usage/endpoints/endpoint.mocks.ts  | 10 +++----
 15 files changed, 71 insertions(+), 40 deletions(-)
 create mode 100644 x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts

diff --git a/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json b/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
index 144caaae002df1..ce79552320fe4f 100644
--- a/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
+++ b/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
@@ -4143,7 +4143,7 @@
           "config_id": {
             "type": "string"
           },
-          "config_revision": {
+          "agent_policy_revision": {
             "type": ["number", "null"]
           },
           "last_checkin": {
diff --git a/x-pack/plugins/ingest_manager/common/types/models/agent.ts b/x-pack/plugins/ingest_manager/common/types/models/agent.ts
index f31d33e73c76f6..52170d8a88dd3b 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/agent.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/agent.ts
@@ -89,8 +89,8 @@ interface AgentBase {
   access_api_key_id?: string;
   default_api_key?: string;
   default_api_key_id?: string;
-  config_id?: string;
-  config_revision?: number | null;
+  agent_policy_id?: string;
+  agent_policy_revision?: number | null;
   last_checkin?: string;
   last_checkin_status?: 'error' | 'online' | 'degraded';
   user_provided_metadata: AgentMetadata;
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/agent_details.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/agent_details.tsx
index abfc4c208eeebe..d0cebab401cbfa 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/agent_details.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/agent_details.tsx
@@ -53,13 +53,13 @@ export const AgentDetailsContent: React.FunctionComponent<{
           }),
           description: agentPolicy ? (
             <EuiLink
-              href={getHref('policy_details', { policyId: agent.config_id! })}
+              href={getHref('policy_details', { policyId: agent.agent_policy_id! })}
               className="eui-textBreakWord"
             >
-              {agentPolicy.name || agent.config_id}
+              {agentPolicy.name || agent.agent_policy_id}
             </EuiLink>
           ) : (
-            agent.config_id || '-'
+            agent.agent_policy_id || '-'
           ),
         },
         {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/index.tsx
index 087c7889ba1c77..5ee91a8a1b36b5 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/index.tsx
@@ -59,7 +59,7 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
     isLoading: isAgentPolicyLoading,
     data: agentPolicyData,
     sendRequest: sendAgentPolicyRequest,
-  } = useGetOneAgentPolicy(agentData?.item?.config_id);
+  } = useGetOneAgentPolicy(agentData?.item?.agent_policy_id);
 
   const {
     application: { navigateToApp },
@@ -134,13 +134,13 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
                 <Loading size="m" />
               ) : agentPolicyData?.item ? (
                 <EuiLink
-                  href={getHref('policy_details', { policyId: agentData.item.config_id! })}
+                  href={getHref('policy_details', { policyId: agentData.item.agent_policy_id! })}
                   className="eui-textBreakWord"
                 >
-                  {agentPolicyData.item.name || agentData.item.config_id}
+                  {agentPolicyData.item.name || agentData.item.agent_policy_id}
                 </EuiLink>
               ) : (
-                agentData.item.config_id || '-'
+                agentData.item.agent_policy_id || '-'
               ),
             },
             { isDivider: true },
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
index 2826f8217f459d..0c62afb90284ce 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
@@ -284,21 +284,22 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
                 {policyName || policyId}
               </EuiLink>
             </EuiFlexItem>
-            {agent.config_revision && (
+            {agent.agent_policy_revision && (
               <EuiFlexItem grow={false}>
                 <EuiText color="default" size="xs" className="eui-textNoWrap">
                   <FormattedMessage
                     id="xpack.ingestManager.agentList.revisionNumber"
                     defaultMessage="rev. {revNumber}"
-                    values={{ revNumber: agent.config_revision }}
+                    values={{ revNumber: agent.agent_policy_revision }}
                   />
                 </EuiText>
               </EuiFlexItem>
             )}
-            {agent.config_id &&
-              agent.config_revision &&
-              agentPoliciesIndexedById[agent.config_id] &&
-              agentPoliciesIndexedById[agent.config_id].revision > agent.config_revision && (
+            {agent.agent_policy_id &&
+              agent.agent_policy_revision &&
+              agentPoliciesIndexedById[agent.agent_policy_id] &&
+              agentPoliciesIndexedById[agent.agent_policy_id].revision >
+                agent.agent_policy_revision && (
                 <EuiFlexItem grow={false}>
                   <EuiText color="subdued" size="xs" className="eui-textNoWrap">
                     <EuiIcon size="m" type="alert" color="warning" />
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx
index f088a7d9c99697..3e2059f5505375 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx
@@ -36,7 +36,7 @@ export const AgentReassignAgentPolicyFlyout: React.FunctionComponent<Props> = ({
 }) => {
   const { notifications } = useCore();
   const [selectedAgentPolicyId, setSelectedAgentPolicyId] = useState<string | undefined>(
-    agent.config_id
+    agent.agent_policy_id
   );
 
   const agentPoliciesRequest = useGetAgentPolicies({
@@ -134,7 +134,7 @@ export const AgentReassignAgentPolicyFlyout: React.FunctionComponent<Props> = ({
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
             <EuiButton
-              disabled={selectedAgentPolicyId === agent.config_id}
+              disabled={selectedAgentPolicyId === agent.agent_policy_id}
               fill
               onClick={onSubmit}
               isLoading={isSubmitting}
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
index 6faeb70df939ef..0449610cdd65f6 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
@@ -17,6 +17,7 @@ import {
   ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
   GLOBAL_SETTINGS_SAVED_OBJECT_TYPE,
 } from '../constants';
+import { migrateAgentToV7100 } from './migrations/to_v7_10_0.ts';
 
 /*
  * Saved object types and mappings
@@ -61,11 +62,11 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
         version: { type: 'keyword' },
         user_provided_metadata: { type: 'flattened' },
         local_metadata: { type: 'flattened' },
-        config_id: { type: 'keyword' },
+        agent_policy_id: { type: 'keyword' },
+        agent_policy_revision: { type: 'integer' },
         last_updated: { type: 'date' },
         last_checkin: { type: 'date' },
         last_checkin_status: { type: 'keyword' },
-        config_revision: { type: 'integer' },
         default_api_key_id: { type: 'keyword' },
         default_api_key: { type: 'binary' },
         updated_at: { type: 'date' },
@@ -73,6 +74,9 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
         packages: { type: 'keyword' },
       },
     },
+    migrations: {
+      '7.10.0': migrateAgentToV7100,
+    },
   },
   [AGENT_ACTION_SAVED_OBJECT_TYPE]: {
     name: AGENT_ACTION_SAVED_OBJECT_TYPE,
@@ -316,12 +320,11 @@ export function registerEncryptedSavedObjects(
       'version',
       'user_provided_metadata',
       'local_metadata',
-      'config_id',
+      'agent_policy_id',
+      'agent_policy_revision',
       'last_updated',
       'last_checkin',
       'last_checkin_status',
-      'config_revision',
-      'config_newest_revision',
       'updated_at',
       'current_error_events',
       'unenrolled_at',
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
new file mode 100644
index 00000000000000..5e6ccc7a40ea9c
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { SavedObjectMigrationFn } from 'kibana/server';
+import { cloneDeep } from 'lodash';
+import { Agent } from '../../types';
+
+export const migrateAgentToV7100: SavedObjectMigrationFn<
+  Exclude<Agent, 'agent_policy_id' | 'agent_policy_revision'> & {
+    config_id?: string;
+    agent_policy_revision?: number | null;
+  },
+  Agent
+> = (agentDoc) => {
+  const updatedAgentDoc = cloneDeep(agentDoc);
+
+  updatedAgentDoc.attributes.agent_policy_id = agentDoc.attributes.config_id;
+  delete updatedAgentDoc.attributes.config_id;
+
+  updatedAgentDoc.attributes.agent_policy_revision = agentDoc.attributes.agent_policy_revision;
+  delete updatedAgentDoc.attributes.agent_policy_revision;
+
+  return updatedAgentDoc;
+};
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts b/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
index 23f8d0ff673813..e1fa97e57d436f 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
@@ -224,7 +224,7 @@ describe('test agent acks services', () => {
     expect(mockSavedObjectsClient.bulkUpdate.mock.calls[0][0][0]).toMatchInlineSnapshot(`
       Object {
         "attributes": Object {
-          "config_revision": 4,
+          "agent_policy_revision": 4,
           "packages": Array [
             "system",
           ],
@@ -350,7 +350,7 @@ describe('test agent acks services', () => {
         id: 'id',
         type: AGENT_TYPE_PERMANENT,
         config_id: 'config1',
-        config_revision: 100,
+        agent_policy_revision: 100,
       } as unknown) as Agent,
       [
         {
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/acks.ts b/x-pack/plugins/ingest_manager/server/services/agents/acks.ts
index 6f90a3abf522ba..3b4c00cf5c8885 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/acks.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/acks.ts
@@ -87,11 +87,11 @@ function getLatestAgentPolicyIfUpdated(agent: Agent, actions: AgentAction[]) {
     }
     const data = action.data || {};
 
-    if (data?.config?.id !== agent.config_id) {
+    if (data?.config?.id !== agent.agent_policy_id) {
       return acc;
     }
 
-    const currentRevision = (acc && acc.revision) || agent.config_revision || 0;
+    const currentRevision = (acc && acc.revision) || agent.agent_policy_revision || 0;
 
     return data?.config?.revision > currentRevision ? data?.config : acc;
   }, null);
@@ -110,7 +110,7 @@ function buildUpdateAgentPolicy(agentId: string, agentPolicy: FullAgentPolicy) {
     type: AGENT_SAVED_OBJECT_TYPE,
     id: agentId,
     attributes: {
-      config_revision: agentPolicy.revision,
+      agent_policy_revision: agentPolicy.revision,
       packages,
     },
   };
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/checkin/index.ts b/x-pack/plugins/ingest_manager/server/services/agents/checkin/index.ts
index ece38f86b49870..5db0492173c036 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/checkin/index.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/checkin/index.ts
@@ -63,7 +63,7 @@ async function processEventsForCheckin(
   const updatedErrorEvents: Array<AgentEvent | NewAgentEvent> = [...agent.current_error_events];
   for (const event of events) {
     // @ts-ignore
-    event.config_id = agent.config_id;
+    event.config_id = agent.agent_policy_id;
 
     if (isErrorOrState(event)) {
       // Remove any global or specific to a stream event
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
index 8951776aae4078..2c2e84496006e9 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
@@ -102,7 +102,7 @@ function shouldCreateAgentPolicyAction(agent: Agent, agentPolicy: FullAgentPolic
     return false;
   }
   const isAgentPolicyOutdated =
-    !agent.config_revision || agent.config_revision < agentPolicy.revision;
+    !agent.agent_policy_revision || agent.agent_policy_revision < agentPolicy.revision;
   if (!isAgentPolicyOutdated) {
     return false;
   }
@@ -150,10 +150,10 @@ export function agentCheckinStateNewActionsFactory() {
     agent: Agent,
     options?: { signal: AbortSignal }
   ): Promise<AgentAction[]> {
-    if (!agent.config_id) {
+    if (!agent.agent_policy_id) {
       throw new Error('Agent does not have a policy');
     }
-    const agentPolicyId = agent.config_id;
+    const agentPolicyId = agent.agent_policy_id;
     if (!agentPolicies$.has(agentPolicyId)) {
       agentPolicies$.set(agentPolicyId, createAgentPolicySharedObservable(agentPolicyId));
     }
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/enroll.ts b/x-pack/plugins/ingest_manager/server/services/agents/enroll.ts
index 9d851a5e769fd8..acae480be258bf 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/enroll.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/enroll.ts
@@ -33,7 +33,7 @@ export async function enroll(
   const agentData: AgentSOAttributes = {
     shared_id: sharedId,
     active: true,
-    config_id: agentPolicyId,
+    agent_policy_id: agentPolicyId,
     type,
     enrolled_at: enrolledAt,
     user_provided_metadata: metadata?.userProvided ?? {},
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts b/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts
index f207b5027ecf4e..65749572eb363f 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts
@@ -21,7 +21,7 @@ export async function reassignAgent(
   }
 
   await soClient.update<AgentSOAttributes>(AGENT_SAVED_OBJECT_TYPE, agentId, {
-    config_id: newAgentPolicyId,
-    config_revision: null,
+    agent_policy_id: newAgentPolicyId,
+    agent_policy_revision: null,
   });
 }
diff --git a/x-pack/plugins/security_solution/server/usage/endpoints/endpoint.mocks.ts b/x-pack/plugins/security_solution/server/usage/endpoints/endpoint.mocks.ts
index d753eeee935949..d6e69919b9ffaa 100644
--- a/x-pack/plugins/security_solution/server/usage/endpoints/endpoint.mocks.ts
+++ b/x-pack/plugins/security_solution/server/usage/endpoints/endpoint.mocks.ts
@@ -13,7 +13,7 @@ import { Agent } from '../../../../ingest_manager/common';
 import { FLEET_ENDPOINT_PACKAGE_CONSTANT } from './fleet_saved_objects';
 
 const testAgentId = 'testAgentId';
-const testConfigId = 'testConfigId';
+const testAgentPolicyId = 'testAgentPolicyId';
 const testHostId = 'randoHostId';
 const testHostName = 'testDesktop';
 
@@ -45,7 +45,7 @@ export const mockFleetObjectsResponse = (
       attributes: {
         active: true,
         id: testAgentId,
-        config_id: 'randoConfigId',
+        agent_policy_id: 'randoAgentPolicyId',
         type: 'PERMANENT',
         user_provided_metadata: {},
         enrolled_at: lastCheckIn,
@@ -82,7 +82,7 @@ export const mockFleetObjectsResponse = (
       attributes: {
         active: true,
         id: 'oldTestAgentId',
-        config_id: 'randoConfigId',
+        agent_policy_id: 'randoAgentPolicyId',
         type: 'PERMANENT',
         user_provided_metadata: {},
         enrolled_at: lastCheckIn,
@@ -250,7 +250,7 @@ export const mockFleetEventsObjectsResponse = (
             running ? 'RUNNING' : 'FAILED'
           }: `,
           payload: running ? mockPolicyPayload(policyStatus, policyMode) : undefined,
-          config_id: testConfigId,
+          config_id: testAgentPolicyId,
         },
         references: [],
         updated_at: updatedDate,
@@ -267,7 +267,7 @@ export const mockFleetEventsObjectsResponse = (
           subtype: 'STARTING',
           message:
             'Application: endpoint-security--8.0.0[d8f7f6e8-9375-483c-b456-b479f1d7a4f2]: State changed to STARTING: Starting',
-          config_id: testConfigId,
+          config_id: testAgentPolicyId,
         },
         references: [],
         updated_at: updatedDate,

From 1a8b0df1242d61e2e0a30f7a020a170ed948b07a Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Thu, 13 Aug 2020 17:37:15 -0700
Subject: [PATCH 08/24] Remove agent prefix from policy fields

---
 .../ingest_manager/common/openapi/spec_oas3.json    |  2 +-
 .../ingest_manager/common/types/models/agent.ts     |  4 ++--
 .../ingest_manager/common/types/rest_spec/agent.ts  |  2 +-
 .../common/types/rest_spec/enrollment_api_key.ts    |  2 +-
 .../agent_details_page/components/agent_details.tsx |  6 +++---
 .../sections/fleet/agent_details_page/index.tsx     |  8 ++++----
 .../sections/fleet/agent_list_page/index.tsx        | 13 ++++++-------
 .../agent_reassign_config_flyout/index.tsx          |  6 +++---
 .../ingest_manager/server/routes/agent/handlers.ts  |  6 +-----
 .../server/routes/enrollment_api_key/handler.ts     |  2 +-
 .../ingest_manager/server/saved_objects/index.ts    | 10 +++++-----
 .../server/saved_objects/migrations/to_v7_10_0.ts   | 10 +++++-----
 .../server/services/agents/acks.test.ts             |  4 ++--
 .../ingest_manager/server/services/agents/acks.ts   |  6 +++---
 .../server/services/agents/checkin/index.ts         |  2 +-
 .../services/agents/checkin/state_new_actions.ts    |  6 +++---
 .../ingest_manager/server/services/agents/enroll.ts |  2 +-
 .../server/services/agents/reassign.ts              |  4 ++--
 .../ingest_manager/server/types/rest_spec/agent.ts  |  2 +-
 .../server/types/rest_spec/enrollment_api_key.ts    |  2 +-
 .../server/usage/endpoints/endpoint.mocks.ts        |  4 ++--
 21 files changed, 49 insertions(+), 54 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json b/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
index ce79552320fe4f..29d9bf63de6306 100644
--- a/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
+++ b/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
@@ -4143,7 +4143,7 @@
           "config_id": {
             "type": "string"
           },
-          "agent_policy_revision": {
+          "policy_revision": {
             "type": ["number", "null"]
           },
           "last_checkin": {
diff --git a/x-pack/plugins/ingest_manager/common/types/models/agent.ts b/x-pack/plugins/ingest_manager/common/types/models/agent.ts
index 52170d8a88dd3b..abfd3a071d4fe4 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/agent.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/agent.ts
@@ -89,8 +89,8 @@ interface AgentBase {
   access_api_key_id?: string;
   default_api_key?: string;
   default_api_key_id?: string;
-  agent_policy_id?: string;
-  agent_policy_revision?: number | null;
+  policy_id?: string;
+  policy_revision?: number | null;
   last_checkin?: string;
   last_checkin_status?: 'error' | 'online' | 'degraded';
   user_provided_metadata: AgentMetadata;
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/agent.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/agent.ts
index e796aaee13600f..4a50938049a7b2 100644
--- a/x-pack/plugins/ingest_manager/common/types/rest_spec/agent.ts
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/agent.ts
@@ -118,7 +118,7 @@ export interface PutAgentReassignRequest {
   params: {
     agentId: string;
   };
-  body: { agent_policy_id: string };
+  body: { policy_id: string };
 }
 
 export interface PutAgentReassignResponse {
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/enrollment_api_key.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/enrollment_api_key.ts
index dae3e3cd392364..1929955cac84c9 100644
--- a/x-pack/plugins/ingest_manager/common/types/rest_spec/enrollment_api_key.ts
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/enrollment_api_key.ts
@@ -47,7 +47,7 @@ export interface DeleteEnrollmentAPIKeyResponse {
 export interface PostEnrollmentAPIKeyRequest {
   body: {
     name?: string;
-    agent_policy_id: string;
+    policy_id: string;
     expiration?: string;
   };
 }
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/agent_details.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/agent_details.tsx
index d0cebab401cbfa..68abb43abac184 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/agent_details.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/agent_details.tsx
@@ -53,13 +53,13 @@ export const AgentDetailsContent: React.FunctionComponent<{
           }),
           description: agentPolicy ? (
             <EuiLink
-              href={getHref('policy_details', { policyId: agent.agent_policy_id! })}
+              href={getHref('policy_details', { policyId: agent.policy_id! })}
               className="eui-textBreakWord"
             >
-              {agentPolicy.name || agent.agent_policy_id}
+              {agentPolicy.name || agent.policy_id}
             </EuiLink>
           ) : (
-            agent.agent_policy_id || '-'
+            agent.policy_id || '-'
           ),
         },
         {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/index.tsx
index 5ee91a8a1b36b5..219b343eba41b5 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/index.tsx
@@ -59,7 +59,7 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
     isLoading: isAgentPolicyLoading,
     data: agentPolicyData,
     sendRequest: sendAgentPolicyRequest,
-  } = useGetOneAgentPolicy(agentData?.item?.agent_policy_id);
+  } = useGetOneAgentPolicy(agentData?.item?.policy_id);
 
   const {
     application: { navigateToApp },
@@ -134,13 +134,13 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
                 <Loading size="m" />
               ) : agentPolicyData?.item ? (
                 <EuiLink
-                  href={getHref('policy_details', { policyId: agentData.item.agent_policy_id! })}
+                  href={getHref('policy_details', { policyId: agentData.item.policy_id! })}
                   className="eui-textBreakWord"
                 >
-                  {agentPolicyData.item.name || agentData.item.agent_policy_id}
+                  {agentPolicyData.item.name || agentData.item.policy_id}
                 </EuiLink>
               ) : (
-                agentData.item.agent_policy_id || '-'
+                agentData.item.policy_id || '-'
               ),
             },
             { isDivider: true },
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
index 0c62afb90284ce..05c75f0b3bf1f1 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
@@ -284,22 +284,21 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
                 {policyName || policyId}
               </EuiLink>
             </EuiFlexItem>
-            {agent.agent_policy_revision && (
+            {agent.policy_revision && (
               <EuiFlexItem grow={false}>
                 <EuiText color="default" size="xs" className="eui-textNoWrap">
                   <FormattedMessage
                     id="xpack.ingestManager.agentList.revisionNumber"
                     defaultMessage="rev. {revNumber}"
-                    values={{ revNumber: agent.agent_policy_revision }}
+                    values={{ revNumber: agent.policy_revision }}
                   />
                 </EuiText>
               </EuiFlexItem>
             )}
-            {agent.agent_policy_id &&
-              agent.agent_policy_revision &&
-              agentPoliciesIndexedById[agent.agent_policy_id] &&
-              agentPoliciesIndexedById[agent.agent_policy_id].revision >
-                agent.agent_policy_revision && (
+            {agent.policy_id &&
+              agent.policy_revision &&
+              agentPoliciesIndexedById[agent.policy_id] &&
+              agentPoliciesIndexedById[agent.policy_id].revision > agent.policy_revision && (
                 <EuiFlexItem grow={false}>
                   <EuiText color="subdued" size="xs" className="eui-textNoWrap">
                     <EuiIcon size="m" type="alert" color="warning" />
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx
index 3e2059f5505375..740367de9e49be 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx
@@ -36,7 +36,7 @@ export const AgentReassignAgentPolicyFlyout: React.FunctionComponent<Props> = ({
 }) => {
   const { notifications } = useCore();
   const [selectedAgentPolicyId, setSelectedAgentPolicyId] = useState<string | undefined>(
-    agent.agent_policy_id
+    agent.policy_id
   );
 
   const agentPoliciesRequest = useGetAgentPolicies({
@@ -54,7 +54,7 @@ export const AgentReassignAgentPolicyFlyout: React.FunctionComponent<Props> = ({
         throw new Error('No selected agent policy id');
       }
       const res = await sendPutAgentReassign(agent.id, {
-        agent_policy_id: selectedAgentPolicyId,
+        policy_id: selectedAgentPolicyId,
       });
       if (res.error) {
         throw res.error;
@@ -134,7 +134,7 @@ export const AgentReassignAgentPolicyFlyout: React.FunctionComponent<Props> = ({
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
             <EuiButton
-              disabled={selectedAgentPolicyId === agent.agent_policy_id}
+              disabled={selectedAgentPolicyId === agent.policy_id}
               fill
               onClick={onSubmit}
               isLoading={isSubmitting}
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts
index 439cee9334ee66..bc9100a3e41989 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts
@@ -310,11 +310,7 @@ export const putAgentsReassignHandler: RequestHandler<
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   try {
-    await AgentService.reassignAgent(
-      soClient,
-      request.params.agentId,
-      request.body.agent_policy_id
-    );
+    await AgentService.reassignAgent(soClient, request.params.agentId, request.body.policy_id);
 
     const body: PutAgentReassignResponse = {
       success: true,
diff --git a/x-pack/plugins/ingest_manager/server/routes/enrollment_api_key/handler.ts b/x-pack/plugins/ingest_manager/server/routes/enrollment_api_key/handler.ts
index 8c7937640a515f..2d6e2f67225e33 100644
--- a/x-pack/plugins/ingest_manager/server/routes/enrollment_api_key/handler.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/enrollment_api_key/handler.ts
@@ -51,7 +51,7 @@ export const postEnrollmentApiKeyHandler: RequestHandler<
     const apiKey = await APIKeyService.generateEnrollmentAPIKey(soClient, {
       name: request.body.name,
       expiration: request.body.expiration,
-      agentPolicyId: request.body.agent_policy_id,
+      agentPolicyId: request.body.policy_id,
     });
 
     const body: PostEnrollmentAPIKeyResponse = { item: apiKey, success: true, action: 'created' };
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
index 0449610cdd65f6..6e7ae840751463 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
@@ -17,7 +17,7 @@ import {
   ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
   GLOBAL_SETTINGS_SAVED_OBJECT_TYPE,
 } from '../constants';
-import { migrateAgentToV7100 } from './migrations/to_v7_10_0.ts';
+import { migrateAgentToV7100 } from './migrations/to_v7_10_0';
 
 /*
  * Saved object types and mappings
@@ -62,8 +62,8 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
         version: { type: 'keyword' },
         user_provided_metadata: { type: 'flattened' },
         local_metadata: { type: 'flattened' },
-        agent_policy_id: { type: 'keyword' },
-        agent_policy_revision: { type: 'integer' },
+        policy_id: { type: 'keyword' },
+        policy_revision: { type: 'integer' },
         last_updated: { type: 'date' },
         last_checkin: { type: 'date' },
         last_checkin_status: { type: 'keyword' },
@@ -320,8 +320,8 @@ export function registerEncryptedSavedObjects(
       'version',
       'user_provided_metadata',
       'local_metadata',
-      'agent_policy_id',
-      'agent_policy_revision',
+      'policy_id',
+      'policy_revision',
       'last_updated',
       'last_checkin',
       'last_checkin_status',
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
index 5e6ccc7a40ea9c..efc61afc4f3d75 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
@@ -9,19 +9,19 @@ import { cloneDeep } from 'lodash';
 import { Agent } from '../../types';
 
 export const migrateAgentToV7100: SavedObjectMigrationFn<
-  Exclude<Agent, 'agent_policy_id' | 'agent_policy_revision'> & {
+  Exclude<Agent, 'policy_id' | 'policy_revision'> & {
     config_id?: string;
-    agent_policy_revision?: number | null;
+    policy_revision?: number | null;
   },
   Agent
 > = (agentDoc) => {
   const updatedAgentDoc = cloneDeep(agentDoc);
 
-  updatedAgentDoc.attributes.agent_policy_id = agentDoc.attributes.config_id;
+  updatedAgentDoc.attributes.policy_id = agentDoc.attributes.config_id;
   delete updatedAgentDoc.attributes.config_id;
 
-  updatedAgentDoc.attributes.agent_policy_revision = agentDoc.attributes.agent_policy_revision;
-  delete updatedAgentDoc.attributes.agent_policy_revision;
+  updatedAgentDoc.attributes.policy_revision = agentDoc.attributes.policy_revision;
+  delete updatedAgentDoc.attributes.policy_revision;
 
   return updatedAgentDoc;
 };
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts b/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
index e1fa97e57d436f..3313ac4a9fddda 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
@@ -224,7 +224,7 @@ describe('test agent acks services', () => {
     expect(mockSavedObjectsClient.bulkUpdate.mock.calls[0][0][0]).toMatchInlineSnapshot(`
       Object {
         "attributes": Object {
-          "agent_policy_revision": 4,
+          "policy_revision": 4,
           "packages": Array [
             "system",
           ],
@@ -350,7 +350,7 @@ describe('test agent acks services', () => {
         id: 'id',
         type: AGENT_TYPE_PERMANENT,
         config_id: 'config1',
-        agent_policy_revision: 100,
+        policy_revision: 100,
       } as unknown) as Agent,
       [
         {
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/acks.ts b/x-pack/plugins/ingest_manager/server/services/agents/acks.ts
index 3b4c00cf5c8885..87572ce405ee70 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/acks.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/acks.ts
@@ -87,11 +87,11 @@ function getLatestAgentPolicyIfUpdated(agent: Agent, actions: AgentAction[]) {
     }
     const data = action.data || {};
 
-    if (data?.config?.id !== agent.agent_policy_id) {
+    if (data?.config?.id !== agent.policy_id) {
       return acc;
     }
 
-    const currentRevision = (acc && acc.revision) || agent.agent_policy_revision || 0;
+    const currentRevision = (acc && acc.revision) || agent.policy_revision || 0;
 
     return data?.config?.revision > currentRevision ? data?.config : acc;
   }, null);
@@ -110,7 +110,7 @@ function buildUpdateAgentPolicy(agentId: string, agentPolicy: FullAgentPolicy) {
     type: AGENT_SAVED_OBJECT_TYPE,
     id: agentId,
     attributes: {
-      agent_policy_revision: agentPolicy.revision,
+      policy_revision: agentPolicy.revision,
       packages,
     },
   };
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/checkin/index.ts b/x-pack/plugins/ingest_manager/server/services/agents/checkin/index.ts
index 5db0492173c036..f8584c6dc372a7 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/checkin/index.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/checkin/index.ts
@@ -63,7 +63,7 @@ async function processEventsForCheckin(
   const updatedErrorEvents: Array<AgentEvent | NewAgentEvent> = [...agent.current_error_events];
   for (const event of events) {
     // @ts-ignore
-    event.config_id = agent.agent_policy_id;
+    event.config_id = agent.policy_id;
 
     if (isErrorOrState(event)) {
       // Remove any global or specific to a stream event
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
index 2c2e84496006e9..dd4b26a7b0074f 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
@@ -102,7 +102,7 @@ function shouldCreateAgentPolicyAction(agent: Agent, agentPolicy: FullAgentPolic
     return false;
   }
   const isAgentPolicyOutdated =
-    !agent.agent_policy_revision || agent.agent_policy_revision < agentPolicy.revision;
+    !agent.policy_revision || agent.policy_revision < agentPolicy.revision;
   if (!isAgentPolicyOutdated) {
     return false;
   }
@@ -150,10 +150,10 @@ export function agentCheckinStateNewActionsFactory() {
     agent: Agent,
     options?: { signal: AbortSignal }
   ): Promise<AgentAction[]> {
-    if (!agent.agent_policy_id) {
+    if (!agent.policy_id) {
       throw new Error('Agent does not have a policy');
     }
-    const agentPolicyId = agent.agent_policy_id;
+    const agentPolicyId = agent.policy_id;
     if (!agentPolicies$.has(agentPolicyId)) {
       agentPolicies$.set(agentPolicyId, createAgentPolicySharedObservable(agentPolicyId));
     }
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/enroll.ts b/x-pack/plugins/ingest_manager/server/services/agents/enroll.ts
index acae480be258bf..606d5c4dcbb90a 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/enroll.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/enroll.ts
@@ -33,7 +33,7 @@ export async function enroll(
   const agentData: AgentSOAttributes = {
     shared_id: sharedId,
     active: true,
-    agent_policy_id: agentPolicyId,
+    policy_id: agentPolicyId,
     type,
     enrolled_at: enrolledAt,
     user_provided_metadata: metadata?.userProvided ?? {},
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts b/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts
index 65749572eb363f..e75f0bf5a6d0a4 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts
@@ -21,7 +21,7 @@ export async function reassignAgent(
   }
 
   await soClient.update<AgentSOAttributes>(AGENT_SAVED_OBJECT_TYPE, agentId, {
-    agent_policy_id: newAgentPolicyId,
-    agent_policy_revision: null,
+    policy_id: newAgentPolicyId,
+    policy_revision: null,
   });
 }
diff --git a/x-pack/plugins/ingest_manager/server/types/rest_spec/agent.ts b/x-pack/plugins/ingest_manager/server/types/rest_spec/agent.ts
index 4fb930e663098f..3302b0ab84ba88 100644
--- a/x-pack/plugins/ingest_manager/server/types/rest_spec/agent.ts
+++ b/x-pack/plugins/ingest_manager/server/types/rest_spec/agent.ts
@@ -85,7 +85,7 @@ export const PutAgentReassignRequestSchema = {
     agentId: schema.string(),
   }),
   body: schema.object({
-    agent_policy_id: schema.string(),
+    policy_id: schema.string(),
   }),
 };
 
diff --git a/x-pack/plugins/ingest_manager/server/types/rest_spec/enrollment_api_key.ts b/x-pack/plugins/ingest_manager/server/types/rest_spec/enrollment_api_key.ts
index 62353a3eca19cf..397927ae792a49 100644
--- a/x-pack/plugins/ingest_manager/server/types/rest_spec/enrollment_api_key.ts
+++ b/x-pack/plugins/ingest_manager/server/types/rest_spec/enrollment_api_key.ts
@@ -29,7 +29,7 @@ export const DeleteEnrollmentAPIKeyRequestSchema = {
 export const PostEnrollmentAPIKeyRequestSchema = {
   body: schema.object({
     name: schema.maybe(schema.string()),
-    agent_policy_id: schema.string(),
+    policy_id: schema.string(),
     expiration: schema.maybe(schema.string()),
   }),
 };
diff --git a/x-pack/plugins/security_solution/server/usage/endpoints/endpoint.mocks.ts b/x-pack/plugins/security_solution/server/usage/endpoints/endpoint.mocks.ts
index d6e69919b9ffaa..94957decc52fe0 100644
--- a/x-pack/plugins/security_solution/server/usage/endpoints/endpoint.mocks.ts
+++ b/x-pack/plugins/security_solution/server/usage/endpoints/endpoint.mocks.ts
@@ -45,7 +45,7 @@ export const mockFleetObjectsResponse = (
       attributes: {
         active: true,
         id: testAgentId,
-        agent_policy_id: 'randoAgentPolicyId',
+        policy_id: 'randoAgentPolicyId',
         type: 'PERMANENT',
         user_provided_metadata: {},
         enrolled_at: lastCheckIn,
@@ -82,7 +82,7 @@ export const mockFleetObjectsResponse = (
       attributes: {
         active: true,
         id: 'oldTestAgentId',
-        agent_policy_id: 'randoAgentPolicyId',
+        policy_id: 'randoAgentPolicyId',
         type: 'PERMANENT',
         user_provided_metadata: {},
         enrolled_at: lastCheckIn,

From ec292722be012a12ae1c816278bcb0db534c905b Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Thu, 13 Aug 2020 17:56:56 -0700
Subject: [PATCH 09/24] Rename agent policy SO attributes and add migrations

---
 .../common/constants/agent_config.ts          |  2 +-
 .../common/services/limited_package.ts        |  4 ++--
 .../common/types/models/agent_config.ts       |  2 +-
 .../dev_docs/schema/saved_objects.mml         |  8 +++----
 .../step_define_package_config.tsx            | 12 +++++-----
 .../step_select_package.tsx                   |  2 +-
 .../components/package_configs/index.tsx      |  4 ++--
 .../agent_config/details_page/index.tsx       |  4 ++--
 .../sections/agent_config/list_page/index.tsx |  4 ++--
 .../agent_config_package_badges.tsx           |  6 ++---
 .../server/collectors/package_collectors.ts   |  2 +-
 .../server/saved_objects/index.ts             |  7 ++++--
 .../saved_objects/migrations/to_v7_10_0.ts    | 16 ++++++++++++-
 .../server/services/agent_config.ts           | 24 +++++++++----------
 .../server/services/package_config.ts         |  4 ++--
 .../ingest_manager/server/services/setup.ts   |  6 ++---
 .../server/types/models/agent_config.ts       |  2 +-
 .../common/endpoint/generate_data.ts          |  2 +-
 .../pages/endpoint_hosts/store/middleware.ts  |  4 ++--
 .../store/mock_endpoint_result_list.ts        |  2 +-
 20 files changed, 67 insertions(+), 50 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/common/constants/agent_config.ts b/x-pack/plugins/ingest_manager/common/constants/agent_config.ts
index d998ef761a8cf8..f6261790f66739 100644
--- a/x-pack/plugins/ingest_manager/common/constants/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/common/constants/agent_config.ts
@@ -12,7 +12,7 @@ export const DEFAULT_AGENT_POLICY = {
   namespace: 'default',
   description: 'Default agent policy created by Kibana',
   status: AgentPolicyStatus.Active,
-  package_configs: [],
+  package_policies: [],
   is_default: true,
   monitoring_enabled: ['logs', 'metrics'] as Array<'logs' | 'metrics'>,
 };
diff --git a/x-pack/plugins/ingest_manager/common/services/limited_package.ts b/x-pack/plugins/ingest_manager/common/services/limited_package.ts
index 311ce359c81fbd..21d1dbd1556b7c 100644
--- a/x-pack/plugins/ingest_manager/common/services/limited_package.ts
+++ b/x-pack/plugins/ingest_manager/common/services/limited_package.ts
@@ -14,10 +14,10 @@ export const doesAgentPolicyAlreadyIncludePackage = (
   agentPolicy: AgentPolicy,
   packageName: string
 ): boolean => {
-  if (agentPolicy.package_configs.length && typeof agentPolicy.package_configs[0] === 'string') {
+  if (agentPolicy.package_policies.length && typeof agentPolicy.package_policies[0] === 'string') {
     throw new Error('Unable to read full package policy information');
   }
-  return (agentPolicy.package_configs as PackagePolicy[])
+  return (agentPolicy.package_policies as PackagePolicy[])
     .map((packagePolicy) => packagePolicy.package?.name || '')
     .includes(packageName);
 };
diff --git a/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts b/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts
index e1a62eb7296035..8e4ecfb1bc8e54 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts
@@ -22,7 +22,7 @@ export interface NewAgentPolicy {
 export interface AgentPolicy extends NewAgentPolicy {
   id: string;
   status: AgentPolicyStatus;
-  package_configs: string[] | PackagePolicy[];
+  package_policies: string[] | PackagePolicy[];
   updated_at: string;
   updated_by: string;
   revision: number;
diff --git a/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml b/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml
index d740adecd30e40..b45a99b067850d 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml
+++ b/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml
@@ -1,11 +1,11 @@
 classDiagram
-  agent_configs "1" -- "*"  package_configs
+  agent_configs "1" -- "*"  package_policies
   agent_configs "1" -- "*"  enrollment_api_keys
   agent_configs "1" -- "*"  agents : is used
   agent_configs "*" -- "*"  outputs
   agents "1" -- "*"  agent_events
   agents "1" -- "*"  agent_events
-  package "1" -- "*"  package_configs
+  package "1" -- "*"  package_policies
 
   class package {
     installed
@@ -37,14 +37,14 @@ classDiagram
   }
 
   class agent_configs {
-    package_configs // package_config ids
+    package_policies // package_config ids
     name
     namespace
     description
     status
   }
 
-	class package_configs {
+	class package_policies {
     name
     namespace
     config_id
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_define_package_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_define_package_config.tsx
index 9ad396601cec43..bdbe2d6ed9177a 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_define_package_config.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_define_package_config.tsx
@@ -40,10 +40,10 @@ export const StepDefinePackagePolicy: React.FunctionComponent<{
     // If package has changed, create shell package policy with input&stream values based on package info
     if (currentPkgKey !== pkgKey) {
       // Existing package policies on the agent policy using the package name, retrieve highest number appended to package policy name
-      const dsPackageNamePattern = new RegExp(`${packageInfo.name}-(\\d+)`);
-      const dsWithMatchingNames = (agentPolicy.package_configs as PackagePolicy[])
-        .filter((ds) => Boolean(ds.name.match(dsPackageNamePattern)))
-        .map((ds) => parseInt(ds.name.match(dsPackageNamePattern)![1], 10))
+      const pkgPoliciesNamePattern = new RegExp(`${packageInfo.name}-(\\d+)`);
+      const pkgPoliciesWithMatchingNames = (agentPolicy.package_policies as PackagePolicy[])
+        .filter((ds) => Boolean(ds.name.match(pkgPoliciesNamePattern)))
+        .map((ds) => parseInt(ds.name.match(pkgPoliciesNamePattern)![1], 10))
         .sort();
 
       updatePackagePolicy({
@@ -53,8 +53,8 @@ export const StepDefinePackagePolicy: React.FunctionComponent<{
           // FIXME: Improve package policies name uniqueness - https://github.com/elastic/kibana/issues/72948
           packageInfo.name !== 'endpoint'
             ? `${packageInfo.name}-${
-                dsWithMatchingNames.length
-                  ? dsWithMatchingNames[dsWithMatchingNames.length - 1] + 1
+                pkgPoliciesWithMatchingNames.length
+                  ? pkgPoliciesWithMatchingNames[pkgPoliciesWithMatchingNames.length - 1] + 1
                   : 1
               }`
             : '',
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_package.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_package.tsx
index ab7a415ec7a90d..704455b21d64a7 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_package.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_package.tsx
@@ -59,7 +59,7 @@ export const StepSelectPackage: React.FunctionComponent<{
     if (packagesData?.response && limitedPackagesData?.response && agentPolicyData?.item) {
       const allPackages = packagesData.response;
       const limitedPackages = limitedPackagesData.response;
-      const usedLimitedPackages = (agentPolicyData.item.package_configs as PackagePolicy[])
+      const usedLimitedPackages = (agentPolicyData.item.package_policies as PackagePolicy[])
         .map((packagePolicy) => packagePolicy.package?.name || '')
         .filter((pkgName) => limitedPackages.includes(pkgName));
       setPackages(allPackages.filter((pkg) => !usedLimitedPackages.includes(pkg.name)));
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/index.tsx
index 55f80af5e2d8c2..03145a3f39ddf1 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/index.tsx
@@ -10,14 +10,14 @@ import { NoPackagePolicies } from './no_package_configs';
 import { PackagePoliciesTable } from './package_configs_table';
 
 export const PackagePoliciesView = memo<{ agentPolicy: AgentPolicy }>(({ agentPolicy }) => {
-  if (agentPolicy.package_configs.length === 0) {
+  if (agentPolicy.package_policies.length === 0) {
     return <NoPackagePolicies policyId={agentPolicy.id} />;
   }
 
   return (
     <PackagePoliciesTable
       agentPolicy={agentPolicy}
-      packagePolicies={(agentPolicy.package_configs || []) as PackagePolicy[]}
+      packagePolicies={(agentPolicy.package_policies || []) as PackagePolicy[]}
     />
   );
 });
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx
index 67057a13bd21a4..014e35dc32dae4 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx
@@ -127,8 +127,8 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
                 <EuiI18nNumber
                   value={
                     (agentPolicy &&
-                      agentPolicy.package_configs &&
-                      agentPolicy.package_configs.length) ||
+                      agentPolicy.package_policies &&
+                      agentPolicy.package_policies.length) ||
                     0
                   }
                 />
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/index.tsx
index 0c1e278d5cba71..361b1c33f1a042 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/index.tsx
@@ -184,7 +184,7 @@ export const AgentPolicyListPage: React.FunctionComponent<{}> = () => {
         ),
       },
       {
-        field: 'package_configs',
+        field: 'package_policies',
         name: i18n.translate(
           'xpack.ingestManager.agentPolicyList.packagePoliciesCountColumnTitle',
           {
@@ -192,7 +192,7 @@ export const AgentPolicyListPage: React.FunctionComponent<{}> = () => {
           }
         ),
         dataType: 'number',
-        render: (packagePolicies: AgentPolicy['package_configs']) =>
+        render: (packagePolicies: AgentPolicy['package_policies']) =>
           packagePolicies ? packagePolicies.length : 0,
       },
       {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_config_package_badges.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_config_package_badges.tsx
index 35685b5c12b346..0a3d6d54da8340 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_config_package_badges.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_config_package_badges.tsx
@@ -28,13 +28,13 @@ export const AgentPolicyPackageBadges: React.FunctionComponent<Props> = ({ agent
           id="xpack.ingestManager.agentReassignPolicy.policyDescription"
           defaultMessage="The selected agent policy will collect data for {count, plural, one {{countValue} integration} other {{countValue} integrations}}:"
           values={{
-            count: agentPolicy.package_configs.length,
-            countValue: <b>{agentPolicy.package_configs.length}</b>,
+            count: agentPolicy.package_policies.length,
+            countValue: <b>{agentPolicy.package_policies.length}</b>,
           }}
         />
       </EuiText>
       <EuiSpacer size="s" />
-      {(agentPolicy.package_configs as PackagePolicy[]).map((packagePolicy, idx) => {
+      {(agentPolicy.package_policies as PackagePolicy[]).map((packagePolicy, idx) => {
         if (!packagePolicy.package) {
           return null;
         }
diff --git a/x-pack/plugins/ingest_manager/server/collectors/package_collectors.ts b/x-pack/plugins/ingest_manager/server/collectors/package_collectors.ts
index 18c5d34cdd8c78..63f118c84301f9 100644
--- a/x-pack/plugins/ingest_manager/server/collectors/package_collectors.ts
+++ b/x-pack/plugins/ingest_manager/server/collectors/package_collectors.ts
@@ -30,7 +30,7 @@ export const getPackageUsage = async (soClient?: SavedObjectsClient): Promise<Pa
   // to the (then to be created) agent policy collector, so we only query and loop over these
   // objects once.
   const packagesInAgentPolicies = agentPolicies.items.map((agentPolicy) => {
-    const packagePolicies: NewPackagePolicy[] = agentPolicy.package_configs as NewPackagePolicy[];
+    const packagePolicies: NewPackagePolicy[] = agentPolicy.package_policies as NewPackagePolicy[];
     return packagePolicies
       .map((packagePolicy) => packagePolicy.package?.name)
       .filter((packageName): packageName is string => packageName !== undefined);
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
index 6e7ae840751463..647a0a6dd5cde2 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
@@ -17,7 +17,7 @@ import {
   ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
   GLOBAL_SETTINGS_SAVED_OBJECT_TYPE,
 } from '../constants';
-import { migrateAgentToV7100 } from './migrations/to_v7_10_0';
+import { migrateAgentToV7100, migrateAgentPolicyToV7100 } from './migrations/to_v7_10_0';
 
 /*
  * Saved object types and mappings
@@ -131,13 +131,16 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
         namespace: { type: 'keyword' },
         is_default: { type: 'boolean' },
         status: { type: 'keyword' },
-        package_configs: { type: 'keyword' },
+        package_policies: { type: 'keyword' },
         updated_at: { type: 'date' },
         updated_by: { type: 'keyword' },
         revision: { type: 'integer' },
         monitoring_enabled: { type: 'keyword', index: false },
       },
     },
+    migrations: {
+      '7.10.0': migrateAgentPolicyToV7100,
+    },
   },
   [ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE]: {
     name: ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
index efc61afc4f3d75..c03da21daca9a7 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
@@ -6,7 +6,7 @@
 
 import { SavedObjectMigrationFn } from 'kibana/server';
 import { cloneDeep } from 'lodash';
-import { Agent } from '../../types';
+import { Agent, AgentPolicy, PackagePolicy } from '../../types';
 
 export const migrateAgentToV7100: SavedObjectMigrationFn<
   Exclude<Agent, 'policy_id' | 'policy_revision'> & {
@@ -25,3 +25,17 @@ export const migrateAgentToV7100: SavedObjectMigrationFn<
 
   return updatedAgentDoc;
 };
+
+export const migrateAgentPolicyToV7100: SavedObjectMigrationFn<
+  Exclude<AgentPolicy, 'package_policies'> & {
+    package_configs: string[] | PackagePolicy[];
+  },
+  AgentPolicy
+> = (agentPolicyDoc) => {
+  const updatedAgentPolicyDoc = cloneDeep(agentPolicyDoc);
+
+  updatedAgentPolicyDoc.attributes.package_policies = agentPolicyDoc.attributes.package_configs;
+  delete updatedAgentPolicyDoc.attributes.package_configs;
+
+  return updatedAgentPolicyDoc;
+};
diff --git a/x-pack/plugins/ingest_manager/server/services/agent_config.ts b/x-pack/plugins/ingest_manager/server/services/agent_config.ts
index 41d4240d85a310..d0f496458d77f5 100644
--- a/x-pack/plugins/ingest_manager/server/services/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agent_config.ts
@@ -130,10 +130,10 @@ class AgentPolicyService {
     const agentPolicy = { id: agentPolicySO.id, ...agentPolicySO.attributes };
 
     if (withPackagePolicies) {
-      agentPolicy.package_configs =
+      agentPolicy.package_policies =
         (await packagePolicyService.getByIDs(
           soClient,
-          (agentPolicySO.attributes.package_configs as string[]) || []
+          (agentPolicySO.attributes.package_policies as string[]) || []
         )) || [];
     }
 
@@ -183,7 +183,7 @@ class AgentPolicyService {
             withPackagePolicies
           );
           if (agentPolicyWithPackagePolicies) {
-            agentPolicy.package_configs = agentPolicyWithPackagePolicies.package_configs;
+            agentPolicy.package_policies = agentPolicyWithPackagePolicies.package_policies;
           }
         }
         return agentPolicy;
@@ -231,8 +231,8 @@ class AgentPolicyService {
     );
 
     // Copy all package policies
-    if (baseAgentPolicy.package_configs.length) {
-      const newPackagePolicies = (baseAgentPolicy.package_configs as PackagePolicy[]).map(
+    if (baseAgentPolicy.package_policies.length) {
+      const newPackagePolicies = (baseAgentPolicy.package_policies as PackagePolicy[]).map(
         (packagePolicy: PackagePolicy) => {
           const { id: packagePolicyId, version, ...newPackagePolicy } = packagePolicy;
           return newPackagePolicy;
@@ -277,8 +277,8 @@ class AgentPolicyService {
       soClient,
       id,
       {
-        package_configs: uniq(
-          [...((oldAgentPolicy.package_configs || []) as string[])].concat(packagePolicyIds)
+        package_policies: uniq(
+          [...((oldAgentPolicy.package_policies || []) as string[])].concat(packagePolicyIds)
         ),
       },
       options?.user,
@@ -302,8 +302,8 @@ class AgentPolicyService {
       soClient,
       id,
       {
-        package_configs: uniq(
-          [...((oldAgentPolicy.package_configs || []) as string[])].filter(
+        package_policies: uniq(
+          [...((oldAgentPolicy.package_policies || []) as string[])].filter(
             (packagePolicyId) => !packagePolicyIds.includes(packagePolicyId)
           )
         ),
@@ -351,8 +351,8 @@ class AgentPolicyService {
       throw new Error('Cannot delete agent policy that is assigned to agent(s)');
     }
 
-    if (agentPolicy.package_configs && agentPolicy.package_configs.length) {
-      await packagePolicyService.delete(soClient, agentPolicy.package_configs as string[], {
+    if (agentPolicy.package_policies && agentPolicy.package_policies.length) {
+      await packagePolicyService.delete(soClient, agentPolicy.package_policies as string[], {
         skipUnassignFromAgentPolicies: true,
       });
     }
@@ -415,7 +415,7 @@ class AgentPolicyService {
           {} as FullAgentPolicy['outputs']
         ),
       },
-      inputs: storedPackagePoliciesToAgentInputs(agentPolicy.package_configs as PackagePolicy[]),
+      inputs: storedPackagePoliciesToAgentInputs(agentPolicy.package_policies as PackagePolicy[]),
       revision: agentPolicy.revision,
       ...(agentPolicy.monitoring_enabled && agentPolicy.monitoring_enabled.length > 0
         ? {
diff --git a/x-pack/plugins/ingest_manager/server/services/package_config.ts b/x-pack/plugins/ingest_manager/server/services/package_config.ts
index 60b18d272d56be..5a3e03601c718b 100644
--- a/x-pack/plugins/ingest_manager/server/services/package_config.ts
+++ b/x-pack/plugins/ingest_manager/server/services/package_config.ts
@@ -50,7 +50,7 @@ class PackagePolicyService {
       throw new Error('Agent policy not found');
     } else {
       if (
-        (parentAgentPolicy.package_configs as PackagePolicy[]).find(
+        (parentAgentPolicy.package_policies as PackagePolicy[]).find(
           (siblingPackagePolicy) => siblingPackagePolicy.name === packagePolicy.name
         )
       ) {
@@ -251,7 +251,7 @@ class PackagePolicyService {
       throw new Error('Agent policy not found');
     } else {
       if (
-        (parentAgentPolicy.package_configs as PackagePolicy[]).find(
+        (parentAgentPolicy.package_policies as PackagePolicy[]).find(
           (siblingPackagePolicy) =>
             siblingPackagePolicy.id !== id && siblingPackagePolicy.name === packagePolicy.name
         )
diff --git a/x-pack/plugins/ingest_manager/server/services/setup.ts b/x-pack/plugins/ingest_manager/server/services/setup.ts
index dc3595c5b35478..b7865d6caea742 100644
--- a/x-pack/plugins/ingest_manager/server/services/setup.ts
+++ b/x-pack/plugins/ingest_manager/server/services/setup.ts
@@ -95,8 +95,8 @@ export async function setupIngestManager(
       throw new Error('Policy not found');
     }
     if (
-      agentPolicyWithPackagePolicies.package_configs.length &&
-      typeof agentPolicyWithPackagePolicies.package_configs[0] === 'string'
+      agentPolicyWithPackagePolicies.package_policies.length &&
+      typeof agentPolicyWithPackagePolicies.package_policies[0] === 'string'
     ) {
       throw new Error('Policy not found');
     }
@@ -108,7 +108,7 @@ export async function setupIngestManager(
         continue;
       }
 
-      const isInstalled = agentPolicyWithPackagePolicies.package_configs.some(
+      const isInstalled = agentPolicyWithPackagePolicies.package_policies.some(
         (d: PackagePolicy | string) => {
           return typeof d !== 'string' && d.package?.name === installedPackage.name;
         }
diff --git a/x-pack/plugins/ingest_manager/server/types/models/agent_config.ts b/x-pack/plugins/ingest_manager/server/types/models/agent_config.ts
index c83f8c93675c19..94dc11ba93ac16 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/agent_config.ts
@@ -27,7 +27,7 @@ export const AgentPolicySchema = schema.object({
     schema.literal(AgentPolicyStatus.Active),
     schema.literal(AgentPolicyStatus.Inactive),
   ]),
-  package_configs: schema.oneOf([
+  package_policies: schema.oneOf([
     schema.arrayOf(schema.string()),
     schema.arrayOf(PackagePolicySchema),
   ]),
diff --git a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
index b7c6fe5c8beb62..e56679f3286712 100644
--- a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
@@ -1089,7 +1089,7 @@ export class EndpointDocGenerator {
       revision: 2,
       updated_at: '2020-07-22T16:36:49.196Z',
       updated_by: 'elastic',
-      package_configs: ['852491f0-cc39-11ea-bac2-cdbf95b4b41a'],
+      package_policies: ['852491f0-cc39-11ea-bac2-cdbf95b4b41a'],
       agents: 0,
     };
   }
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts
index 8cffa22196d5a7..f56f28bfef39ac 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts
@@ -265,13 +265,13 @@ const getNonExistingPoliciesForEndpointsList = async (
   const policiesFound = (
     await sendGetAgentPolicyList(http, {
       query: {
-        kuery: `${AGENT_POLICY_SAVED_OBJECT_TYPE}.package_configs: (${policyIdsToCheck.join(
+        kuery: `${AGENT_POLICY_SAVED_OBJECT_TYPE}.package_policies: (${policyIdsToCheck.join(
           ' or '
         )})`,
       },
     })
   ).items.reduce<EndpointState['nonExistingPolicies']>((list, agentPolicy) => {
-    (agentPolicy.package_configs as string[]).forEach((packagePolicy) => {
+    (agentPolicy.package_policies as string[]).forEach((packagePolicy) => {
       list[packagePolicy as string] = true;
     });
     return list;
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts
index 4ca986b50ce557..c8dfd452d14211 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts
@@ -108,7 +108,7 @@ const endpointListApiPathHandlerMocks = ({
     // just returns 1 single agent policy that includes all of the packagePolicy IDs provided
     [INGEST_API_AGENT_CONFIGS]: (): GetAgentPoliciesResponse => {
       const agentPolicy = generator.generateAgentPolicy();
-      (agentPolicy.package_configs as string[]).push(
+      (agentPolicy.package_policies as string[]).push(
         ...endpointPackagePolicies.map((packagePolicy) => packagePolicy.id)
       );
       return {

From a2b36ecfc18d73b1a8ec2786fb17c596be195659 Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Fri, 14 Aug 2020 13:26:55 -0700
Subject: [PATCH 10/24] Rename enrollment api key SO attributes and add
 migrations

---
 .../common/types/models/enrollment_api_key.ts    | 12 +++---------
 .../agent_enrollment_flyout/config_selection.tsx |  4 ++--
 .../server/routes/agent/handlers.ts              |  2 +-
 .../ingest_manager/server/saved_objects/index.ts | 13 ++++++++++---
 .../saved_objects/migrations/to_v7_10_0.ts       | 16 +++++++++++++++-
 .../services/api_keys/enrollment_api_key.ts      |  2 +-
 .../server/types/models/enrollment_api_key.ts    | 12 +-----------
 7 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/common/types/models/enrollment_api_key.ts b/x-pack/plugins/ingest_manager/common/types/models/enrollment_api_key.ts
index 204ce4b15ea5b3..f39076ce1027b4 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/enrollment_api_key.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/enrollment_api_key.ts
@@ -3,7 +3,6 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { SavedObjectAttributes } from 'src/core/public';
 
 export interface EnrollmentAPIKey {
   id: string;
@@ -11,13 +10,8 @@ export interface EnrollmentAPIKey {
   api_key: string;
   name?: string;
   active: boolean;
-  config_id?: string;
+  policy_id?: string;
+  created_at: string;
 }
 
-export interface EnrollmentAPIKeySOAttributes extends SavedObjectAttributes {
-  api_key_id: string;
-  api_key: string;
-  name?: string;
-  active: boolean;
-  config_id?: string;
-}
+export type EnrollmentAPIKeySOAttributes = Omit<EnrollmentAPIKey, 'id'>;
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx
index b2226626ab4f73..eda80905cd4526 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx
@@ -109,7 +109,7 @@ export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
           }
 
           setEnrollmentAPIKeys(
-            res.data.list.filter((key) => key.config_id === selectedState.agentPolicyId)
+            res.data.list.filter((key) => key.policy_id === selectedState.agentPolicyId)
           );
         } catch (error) {
           notifications.toasts.addError(error, {
@@ -130,7 +130,7 @@ export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
       if (
         !selectedState.enrollmentAPIKeyId &&
         enrollmentAPIKeys.length > 0 &&
-        enrollmentAPIKeys[0].config_id === selectedState.agentPolicyId
+        enrollmentAPIKeys[0].policy_id === selectedState.agentPolicyId
       ) {
         const enrollmentAPIKeyId = enrollmentAPIKeys[0].id;
         setSelectedState({
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts
index bc9100a3e41989..3e80a74dc2b11f 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts
@@ -239,7 +239,7 @@ export const postAgentEnrollHandler: RequestHandler<
     const agent = await AgentService.enroll(
       soClient,
       request.body.type,
-      enrollmentAPIKey.config_id as string,
+      enrollmentAPIKey.policy_id as string,
       {
         userProvided: request.body.metadata.user_provided,
         local: request.body.metadata.local,
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
index 647a0a6dd5cde2..bfe41a82584c74 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
@@ -17,7 +17,11 @@ import {
   ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
   GLOBAL_SETTINGS_SAVED_OBJECT_TYPE,
 } from '../constants';
-import { migrateAgentToV7100, migrateAgentPolicyToV7100 } from './migrations/to_v7_10_0';
+import {
+  migrateAgentToV7100,
+  migrateAgentPolicyToV7100,
+  migrateEnrollmentApiKeysToV7100,
+} from './migrations/to_v7_10_0';
 
 /*
  * Saved object types and mappings
@@ -155,13 +159,16 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
         type: { type: 'keyword' },
         api_key: { type: 'binary' },
         api_key_id: { type: 'keyword' },
-        config_id: { type: 'keyword' },
+        policy_id: { type: 'keyword' },
         created_at: { type: 'date' },
         updated_at: { type: 'date' },
         expire_at: { type: 'date' },
         active: { type: 'boolean' },
       },
     },
+    migrations: {
+      '7.10.0': migrateEnrollmentApiKeysToV7100,
+    },
   },
   [OUTPUT_SAVED_OBJECT_TYPE]: {
     name: OUTPUT_SAVED_OBJECT_TYPE,
@@ -292,7 +299,7 @@ export function registerEncryptedSavedObjects(
       'name',
       'type',
       'api_key_id',
-      'config_id',
+      'policy_id',
       'created_at',
       'updated_at',
       'expire_at',
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
index c03da21daca9a7..6e43379316697d 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
@@ -6,7 +6,7 @@
 
 import { SavedObjectMigrationFn } from 'kibana/server';
 import { cloneDeep } from 'lodash';
-import { Agent, AgentPolicy, PackagePolicy } from '../../types';
+import { Agent, AgentPolicy, PackagePolicy, EnrollmentAPIKey } from '../../types';
 
 export const migrateAgentToV7100: SavedObjectMigrationFn<
   Exclude<Agent, 'policy_id' | 'policy_revision'> & {
@@ -39,3 +39,17 @@ export const migrateAgentPolicyToV7100: SavedObjectMigrationFn<
 
   return updatedAgentPolicyDoc;
 };
+
+export const migrateEnrollmentApiKeysToV7100: SavedObjectMigrationFn<
+  Exclude<EnrollmentAPIKey, 'policy_id'> & {
+    config_id?: string;
+  },
+  EnrollmentAPIKey
+> = (enrollmentApiKeyDoc) => {
+  const updatedEnrollmentApiKeyDoc = cloneDeep(enrollmentApiKeyDoc);
+
+  updatedEnrollmentApiKeyDoc.attributes.policy_id = enrollmentApiKeyDoc.attributes.config_id;
+  delete updatedEnrollmentApiKeyDoc.attributes.config_id;
+
+  return updatedEnrollmentApiKeyDoc;
+};
diff --git a/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts b/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts
index 1f5346e1dd4a84..d90f0a16d9ad20 100644
--- a/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts
+++ b/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts
@@ -141,7 +141,7 @@ export async function generateEnrollmentAPIKey(
       api_key_id: key.id,
       api_key: apiKey,
       name,
-      config_id: agentPolicyId,
+      policy_id: agentPolicyId,
       created_at: new Date().toISOString(),
     }
   );
diff --git a/x-pack/plugins/ingest_manager/server/types/models/enrollment_api_key.ts b/x-pack/plugins/ingest_manager/server/types/models/enrollment_api_key.ts
index e563b39e53f507..919204f93ff21f 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/enrollment_api_key.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/enrollment_api_key.ts
@@ -11,15 +11,5 @@ export const EnrollmentAPIKeySchema = schema.object({
   api_key: schema.string(),
   name: schema.maybe(schema.string()),
   active: schema.boolean(),
-  config_id: schema.maybe(schema.string()),
-});
-
-export const EnrollmentAPIKeySOAttributesSchema = schema.object({
-  api_key_id: schema.string(),
-  api_key: schema.string(),
-  name: schema.maybe(schema.string()),
-  active: schema.boolean(),
-  config_id: schema.maybe(schema.string()),
-  // ASK: Is this allowUnknown? How do we type this with config-schema?
-  // [k: string]: schema.any(), // allow to use it as saved object attributes type
+  policy_id: schema.maybe(schema.string()),
 });

From 9223661ebb8d9f46a34d59ed166cf724befd7c88 Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Fri, 14 Aug 2020 14:07:35 -0700
Subject: [PATCH 11/24] Rename package policy SO attributes and add migrations

---
 x-pack/plugins/ingest_manager/common/mocks.ts      |  2 +-
 .../ingest_manager/common/openapi/spec_oas3.json   | 12 ++++++------
 .../package_configs_to_agent_inputs.test.ts        |  2 +-
 .../common/services/package_to_config.test.ts      |  8 ++++----
 .../common/services/package_to_config.ts           |  2 +-
 .../common/types/models/package_config.ts          |  2 +-
 .../ingest_manager/dev_docs/actions_and_events.md  |  2 +-
 .../ingest_manager/dev_docs/api/agents_enroll.md   |  2 +-
 .../dev_docs/schema/saved_objects.mml              |  6 +++---
 .../components/config_delete_provider.tsx          |  2 +-
 .../agent_config/components/linked_agent_count.tsx |  2 +-
 .../components/package_config_delete_provider.tsx  |  2 +-
 .../create_package_config_page/index.tsx           |  4 ++--
 .../services/validate_package_config.ts.test.ts    |  2 +-
 .../step_define_package_config.tsx                 |  6 +++---
 .../edit_package_config_page/index.tsx             |  2 +-
 .../sections/fleet/agent_list_page/index.tsx       |  4 ++--
 .../components/new_enrollment_key_flyout.tsx       |  2 +-
 .../fleet/enrollment_token_list_page/index.tsx     |  2 +-
 .../server/routes/agent_config/handlers.ts         |  4 ++--
 .../server/routes/package_config/handlers.test.ts  | 10 +++++-----
 .../ingest_manager/server/saved_objects/index.ts   |  6 +++++-
 .../server/saved_objects/migrations/to_v7_10_0.ts  | 14 ++++++++++++++
 .../ingest_manager/server/services/agent_config.ts |  2 +-
 .../server/services/agents/acks.test.ts            |  8 ++++----
 .../server/services/agents/status.ts               |  4 ++--
 .../server/services/agents/update.ts               |  2 +-
 .../server/services/api_keys/enrollment_api_key.ts |  2 +-
 .../server/services/package_config.ts              | 14 +++++++-------
 .../server/types/models/package_config.ts          |  2 +-
 .../common/endpoint/generate_data.ts               |  2 +-
 .../management/pages/endpoint_hosts/view/index.tsx |  4 ++--
 .../policy/store/policy_details/index.test.ts      |  4 ++--
 .../policy/store/policy_details/middleware.ts      |  4 ++--
 .../configure_package_config.tsx                   |  2 +-
 .../management/pages/policy/view/policy_list.tsx   |  8 ++++----
 .../endpoint/artifacts/api_feature/data.json       |  4 ++--
 .../functional/es_archives/fleet/agents/data.json  |  4 ++--
 .../apis/fleet/agents/enroll.ts                    |  2 +-
 .../apis/fleet/enrollment_api_keys/crud.ts         | 10 +++++-----
 .../apis/package_config/create.ts                  | 12 ++++++------
 .../apis/package_config/get.ts                     |  2 +-
 .../apis/package_config/update.ts                  |  8 ++++----
 .../services/endpoint_policy.ts                    |  2 +-
 44 files changed, 110 insertions(+), 92 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/common/mocks.ts b/x-pack/plugins/ingest_manager/common/mocks.ts
index eb52df1ba2a8af..c0ad9f2eff6421 100644
--- a/x-pack/plugins/ingest_manager/common/mocks.ts
+++ b/x-pack/plugins/ingest_manager/common/mocks.ts
@@ -12,7 +12,7 @@ export const createNewPackagePolicyMock = (): NewPackagePolicy => {
     description: '',
     namespace: 'default',
     enabled: true,
-    config_id: '93c46720-c217-11ea-9906-b5b8a21b268e',
+    policy_id: '93c46720-c217-11ea-9906-b5b8a21b268e',
     output_id: '',
     package: {
       name: 'endpoint',
diff --git a/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json b/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
index 29d9bf63de6306..2589cf8a4ba4db 100644
--- a/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
+++ b/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
@@ -186,7 +186,7 @@
                               "version": "0.0.3"
                             },
                             "enabled": true,
-                            "config_id": "82da1fc0-8fbf-11ea-b2ce-01c4a6127154",
+                            "policy_id": "82da1fc0-8fbf-11ea-b2ce-01c4a6127154",
                             "output_id": "08adc51c-69f3-4294-80e2-24527c6ff73d",
                             "inputs": [
                               {
@@ -2765,7 +2765,7 @@
                         {
                           "id": "205661d0-5e53-11ea-ad31-4f31c06bd9a4",
                           "active": true,
-                          "config_id": "ae556400-5e39-11ea-8b49-f9747e466f7b",
+                          "policy_id": "ae556400-5e39-11ea-8b49-f9747e466f7b",
                           "type": "PERMANENT",
                           "enrolled_at": "2020-03-04T20:02:50.605Z",
                           "user_provided_metadata": {
@@ -3433,7 +3433,7 @@
                       "item": {
                         "id": "8086fb1a-72ca-4a67-8533-09300c1639fa",
                         "active": true,
-                        "config_id": "2fe89350-a5e0-11ea-a587-5f886c8a849f",
+                        "policy_id": "2fe89350-a5e0-11ea-a587-5f886c8a849f",
                         "type": "PERMANENT",
                         "enrolled_at": "2020-06-04T13:03:57.856Z",
                         "user_provided_metadata": {
@@ -3892,7 +3892,7 @@
               "required": ["type", "enabled", "streams"]
             }
           },
-          "config_id": {
+          "policy_id": {
             "type": "string"
           },
           "name": {
@@ -3902,7 +3902,7 @@
             "type": "string"
           }
         },
-        "required": ["output_id", "inputs", "config_id", "name"]
+        "required": ["output_id", "inputs", "policy_id", "name"]
       },
       "PackageInfo": {
         "title": "PackageInfo",
@@ -4140,7 +4140,7 @@
           "default_api_key_id": {
             "type": "string"
           },
-          "config_id": {
+          "policy_id": {
             "type": "string"
           },
           "policy_revision": {
diff --git a/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.test.ts b/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.test.ts
index 23caee82b754b3..3910819434da54 100644
--- a/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.test.ts
+++ b/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.test.ts
@@ -15,7 +15,7 @@ describe('Ingest Manager - storedPackagePoliciesToAgentInputs', () => {
     created_by: '',
     updated_at: '',
     updated_by: '',
-    config_id: '',
+    policy_id: '',
     enabled: true,
     output_id: '',
     namespace: 'default',
diff --git a/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts b/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts
index 943f5c04dfa0a9..21dab8c8e416bb 100644
--- a/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts
+++ b/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts
@@ -318,7 +318,7 @@ describe('Ingest Manager - packageToPackagePolicy', () => {
   describe('packageToPackagePolicy', () => {
     it('returns package policy with default name', () => {
       expect(packageToPackagePolicy(mockPackage, '1', '2')).toEqual({
-        config_id: '1',
+        policy_id: '1',
         namespace: '',
         enabled: true,
         inputs: [],
@@ -333,7 +333,7 @@ describe('Ingest Manager - packageToPackagePolicy', () => {
     });
     it('returns package policy with custom name', () => {
       expect(packageToPackagePolicy(mockPackage, '1', '2', 'default', 'pkgPolicy-1')).toEqual({
-        config_id: '1',
+        policy_id: '1',
         namespace: 'default',
         enabled: true,
         inputs: [],
@@ -357,7 +357,7 @@ describe('Ingest Manager - packageToPackagePolicy', () => {
           'Test description'
         )
       ).toEqual({
-        config_id: '1',
+        policy_id: '1',
         enabled: true,
         inputs: [],
         name: 'pkgPolicy-1',
@@ -380,7 +380,7 @@ describe('Ingest Manager - packageToPackagePolicy', () => {
       expect(
         packageToPackagePolicy(mockPackageWithConfigTemplates, '1', '2', 'default', 'pkgPolicy-1')
       ).toEqual({
-        config_id: '1',
+        policy_id: '1',
         namespace: 'default',
         enabled: true,
         inputs: [{ type: 'foo', enabled: true, streams: [] }],
diff --git a/x-pack/plugins/ingest_manager/common/services/package_to_config.ts b/x-pack/plugins/ingest_manager/common/services/package_to_config.ts
index 0f752be6d1d605..eab2e8ac2d745a 100644
--- a/x-pack/plugins/ingest_manager/common/services/package_to_config.ts
+++ b/x-pack/plugins/ingest_manager/common/services/package_to_config.ts
@@ -129,7 +129,7 @@ export const packageToPackagePolicy = (
       version: packageInfo.version,
     },
     enabled: true,
-    config_id: agentPolicyId,
+    policy_id: agentPolicyId,
     output_id: outputId,
     inputs: packageToPackagePolicyInputs(packageInfo),
   };
diff --git a/x-pack/plugins/ingest_manager/common/types/models/package_config.ts b/x-pack/plugins/ingest_manager/common/types/models/package_config.ts
index b1aef24b88c1d6..724dbae5dac853 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/package_config.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/package_config.ts
@@ -49,7 +49,7 @@ export interface NewPackagePolicy {
   description?: string;
   namespace: string;
   enabled: boolean;
-  config_id: string;
+  policy_id: string;
   output_id: string;
   package?: PackagePolicyPackage;
   inputs: NewPackagePolicyInput[];
diff --git a/x-pack/plugins/ingest_manager/dev_docs/actions_and_events.md b/x-pack/plugins/ingest_manager/dev_docs/actions_and_events.md
index b41cdc221c51a3..f98a1c281e3eed 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/actions_and_events.md
+++ b/x-pack/plugins/ingest_manager/dev_docs/actions_and_events.md
@@ -17,7 +17,7 @@ This action is send when a new policy is available, the policy is available unde
     "id": "action_id_1",
     "data": {
       "policy":  {
-        "id": "config_id",
+        "id": "policy_id",
         "outputs": {
           "default": {
             "api_key": "slfhsdlfhjjkshfkjh:sdfsdfsdfsdf",
diff --git a/x-pack/plugins/ingest_manager/dev_docs/api/agents_enroll.md b/x-pack/plugins/ingest_manager/dev_docs/api/agents_enroll.md
index 304ce733b7dcd2..b32e6873c60e57 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/api/agents_enroll.md
+++ b/x-pack/plugins/ingest_manager/dev_docs/api/agents_enroll.md
@@ -45,7 +45,7 @@ The API returns the following:
   "item": {
     "id": "a4937110-e53e-11e9-934f-47a8e38a522c",
     "active": true,
-    "config_id": "default",
+    "policy_id": "default",
     "type": "PERMANENT",
     "enrolled_at": "2019-10-02T18:01:22.337Z",
     "user_provided_metadata": {},
diff --git a/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml b/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml
index b45a99b067850d..c45ff9d6f7cd3e 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml
+++ b/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml
@@ -14,7 +14,7 @@ classDiagram
 	class agents {
 		status
     access_api_key_id
-    config_id
+    policy_id
     last_checkin
     local_metadata
     user_provided_metadata
@@ -47,7 +47,7 @@ classDiagram
 	class package_policies {
     name
     namespace
-    config_id
+    policy_id
     enabled
     package
     output_id
@@ -64,7 +64,7 @@ classDiagram
 	}
 
   class enrollment_api_keys {
-    config_id
+    policy_id
     api_key_id
     api_key // Encrypted
   }
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_delete_provider.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_delete_provider.tsx
index c68d2c4e1ed40b..08367bf2a97bfc 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_delete_provider.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_delete_provider.tsx
@@ -98,7 +98,7 @@ export const AgentPolicyDeleteProvider: React.FunctionComponent<Props> = ({ chil
       path: `/api/ingest_manager/fleet/agents`,
       method: 'get',
       query: {
-        kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id : ${agentPolicyToCheck}`,
+        kuery: `${AGENT_SAVED_OBJECT_TYPE}.policy_id : ${agentPolicyToCheck}`,
       },
     });
     setAgentsCount(data?.total || 0);
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/linked_agent_count.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/linked_agent_count.tsx
index 4b88617f14e4b0..72e60ae678739b 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/linked_agent_count.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/linked_agent_count.tsx
@@ -23,7 +23,7 @@ export const LinkedAgentCount = memo<{ count: number; agentPolicyId: string }>(
     return count > 0 ? (
       <EuiLink
         href={getHref('fleet_agent_list', {
-          kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id : ${agentPolicyId}`,
+          kuery: `${AGENT_SAVED_OBJECT_TYPE}.policy_id : ${agentPolicyId}`,
         })}
       >
         {displayValue}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/package_config_delete_provider.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/package_config_delete_provider.tsx
index aeba0c8d29f2d1..3a6852de873f8b 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/package_config_delete_provider.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/package_config_delete_provider.tsx
@@ -51,7 +51,7 @@ export const PackagePolicyDeleteProvider: React.FunctionComponent<Props> = ({
         query: {
           page: 1,
           perPage: 1,
-          kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id : ${agentPolicy.id}`,
+          kuery: `${AGENT_SAVED_OBJECT_TYPE}.policy_id : ${agentPolicy.id}`,
         },
       });
       setAgentsCount(data?.total || 0);
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx
index 644004a2ab0203..99501be92672cf 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx
@@ -108,7 +108,7 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
     name: '',
     description: '',
     namespace: '',
-    config_id: '',
+    policy_id: '',
     enabled: true,
     output_id: '', // TODO: Blank for now as we only support default output
     inputs: [],
@@ -194,7 +194,7 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
       const hasValidationErrors = newValidationResults
         ? validationHasErrors(newValidationResults)
         : false;
-      const hasAgentPolicy = newPackagePolicy.config_id && newPackagePolicy.config_id !== '';
+      const hasAgentPolicy = newPackagePolicy.policy_id && newPackagePolicy.policy_id !== '';
       if (hasPackage && hasAgentPolicy && !hasValidationErrors) {
         setFormState('VALID');
       }
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts.test.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts.test.ts
index 1480c817415ace..93c9b98484a882 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts.test.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts.test.ts
@@ -144,7 +144,7 @@ describe('Ingest Manager - validatePackagePolicy()', () => {
   const validPackagePolicy: NewPackagePolicy = {
     name: 'pkgPolicy1-1',
     namespace: 'default',
-    config_id: 'test-policy',
+    policy_id: 'test-policy',
     enabled: true,
     output_id: 'test-output',
     inputs: [
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_define_package_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_define_package_config.tsx
index bdbe2d6ed9177a..86f69208e06382 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_define_package_config.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_define_package_config.tsx
@@ -68,15 +68,15 @@ export const StepDefinePackagePolicy: React.FunctionComponent<{
     }
 
     // If agent policy has changed, update package policy's agent policy ID and namespace
-    if (packagePolicy.config_id !== agentPolicy.id) {
+    if (packagePolicy.policy_id !== agentPolicy.id) {
       updatePackagePolicy({
-        config_id: agentPolicy.id,
+        policy_id: agentPolicy.id,
         namespace: agentPolicy.namespace,
       });
     }
   }, [
     packagePolicy.package,
-    packagePolicy.config_id,
+    packagePolicy.policy_id,
     agentPolicy,
     packageInfo,
     updatePackagePolicy,
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx
index 97c3cf06570f76..c9c5efc5cec6cb 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx
@@ -75,7 +75,7 @@ export const EditPackagePolicyPage: React.FunctionComponent = () => {
     name: '',
     description: '',
     namespace: '',
-    config_id: '',
+    policy_id: '',
     enabled: true,
     output_id: '',
     inputs: [],
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
index 05c75f0b3bf1f1..9548340df5b301 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
@@ -187,7 +187,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
     if (kuery) {
       kuery = `(${kuery}) and`;
     }
-    kuery = `${kuery} ${AGENT_SAVED_OBJECT_TYPE}.config_id : (${selectedAgentPolicies
+    kuery = `${kuery} ${AGENT_SAVED_OBJECT_TYPE}.policy_id : (${selectedAgentPolicies
       .map((agentPolicy) => `"${agentPolicy}"`)
       .join(' or ')})`;
   }
@@ -267,7 +267,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
       render: (active: boolean, agent: any) => <AgentHealth agent={agent} />,
     },
     {
-      field: 'config_id',
+      field: 'policy_id',
       name: i18n.translate('xpack.ingestManager.agentList.policyColumnTitle', {
         defaultMessage: 'Agent policy',
       }),
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/components/new_enrollment_key_flyout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/components/new_enrollment_key_flyout.tsx
index aa276a11c5e862..8921b690690fb0 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/components/new_enrollment_key_flyout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/components/new_enrollment_key_flyout.tsx
@@ -43,7 +43,7 @@ function useCreateApiKeyForm(
         path: enrollmentAPIKeyRouteService.getCreatePath(),
         body: JSON.stringify({
           name: apiKeyNameInput.value,
-          config_id: policyIdInput.value,
+          policy_id: policyIdInput.value,
         }),
       });
       policyIdInput.clear();
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/index.tsx
index 52fbc23d297fb7..b3a4938b223109 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/index.tsx
@@ -198,7 +198,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
       },
     },
     {
-      field: 'config_id',
+      field: 'policy_id',
       name: i18n.translate('xpack.ingestManager.enrollmentTokensList.policyTitle', {
         defaultMessage: 'Agent policy',
       }),
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts
index 6f6f501229c299..fb9fb57f88a93b 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts
@@ -59,7 +59,7 @@ export const getAgentPoliciesHandler: RequestHandler<
           showInactive: false,
           perPage: 0,
           page: 1,
-          kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id:${agentPolicy.id}`,
+          kuery: `${AGENT_SAVED_OBJECT_TYPE}.policy_id:${agentPolicy.id}`,
         }).then(({ total: agentTotal }) => (agentPolicy.agents = agentTotal)),
       { concurrency: 10 }
     );
@@ -131,7 +131,7 @@ export const createAgentPolicyHandler: RequestHandler<
 
     // Create the system monitoring package policy and add it to agent policy.
     if (withSysMonitoring && newSysPackagePolicy !== undefined && agentPolicy !== undefined) {
-      newSysPackagePolicy.config_id = agentPolicy.id;
+      newSysPackagePolicy.policy_id = agentPolicy.id;
       newSysPackagePolicy.namespace = agentPolicy.namespace;
       await packagePolicyService.create(soClient, callCluster, newSysPackagePolicy, {
         user,
diff --git a/x-pack/plugins/ingest_manager/server/routes/package_config/handlers.test.ts b/x-pack/plugins/ingest_manager/server/routes/package_config/handlers.test.ts
index 03a3b3ce176084..4dacabb873bea8 100644
--- a/x-pack/plugins/ingest_manager/server/routes/package_config/handlers.test.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/package_config/handlers.test.ts
@@ -89,7 +89,7 @@ describe('When calling package policy', () => {
         body: newData || {
           name: 'endpoint-1',
           description: '',
-          config_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
+          policy_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
           enabled: true,
           output_id: '',
           inputs: [],
@@ -169,7 +169,7 @@ describe('When calling package policy', () => {
         await routeHandler(context, request, response);
         expect(response.ok).toHaveBeenCalled();
         expect(callbackOne).toHaveBeenCalledWith({
-          config_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
+          policy_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
           description: '',
           enabled: true,
           inputs: [],
@@ -183,7 +183,7 @@ describe('When calling package policy', () => {
           },
         });
         expect(callbackTwo).toHaveBeenCalledWith({
-          config_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
+          policy_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
           description: '',
           enabled: true,
           inputs: [
@@ -214,7 +214,7 @@ describe('When calling package policy', () => {
         await routeHandler(context, request, response);
         expect(response.ok).toHaveBeenCalled();
         expect(packagePolicyServiceMock.create.mock.calls[0][2]).toEqual({
-          config_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
+          policy_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
           description: '',
           enabled: true,
           inputs: [
@@ -295,7 +295,7 @@ describe('When calling package policy', () => {
           await routeHandler(context, request, response);
           expect(response.ok).toHaveBeenCalled();
           expect(packagePolicyServiceMock.create.mock.calls[0][2]).toEqual({
-            config_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
+            policy_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
             description: '',
             enabled: true,
             inputs: [
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
index bfe41a82584c74..c6697f49e73db9 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
@@ -21,6 +21,7 @@ import {
   migrateAgentToV7100,
   migrateAgentPolicyToV7100,
   migrateEnrollmentApiKeysToV7100,
+  migratePackagePolicyToV7100,
 } from './migrations/to_v7_10_0';
 
 /*
@@ -203,7 +204,7 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
         description: { type: 'text' },
         namespace: { type: 'keyword' },
         enabled: { type: 'boolean' },
-        config_id: { type: 'keyword' },
+        policy_id: { type: 'keyword' },
         output_id: { type: 'keyword' },
         package: {
           properties: {
@@ -245,6 +246,9 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
         created_by: { type: 'keyword' },
       },
     },
+    migrations: {
+      '7.10.0': migratePackagePolicyToV7100,
+    },
   },
   [PACKAGES_SAVED_OBJECT_TYPE]: {
     name: PACKAGES_SAVED_OBJECT_TYPE,
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
index 6e43379316697d..816b45d1af62ea 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
@@ -53,3 +53,17 @@ export const migrateEnrollmentApiKeysToV7100: SavedObjectMigrationFn<
 
   return updatedEnrollmentApiKeyDoc;
 };
+
+export const migratePackagePolicyToV7100: SavedObjectMigrationFn<
+  Exclude<PackagePolicy, 'policy_id'> & {
+    config_id: string;
+  },
+  PackagePolicy
+> = (packagePolicyDoc) => {
+  const updatedPackagePolicyDoc = cloneDeep(packagePolicyDoc);
+
+  updatedPackagePolicyDoc.attributes.policy_id = packagePolicyDoc.attributes.config_id;
+  delete updatedPackagePolicyDoc.attributes.config_id;
+
+  return updatedPackagePolicyDoc;
+};
diff --git a/x-pack/plugins/ingest_manager/server/services/agent_config.ts b/x-pack/plugins/ingest_manager/server/services/agent_config.ts
index d0f496458d77f5..eec6f2530d7a36 100644
--- a/x-pack/plugins/ingest_manager/server/services/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agent_config.ts
@@ -344,7 +344,7 @@ class AgentPolicyService {
       showInactive: false,
       perPage: 0,
       page: 1,
-      kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id:${id}`,
+      kuery: `${AGENT_SAVED_OBJECT_TYPE}.policy_id:${id}`,
     });
 
     if (total > 0) {
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts b/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
index 3313ac4a9fddda..08fb8d45231864 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
@@ -117,7 +117,7 @@ describe('test agent acks services', () => {
           created_at: '2020-03-14T19:45:02.620Z',
           data: JSON.stringify({
             config: {
-              id: 'config1',
+              id: 'policy1',
               revision: 4,
               settings: {
                 monitoring: {
@@ -207,7 +207,7 @@ describe('test agent acks services', () => {
       ({
         id: 'id',
         type: AGENT_TYPE_PERMANENT,
-        config_id: 'config1',
+        policy_id: 'policy1',
       } as unknown) as Agent,
       [
         {
@@ -259,7 +259,7 @@ describe('test agent acks services', () => {
           created_at: '2020-03-14T19:45:02.620Z',
           data: JSON.stringify({
             config: {
-              id: 'config1',
+              id: 'policy1',
               revision: 4,
               settings: {
                 monitoring: {
@@ -349,7 +349,7 @@ describe('test agent acks services', () => {
       ({
         id: 'id',
         type: AGENT_TYPE_PERMANENT,
-        config_id: 'config1',
+        policy_id: 'policy1',
         policy_revision: 100,
       } as unknown) as Agent,
       [
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/status.ts b/x-pack/plugins/ingest_manager/server/services/agents/status.ts
index afc2d5802bae3c..989cf1ec230f60 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/status.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/status.ts
@@ -38,8 +38,8 @@ export async function getAgentStatusForAgentPolicy(
         page: 1,
         kuery: agentPolicyId
           ? kuery
-            ? `(${kuery}) and (${AGENT_SAVED_OBJECT_TYPE}.config_id:"${agentPolicyId}")`
-            : `${AGENT_SAVED_OBJECT_TYPE}.config_id:"${agentPolicyId}"`
+            ? `(${kuery}) and (${AGENT_SAVED_OBJECT_TYPE}.policy_id:"${agentPolicyId}")`
+            : `${AGENT_SAVED_OBJECT_TYPE}.policy_id:"${agentPolicyId}"`
           : kuery,
       })
     )
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/update.ts b/x-pack/plugins/ingest_manager/server/services/agents/update.ts
index 56350bddb61a8d..b85a831294b58c 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/update.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/update.ts
@@ -17,7 +17,7 @@ export async function unenrollForAgentPolicyId(
   let page = 1;
   while (hasMore) {
     const { agents } = await listAgents(soClient, {
-      kuery: `${AGENT_SAVED_OBJECT_TYPE}.config_id:"${policyId}"`,
+      kuery: `${AGENT_SAVED_OBJECT_TYPE}.policy_id:"${policyId}"`,
       page: page++,
       perPage: 1000,
       showInactive: true,
diff --git a/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts b/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts
index d90f0a16d9ad20..a5efdb5a11972f 100644
--- a/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts
+++ b/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts
@@ -85,7 +85,7 @@ export async function deleteEnrollmentApiKeyForAgentPolicyId(
     const { items } = await listEnrollmentApiKeys(soClient, {
       page: page++,
       perPage: 100,
-      kuery: `${ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE}.config_id:${agentPolicyId}`,
+      kuery: `${ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE}.policy_id:${agentPolicyId}`,
     });
 
     if (items.length === 0) {
diff --git a/x-pack/plugins/ingest_manager/server/services/package_config.ts b/x-pack/plugins/ingest_manager/server/services/package_config.ts
index 5a3e03601c718b..73f7d1685dfce0 100644
--- a/x-pack/plugins/ingest_manager/server/services/package_config.ts
+++ b/x-pack/plugins/ingest_manager/server/services/package_config.ts
@@ -45,7 +45,7 @@ class PackagePolicyService {
     options?: { id?: string; user?: AuthenticatedUser; bumpRevision?: boolean }
   ): Promise<PackagePolicy> {
     // Check that its agent policy does not have a package policy with the same name
-    const parentAgentPolicy = await agentPolicyService.get(soClient, packagePolicy.config_id);
+    const parentAgentPolicy = await agentPolicyService.get(soClient, packagePolicy.policy_id);
     if (!parentAgentPolicy) {
       throw new Error('Agent policy not found');
     } else {
@@ -76,7 +76,7 @@ class PackagePolicyService {
       // Check if it is a limited package, and if so, check that the corresponding agent policy does not
       // already contain a package policy for this package
       if (isPackageLimited(pkgInfo)) {
-        const agentPolicy = await agentPolicyService.get(soClient, packagePolicy.config_id, true);
+        const agentPolicy = await agentPolicyService.get(soClient, packagePolicy.policy_id, true);
         if (agentPolicy && doesAgentPolicyAlreadyIncludePackage(agentPolicy, pkgInfo.name)) {
           throw new Error(
             `Unable to create package policy. Package '${pkgInfo.name}' already exists on this agent policy.`
@@ -102,7 +102,7 @@ class PackagePolicyService {
     );
 
     // Assign it to the given agent policy
-    await agentPolicyService.assignPackagePolicies(soClient, packagePolicy.config_id, [newSo.id], {
+    await agentPolicyService.assignPackagePolicies(soClient, packagePolicy.policy_id, [newSo.id], {
       user: options?.user,
       bumpRevision: options?.bumpRevision ?? true,
     });
@@ -127,7 +127,7 @@ class PackagePolicyService {
         type: SAVED_OBJECT_TYPE,
         attributes: {
           ...packagePolicy,
-          config_id: agentPolicyId,
+          policy_id: agentPolicyId,
           revision: 1,
           created_at: isoDate,
           created_by: options?.user?.username ?? 'system',
@@ -246,7 +246,7 @@ class PackagePolicyService {
     }
 
     // Check that its agent policy does not have a package policy with the same name
-    const parentAgentPolicy = await agentPolicyService.get(soClient, packagePolicy.config_id);
+    const parentAgentPolicy = await agentPolicyService.get(soClient, packagePolicy.policy_id);
     if (!parentAgentPolicy) {
       throw new Error('Agent policy not found');
     } else {
@@ -275,7 +275,7 @@ class PackagePolicyService {
     );
 
     // Bump revision of associated agent policy
-    await agentPolicyService.bumpRevision(soClient, packagePolicy.config_id, {
+    await agentPolicyService.bumpRevision(soClient, packagePolicy.policy_id, {
       user: options?.user,
     });
 
@@ -298,7 +298,7 @@ class PackagePolicyService {
         if (!options?.skipUnassignFromAgentPolicies) {
           await agentPolicyService.unassignPackagePolicies(
             soClient,
-            oldPackagePolicy.config_id,
+            oldPackagePolicy.policy_id,
             [oldPackagePolicy.id],
             {
               user: options?.user,
diff --git a/x-pack/plugins/ingest_manager/server/types/models/package_config.ts b/x-pack/plugins/ingest_manager/server/types/models/package_config.ts
index f81ad95bf1269b..81bfb599b4c9af 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/package_config.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/package_config.ts
@@ -17,7 +17,7 @@ const PackagePolicyBaseSchema = {
   name: schema.string(),
   description: schema.maybe(schema.string()),
   namespace: schema.string({ minLength: 1 }),
-  config_id: schema.string(),
+  policy_id: schema.string(),
   enabled: schema.boolean(),
   package: schema.maybe(
     schema.object({
diff --git a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
index e56679f3286712..0a6473b8338633 100644
--- a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
@@ -1043,7 +1043,7 @@ export class EndpointDocGenerator {
       created_by: 'elastic',
       updated_at: new Date().toISOString(),
       updated_by: 'elastic',
-      config_id: this.seededUUIDv4(),
+      policy_id: this.seededUUIDv4(),
       enabled: true,
       output_id: '',
       inputs: [
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
index 76140478359ab7..9a50077f699323 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
@@ -156,9 +156,9 @@ export const EndpointList = () => {
   const selectionOptions = useMemo<EuiSelectableProps['options']>(() => {
     return policyItems.map((item) => {
       return {
-        key: item.config_id,
+        key: item.policy_id,
         label: item.name,
-        checked: selectedPolicyId === item.config_id ? 'on' : undefined,
+        checked: selectedPolicyId === item.policy_id ? 'on' : undefined,
       };
     });
   }, [policyItems, selectedPolicyId]);
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts
index d3ec0670d29c54..0eedecef22170c 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts
@@ -36,7 +36,7 @@ describe('policy details: ', () => {
       created_by: '',
       updated_at: '',
       updated_by: '',
-      config_id: '',
+      policy_id: '',
       enabled: true,
       output_id: '',
       inputs: [
@@ -213,7 +213,7 @@ describe('policy details: ', () => {
       expect(JSON.parse(lastPutCallPayload.body as string)).toEqual({
         name: '',
         description: '',
-        config_id: '',
+        policy_id: '',
         enabled: true,
         output_id: '',
         inputs: [
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware.ts
index 968a3c110664ce..250a5b25230f1d 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware.ts
@@ -53,8 +53,8 @@ export const policyDetailsMiddlewareFactory: ImmutableMiddlewareFactory<PolicyDe
 
       // Agent summary is secondary data, so its ok for it to come after the details
       // page is populated with the main content
-      if (policyItem.config_id) {
-        const { results } = await sendGetFleetAgentStatusForPolicy(http, policyItem.config_id);
+      if (policyItem.policy_id) {
+        const { results } = await sendGetFleetAgentStatusForPolicy(http, policyItem.policy_id);
         dispatch({
           type: 'serverReturnedPolicyDetailsAgentSummaryData',
           payload: {
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_package_config.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_package_config.tsx
index c0f74e10e0d72e..b03069a739e352 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_package_config.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_package_config.tsx
@@ -24,7 +24,7 @@ export const ConfigureEndpointPackagePolicy = memo<CustomConfigurePackagePolicyC
   ({
     from,
     packagePolicyId,
-    packagePolicy: { config_id: agentPolicyId },
+    packagePolicy: { policy_id: agentPolicyId },
   }: CustomConfigurePackagePolicyProps) => {
     let policyUrl = '';
     if (from === 'edit' && packagePolicyId) {
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx
index 1de40e3146864f..acbc4891b8b197 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx
@@ -342,9 +342,9 @@ export const PolicyList = React.memo(() => {
                       <LinkToApp
                         data-test-subj="agentPolicyLink"
                         appId="ingestManager"
-                        appPath={`#/policies/${item.config_id}`}
+                        appPath={`#/policies/${item.policy_id}`}
                         href={`${services.application.getUrlForApp('ingestManager')}#/policies/${
-                          item.config_id
+                          item.policy_id
                         }`}
                       >
                         <FormattedMessage
@@ -356,9 +356,9 @@ export const PolicyList = React.memo(() => {
                     <DangerEuiContextMenuItem
                       data-test-subj="policyDeleteButton"
                       icon="trash"
-                      key="policyDeletAction"
+                      key="policyDeleteAction"
                       onClick={() => {
-                        handleDeleteOnClick({ agentPolicyId: item.config_id, policyId: item.id });
+                        handleDeleteOnClick({ agentPolicyId: item.policy_id, policyId: item.id });
                       }}
                     >
                       <FormattedMessage
diff --git a/x-pack/test/functional/es_archives/endpoint/artifacts/api_feature/data.json b/x-pack/test/functional/es_archives/endpoint/artifacts/api_feature/data.json
index 3af10705976716..953a3728ec7170 100644
--- a/x-pack/test/functional/es_archives/endpoint/artifacts/api_feature/data.json
+++ b/x-pack/test/functional/es_archives/endpoint/artifacts/api_feature/data.json
@@ -167,7 +167,7 @@
       "fleet-agents": {
         "access_api_key_id": "8ZnT7HIBwLFvkUEPQaT3",
         "active": true,
-        "config_id": "2dd2a110-b6f6-11ea-a66d-63cf082a3b58",
+        "policy_id": "2dd2a110-b6f6-11ea-a66d-63cf082a3b58",
         "enrolled_at": "2020-06-25T18:52:47.290Z",
         "local_metadata": {
           "os": "macos"
@@ -195,7 +195,7 @@
         "active": true,
         "api_key": "8ZnT7HIBwLFvkUEPQaT3",
         "api_key_id": "8ZnT7HIBwLFvkUEPQaT3",
-        "config_id": "2dd2a110-b6f6-11ea-a66d-63cf082a3b58",
+        "policy_id": "2dd2a110-b6f6-11ea-a66d-63cf082a3b58",
         "created_at": "2020-06-25T17:25:30.065Z",
         "name": "Default (93aa98c8-d650-422e-aa7b-663dae3dff83)"
       },
diff --git a/x-pack/test/functional/es_archives/fleet/agents/data.json b/x-pack/test/functional/es_archives/fleet/agents/data.json
index c94b87f6ad1ec6..8ee5a80aeb4f80 100644
--- a/x-pack/test/functional/es_archives/fleet/agents/data.json
+++ b/x-pack/test/functional/es_archives/fleet/agents/data.json
@@ -9,7 +9,7 @@
         "access_api_key_id": "api-key-2",
         "active": true,
         "shared_id": "agent1_filebeat",
-        "config_id": "config1",
+        "policy_id": "policy1",
         "type": "PERMANENT",
         "local_metadata": {},
         "user_provided_metadata": {}
@@ -85,7 +85,7 @@
         "created_at" : "2019-10-10T16:31:12.518Z",
         "name": "FleetEnrollmentKey:1",
         "api_key_id" : "key",
-        "config_id" : "policy:1",
+        "policy_id" : "policy1",
         "active" : true
       },
       "type" : "fleet-enrollment-api-keys",
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/enroll.ts b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/enroll.ts
index ef9f2b2e61500b..ce356dbd081c88 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/enroll.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/enroll.ts
@@ -137,7 +137,7 @@ export default function (providerContext: FtrProviderContext) {
         })
         .expect(200);
       expect(apiResponse.success).to.eql(true);
-      expect(apiResponse.item).to.have.keys('id', 'active', 'access_api_key', 'type', 'config_id');
+      expect(apiResponse.item).to.have.keys('id', 'active', 'access_api_key', 'type', 'policy_id');
     });
 
     it('when enrolling an agent it should generate an access api key with limited privileges', async () => {
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fleet/enrollment_api_keys/crud.ts b/x-pack/test/ingest_manager_api_integration/apis/fleet/enrollment_api_keys/crud.ts
index bc9182627326b9..a83e25d984d126 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/fleet/enrollment_api_keys/crud.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/fleet/enrollment_api_keys/crud.ts
@@ -59,7 +59,7 @@ export default function (providerContext: FtrProviderContext) {
           .post(`/api/ingest_manager/fleet/enrollment-api-keys`)
           .set('kbn-xsrf', 'xxx')
           .send({
-            config_id: 'config1',
+            policy_id: 'policy1',
           })
           .expect(200);
         keyId = apiResponse.item.id;
@@ -99,7 +99,7 @@ export default function (providerContext: FtrProviderContext) {
           .post(`/api/ingest_manager/fleet/enrollment-api-keys`)
           .set('kbn-xsrf', 'xxx')
           .send({
-            config_id: 'idonotexistsconfig',
+            policy_id: 'idonotexistsconfig',
           })
           .expect(400);
       });
@@ -109,12 +109,12 @@ export default function (providerContext: FtrProviderContext) {
           .post(`/api/ingest_manager/fleet/enrollment-api-keys`)
           .set('kbn-xsrf', 'xxx')
           .send({
-            config_id: 'config1',
+            policy_id: 'config1',
           })
           .expect(200);
 
         expect(apiResponse.success).to.eql(true);
-        expect(apiResponse.item).to.have.keys('id', 'api_key', 'api_key_id', 'name', 'config_id');
+        expect(apiResponse.item).to.have.keys('id', 'api_key', 'api_key_id', 'name', 'policy_id');
       });
 
       it('should create an ES ApiKey with limited privileges', async () => {
@@ -122,7 +122,7 @@ export default function (providerContext: FtrProviderContext) {
           .post(`/api/ingest_manager/fleet/enrollment-api-keys`)
           .set('kbn-xsrf', 'xxx')
           .send({
-            config_id: 'config1',
+            policy_id: 'config1',
           })
           .expect(200);
         expect(apiResponse.success).to.eql(true);
diff --git a/x-pack/test/ingest_manager_api_integration/apis/package_config/create.ts b/x-pack/test/ingest_manager_api_integration/apis/package_config/create.ts
index 7ac450434fc530..2043faa07b1e11 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/package_config/create.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/package_config/create.ts
@@ -41,7 +41,7 @@ export default function ({ getService }: FtrProviderContext) {
             name: 'filetest-1',
             description: '',
             namespace: 'default',
-            config_id: agentPolicyId,
+            policy_id: agentPolicyId,
             enabled: true,
             output_id: '',
             inputs: [],
@@ -68,7 +68,7 @@ export default function ({ getService }: FtrProviderContext) {
             name: 'filetest-1',
             description: '',
             namespace: '',
-            config_id: agentPolicyId,
+            policy_id: agentPolicyId,
             enabled: true,
             output_id: '',
             inputs: [],
@@ -93,7 +93,7 @@ export default function ({ getService }: FtrProviderContext) {
             name: 'endpoint-1',
             description: '',
             namespace: 'default',
-            config_id: agentPolicyId,
+            policy_id: agentPolicyId,
             enabled: true,
             output_id: '',
             inputs: [],
@@ -111,7 +111,7 @@ export default function ({ getService }: FtrProviderContext) {
             name: 'endpoint-2',
             description: '',
             namespace: 'default',
-            config_id: agentPolicyId,
+            policy_id: agentPolicyId,
             enabled: true,
             output_id: '',
             inputs: [],
@@ -136,7 +136,7 @@ export default function ({ getService }: FtrProviderContext) {
             name: 'same-name-test-1',
             description: '',
             namespace: 'default',
-            config_id: agentPolicyId,
+            policy_id: agentPolicyId,
             enabled: true,
             output_id: '',
             inputs: [],
@@ -154,7 +154,7 @@ export default function ({ getService }: FtrProviderContext) {
             name: 'same-name-test-1',
             description: '',
             namespace: 'default',
-            config_id: agentPolicyId,
+            policy_id: agentPolicyId,
             enabled: true,
             output_id: '',
             inputs: [],
diff --git a/x-pack/test/ingest_manager_api_integration/apis/package_config/get.ts b/x-pack/test/ingest_manager_api_integration/apis/package_config/get.ts
index 0e838346cbb2b8..756eaa8ea49bab 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/package_config/get.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/package_config/get.ts
@@ -43,7 +43,7 @@ export default function (providerContext: FtrProviderContext) {
           name: 'filetest-1',
           description: '',
           namespace: 'default',
-          config_id: agentPolicyId,
+          policy_id: agentPolicyId,
           enabled: true,
           output_id: '',
           inputs: [],
diff --git a/x-pack/test/ingest_manager_api_integration/apis/package_config/update.ts b/x-pack/test/ingest_manager_api_integration/apis/package_config/update.ts
index 13c27795bfc30f..e74d88f3538e4a 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/package_config/update.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/package_config/update.ts
@@ -44,7 +44,7 @@ export default function (providerContext: FtrProviderContext) {
           name: 'filetest-1',
           description: '',
           namespace: 'default',
-          config_id: agentPolicyId,
+          policy_id: agentPolicyId,
           enabled: true,
           output_id: '',
           inputs: [],
@@ -63,7 +63,7 @@ export default function (providerContext: FtrProviderContext) {
           name: 'filetest-2',
           description: '',
           namespace: 'default',
-          config_id: agentPolicyId,
+          policy_id: agentPolicyId,
           enabled: true,
           output_id: '',
           inputs: [],
@@ -84,7 +84,7 @@ export default function (providerContext: FtrProviderContext) {
           name: 'filetest-1',
           description: '',
           namespace: 'updated_namespace',
-          config_id: agentPolicyId,
+          policy_id: agentPolicyId,
           enabled: true,
           output_id: '',
           inputs: [],
@@ -107,7 +107,7 @@ export default function (providerContext: FtrProviderContext) {
           name: 'filetest-1',
           description: '',
           namespace: 'updated_namespace',
-          config_id: agentPolicyId,
+          policy_id: agentPolicyId,
           enabled: true,
           output_id: '',
           inputs: [],
diff --git a/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts b/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
index 694c28a68d6099..349aa0bc3a9ea7 100644
--- a/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
+++ b/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
@@ -157,7 +157,7 @@ export function EndpointPolicyTestResourcesProvider({ getService }: FtrProviderC
         const newPackagePolicyData: CreatePackagePolicyRequest['body'] = {
           name: 'Protect East Coast',
           description: 'Protect the worlds data - but in the East Coast',
-          config_id: agentPolicy!.id,
+          policy_id: agentPolicy!.id,
           enabled: true,
           output_id: '',
           inputs: [

From 11f1832df9c5054ceaf4d4067c12cb5b5cb2d188 Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Fri, 14 Aug 2020 15:10:02 -0700
Subject: [PATCH 12/24] Rename agent event SO attributes and add migrations

---
 .../common/openapi/spec_oas3.json             |  2 +-
 .../common/types/models/agent.ts              |  2 +-
 .../dev_docs/schema/saved_objects.mml         | 14 ++++----
 .../agent_config/details_page/index.tsx       |  2 +-
 .../server/routes/agent/index.ts              |  2 +-
 .../server/saved_objects/index.ts             |  6 +++-
 .../saved_objects/migrations/to_v7_10_0.ts    | 34 +++++++++++++------
 .../server/services/agents/checkin/index.ts   |  2 +-
 .../agents/checkin/state_new_actions.ts       |  4 +--
 .../server/services/agents/status.ts          |  2 +-
 .../server/types/models/agent.ts              |  2 +-
 .../store/mock_endpoint_result_list.ts        |  8 ++---
 .../policy/store/policy_list/index.test.ts    | 14 ++++----
 .../store/policy_list/services/ingest.ts      | 20 +++++------
 .../store/policy_list/test_mock_utils.ts      |  4 +--
 .../server/usage/endpoints/endpoint.mocks.ts  |  4 +--
 .../apis/agent_config/agent_config.ts         | 26 +++++++-------
 17 files changed, 83 insertions(+), 65 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json b/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
index 2589cf8a4ba4db..8c9ede1fde9ba1 100644
--- a/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
+++ b/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
@@ -4221,7 +4221,7 @@
           "agent_id": {
             "type": "string"
           },
-          "config_id": {
+          "policy_id": {
             "type": "string"
           },
           "stream_id": {
diff --git a/x-pack/plugins/ingest_manager/common/types/models/agent.ts b/x-pack/plugins/ingest_manager/common/types/models/agent.ts
index abfd3a071d4fe4..2b8a306577e7d2 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/agent.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/agent.ts
@@ -64,7 +64,7 @@ export interface NewAgentEvent {
   payload?: any;
   agent_id: string;
   action_id?: string;
-  config_id?: string;
+  policy_id?: string;
   stream_id?: string;
 }
 
diff --git a/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml b/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml
index c45ff9d6f7cd3e..9f73a15bed2eb1 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml
+++ b/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml
@@ -1,8 +1,8 @@
 classDiagram
-  agent_configs "1" -- "*"  package_policies
-  agent_configs "1" -- "*"  enrollment_api_keys
-  agent_configs "1" -- "*"  agents : is used
-  agent_configs "*" -- "*"  outputs
+  agent_policies "1" -- "*"  package_policies
+  agent_policies "1" -- "*"  enrollment_api_keys
+  agent_policies "1" -- "*"  agents : is used
+  agent_policies "*" -- "*"  outputs
   agents "1" -- "*"  agent_events
   agents "1" -- "*"  agent_events
   package "1" -- "*"  package_policies
@@ -28,7 +28,7 @@ classDiagram
     subtype
     agent_id
     action_id
-    config_id
+    policy_id
     stream_id
     timestamp
     message
@@ -36,8 +36,8 @@ classDiagram
     data
   }
 
-  class agent_configs {
-    package_policies // package_config ids
+  class agent_policies {
+    package_policies // package_policy ids
     name
     namespace
     description
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx
index 014e35dc32dae4..4c317c54c68c48 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx
@@ -288,7 +288,7 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
 const AgentPolicyDetailsContent: React.FunctionComponent<{ agentPolicy: AgentPolicy }> = ({
   agentPolicy,
 }) => {
-  useBreadcrumbs('policy_details', { configName: agentPolicy.name });
+  useBreadcrumbs('policy_details', { policyName: agentPolicy.name });
   return (
     <Switch>
       <Route
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent/index.ts b/x-pack/plugins/ingest_manager/server/routes/agent/index.ts
index 06eaf574b22c18..7c98ad31e5cdba 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent/index.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent/index.ts
@@ -158,7 +158,7 @@ export const registerRoutes = (router: IRouter) => {
     getAgentEventsHandler
   );
 
-  // Get agent status for config
+  // Get agent status for policy
   router.get(
     {
       path: AGENT_API_ROUTES.STATUS_PATTERN,
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
index c6697f49e73db9..50957c48f70e61 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
@@ -19,6 +19,7 @@ import {
 } from '../constants';
 import {
   migrateAgentToV7100,
+  migrateAgentEventToV7100,
   migrateAgentPolicyToV7100,
   migrateEnrollmentApiKeysToV7100,
   migratePackagePolicyToV7100,
@@ -113,7 +114,7 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
         subtype: { type: 'keyword' },
         agent_id: { type: 'keyword' },
         action_id: { type: 'keyword' },
-        config_id: { type: 'keyword' },
+        policy_id: { type: 'keyword' },
         stream_id: { type: 'keyword' },
         timestamp: { type: 'date' },
         message: { type: 'text' },
@@ -121,6 +122,9 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
         data: { type: 'text' },
       },
     },
+    migrations: {
+      '7.10.0': migrateAgentEventToV7100,
+    },
   },
   [AGENT_POLICY_SAVED_OBJECT_TYPE]: {
     name: AGENT_POLICY_SAVED_OBJECT_TYPE,
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
index 816b45d1af62ea..2c38f3279c4348 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
@@ -6,19 +6,19 @@
 
 import { SavedObjectMigrationFn } from 'kibana/server';
 import { cloneDeep } from 'lodash';
-import { Agent, AgentPolicy, PackagePolicy, EnrollmentAPIKey } from '../../types';
+import { Agent, AgentEvent, AgentPolicy, PackagePolicy, EnrollmentAPIKey } from '../../types';
 
 export const migrateAgentToV7100: SavedObjectMigrationFn<
   Exclude<Agent, 'policy_id' | 'policy_revision'> & {
-    config_id?: string;
+    policy_id?: string;
     policy_revision?: number | null;
   },
   Agent
 > = (agentDoc) => {
   const updatedAgentDoc = cloneDeep(agentDoc);
 
-  updatedAgentDoc.attributes.policy_id = agentDoc.attributes.config_id;
-  delete updatedAgentDoc.attributes.config_id;
+  updatedAgentDoc.attributes.policy_id = agentDoc.attributes.policy_id;
+  delete updatedAgentDoc.attributes.policy_id;
 
   updatedAgentDoc.attributes.policy_revision = agentDoc.attributes.policy_revision;
   delete updatedAgentDoc.attributes.policy_revision;
@@ -26,6 +26,20 @@ export const migrateAgentToV7100: SavedObjectMigrationFn<
   return updatedAgentDoc;
 };
 
+export const migrateAgentEventToV7100: SavedObjectMigrationFn<
+  Exclude<AgentEvent, 'policy_id'> & {
+    policy_id?: string;
+  },
+  AgentEvent
+> = (agentEventDoc) => {
+  const updatedAgentEventDoc = cloneDeep(agentEventDoc);
+
+  updatedAgentEventDoc.attributes.policy_id = agentEventDoc.attributes.policy_id;
+  delete updatedAgentEventDoc.attributes.policy_id;
+
+  return updatedAgentEventDoc;
+};
+
 export const migrateAgentPolicyToV7100: SavedObjectMigrationFn<
   Exclude<AgentPolicy, 'package_policies'> & {
     package_configs: string[] | PackagePolicy[];
@@ -42,28 +56,28 @@ export const migrateAgentPolicyToV7100: SavedObjectMigrationFn<
 
 export const migrateEnrollmentApiKeysToV7100: SavedObjectMigrationFn<
   Exclude<EnrollmentAPIKey, 'policy_id'> & {
-    config_id?: string;
+    policy_id?: string;
   },
   EnrollmentAPIKey
 > = (enrollmentApiKeyDoc) => {
   const updatedEnrollmentApiKeyDoc = cloneDeep(enrollmentApiKeyDoc);
 
-  updatedEnrollmentApiKeyDoc.attributes.policy_id = enrollmentApiKeyDoc.attributes.config_id;
-  delete updatedEnrollmentApiKeyDoc.attributes.config_id;
+  updatedEnrollmentApiKeyDoc.attributes.policy_id = enrollmentApiKeyDoc.attributes.policy_id;
+  delete updatedEnrollmentApiKeyDoc.attributes.policy_id;
 
   return updatedEnrollmentApiKeyDoc;
 };
 
 export const migratePackagePolicyToV7100: SavedObjectMigrationFn<
   Exclude<PackagePolicy, 'policy_id'> & {
-    config_id: string;
+    policy_id: string;
   },
   PackagePolicy
 > = (packagePolicyDoc) => {
   const updatedPackagePolicyDoc = cloneDeep(packagePolicyDoc);
 
-  updatedPackagePolicyDoc.attributes.policy_id = packagePolicyDoc.attributes.config_id;
-  delete updatedPackagePolicyDoc.attributes.config_id;
+  updatedPackagePolicyDoc.attributes.policy_id = packagePolicyDoc.attributes.policy_id;
+  delete updatedPackagePolicyDoc.attributes.policy_id;
 
   return updatedPackagePolicyDoc;
 };
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/checkin/index.ts b/x-pack/plugins/ingest_manager/server/services/agents/checkin/index.ts
index f8584c6dc372a7..78e6a11fa78a47 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/checkin/index.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/checkin/index.ts
@@ -63,7 +63,7 @@ async function processEventsForCheckin(
   const updatedErrorEvents: Array<AgentEvent | NewAgentEvent> = [...agent.current_error_events];
   for (const event of events) {
     // @ts-ignore
-    event.config_id = agent.policy_id;
+    event.policy_id = agent.policy_id;
 
     if (isErrorOrState(event)) {
       // Remove any global or specific to a stream event
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
index dd4b26a7b0074f..4b5d4bd72233fb 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
@@ -110,7 +110,7 @@ function shouldCreateAgentPolicyAction(agent: Agent, agentPolicy: FullAgentPolic
   return true;
 }
 
-async function createAgentActionFromConfig(
+async function createAgentActionFromAgentPolicy(
   soClient: SavedObjectsClientContract,
   agent: Agent,
   policy: FullAgentPolicy | null
@@ -166,7 +166,7 @@ export function agentCheckinStateNewActionsFactory() {
       timeout(appContextService.getConfig()?.fleet.pollingRequestTimeout || 0),
       filter((agentPolicy) => shouldCreateAgentPolicyAction(agent, agentPolicy)),
       rateLimiter(),
-      mergeMap((agentPolicy) => createAgentActionFromConfig(soClient, agent, agentPolicy)),
+      mergeMap((agentPolicy) => createAgentActionFromAgentPolicy(soClient, agent, agentPolicy)),
       merge(newActions$),
       mergeMap(async (data) => {
         if (!data) {
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/status.ts b/x-pack/plugins/ingest_manager/server/services/agents/status.ts
index 989cf1ec230f60..35033cbe86ea51 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/status.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/status.ts
@@ -58,7 +58,7 @@ export async function getAgentStatusForAgentPolicy(
 async function getEventsCount(soClient: SavedObjectsClientContract, agentPolicyId?: string) {
   const { total } = await soClient.find({
     type: AGENT_EVENT_SAVED_OBJECT_TYPE,
-    searchFields: ['config_id'],
+    searchFields: ['policy_id'],
     search: agentPolicyId,
     perPage: 0,
     page: 1,
diff --git a/x-pack/plugins/ingest_manager/server/types/models/agent.ts b/x-pack/plugins/ingest_manager/server/types/models/agent.ts
index ea5eacc8e63d0b..5ad98cfd406226 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/agent.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/agent.ts
@@ -43,7 +43,7 @@ const AgentEventBase = {
   payload: schema.maybe(schema.any()),
   agent_id: schema.string(),
   action_id: schema.maybe(schema.string()),
-  config_id: schema.maybe(schema.string()),
+  policy_id: schema.maybe(schema.string()),
   stream_id: schema.maybe(schema.string()),
 };
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts
index c8dfd452d14211..aa9bef7bb5417e 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts
@@ -14,9 +14,9 @@ import {
 } from '../../../../../common/endpoint/types';
 import { EndpointDocGenerator } from '../../../../../common/endpoint/generate_data';
 import {
-  INGEST_API_AGENT_CONFIGS,
+  INGEST_API_AGENT_POLICIES,
   INGEST_API_EPM_PACKAGES,
-  INGEST_API_PACKAGE_CONFIGS,
+  INGEST_API_PACKAGE_POLICIES,
 } from '../../policy/store/policy_list/services/ingest';
 import {
   GetAgentPoliciesResponse,
@@ -106,7 +106,7 @@ const endpointListApiPathHandlerMocks = ({
 
     // Do policies referenced in endpoint list exist
     // just returns 1 single agent policy that includes all of the packagePolicy IDs provided
-    [INGEST_API_AGENT_CONFIGS]: (): GetAgentPoliciesResponse => {
+    [INGEST_API_AGENT_POLICIES]: (): GetAgentPoliciesResponse => {
       const agentPolicy = generator.generateAgentPolicy();
       (agentPolicy.package_policies as string[]).push(
         ...endpointPackagePolicies.map((packagePolicy) => packagePolicy.id)
@@ -126,7 +126,7 @@ const endpointListApiPathHandlerMocks = ({
     },
 
     // List of Policies (package policies) for onboarding
-    [INGEST_API_PACKAGE_CONFIGS]: (): GetPolicyListResponse => {
+    [INGEST_API_PACKAGE_POLICIES]: (): GetPolicyListResponse => {
       return {
         items: endpointPackagePolicies,
         page: 1,
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/index.test.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/index.test.ts
index 48287b725b156e..03e65bd6f43cbe 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/index.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/index.test.ts
@@ -22,7 +22,7 @@ import {
 } from './selectors';
 import { DepsStartMock, depsStartMock } from '../../../../../common/mock/endpoint';
 import { setPolicyListApiMockImplementation } from './test_mock_utils';
-import { INGEST_API_PACKAGE_CONFIGS } from './services/ingest';
+import { INGEST_API_PACKAGE_POLICIES } from './services/ingest';
 import {
   createSpyMiddleware,
   MiddlewareActionSpyHelper,
@@ -167,7 +167,7 @@ describe('policy list store concerns', () => {
       },
     });
     await waitForAction('serverReturnedPolicyListData');
-    expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_CONFIGS, {
+    expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_POLICIES, {
       query: {
         kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
         page: 1,
@@ -190,7 +190,7 @@ describe('policy list store concerns', () => {
     it('uses pagination params from url', async () => {
       dispatchUserChangedUrl('?page_size=50&page_index=0');
       await waitForAction('serverReturnedPolicyListData');
-      expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_CONFIGS, {
+      expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_POLICIES, {
         query: {
           kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
           page: 1,
@@ -213,7 +213,7 @@ describe('policy list store concerns', () => {
     it('accepts only positive numbers for page_index and page_size', async () => {
       dispatchUserChangedUrl('?page_size=-50&page_index=-99');
       await waitForAction('serverReturnedPolicyListData');
-      expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_CONFIGS, {
+      expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_POLICIES, {
         query: {
           kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
           page: 1,
@@ -224,7 +224,7 @@ describe('policy list store concerns', () => {
     it('it ignores non-numeric values for page_index and page_size', async () => {
       dispatchUserChangedUrl('?page_size=fifty&page_index=ten');
       await waitForAction('serverReturnedPolicyListData');
-      expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_CONFIGS, {
+      expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_POLICIES, {
         query: {
           kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
           page: 1,
@@ -235,7 +235,7 @@ describe('policy list store concerns', () => {
     it('accepts only known values for `page_size`', async () => {
       dispatchUserChangedUrl('?page_size=300&page_index=10');
       await waitForAction('serverReturnedPolicyListData');
-      expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_CONFIGS, {
+      expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_POLICIES, {
         query: {
           kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
           page: 11,
@@ -264,7 +264,7 @@ describe('policy list store concerns', () => {
       expect(endpointPackageVersion(store.getState())).toEqual('0.5.0');
       fakeCoreStart.http.get.mockClear();
       dispatchUserChangedUrl('?page_size=10&page_index=11');
-      expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_CONFIGS, {
+      expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_PACKAGE_POLICIES, {
         query: {
           kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name: endpoint`,
           page: 12,
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.ts
index 7f0ab36b72234d..e3b12e06a7025f 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.ts
@@ -19,12 +19,12 @@ import { GetPolicyListResponse, GetPolicyResponse, UpdatePolicyResponse } from '
 import { NewPolicyData } from '../../../../../../../common/endpoint/types';
 
 const INGEST_API_ROOT = `/api/ingest_manager`;
-export const INGEST_API_PACKAGE_CONFIGS = `${INGEST_API_ROOT}/package_policies`;
-export const INGEST_API_AGENT_CONFIGS = `${INGEST_API_ROOT}/agent_policies`;
+export const INGEST_API_PACKAGE_POLICIES = `${INGEST_API_ROOT}/package_policies`;
+export const INGEST_API_AGENT_POLICIES = `${INGEST_API_ROOT}/agent_policies`;
 const INGEST_API_FLEET = `${INGEST_API_ROOT}/fleet`;
 const INGEST_API_FLEET_AGENT_STATUS = `${INGEST_API_FLEET}/agent-status`;
 export const INGEST_API_EPM_PACKAGES = `${INGEST_API_ROOT}/epm/packages`;
-const INGEST_API_DELETE_PACKAGE_CONFIG = `${INGEST_API_PACKAGE_CONFIGS}/delete`;
+const INGEST_API_DELETE_PACKAGE_POLICY = `${INGEST_API_PACKAGE_POLICIES}/delete`;
 
 /**
  * Retrieves a list of endpoint specific package policies (those created with a `package.name` of
@@ -36,7 +36,7 @@ export const sendGetEndpointSpecificPackagePolicies = (
   http: HttpStart,
   options: HttpFetchOptions & Partial<GetPackagePoliciesRequest> = {}
 ): Promise<GetPolicyListResponse> => {
-  return http.get<GetPolicyListResponse>(INGEST_API_PACKAGE_CONFIGS, {
+  return http.get<GetPolicyListResponse>(INGEST_API_PACKAGE_POLICIES, {
     ...options,
     query: {
       ...options.query,
@@ -58,7 +58,7 @@ export const sendGetPackagePolicy = (
   packagePolicyId: string,
   options?: HttpFetchOptions
 ) => {
-  return http.get<GetPolicyResponse>(`${INGEST_API_PACKAGE_CONFIGS}/${packagePolicyId}`, options);
+  return http.get<GetPolicyResponse>(`${INGEST_API_PACKAGE_POLICIES}/${packagePolicyId}`, options);
 };
 
 /**
@@ -72,7 +72,7 @@ export const sendDeletePackagePolicy = (
   body: DeletePackagePoliciesRequest,
   options?: HttpFetchOptions
 ) => {
-  return http.post<DeletePackagePoliciesResponse>(INGEST_API_DELETE_PACKAGE_CONFIG, {
+  return http.post<DeletePackagePoliciesResponse>(INGEST_API_DELETE_PACKAGE_POLICY, {
     ...options,
     body: JSON.stringify(body.body),
   });
@@ -87,7 +87,7 @@ export const sendGetAgentPolicyList = (
   http: HttpStart,
   options: HttpFetchOptions & GetAgentPoliciesRequest
 ) => {
-  return http.get<GetAgentPoliciesResponse>(INGEST_API_AGENT_CONFIGS, options);
+  return http.get<GetAgentPoliciesResponse>(INGEST_API_AGENT_POLICIES, options);
 };
 
 /**
@@ -104,7 +104,7 @@ export const sendPutPackagePolicy = (
   packagePolicy: NewPolicyData,
   options: Exclude<HttpFetchOptions, 'body'> = {}
 ): Promise<UpdatePolicyResponse> => {
-  return http.put(`${INGEST_API_PACKAGE_CONFIGS}/${packagePolicyId}`, {
+  return http.put(`${INGEST_API_PACKAGE_POLICIES}/${packagePolicyId}`, {
     ...options,
     body: JSON.stringify(packagePolicy),
   });
@@ -114,12 +114,12 @@ export const sendPutPackagePolicy = (
  * Get a status summary for all Agents that are currently assigned to a given agent policy
  *
  * @param http
- * @param configId
+ * @param policyId
  * @param options
  */
 export const sendGetFleetAgentStatusForPolicy = (
   http: HttpStart,
-  /** the Agent (fleet) configuration id */
+  /** the Agent (fleet) policy id */
   policyId: string,
   options: Exclude<HttpFetchOptions, 'query'> = {}
 ): Promise<GetAgentStatusResponse> => {
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/test_mock_utils.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/test_mock_utils.ts
index 1c14c5c1f0eabc..5ef01c00dbf166 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/test_mock_utils.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/test_mock_utils.ts
@@ -5,7 +5,7 @@
  */
 
 import { HttpStart } from 'kibana/public';
-import { INGEST_API_EPM_PACKAGES, INGEST_API_PACKAGE_CONFIGS } from './services/ingest';
+import { INGEST_API_EPM_PACKAGES, INGEST_API_PACKAGE_POLICIES } from './services/ingest';
 import { EndpointDocGenerator } from '../../../../../../common/endpoint/generate_data';
 import { GetPolicyListResponse } from '../../types';
 import { GetPackagesResponse } from '../../../../../../../ingest_manager/common';
@@ -75,7 +75,7 @@ export const mockPolicyResultList: (options?: {
  */
 export const policyListApiPathHandlers = (totalPolicies: number = 1) => {
   return {
-    [INGEST_API_PACKAGE_CONFIGS]: () => {
+    [INGEST_API_PACKAGE_POLICIES]: () => {
       return mockPolicyResultList({ total: totalPolicies });
     },
     [INGEST_API_EPM_PACKAGES]: (): GetPackagesResponse => {
diff --git a/x-pack/plugins/security_solution/server/usage/endpoints/endpoint.mocks.ts b/x-pack/plugins/security_solution/server/usage/endpoints/endpoint.mocks.ts
index 94957decc52fe0..d5e1d21b7772be 100644
--- a/x-pack/plugins/security_solution/server/usage/endpoints/endpoint.mocks.ts
+++ b/x-pack/plugins/security_solution/server/usage/endpoints/endpoint.mocks.ts
@@ -250,7 +250,7 @@ export const mockFleetEventsObjectsResponse = (
             running ? 'RUNNING' : 'FAILED'
           }: `,
           payload: running ? mockPolicyPayload(policyStatus, policyMode) : undefined,
-          config_id: testAgentPolicyId,
+          policy_id: testAgentPolicyId,
         },
         references: [],
         updated_at: updatedDate,
@@ -267,7 +267,7 @@ export const mockFleetEventsObjectsResponse = (
           subtype: 'STARTING',
           message:
             'Application: endpoint-security--8.0.0[d8f7f6e8-9375-483c-b456-b479f1d7a4f2]: State changed to STARTING: Starting',
-          config_id: testAgentPolicyId,
+          policy_id: testAgentPolicyId,
         },
         references: [],
         updated_at: updatedDate,
diff --git a/x-pack/test/ingest_manager_api_integration/apis/agent_config/agent_config.ts b/x-pack/test/ingest_manager_api_integration/apis/agent_config/agent_config.ts
index 7a1044f170c5bc..ffb9876810d707 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/agent_config/agent_config.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/agent_config/agent_config.ts
@@ -38,7 +38,7 @@ export default function ({ getService }: FtrProviderContext) {
       });
     });
 
-    describe('POST /api/ingest_manager/agent_policies/{agentConfigId}/copy', () => {
+    describe('POST /api/ingest_manager/agent_policies/{agentPolicyId}/copy', () => {
       before(async () => {
         await esArchiver.loadIfNeeded('fleet/agents');
       });
@@ -46,40 +46,40 @@ export default function ({ getService }: FtrProviderContext) {
         await esArchiver.unload('fleet/agents');
       });
 
-      const TEST_CONFIG_ID = 'config1';
+      const TEST_POLICY_ID = 'policy1';
 
       it('should work with valid values', async () => {
         const {
           body: { success, item },
         } = await supertest
-          .post(`/api/ingest_manager/agent_policies/${TEST_CONFIG_ID}/copy`)
+          .post(`/api/ingest_manager/agent_policies/${TEST_POLICY_ID}/copy`)
           .set('kbn-xsrf', 'xxxx')
           .send({
-            name: 'Copied config',
+            name: 'Copied policy',
             description: 'Test',
           })
           .expect(200);
         // eslint-disable-next-line @typescript-eslint/naming-convention
-        const { id, updated_at, ...newConfig } = item;
+        const { id, updated_at, ...newPolicy } = item;
 
         expect(success).to.be(true);
-        expect(newConfig).to.eql({
-          name: 'Copied config',
+        expect(newPolicy).to.eql({
+          name: 'Copied policy',
           description: 'Test',
           namespace: 'default',
           monitoring_enabled: ['logs', 'metrics'],
           revision: 1,
           updated_by: 'elastic',
-          package_configs: [],
+          package_policies: [],
         });
       });
 
-      it('should return a 500 with invalid source config', async () => {
+      it('should return a 500 with invalid source policy', async () => {
         await supertest
-          .post(`/api/ingest_manager/agent_policies/INVALID_CONFIG_ID/copy`)
+          .post(`/api/ingest_manager/agent_policies/INVALID_POLICY_ID/copy`)
           .set('kbn-xsrf', 'xxxx')
           .send({
-            name: 'Copied config',
+            name: 'Copied policy',
             description: '',
           })
           .expect(500);
@@ -87,7 +87,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       it('should return a 400 with invalid payload', async () => {
         await supertest
-          .post(`/api/ingest_manager/agent_policies/${TEST_CONFIG_ID}/copy`)
+          .post(`/api/ingest_manager/agent_policies/${TEST_POLICY_ID}/copy`)
           .set('kbn-xsrf', 'xxxx')
           .send({})
           .expect(400);
@@ -95,7 +95,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       it('should return a 400 with invalid name', async () => {
         await supertest
-          .post(`/api/ingest_manager/agent_policies/${TEST_CONFIG_ID}/copy`)
+          .post(`/api/ingest_manager/agent_policies/${TEST_POLICY_ID}/copy`)
           .set('kbn-xsrf', 'xxxx')
           .send({
             name: '',

From 3c91e01ed98d34de18a06ae8cb06dadf3b2c77be Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Fri, 14 Aug 2020 15:54:05 -0700
Subject: [PATCH 13/24] Rename subtype CONFIG to POLICY (I don't think this
 string is ever sent by agent, though)

---
 .../plugins/ingest_manager/common/openapi/spec_oas3.json  | 4 ++--
 .../plugins/ingest_manager/common/types/models/agent.ts   | 2 +-
 .../fleet/agent_details_page/components/type_labels.tsx   | 2 +-
 .../server/routes/agent/acks_handlers.test.ts             | 6 +++---
 .../ingest_manager/server/services/agents/acks.test.ts    | 8 ++++----
 .../plugins/ingest_manager/server/types/models/agent.ts   | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json b/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
index 8c9ede1fde9ba1..c83e28819db82f 100644
--- a/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
+++ b/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
@@ -3387,7 +3387,7 @@
                     "events": [
                       {
                         "type": "ACTION_RESULT",
-                        "subtype": "CONFIG",
+                        "subtype": "POLICY",
                         "timestamp": "2019-01-04T14:32:03.36764-05:00",
                         "action_id": "51c6ad1e-a9c0-4c70-80da-99a5c51eedaf",
                         "agent_id": "a6f14bd2-1a2a-481c-9212-9494d064ffdf",
@@ -4199,7 +4199,7 @@
               "RUNNING",
               "STARTING",
               "IN_PROGRESS",
-              "CONFIG",
+              "POLICY",
               "FAILED",
               "STOPPING",
               "STOPPED",
diff --git a/x-pack/plugins/ingest_manager/common/types/models/agent.ts b/x-pack/plugins/ingest_manager/common/types/models/agent.ts
index 2b8a306577e7d2..bb78c8cb9338b3 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/agent.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/agent.ts
@@ -49,7 +49,7 @@ export interface NewAgentEvent {
   | 'RUNNING'
     | 'STARTING'
     | 'IN_PROGRESS'
-    | 'CONFIG'
+    | 'POLICY'
     | 'FAILED'
     | 'STOPPING'
     | 'STOPPED'
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx
index 766808493e8b98..706de48b933c47 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx
@@ -63,7 +63,7 @@ export const SUBTYPE_LABEL: { [key in AgentEvent['subtype']]: JSX.Element } = {
       />
     </EuiBadge>
   ),
-  CONFIG: (
+  POLICY: (
     <EuiBadge color="hollow">
       <FormattedMessage
         id="xpack.ingestManager.agentEventSubtype.policyLabel"
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent/acks_handlers.test.ts b/x-pack/plugins/ingest_manager/server/routes/agent/acks_handlers.test.ts
index aaed189ae3dddf..d665b1d412a5c5 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent/acks_handlers.test.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent/acks_handlers.test.ts
@@ -20,7 +20,7 @@ describe('test acks schema', () => {
     expect(() =>
       AckEventSchema.validate({
         type: 'ACTION_RESULT',
-        subtype: 'CONFIG',
+        subtype: 'POLICY',
         timestamp: '2019-01-04T14:32:03.36764-05:00',
         agent_id: 'agent',
         message: 'hello',
@@ -31,7 +31,7 @@ describe('test acks schema', () => {
     expect(
       AckEventSchema.validate({
         type: 'ACTION_RESULT',
-        subtype: 'CONFIG',
+        subtype: 'POLICY',
         timestamp: '2019-01-04T14:32:03.36764-05:00',
         agent_id: 'agent',
         action_id: 'actionId',
@@ -60,7 +60,7 @@ describe('test acks handlers', () => {
         events: [
           {
             type: 'ACTION_RESULT',
-            subtype: 'CONFIG',
+            subtype: 'POLICY',
             timestamp: '2019-01-04T14:32:03.36764-05:00',
             action_id: 'action1',
             agent_id: 'agent',
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts b/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
index 08fb8d45231864..787d992013576a 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
@@ -74,7 +74,7 @@ describe('test agent acks services', () => {
       [
         {
           type: 'ACTION_RESULT',
-          subtype: 'CONFIG',
+          subtype: 'POLICY',
           timestamp: '2019-01-04T14:32:03.36764-05:00',
           action_id: 'action1',
           agent_id: 'id',
@@ -212,7 +212,7 @@ describe('test agent acks services', () => {
       [
         {
           type: 'ACTION_RESULT',
-          subtype: 'CONFIG',
+          subtype: 'POLICY',
           timestamp: '2019-01-04T14:32:03.36764-05:00',
           action_id: 'action1',
           agent_id: 'id',
@@ -355,7 +355,7 @@ describe('test agent acks services', () => {
       [
         {
           type: 'ACTION_RESULT',
-          subtype: 'CONFIG',
+          subtype: 'POLICY',
           timestamp: '2019-01-04T14:32:03.36764-05:00',
           action_id: 'action1',
           agent_id: 'id',
@@ -392,7 +392,7 @@ describe('test agent acks services', () => {
         [
           ({
             type: 'ACTION_RESULT',
-            subtype: 'CONFIG',
+            subtype: 'POLICY',
             timestamp: '2019-01-04T14:32:03.36764-05:00',
             action_id: 'action2',
             agent_id: 'id',
diff --git a/x-pack/plugins/ingest_manager/server/types/models/agent.ts b/x-pack/plugins/ingest_manager/server/types/models/agent.ts
index 5ad98cfd406226..c188df9f0e9714 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/agent.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/agent.ts
@@ -26,7 +26,7 @@ const AgentEventBase = {
       schema.literal('RUNNING'),
       schema.literal('STARTING'),
       schema.literal('IN_PROGRESS'),
-      schema.literal('CONFIG'),
+      schema.literal('POLICY'),
       schema.literal('FAILED'),
       schema.literal('STOPPING'),
       schema.literal('STOPPED'),

From 09f75c748bfd29e3b462970ab49c07e66369f7b6 Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Fri, 14 Aug 2020 15:58:03 -0700
Subject: [PATCH 14/24] Update snapshot

---
 .../plugins/ingest_manager/server/services/agents/acks.test.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts b/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
index 787d992013576a..8b105cceff5c30 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
@@ -224,10 +224,10 @@ describe('test agent acks services', () => {
     expect(mockSavedObjectsClient.bulkUpdate.mock.calls[0][0][0]).toMatchInlineSnapshot(`
       Object {
         "attributes": Object {
-          "policy_revision": 4,
           "packages": Array [
             "system",
           ],
+          "policy_revision": 4,
         },
         "id": "id",
         "type": "fleet-agents",

From 2935f5a21d4f1cca577b1a9c6117d3c3b41133f0 Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Fri, 14 Aug 2020 16:51:07 -0700
Subject: [PATCH 15/24] Remove unnecessary cloning in migrations

---
 .../saved_objects/migrations/to_v7_10_0.ts    | 44 +++++++------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
index 2c38f3279c4348..994c322aada7d1 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
@@ -15,15 +15,13 @@ export const migrateAgentToV7100: SavedObjectMigrationFn<
   },
   Agent
 > = (agentDoc) => {
-  const updatedAgentDoc = cloneDeep(agentDoc);
+  agentDoc.attributes.policy_id = agentDoc.attributes.policy_id;
+  delete agentDoc.attributes.policy_id;
 
-  updatedAgentDoc.attributes.policy_id = agentDoc.attributes.policy_id;
-  delete updatedAgentDoc.attributes.policy_id;
+  agentDoc.attributes.policy_revision = agentDoc.attributes.policy_revision;
+  delete agentDoc.attributes.policy_revision;
 
-  updatedAgentDoc.attributes.policy_revision = agentDoc.attributes.policy_revision;
-  delete updatedAgentDoc.attributes.policy_revision;
-
-  return updatedAgentDoc;
+  return agentDoc;
 };
 
 export const migrateAgentEventToV7100: SavedObjectMigrationFn<
@@ -32,12 +30,10 @@ export const migrateAgentEventToV7100: SavedObjectMigrationFn<
   },
   AgentEvent
 > = (agentEventDoc) => {
-  const updatedAgentEventDoc = cloneDeep(agentEventDoc);
-
-  updatedAgentEventDoc.attributes.policy_id = agentEventDoc.attributes.policy_id;
-  delete updatedAgentEventDoc.attributes.policy_id;
+  agentEventDoc.attributes.policy_id = agentEventDoc.attributes.policy_id;
+  delete agentEventDoc.attributes.policy_id;
 
-  return updatedAgentEventDoc;
+  return agentEventDoc;
 };
 
 export const migrateAgentPolicyToV7100: SavedObjectMigrationFn<
@@ -46,12 +42,10 @@ export const migrateAgentPolicyToV7100: SavedObjectMigrationFn<
   },
   AgentPolicy
 > = (agentPolicyDoc) => {
-  const updatedAgentPolicyDoc = cloneDeep(agentPolicyDoc);
-
-  updatedAgentPolicyDoc.attributes.package_policies = agentPolicyDoc.attributes.package_configs;
-  delete updatedAgentPolicyDoc.attributes.package_configs;
+  agentPolicyDoc.attributes.package_policies = agentPolicyDoc.attributes.package_configs;
+  delete agentPolicyDoc.attributes.package_configs;
 
-  return updatedAgentPolicyDoc;
+  return agentPolicyDoc;
 };
 
 export const migrateEnrollmentApiKeysToV7100: SavedObjectMigrationFn<
@@ -60,12 +54,10 @@ export const migrateEnrollmentApiKeysToV7100: SavedObjectMigrationFn<
   },
   EnrollmentAPIKey
 > = (enrollmentApiKeyDoc) => {
-  const updatedEnrollmentApiKeyDoc = cloneDeep(enrollmentApiKeyDoc);
+  enrollmentApiKeyDoc.attributes.policy_id = enrollmentApiKeyDoc.attributes.policy_id;
+  delete enrollmentApiKeyDoc.attributes.policy_id;
 
-  updatedEnrollmentApiKeyDoc.attributes.policy_id = enrollmentApiKeyDoc.attributes.policy_id;
-  delete updatedEnrollmentApiKeyDoc.attributes.policy_id;
-
-  return updatedEnrollmentApiKeyDoc;
+  return enrollmentApiKeyDoc;
 };
 
 export const migratePackagePolicyToV7100: SavedObjectMigrationFn<
@@ -74,10 +66,8 @@ export const migratePackagePolicyToV7100: SavedObjectMigrationFn<
   },
   PackagePolicy
 > = (packagePolicyDoc) => {
-  const updatedPackagePolicyDoc = cloneDeep(packagePolicyDoc);
-
-  updatedPackagePolicyDoc.attributes.policy_id = packagePolicyDoc.attributes.policy_id;
-  delete updatedPackagePolicyDoc.attributes.policy_id;
+  packagePolicyDoc.attributes.policy_id = packagePolicyDoc.attributes.policy_id;
+  delete packagePolicyDoc.attributes.policy_id;
 
-  return updatedPackagePolicyDoc;
+  return packagePolicyDoc;
 };

From a2b365b436eab9fc34af28e91566590c741985ff Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Fri, 14 Aug 2020 17:02:10 -0700
Subject: [PATCH 16/24] Fix migration typos

---
 .../saved_objects/migrations/to_v7_10_0.ts    | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
index 994c322aada7d1..9a5b6fb2d4c598 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
@@ -10,28 +10,28 @@ import { Agent, AgentEvent, AgentPolicy, PackagePolicy, EnrollmentAPIKey } from
 
 export const migrateAgentToV7100: SavedObjectMigrationFn<
   Exclude<Agent, 'policy_id' | 'policy_revision'> & {
-    policy_id?: string;
-    policy_revision?: number | null;
+    config_id?: string;
+    config_revision?: number | null;
   },
   Agent
 > = (agentDoc) => {
-  agentDoc.attributes.policy_id = agentDoc.attributes.policy_id;
-  delete agentDoc.attributes.policy_id;
+  agentDoc.attributes.policy_id = agentDoc.attributes.config_id;
+  delete agentDoc.attributes.config_id;
 
-  agentDoc.attributes.policy_revision = agentDoc.attributes.policy_revision;
-  delete agentDoc.attributes.policy_revision;
+  agentDoc.attributes.policy_revision = agentDoc.attributes.config_revision;
+  delete agentDoc.attributes.config_revision;
 
   return agentDoc;
 };
 
 export const migrateAgentEventToV7100: SavedObjectMigrationFn<
   Exclude<AgentEvent, 'policy_id'> & {
-    policy_id?: string;
+    config_id?: string;
   },
   AgentEvent
 > = (agentEventDoc) => {
-  agentEventDoc.attributes.policy_id = agentEventDoc.attributes.policy_id;
-  delete agentEventDoc.attributes.policy_id;
+  agentEventDoc.attributes.policy_id = agentEventDoc.attributes.config_id;
+  delete agentEventDoc.attributes.config_id;
 
   return agentEventDoc;
 };
@@ -50,24 +50,24 @@ export const migrateAgentPolicyToV7100: SavedObjectMigrationFn<
 
 export const migrateEnrollmentApiKeysToV7100: SavedObjectMigrationFn<
   Exclude<EnrollmentAPIKey, 'policy_id'> & {
-    policy_id?: string;
+    config_id?: string;
   },
   EnrollmentAPIKey
 > = (enrollmentApiKeyDoc) => {
-  enrollmentApiKeyDoc.attributes.policy_id = enrollmentApiKeyDoc.attributes.policy_id;
-  delete enrollmentApiKeyDoc.attributes.policy_id;
+  enrollmentApiKeyDoc.attributes.policy_id = enrollmentApiKeyDoc.attributes.config_id;
+  delete enrollmentApiKeyDoc.attributes.config_id;
 
   return enrollmentApiKeyDoc;
 };
 
 export const migratePackagePolicyToV7100: SavedObjectMigrationFn<
   Exclude<PackagePolicy, 'policy_id'> & {
-    policy_id: string;
+    config_id: string;
   },
   PackagePolicy
 > = (packagePolicyDoc) => {
-  packagePolicyDoc.attributes.policy_id = packagePolicyDoc.attributes.policy_id;
-  delete packagePolicyDoc.attributes.policy_id;
+  packagePolicyDoc.attributes.policy_id = packagePolicyDoc.attributes.config_id;
+  delete packagePolicyDoc.attributes.config_id;
 
   return packagePolicyDoc;
 };

From 06e785edcb556124deda5931469c794773f9c55b Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Mon, 17 Aug 2020 08:10:40 -0700
Subject: [PATCH 17/24] Update naming in tests and es archiver data

---
 .../functional/es_archives/fleet/agents/data.json |  8 ++++----
 .../es_archives/fleet/agents/mappings.json        | 15 ++++++---------
 .../functional/es_archives/lists/mappings.json    | 12 ++++++------
 .../reporting/canvas_disallowed_url/mappings.json | 12 ++++++------
 .../apis/agent_config/agent_config.ts             |  2 +-
 .../apis/fleet/enrollment_api_keys/crud.ts        | 10 +++++-----
 .../ingest_manager_api_integration/apis/index.js  |  5 +++--
 .../es_archives/export_rule/mappings.json         | 10 +++++-----
 8 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/x-pack/test/functional/es_archives/fleet/agents/data.json b/x-pack/test/functional/es_archives/fleet/agents/data.json
index 8ee5a80aeb4f80..a9d59a5f50f383 100644
--- a/x-pack/test/functional/es_archives/fleet/agents/data.json
+++ b/x-pack/test/functional/es_archives/fleet/agents/data.json
@@ -203,16 +203,16 @@
 {
   "type": "doc",
   "value": {
-    "id": "ingest-agent-policies:config1",
+    "id": "ingest-agent-policies:policy1",
     "index": ".kibana",
     "source": {
       "type": "ingest-agent-policies",
       "ingest-agent-policies": {
-        "name": "Test config",
+        "name": "Test policy",
         "namespace": "default",
-        "description": "Config 1",
+        "description": "Policy 1",
         "status": "active",
-        "package_configs": [],
+        "package_policies": [],
         "is_default": true,
         "monitoring_enabled": [
           "logs",
diff --git a/x-pack/test/functional/es_archives/fleet/agents/mappings.json b/x-pack/test/functional/es_archives/fleet/agents/mappings.json
index 12d3be3e2a9710..936b34f2d8654d 100644
--- a/x-pack/test/functional/es_archives/fleet/agents/mappings.json
+++ b/x-pack/test/functional/es_archives/fleet/agents/mappings.json
@@ -1561,7 +1561,7 @@
             "agent_id": {
               "type": "keyword"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "data": {
@@ -1595,13 +1595,10 @@
             "active": {
               "type": "boolean"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
-            "config_newest_revision": {
-              "type": "integer"
-            },
-            "config_revision": {
+            "policy_revision": {
               "type": "integer"
             },
             "current_error_events": {
@@ -1653,7 +1650,7 @@
             "api_key_id": {
               "type": "keyword"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "created_at": {
@@ -1799,7 +1796,7 @@
         },
         "ingest-agent-policies": {
           "properties": {
-            "package_configs": {
+            "package_policies": {
               "type": "keyword"
             },
             "description": {
@@ -1836,7 +1833,7 @@
         },
         "ingest-package-policies": {
           "properties": {
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "created_at": {
diff --git a/x-pack/test/functional/es_archives/lists/mappings.json b/x-pack/test/functional/es_archives/lists/mappings.json
index ba4e1b276d45ef..73cb3ead0356a6 100644
--- a/x-pack/test/functional/es_archives/lists/mappings.json
+++ b/x-pack/test/functional/es_archives/lists/mappings.json
@@ -958,7 +958,7 @@
             "agent_id": {
               "type": "keyword"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "data": {
@@ -992,10 +992,10 @@
             "active": {
               "type": "boolean"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
-            "config_revision": {
+            "policy_revision": {
               "type": "integer"
             },
             "current_error_events": {
@@ -1060,7 +1060,7 @@
             "api_key_id": {
               "type": "keyword"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "created_at": {
@@ -1228,7 +1228,7 @@
             "namespace": {
               "type": "keyword"
             },
-            "package_configs": {
+            "package_policies": {
               "type": "keyword"
             },
             "revision": {
@@ -1276,7 +1276,7 @@
         },
         "ingest-package-policies": {
           "properties": {
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "created_at": {
diff --git a/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json b/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json
index 2380154277e552..da74f0a1f74bee 100644
--- a/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json
+++ b/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json
@@ -966,7 +966,7 @@
             "agent_id": {
               "type": "keyword"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "data": {
@@ -1000,10 +1000,10 @@
             "active": {
               "type": "boolean"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
-            "config_revision": {
+            "policy_revision": {
               "type": "integer"
             },
             "current_error_events": {
@@ -1068,7 +1068,7 @@
             "api_key_id": {
               "type": "keyword"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "created_at": {
@@ -1166,7 +1166,7 @@
             "namespace": {
               "type": "keyword"
             },
-            "package_configs": {
+            "package_policies": {
               "type": "keyword"
             },
             "revision": {
@@ -1214,7 +1214,7 @@
         },
         "ingest-package-policies": {
           "properties": {
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "created_at": {
diff --git a/x-pack/test/ingest_manager_api_integration/apis/agent_config/agent_config.ts b/x-pack/test/ingest_manager_api_integration/apis/agent_config/agent_config.ts
index ffb9876810d707..5253b19b24d658 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/agent_config/agent_config.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/agent_config/agent_config.ts
@@ -11,7 +11,7 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
-  describe('ingest_manager_agent_configs', () => {
+  describe('ingest_manager_agent_policies', () => {
     describe('POST /api/ingest_manager/agent_policies', () => {
       it('should work with valid values', async () => {
         const { body: apiResponse } = await supertest
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fleet/enrollment_api_keys/crud.ts b/x-pack/test/ingest_manager_api_integration/apis/fleet/enrollment_api_keys/crud.ts
index a83e25d984d126..275462072919bb 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/fleet/enrollment_api_keys/crud.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/fleet/enrollment_api_keys/crud.ts
@@ -94,22 +94,22 @@ export default function (providerContext: FtrProviderContext) {
           .expect(400);
       });
 
-      it('should not allow to create an enrollment api key for a non existing agent config', async () => {
+      it('should not allow to create an enrollment api key for a non existing agent policy', async () => {
         await supertest
           .post(`/api/ingest_manager/fleet/enrollment-api-keys`)
           .set('kbn-xsrf', 'xxx')
           .send({
-            policy_id: 'idonotexistsconfig',
+            policy_id: 'idonotexistspolicy',
           })
           .expect(400);
       });
 
-      it('should allow to create an enrollment api key with an agent config', async () => {
+      it('should allow to create an enrollment api key with an agent policy', async () => {
         const { body: apiResponse } = await supertest
           .post(`/api/ingest_manager/fleet/enrollment-api-keys`)
           .set('kbn-xsrf', 'xxx')
           .send({
-            policy_id: 'config1',
+            policy_id: 'policy1',
           })
           .expect(200);
 
@@ -122,7 +122,7 @@ export default function (providerContext: FtrProviderContext) {
           .post(`/api/ingest_manager/fleet/enrollment-api-keys`)
           .set('kbn-xsrf', 'xxx')
           .send({
-            policy_id: 'config1',
+            policy_id: 'policy1',
           })
           .expect(200);
         expect(apiResponse.success).to.eql(true);
diff --git a/x-pack/test/ingest_manager_api_integration/apis/index.js b/x-pack/test/ingest_manager_api_integration/apis/index.js
index 72121b2164bfd8..6a3f5f9adad59b 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/index.js
+++ b/x-pack/test/ingest_manager_api_integration/apis/index.js
@@ -14,11 +14,12 @@ export default function ({ loadTestFile }) {
     // EPM
     loadTestFile(require.resolve('./epm/index'));
 
-    // Package configs
+    // Package policies
     loadTestFile(require.resolve('./package_config/create'));
     loadTestFile(require.resolve('./package_config/update'));
     loadTestFile(require.resolve('./package_config/get'));
-    // Agent config
+
+    // Agent policies
     loadTestFile(require.resolve('./agent_config/index'));
   });
 }
diff --git a/x-pack/test/security_solution_cypress/es_archives/export_rule/mappings.json b/x-pack/test/security_solution_cypress/es_archives/export_rule/mappings.json
index 249b03981386d3..5eec03ca3d11a8 100644
--- a/x-pack/test/security_solution_cypress/es_archives/export_rule/mappings.json
+++ b/x-pack/test/security_solution_cypress/es_archives/export_rule/mappings.json
@@ -970,7 +970,7 @@
             "agent_id": {
               "type": "keyword"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "data": {
@@ -1004,7 +1004,7 @@
             "active": {
               "type": "boolean"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "config_revision": {
@@ -1072,7 +1072,7 @@
             "api_key_id": {
               "type": "keyword"
             },
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "created_at": {
@@ -1240,7 +1240,7 @@
             "namespace": {
               "type": "keyword"
             },
-            "package_configs": {
+            "package_policies": {
               "type": "keyword"
             },
             "revision": {
@@ -1288,7 +1288,7 @@
         },
         "ingest-package-policies": {
           "properties": {
-            "config_id": {
+            "policy_id": {
               "type": "keyword"
             },
             "created_at": {

From a11afec0702d3922d5f38914b7c0d8846a6684c3 Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Mon, 17 Aug 2020 08:29:40 -0700
Subject: [PATCH 18/24] Rename file names in /common

---
 .../common/constants/{agent_config.ts => agent_policy.ts}   | 0
 x-pack/plugins/ingest_manager/common/constants/index.ts     | 4 ++--
 .../constants/{package_config.ts => package_policy.ts}      | 0
 x-pack/plugins/ingest_manager/common/mocks.ts               | 2 +-
 .../{config_to_yaml.ts => full_agent_policy_to_yaml.ts}     | 2 +-
 x-pack/plugins/ingest_manager/common/services/index.ts      | 6 +++---
 ...uts.test.ts => package_policies_to_agent_inputs.test.ts} | 2 +-
 ..._agent_inputs.ts => package_policies_to_agent_inputs.ts} | 0
 ..._to_config.test.ts => package_to_package_policy.test.ts} | 2 +-
 .../{package_to_config.ts => package_to_package_policy.ts}  | 0
 .../types/models/{agent_config.ts => agent_policy.ts}       | 2 +-
 x-pack/plugins/ingest_manager/common/types/models/index.ts  | 4 ++--
 .../types/models/{package_config.ts => package_policy.ts}   | 0
 .../types/rest_spec/{agent_config.ts => agent_policy.ts}    | 0
 .../plugins/ingest_manager/common/types/rest_spec/index.ts  | 4 ++--
 .../rest_spec/{package_config.ts => package_policy.ts}      | 0
 .../sections/agent_config/components/config_yaml_flyout.tsx | 4 ++--
 .../agent_enrollment_flyout/standalone_instructions.tsx     | 4 ++--
 .../public/applications/ingest_manager/services/index.ts    | 2 +-
 .../ingest_manager/server/routes/agent_config/handlers.ts   | 4 ++--
 20 files changed, 21 insertions(+), 21 deletions(-)
 rename x-pack/plugins/ingest_manager/common/constants/{agent_config.ts => agent_policy.ts} (100%)
 rename x-pack/plugins/ingest_manager/common/constants/{package_config.ts => package_policy.ts} (100%)
 rename x-pack/plugins/ingest_manager/common/services/{config_to_yaml.ts => full_agent_policy_to_yaml.ts} (92%)
 rename x-pack/plugins/ingest_manager/common/services/{package_configs_to_agent_inputs.test.ts => package_policies_to_agent_inputs.test.ts} (98%)
 rename x-pack/plugins/ingest_manager/common/services/{package_configs_to_agent_inputs.ts => package_policies_to_agent_inputs.ts} (100%)
 rename x-pack/plugins/ingest_manager/common/services/{package_to_config.test.ts => package_to_package_policy.test.ts} (99%)
 rename x-pack/plugins/ingest_manager/common/services/{package_to_config.ts => package_to_package_policy.ts} (100%)
 rename x-pack/plugins/ingest_manager/common/types/models/{agent_config.ts => agent_policy.ts} (95%)
 rename x-pack/plugins/ingest_manager/common/types/models/{package_config.ts => package_policy.ts} (100%)
 rename x-pack/plugins/ingest_manager/common/types/rest_spec/{agent_config.ts => agent_policy.ts} (100%)
 rename x-pack/plugins/ingest_manager/common/types/rest_spec/{package_config.ts => package_policy.ts} (100%)

diff --git a/x-pack/plugins/ingest_manager/common/constants/agent_config.ts b/x-pack/plugins/ingest_manager/common/constants/agent_policy.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/common/constants/agent_config.ts
rename to x-pack/plugins/ingest_manager/common/constants/agent_policy.ts
diff --git a/x-pack/plugins/ingest_manager/common/constants/index.ts b/x-pack/plugins/ingest_manager/common/constants/index.ts
index ed01fcdd316a32..519e2861cdc1d4 100644
--- a/x-pack/plugins/ingest_manager/common/constants/index.ts
+++ b/x-pack/plugins/ingest_manager/common/constants/index.ts
@@ -7,8 +7,8 @@ export * from './plugin';
 export * from './routes';
 
 export * from './agent';
-export * from './agent_config';
-export * from './package_config';
+export * from './agent_policy';
+export * from './package_policy';
 export * from './epm';
 export * from './output';
 export * from './enrollment_api_key';
diff --git a/x-pack/plugins/ingest_manager/common/constants/package_config.ts b/x-pack/plugins/ingest_manager/common/constants/package_policy.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/common/constants/package_config.ts
rename to x-pack/plugins/ingest_manager/common/constants/package_policy.ts
diff --git a/x-pack/plugins/ingest_manager/common/mocks.ts b/x-pack/plugins/ingest_manager/common/mocks.ts
index c0ad9f2eff6421..1e14245e0f3ef5 100644
--- a/x-pack/plugins/ingest_manager/common/mocks.ts
+++ b/x-pack/plugins/ingest_manager/common/mocks.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { NewPackagePolicy, PackagePolicy } from './types/models/package_config';
+import { NewPackagePolicy, PackagePolicy } from './types';
 
 export const createNewPackagePolicyMock = (): NewPackagePolicy => {
   return {
diff --git a/x-pack/plugins/ingest_manager/common/services/config_to_yaml.ts b/x-pack/plugins/ingest_manager/common/services/full_agent_policy_to_yaml.ts
similarity index 92%
rename from x-pack/plugins/ingest_manager/common/services/config_to_yaml.ts
rename to x-pack/plugins/ingest_manager/common/services/full_agent_policy_to_yaml.ts
index 6e8b7d5adaf900..5b4a3b2dacf7b9 100644
--- a/x-pack/plugins/ingest_manager/common/services/config_to_yaml.ts
+++ b/x-pack/plugins/ingest_manager/common/services/full_agent_policy_to_yaml.ts
@@ -21,7 +21,7 @@ const POLICY_KEYS_ORDER = [
   'input',
 ];
 
-export const policyToYaml = (policy: FullAgentPolicy): string => {
+export const fullAgentPolicyToYaml = (policy: FullAgentPolicy): string => {
   return safeDump(policy, {
     skipInvalid: true,
     sortKeys: (keyA: string, keyB: string) => {
diff --git a/x-pack/plugins/ingest_manager/common/services/index.ts b/x-pack/plugins/ingest_manager/common/services/index.ts
index 49822989ce044c..28fd15b5ea7006 100644
--- a/x-pack/plugins/ingest_manager/common/services/index.ts
+++ b/x-pack/plugins/ingest_manager/common/services/index.ts
@@ -5,8 +5,8 @@
  */
 export * from './routes';
 export * as AgentStatusKueryHelper from './agent_status';
-export { packageToPackagePolicyInputs, packageToPackagePolicy } from './package_to_config';
-export { storedPackagePoliciesToAgentInputs } from './package_configs_to_agent_inputs';
-export { policyToYaml } from './config_to_yaml';
+export { packageToPackagePolicyInputs, packageToPackagePolicy } from './package_to_package_policy';
+export { storedPackagePoliciesToAgentInputs } from './package_policies_to_agent_inputs';
+export { fullAgentPolicyToYaml } from './full_agent_policy_to_yaml';
 export { isPackageLimited, doesAgentPolicyAlreadyIncludePackage } from './limited_package';
 export { decodeCloudId } from './decode_cloud_id';
diff --git a/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.test.ts b/x-pack/plugins/ingest_manager/common/services/package_policies_to_agent_inputs.test.ts
similarity index 98%
rename from x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.test.ts
rename to x-pack/plugins/ingest_manager/common/services/package_policies_to_agent_inputs.test.ts
index 3910819434da54..956423a4973731 100644
--- a/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.test.ts
+++ b/x-pack/plugins/ingest_manager/common/services/package_policies_to_agent_inputs.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { PackagePolicy, PackagePolicyInput } from '../types';
-import { storedPackagePoliciesToAgentInputs } from './package_configs_to_agent_inputs';
+import { storedPackagePoliciesToAgentInputs } from './package_policies_to_agent_inputs';
 
 describe('Ingest Manager - storedPackagePoliciesToAgentInputs', () => {
   const mockPackagePolicy: PackagePolicy = {
diff --git a/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.ts b/x-pack/plugins/ingest_manager/common/services/package_policies_to_agent_inputs.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.ts
rename to x-pack/plugins/ingest_manager/common/services/package_policies_to_agent_inputs.ts
diff --git a/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts b/x-pack/plugins/ingest_manager/common/services/package_to_package_policy.test.ts
similarity index 99%
rename from x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts
rename to x-pack/plugins/ingest_manager/common/services/package_to_package_policy.test.ts
index 21dab8c8e416bb..6c3559d7cc5a03 100644
--- a/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts
+++ b/x-pack/plugins/ingest_manager/common/services/package_to_package_policy.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { PackageInfo, InstallationStatus } from '../types';
-import { packageToPackagePolicy, packageToPackagePolicyInputs } from './package_to_config';
+import { packageToPackagePolicy, packageToPackagePolicyInputs } from './package_to_package_policy';
 
 describe('Ingest Manager - packageToPackagePolicy', () => {
   const mockPackage: PackageInfo = {
diff --git a/x-pack/plugins/ingest_manager/common/services/package_to_config.ts b/x-pack/plugins/ingest_manager/common/services/package_to_package_policy.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/common/services/package_to_config.ts
rename to x-pack/plugins/ingest_manager/common/services/package_to_package_policy.ts
diff --git a/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts b/x-pack/plugins/ingest_manager/common/types/models/agent_policy.ts
similarity index 95%
rename from x-pack/plugins/ingest_manager/common/types/models/agent_config.ts
rename to x-pack/plugins/ingest_manager/common/types/models/agent_policy.ts
index 8e4ecfb1bc8e54..c626c85d3fb24f 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/agent_policy.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { PackagePolicy, PackagePolicyPackage } from './package_config';
+import { PackagePolicy, PackagePolicyPackage } from './package_policy';
 import { Output } from './output';
 
 export enum AgentPolicyStatus {
diff --git a/x-pack/plugins/ingest_manager/common/types/models/index.ts b/x-pack/plugins/ingest_manager/common/types/models/index.ts
index 8ad716a4ba7685..ad4c6ad02639e2 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/index.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/index.ts
@@ -5,8 +5,8 @@
  */
 
 export * from './agent';
-export * from './agent_config';
-export * from './package_config';
+export * from './agent_policy';
+export * from './package_policy';
 export * from './data_stream';
 export * from './output';
 export * from './epm';
diff --git a/x-pack/plugins/ingest_manager/common/types/models/package_config.ts b/x-pack/plugins/ingest_manager/common/types/models/package_policy.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/common/types/models/package_config.ts
rename to x-pack/plugins/ingest_manager/common/types/models/package_policy.ts
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/agent_config.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/agent_policy.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/common/types/rest_spec/agent_config.ts
rename to x-pack/plugins/ingest_manager/common/types/rest_spec/agent_policy.ts
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/index.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/index.ts
index c40940fdbb6236..2916347693b980 100644
--- a/x-pack/plugins/ingest_manager/common/types/rest_spec/index.ts
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/index.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 export * from './common';
-export * from './package_config';
+export * from './package_policy';
 export * from './data_stream';
 export * from './agent';
-export * from './agent_config';
+export * from './agent_policy';
 export * from './fleet_setup';
 export * from './epm';
 export * from './enrollment_api_key';
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/package_config.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/package_policy.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/common/types/rest_spec/package_config.ts
rename to x-pack/plugins/ingest_manager/common/types/rest_spec/package_policy.ts
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_yaml_flyout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_yaml_flyout.tsx
index 350dc075a3ae11..919bb49f69aaee 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_yaml_flyout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_yaml_flyout.tsx
@@ -21,7 +21,7 @@ import {
 } from '@elastic/eui';
 import { useGetOneAgentPolicyFull, useGetOneAgentPolicy, useCore } from '../../../hooks';
 import { Loading } from '../../../components';
-import { policyToYaml, agentPolicyRouteService } from '../../../services';
+import { fullAgentPolicyToYaml, agentPolicyRouteService } from '../../../services';
 
 const FlyoutBody = styled(EuiFlyoutBody)`
   .euiFlyoutBody__overflowContent {
@@ -40,7 +40,7 @@ export const AgentPolicyYamlFlyout = memo<{ policyId: string; onClose: () => voi
         <Loading />
       ) : (
         <EuiCodeBlock language="yaml" isCopyable fontSize="m">
-          {policyToYaml(yamlData!.item)}
+          {fullAgentPolicyToYaml(yamlData!.item)}
         </EuiCodeBlock>
       );
 
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx
index 4f5055c97b6408..c2da0b704eaff7 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx
@@ -22,7 +22,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { AgentPolicy } from '../../../../types';
 import { useCore, sendGetOneAgentPolicyFull } from '../../../../hooks';
 import { DownloadStep, AgentPolicySelectionStep } from './steps';
-import { policyToYaml, agentPolicyRouteService } from '../../../../services';
+import { fullAgentPolicyToYaml, agentPolicyRouteService } from '../../../../services';
 
 interface Props {
   agentPolicies?: AgentPolicy[];
@@ -68,7 +68,7 @@ export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentPo
     fetchFullPolicy();
   }, [selectedPolicyId, notifications.toasts]);
 
-  const yaml = useMemo(() => policyToYaml(fullAgentPolicy), [fullAgentPolicy]);
+  const yaml = useMemo(() => fullAgentPolicyToYaml(fullAgentPolicy), [fullAgentPolicy]);
   const steps: EuiContainedStepProps[] = [
     DownloadStep(),
     AgentPolicySelectionStep({ agentPolicies, setSelectedPolicyId }),
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/services/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/services/index.ts
index 6e325948ce0f70..7d426c11c0aaba 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/services/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/services/index.ts
@@ -21,7 +21,7 @@ export {
   appRoutesService,
   packageToPackagePolicyInputs,
   storedPackagePoliciesToAgentInputs,
-  policyToYaml,
+  fullAgentPolicyToYaml,
   isPackageLimited,
   doesAgentPolicyAlreadyIncludePackage,
 } from '../../../../common';
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts
index fb9fb57f88a93b..cc178e1038e2ea 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts
@@ -6,7 +6,7 @@
 import { TypeOf } from '@kbn/config-schema';
 import { RequestHandler, ResponseHeaders } from 'src/core/server';
 import bluebird from 'bluebird';
-import { policyToYaml } from '../../../common/services';
+import { fullAgentPolicyToYaml } from '../../../common/services';
 import { appContextService, agentPolicyService, packagePolicyService } from '../../services';
 import { listAgents } from '../../services/agents';
 import { AGENT_SAVED_OBJECT_TYPE } from '../../constants';
@@ -281,7 +281,7 @@ export const downloadFullAgentPolicy: RequestHandler<
       standalone: request.query.standalone === true,
     });
     if (fullAgentPolicy) {
-      const body = policyToYaml(fullAgentPolicy);
+      const body = fullAgentPolicyToYaml(fullAgentPolicy);
       const headers: ResponseHeaders = {
         'content-type': 'text/x-yaml',
         'content-disposition': `attachment; filename="elastic-agent.yml"`,

From 1856855f02a9c6218f11848646da842305500981 Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Mon, 17 Aug 2020 08:40:48 -0700
Subject: [PATCH 19/24] Rename /server files

---
 x-pack/plugins/ingest_manager/server/index.ts                 | 2 +-
 x-pack/plugins/ingest_manager/server/mocks.ts                 | 2 +-
 .../server/routes/{agent_config => agent_policy}/handlers.ts  | 0
 .../server/routes/{agent_config => agent_policy}/index.ts     | 0
 x-pack/plugins/ingest_manager/server/routes/index.ts          | 4 ++--
 .../{package_config => package_policy}/handlers.test.ts       | 0
 .../routes/{package_config => package_policy}/handlers.ts     | 0
 .../server/routes/{package_config => package_policy}/index.ts | 0
 .../server/saved_objects/migrations/to_v7_10_0.ts             | 1 -
 .../services/{agent_config.test.ts => agent_policy.test.ts}   | 2 +-
 .../server/services/{agent_config.ts => agent_policy.ts}      | 4 ++--
 .../{agent_config_update.ts => agent_policy_update.ts}        | 0
 .../server/services/agents/checkin/state_new_actions.ts       | 2 +-
 .../plugins/ingest_manager/server/services/agents/reassign.ts | 2 +-
 .../server/services/api_keys/enrollment_api_key.ts            | 2 +-
 x-pack/plugins/ingest_manager/server/services/index.ts        | 4 ++--
 .../{package_config.test.ts => package_policy.test.ts}        | 2 +-
 .../server/services/{package_config.ts => package_policy.ts}  | 2 +-
 x-pack/plugins/ingest_manager/server/services/setup.ts        | 4 ++--
 .../server/types/models/{agent_config.ts => agent_policy.ts}  | 2 +-
 x-pack/plugins/ingest_manager/server/types/models/index.ts    | 4 ++--
 .../types/models/{package_config.ts => package_policy.ts}     | 0
 .../types/rest_spec/{agent_config.ts => agent_policy.ts}      | 0
 x-pack/plugins/ingest_manager/server/types/rest_spec/index.ts | 4 ++--
 .../types/rest_spec/{package_config.ts => package_policy.ts}  | 0
 25 files changed, 21 insertions(+), 22 deletions(-)
 rename x-pack/plugins/ingest_manager/server/routes/{agent_config => agent_policy}/handlers.ts (100%)
 rename x-pack/plugins/ingest_manager/server/routes/{agent_config => agent_policy}/index.ts (100%)
 rename x-pack/plugins/ingest_manager/server/routes/{package_config => package_policy}/handlers.test.ts (100%)
 rename x-pack/plugins/ingest_manager/server/routes/{package_config => package_policy}/handlers.ts (100%)
 rename x-pack/plugins/ingest_manager/server/routes/{package_config => package_policy}/index.ts (100%)
 rename x-pack/plugins/ingest_manager/server/services/{agent_config.test.ts => agent_policy.test.ts} (98%)
 rename x-pack/plugins/ingest_manager/server/services/{agent_config.ts => agent_policy.ts} (99%)
 rename x-pack/plugins/ingest_manager/server/services/{agent_config_update.ts => agent_policy_update.ts} (100%)
 rename x-pack/plugins/ingest_manager/server/services/{package_config.test.ts => package_policy.test.ts} (98%)
 rename x-pack/plugins/ingest_manager/server/services/{package_config.ts => package_policy.ts} (99%)
 rename x-pack/plugins/ingest_manager/server/types/models/{agent_config.ts => agent_policy.ts} (95%)
 rename x-pack/plugins/ingest_manager/server/types/models/{package_config.ts => package_policy.ts} (100%)
 rename x-pack/plugins/ingest_manager/server/types/rest_spec/{agent_config.ts => agent_policy.ts} (100%)
 rename x-pack/plugins/ingest_manager/server/types/rest_spec/{package_config.ts => package_policy.ts} (100%)

diff --git a/x-pack/plugins/ingest_manager/server/index.ts b/x-pack/plugins/ingest_manager/server/index.ts
index 0b0fcf3128ddf9..e4155aa91f462b 100644
--- a/x-pack/plugins/ingest_manager/server/index.ts
+++ b/x-pack/plugins/ingest_manager/server/index.ts
@@ -43,7 +43,7 @@ export const config = {
 
 export type IngestManagerConfigType = TypeOf<typeof config.schema>;
 
-export { PackagePolicyServiceInterface } from './services/package_config';
+export { PackagePolicyServiceInterface } from './services/package_policy';
 
 export const plugin = (initializerContext: PluginInitializerContext) => {
   return new IngestManagerPlugin(initializerContext);
diff --git a/x-pack/plugins/ingest_manager/server/mocks.ts b/x-pack/plugins/ingest_manager/server/mocks.ts
index 68dfb880eee558..18b58b5673651a 100644
--- a/x-pack/plugins/ingest_manager/server/mocks.ts
+++ b/x-pack/plugins/ingest_manager/server/mocks.ts
@@ -8,7 +8,7 @@ import { loggingSystemMock, savedObjectsServiceMock } from 'src/core/server/mock
 import { IngestManagerAppContext } from './plugin';
 import { encryptedSavedObjectsMock } from '../../encrypted_saved_objects/server/mocks';
 import { securityMock } from '../../security/server/mocks';
-import { PackagePolicyServiceInterface } from './services/package_config';
+import { PackagePolicyServiceInterface } from './services/package_policy';
 
 export const createAppContextStartContractMock = (): IngestManagerAppContext => {
   return {
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/agent_policy/handlers.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/server/routes/agent_config/handlers.ts
rename to x-pack/plugins/ingest_manager/server/routes/agent_policy/handlers.ts
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent_config/index.ts b/x-pack/plugins/ingest_manager/server/routes/agent_policy/index.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/server/routes/agent_config/index.ts
rename to x-pack/plugins/ingest_manager/server/routes/agent_policy/index.ts
diff --git a/x-pack/plugins/ingest_manager/server/routes/index.ts b/x-pack/plugins/ingest_manager/server/routes/index.ts
index 9dff60e63aac4c..0743270fd71215 100644
--- a/x-pack/plugins/ingest_manager/server/routes/index.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/index.ts
@@ -3,8 +3,8 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-export { registerRoutes as registerAgentPolicyRoutes } from './agent_config';
-export { registerRoutes as registerPackagePolicyRoutes } from './package_config';
+export { registerRoutes as registerAgentPolicyRoutes } from './agent_policy';
+export { registerRoutes as registerPackagePolicyRoutes } from './package_policy';
 export { registerRoutes as registerDataStreamRoutes } from './data_streams';
 export { registerRoutes as registerEPMRoutes } from './epm';
 export { registerRoutes as registerSetupRoutes } from './setup';
diff --git a/x-pack/plugins/ingest_manager/server/routes/package_config/handlers.test.ts b/x-pack/plugins/ingest_manager/server/routes/package_policy/handlers.test.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/server/routes/package_config/handlers.test.ts
rename to x-pack/plugins/ingest_manager/server/routes/package_policy/handlers.test.ts
diff --git a/x-pack/plugins/ingest_manager/server/routes/package_config/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/package_policy/handlers.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/server/routes/package_config/handlers.ts
rename to x-pack/plugins/ingest_manager/server/routes/package_policy/handlers.ts
diff --git a/x-pack/plugins/ingest_manager/server/routes/package_config/index.ts b/x-pack/plugins/ingest_manager/server/routes/package_policy/index.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/server/routes/package_config/index.ts
rename to x-pack/plugins/ingest_manager/server/routes/package_policy/index.ts
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
index 9a5b6fb2d4c598..f45b69eaaa79c2 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
@@ -5,7 +5,6 @@
  */
 
 import { SavedObjectMigrationFn } from 'kibana/server';
-import { cloneDeep } from 'lodash';
 import { Agent, AgentEvent, AgentPolicy, PackagePolicy, EnrollmentAPIKey } from '../../types';
 
 export const migrateAgentToV7100: SavedObjectMigrationFn<
diff --git a/x-pack/plugins/ingest_manager/server/services/agent_config.test.ts b/x-pack/plugins/ingest_manager/server/services/agent_policy.test.ts
similarity index 98%
rename from x-pack/plugins/ingest_manager/server/services/agent_config.test.ts
rename to x-pack/plugins/ingest_manager/server/services/agent_policy.test.ts
index 4835f2b9c6bf81..dc2a89c661ac3d 100644
--- a/x-pack/plugins/ingest_manager/server/services/agent_config.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agent_policy.test.ts
@@ -5,7 +5,7 @@
  */
 
 import { savedObjectsClientMock } from 'src/core/server/mocks';
-import { agentPolicyService } from './agent_config';
+import { agentPolicyService } from './agent_policy';
 import { Output } from '../types';
 
 function getSavedObjectMock(agentPolicyAttributes: any) {
diff --git a/x-pack/plugins/ingest_manager/server/services/agent_config.ts b/x-pack/plugins/ingest_manager/server/services/agent_policy.ts
similarity index 99%
rename from x-pack/plugins/ingest_manager/server/services/agent_config.ts
rename to x-pack/plugins/ingest_manager/server/services/agent_policy.ts
index eec6f2530d7a36..21bc7b021e83a2 100644
--- a/x-pack/plugins/ingest_manager/server/services/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agent_policy.ts
@@ -22,9 +22,9 @@ import {
 } from '../types';
 import { DeleteAgentPolicyResponse, storedPackagePoliciesToAgentInputs } from '../../common';
 import { listAgents } from './agents';
-import { packagePolicyService } from './package_config';
+import { packagePolicyService } from './package_policy';
 import { outputService } from './output';
-import { agentPolicyUpdateEventHandler } from './agent_config_update';
+import { agentPolicyUpdateEventHandler } from './agent_policy_update';
 
 const SAVED_OBJECT_TYPE = AGENT_POLICY_SAVED_OBJECT_TYPE;
 
diff --git a/x-pack/plugins/ingest_manager/server/services/agent_config_update.ts b/x-pack/plugins/ingest_manager/server/services/agent_policy_update.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/server/services/agent_config_update.ts
rename to x-pack/plugins/ingest_manager/server/services/agent_policy_update.ts
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
index 4b5d4bd72233fb..ae231bea461e22 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
@@ -23,7 +23,7 @@ import {
   AgentPolicy,
   FullAgentPolicy,
 } from '../../../types';
-import { agentPolicyService } from '../../agent_config';
+import { agentPolicyService } from '../../agent_policy';
 import * as APIKeysService from '../../api_keys';
 import { AGENT_SAVED_OBJECT_TYPE, AGENT_UPDATE_ACTIONS_INTERVAL_MS } from '../../../constants';
 import { createAgentAction, getNewActionsSince } from '../actions';
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts b/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts
index e75f0bf5a6d0a4..3075e146093e37 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/reassign.ts
@@ -8,7 +8,7 @@ import { SavedObjectsClientContract } from 'kibana/server';
 import Boom from 'boom';
 import { AGENT_SAVED_OBJECT_TYPE } from '../../constants';
 import { AgentSOAttributes } from '../../types';
-import { agentPolicyService } from '../agent_config';
+import { agentPolicyService } from '../agent_policy';
 
 export async function reassignAgent(
   soClient: SavedObjectsClientContract,
diff --git a/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts b/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts
index a5efdb5a11972f..f058166fc2a4fa 100644
--- a/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts
+++ b/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts
@@ -10,7 +10,7 @@ import { SavedObjectsClientContract, SavedObject } from 'src/core/server';
 import { EnrollmentAPIKey, EnrollmentAPIKeySOAttributes } from '../../types';
 import { ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE } from '../../constants';
 import { createAPIKey, invalidateAPIKey } from './security';
-import { agentPolicyService } from '../agent_config';
+import { agentPolicyService } from '../agent_policy';
 import { appContextService } from '../app_context';
 
 export async function listEnrollmentApiKeys(
diff --git a/x-pack/plugins/ingest_manager/server/services/index.ts b/x-pack/plugins/ingest_manager/server/services/index.ts
index 1af63a3935de07..e768862d2dee15 100644
--- a/x-pack/plugins/ingest_manager/server/services/index.ts
+++ b/x-pack/plugins/ingest_manager/server/services/index.ts
@@ -61,8 +61,8 @@ export interface AgentService {
 }
 
 // Saved object services
-export { agentPolicyService } from './agent_config';
-export { packagePolicyService } from './package_config';
+export { agentPolicyService } from './agent_policy';
+export { packagePolicyService } from './package_policy';
 export { outputService } from './output';
 export { settingsService };
 
diff --git a/x-pack/plugins/ingest_manager/server/services/package_config.test.ts b/x-pack/plugins/ingest_manager/server/services/package_policy.test.ts
similarity index 98%
rename from x-pack/plugins/ingest_manager/server/services/package_config.test.ts
rename to x-pack/plugins/ingest_manager/server/services/package_policy.test.ts
index 76ea9c6df45b40..0d89c529576327 100644
--- a/x-pack/plugins/ingest_manager/server/services/package_config.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/package_policy.test.ts
@@ -6,7 +6,7 @@
 
 import { savedObjectsClientMock } from 'src/core/server/mocks';
 import { createPackagePolicyMock } from '../../common/mocks';
-import { packagePolicyService } from './package_config';
+import { packagePolicyService } from './package_policy';
 import { PackageInfo, PackagePolicySOAttributes } from '../types';
 import { SavedObjectsUpdateResponse } from 'src/core/server';
 
diff --git a/x-pack/plugins/ingest_manager/server/services/package_config.ts b/x-pack/plugins/ingest_manager/server/services/package_policy.ts
similarity index 99%
rename from x-pack/plugins/ingest_manager/server/services/package_config.ts
rename to x-pack/plugins/ingest_manager/server/services/package_policy.ts
index 73f7d1685dfce0..b7e1806979db82 100644
--- a/x-pack/plugins/ingest_manager/server/services/package_config.ts
+++ b/x-pack/plugins/ingest_manager/server/services/package_policy.ts
@@ -24,7 +24,7 @@ import {
   RegistryPackage,
   CallESAsCurrentUser,
 } from '../types';
-import { agentPolicyService } from './agent_config';
+import { agentPolicyService } from './agent_policy';
 import { outputService } from './output';
 import * as Registry from './epm/registry';
 import { getPackageInfo, getInstallation, ensureInstalledPackage } from './epm/packages';
diff --git a/x-pack/plugins/ingest_manager/server/services/setup.ts b/x-pack/plugins/ingest_manager/server/services/setup.ts
index b7865d6caea742..727b49cebc6080 100644
--- a/x-pack/plugins/ingest_manager/server/services/setup.ts
+++ b/x-pack/plugins/ingest_manager/server/services/setup.ts
@@ -8,7 +8,7 @@ import url from 'url';
 import uuid from 'uuid';
 import { SavedObjectsClientContract } from 'src/core/server';
 import { CallESAsCurrentUser } from '../types';
-import { agentPolicyService } from './agent_config';
+import { agentPolicyService } from './agent_policy';
 import { outputService } from './output';
 import { ensureInstalledDefaultPackages } from './epm/packages/install';
 import { ensureDefaultIndices } from './epm/kibana/index_pattern/install';
@@ -22,7 +22,7 @@ import {
   decodeCloudId,
 } from '../../common';
 import { getPackageInfo } from './epm/packages';
-import { packagePolicyService } from './package_config';
+import { packagePolicyService } from './package_policy';
 import { generateEnrollmentAPIKey } from './api_keys';
 import { settingsService } from '.';
 import { appContextService } from './app_context';
diff --git a/x-pack/plugins/ingest_manager/server/types/models/agent_config.ts b/x-pack/plugins/ingest_manager/server/types/models/agent_policy.ts
similarity index 95%
rename from x-pack/plugins/ingest_manager/server/types/models/agent_config.ts
rename to x-pack/plugins/ingest_manager/server/types/models/agent_policy.ts
index 94dc11ba93ac16..877d8e9e917141 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/agent_policy.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { schema } from '@kbn/config-schema';
-import { PackagePolicySchema } from './package_config';
+import { PackagePolicySchema } from './package_policy';
 import { AgentPolicyStatus } from '../../../common';
 
 const AgentPolicyBaseSchema = {
diff --git a/x-pack/plugins/ingest_manager/server/types/models/index.ts b/x-pack/plugins/ingest_manager/server/types/models/index.ts
index 268e87eb529be6..243a8a4e09e6e5 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/index.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/index.ts
@@ -3,8 +3,8 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-export * from './agent_config';
+export * from './agent_policy';
 export * from './agent';
-export * from './package_config';
+export * from './package_policy';
 export * from './output';
 export * from './enrollment_api_key';
diff --git a/x-pack/plugins/ingest_manager/server/types/models/package_config.ts b/x-pack/plugins/ingest_manager/server/types/models/package_policy.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/server/types/models/package_config.ts
rename to x-pack/plugins/ingest_manager/server/types/models/package_policy.ts
diff --git a/x-pack/plugins/ingest_manager/server/types/rest_spec/agent_config.ts b/x-pack/plugins/ingest_manager/server/types/rest_spec/agent_policy.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/server/types/rest_spec/agent_config.ts
rename to x-pack/plugins/ingest_manager/server/types/rest_spec/agent_policy.ts
diff --git a/x-pack/plugins/ingest_manager/server/types/rest_spec/index.ts b/x-pack/plugins/ingest_manager/server/types/rest_spec/index.ts
index f3ee868f43f00f..0f340b48634ea6 100644
--- a/x-pack/plugins/ingest_manager/server/types/rest_spec/index.ts
+++ b/x-pack/plugins/ingest_manager/server/types/rest_spec/index.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 export * from './common';
-export * from './agent_config';
+export * from './agent_policy';
 export * from './agent';
-export * from './package_config';
+export * from './package_policy';
 export * from './epm';
 export * from './enrollment_api_key';
 export * from './install_script';
diff --git a/x-pack/plugins/ingest_manager/server/types/rest_spec/package_config.ts b/x-pack/plugins/ingest_manager/server/types/rest_spec/package_policy.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/server/types/rest_spec/package_config.ts
rename to x-pack/plugins/ingest_manager/server/types/rest_spec/package_policy.ts

From 085412470fda14dba4f091923ef4c2c362d4e2cc Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Mon, 17 Aug 2020 09:04:53 -0700
Subject: [PATCH 20/24] Rename /public files

---
 .../use_request/{agent_config.ts => agent_policy.ts}   |  0
 .../ingest_manager/hooks/use_request/index.ts          |  4 ++--
 .../{package_config.ts => package_policy.ts}           |  0
 .../components/actions_menu.tsx                        |  4 ++--
 .../components/agent_policy_copy_provider.tsx}         |  0
 .../components/agent_policy_delete_provider.tsx}       |  0
 .../components/agent_policy_form.tsx}                  |  2 +-
 .../components/agent_policy_yaml_flyout.tsx}           |  0
 .../components/confirm_deploy_modal.tsx                |  0
 .../components/danger_eui_context_menu_item.tsx        |  0
 .../{agent_config => agent_policy}/components/index.ts |  8 +++++---
 .../components/linked_agent_count.tsx                  |  0
 .../components/package_policy_delete_provider.tsx}     |  0
 .../components/custom_package_policy.tsx}              |  0
 .../create_package_policy_page}/components/index.ts    |  6 +++---
 .../create_package_policy_page}/components/layout.tsx  |  0
 .../components/package_policy_input_config.tsx}        |  2 +-
 .../components/package_policy_input_panel.tsx}         |  4 ++--
 .../components/package_policy_input_stream.tsx}        |  2 +-
 .../components/package_policy_input_var_field.tsx}     |  0
 .../create_package_policy_page}/index.tsx              |  4 ++--
 .../services/has_invalid_but_required_var.test.ts      |  0
 .../services/has_invalid_but_required_var.ts           |  0
 .../create_package_policy_page}/services/index.ts      |  2 +-
 .../services/is_advanced_var.test.ts                   |  0
 .../services/is_advanced_var.ts                        |  0
 .../services/validate_package_policy.test..ts}         |  2 +-
 .../services/validate_package_policy.ts}               |  0
 .../step_configure_package.tsx                         |  0
 .../step_define_package_policy.tsx}                    |  0
 .../step_select_agent_policy.tsx}                      |  0
 .../step_select_package.tsx                            |  0
 .../create_package_policy_page}/types.ts               |  0
 .../details_page/components/index.ts                   |  4 ++--
 .../components/package_policies}/index.tsx             |  4 ++--
 .../package_policies/no_package_policies.tsx}          |  0
 .../package_policies/package_policies_table.tsx}       |  0
 .../details_page/components/settings/index.tsx         |  0
 .../details_page/hooks/index.ts                        |  0
 .../details_page/hooks/use_agent_status.tsx            |  0
 .../details_page/hooks/use_config.tsx                  |  0
 .../details_page/index.tsx                             |  0
 .../edit_package_policy_page}/index.tsx                | 10 +++++-----
 .../sections/{agent_config => agent_policy}/index.tsx  |  4 ++--
 .../list_page/components/create_agent_policy.tsx}      |  0
 .../list_page/components/index.ts                      |  2 +-
 .../{agent_config => agent_policy}/list_page/index.tsx |  0
 .../applications/ingest_manager/sections/epm/index.tsx |  2 +-
 .../sections/epm/screens/detail/content.tsx            |  2 +-
 ...ge_configs_panel.tsx => package_policies_panel.tsx} |  0
 .../agent_details_page/components/type_labels.tsx      |  2 +-
 ...config_selection.tsx => agent_policy_selection.tsx} |  2 +-
 .../fleet/components/agent_enrollment_flyout/steps.tsx |  2 +-
 ...kage_badges.tsx => agent_policy_package_badges.tsx} |  0
 .../index.tsx                                          |  2 +-
 .../ingest_manager/sections/fleet/components/index.tsx |  2 +-
 .../sections/fleet/components/list_layout.tsx          |  2 +-
 .../applications/ingest_manager/sections/index.tsx     |  2 +-
 ...figuration_section.tsx => agent_policy_section.tsx} |  0
 .../ingest_manager/sections/overview/index.tsx         |  2 +-
 x-pack/plugins/ingest_manager/public/index.ts          |  2 +-
 x-pack/plugins/ingest_manager/public/plugin.ts         |  2 +-
 62 files changed, 45 insertions(+), 43 deletions(-)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/{agent_config.ts => agent_policy.ts} (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/{package_config.ts => package_policy.ts} (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/components/actions_menu.tsx (96%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/components/config_copy_provider.tsx => agent_policy/components/agent_policy_copy_provider.tsx} (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/components/config_delete_provider.tsx => agent_policy/components/agent_policy_delete_provider.tsx} (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/components/config_form.tsx => agent_policy/components/agent_policy_form.tsx} (99%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/components/config_yaml_flyout.tsx => agent_policy/components/agent_policy_yaml_flyout.tsx} (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/components/confirm_deploy_modal.tsx (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/components/danger_eui_context_menu_item.tsx (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/components/index.ts (58%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/components/linked_agent_count.tsx (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/components/package_config_delete_provider.tsx => agent_policy/components/package_policy_delete_provider.tsx} (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page/components/custom_package_config.tsx => agent_policy/create_package_policy_page/components/custom_package_policy.tsx} (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page => agent_policy/create_package_policy_page}/components/index.ts (62%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page => agent_policy/create_package_policy_page}/components/layout.tsx (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page/components/package_config_input_config.tsx => agent_policy/create_package_policy_page/components/package_policy_input_config.tsx} (99%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page/components/package_config_input_panel.tsx => agent_policy/create_package_policy_page/components/package_policy_input_panel.tsx} (98%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page/components/package_config_input_stream.tsx => agent_policy/create_package_policy_page/components/package_policy_input_stream.tsx} (99%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page/components/package_config_input_var_field.tsx => agent_policy/create_package_policy_page/components/package_policy_input_var_field.tsx} (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page => agent_policy/create_package_policy_page}/index.tsx (99%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page => agent_policy/create_package_policy_page}/services/has_invalid_but_required_var.test.ts (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page => agent_policy/create_package_policy_page}/services/has_invalid_but_required_var.ts (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page => agent_policy/create_package_policy_page}/services/index.ts (94%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page => agent_policy/create_package_policy_page}/services/is_advanced_var.test.ts (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page => agent_policy/create_package_policy_page}/services/is_advanced_var.ts (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page/services/validate_package_config.ts.test.ts => agent_policy/create_package_policy_page/services/validate_package_policy.test..ts} (99%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page/services/validate_package_config.ts => agent_policy/create_package_policy_page/services/validate_package_policy.ts} (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page => agent_policy/create_package_policy_page}/step_configure_package.tsx (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page/step_define_package_config.tsx => agent_policy/create_package_policy_page/step_define_package_policy.tsx} (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page/step_select_config.tsx => agent_policy/create_package_policy_page/step_select_agent_policy.tsx} (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page => agent_policy/create_package_policy_page}/step_select_package.tsx (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/create_package_config_page => agent_policy/create_package_policy_page}/types.ts (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/details_page/components/index.ts (67%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/details_page/components/package_configs => agent_policy/details_page/components/package_policies}/index.tsx (85%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/details_page/components/package_configs/no_package_configs.tsx => agent_policy/details_page/components/package_policies/no_package_policies.tsx} (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/details_page/components/package_configs/package_configs_table.tsx => agent_policy/details_page/components/package_policies/package_policies_table.tsx} (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/details_page/components/settings/index.tsx (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/details_page/hooks/index.ts (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/details_page/hooks/use_agent_status.tsx (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/details_page/hooks/use_config.tsx (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/details_page/index.tsx (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/edit_package_config_page => agent_policy/edit_package_policy_page}/index.tsx (97%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/index.tsx (90%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config/list_page/components/create_config.tsx => agent_policy/list_page/components/create_agent_policy.tsx} (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/list_page/components/index.ts (78%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/{agent_config => agent_policy}/list_page/index.tsx (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/{package_configs_panel.tsx => package_policies_panel.tsx} (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/{config_selection.tsx => agent_policy_selection.tsx} (99%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/{agent_config_package_badges.tsx => agent_policy_package_badges.tsx} (100%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/{agent_reassign_config_flyout => agent_reassign_policy_flyout}/index.tsx (98%)
 rename x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/{configuration_section.tsx => agent_policy_section.tsx} (100%)

diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_config.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_policy.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_config.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_policy.ts
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/index.ts
index 0d703925f2cf3d..e33684b5a0926b 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/index.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 export { setHttpClient, sendRequest, useRequest } from './use_request';
-export * from './agent_config';
-export * from './package_config';
+export * from './agent_policy';
+export * from './package_policy';
 export * from './data_stream';
 export * from './agents';
 export * from './enrollment_api_keys';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/package_config.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/package_policy.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/package_config.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/package_policy.ts
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/actions_menu.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/actions_menu.tsx
similarity index 96%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/actions_menu.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/actions_menu.tsx
index ccbf9e201777a3..691de5f259134f 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/actions_menu.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/actions_menu.tsx
@@ -10,8 +10,8 @@ import { AgentPolicy } from '../../../types';
 import { useCapabilities } from '../../../hooks';
 import { ContextMenuActions } from '../../../components';
 import { AgentEnrollmentFlyout } from '../../fleet/components';
-import { AgentPolicyYamlFlyout } from './config_yaml_flyout';
-import { AgentPolicyCopyProvider } from './config_copy_provider';
+import { AgentPolicyYamlFlyout } from './agent_policy_yaml_flyout';
+import { AgentPolicyCopyProvider } from './agent_policy_copy_provider';
 
 export const AgentPolicyActionMenu = memo<{
   agentPolicy: AgentPolicy;
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_copy_provider.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_copy_provider.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_copy_provider.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_copy_provider.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_delete_provider.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_delete_provider.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_delete_provider.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_delete_provider.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_form.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_form.tsx
similarity index 99%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_form.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_form.tsx
index 4701d4b5794514..a858a53c485b7f 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_form.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_form.tsx
@@ -24,7 +24,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
 import { NewAgentPolicy, AgentPolicy } from '../../../types';
-import { AgentPolicyDeleteProvider } from './config_delete_provider';
+import { AgentPolicyDeleteProvider } from './agent_policy_delete_provider';
 
 interface ValidationResults {
   [key: string]: JSX.Element[];
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_yaml_flyout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_yaml_flyout.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/config_yaml_flyout.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_yaml_flyout.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/confirm_deploy_modal.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/confirm_deploy_modal.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/confirm_deploy_modal.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/confirm_deploy_modal.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/danger_eui_context_menu_item.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/danger_eui_context_menu_item.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/danger_eui_context_menu_item.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/danger_eui_context_menu_item.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/index.ts
similarity index 58%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/index.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/index.ts
index 7fabcddbadb87f..1ec43f4df8c8ea 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/index.ts
@@ -3,9 +3,11 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-export { AgentPolicyForm, agentPolicyFormValidation } from './config_form';
-export { AgentPolicyDeleteProvider } from './config_delete_provider';
-export { PackagePolicyDeleteProvider } from './package_config_delete_provider';
+export { AgentPolicyForm, agentPolicyFormValidation } from './agent_policy_form';
+export { AgentPolicyCopyProvider } from './agent_policy_copy_provider';
+export { AgentPolicyDeleteProvider } from './agent_policy_delete_provider';
+export { PackagePolicyDeleteProvider } from './package_policy_delete_provider';
+export { AgentPolicyYamlFlyout } from './agent_policy_yaml_flyout';
 export { LinkedAgentCount } from './linked_agent_count';
 export { ConfirmDeployAgentPolicyModal } from './confirm_deploy_modal';
 export { DangerEuiContextMenuItem } from './danger_eui_context_menu_item';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/linked_agent_count.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/linked_agent_count.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/linked_agent_count.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/linked_agent_count.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/package_config_delete_provider.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/package_policy_delete_provider.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/package_config_delete_provider.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/package_policy_delete_provider.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/custom_package_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/custom_package_policy.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/custom_package_config.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/custom_package_policy.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/index.ts
similarity index 62%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/index.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/index.ts
index 28b19d0bf7040d..893ed00cca9ac3 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/index.ts
@@ -4,6 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 export { CreatePackagePolicyPageLayout } from './layout';
-export { PackagePolicyInputPanel } from './package_config_input_panel';
-export { PackagePolicyInputVarField } from './package_config_input_var_field';
-export { CustomPackagePolicy } from './custom_package_config';
+export { PackagePolicyInputPanel } from './package_policy_input_panel';
+export { PackagePolicyInputVarField } from './package_policy_input_var_field';
+export { CustomPackagePolicy } from './custom_package_policy';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/layout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/layout.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/layout.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/layout.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_config.tsx
similarity index 99%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_config.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_config.tsx
index 93441814757d35..e966ca30c4c973 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_config.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_config.tsx
@@ -20,7 +20,7 @@ import {
   PackagePolicyConfigValidationResults,
   validationHasErrors,
 } from '../services';
-import { PackagePolicyInputVarField } from './package_config_input_var_field';
+import { PackagePolicyInputVarField } from './package_policy_input_var_field';
 
 const FlexItemWithMaxWidth = styled(EuiFlexItem)`
   max-width: calc(50% - ${(props) => props.theme.eui.euiSizeL});
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_panel.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_panel.tsx
similarity index 98%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_panel.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_panel.tsx
index 83eae7c3727041..13504a1ed355a1 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_panel.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_panel.tsx
@@ -27,8 +27,8 @@ import {
   hasInvalidButRequiredVar,
   countValidationErrors,
 } from '../services';
-import { PackagePolicyInputConfig } from './package_config_input_config';
-import { PackagePolicyInputStreamConfig } from './package_config_input_stream';
+import { PackagePolicyInputConfig } from './package_policy_input_config';
+import { PackagePolicyInputStreamConfig } from './package_policy_input_stream';
 
 const ShortenedHorizontalRule = styled(EuiHorizontalRule)`
   &&& {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_stream.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_stream.tsx
similarity index 99%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_stream.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_stream.tsx
index 1737ccc51f9100..cbc23f4079d9b2 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_stream.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_stream.tsx
@@ -22,7 +22,7 @@ import {
   PackagePolicyConfigValidationResults,
   validationHasErrors,
 } from '../services';
-import { PackagePolicyInputVarField } from './package_config_input_var_field';
+import { PackagePolicyInputVarField } from './package_policy_input_var_field';
 
 const FlexItemWithMaxWidth = styled(EuiFlexItem)`
   max-width: calc(50% - ${(props) => props.theme.eui.euiSizeL});
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_var_field.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_var_field.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_var_field.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_var_field.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/index.tsx
similarity index 99%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/index.tsx
index 99501be92672cf..bdd43b8385ae8a 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/index.tsx
@@ -42,9 +42,9 @@ import {
   validationHasErrors,
 } from './services';
 import { StepSelectPackage } from './step_select_package';
-import { StepSelectAgentPolicy } from './step_select_config';
+import { StepSelectAgentPolicy } from './step_select_agent_policy';
 import { StepConfigurePackagePolicy } from './step_configure_package';
-import { StepDefinePackagePolicy } from './step_define_package_config';
+import { StepDefinePackagePolicy } from './step_define_package_policy';
 import { useIntraAppState } from '../../../hooks/use_intra_app_state';
 
 const StepsWithLessPadding = styled(EuiSteps)`
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/has_invalid_but_required_var.test.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/has_invalid_but_required_var.test.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/has_invalid_but_required_var.test.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/has_invalid_but_required_var.test.ts
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/has_invalid_but_required_var.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/has_invalid_but_required_var.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/has_invalid_but_required_var.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/has_invalid_but_required_var.ts
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/index.ts
similarity index 94%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/index.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/index.ts
index 3b2a4935368eea..6d8fd4c35c0fab 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/index.ts
@@ -13,4 +13,4 @@ export {
   validatePackagePolicyConfig,
   validationHasErrors,
   countValidationErrors,
-} from './validate_package_config';
+} from './validate_package_policy';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/is_advanced_var.test.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/is_advanced_var.test.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/is_advanced_var.test.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/is_advanced_var.test.ts
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/is_advanced_var.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/is_advanced_var.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/is_advanced_var.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/is_advanced_var.ts
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts.test.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/validate_package_policy.test..ts
similarity index 99%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts.test.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/validate_package_policy.test..ts
index 93c9b98484a882..aae750cb674991 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts.test.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/validate_package_policy.test..ts
@@ -9,7 +9,7 @@ import {
   NewPackagePolicy,
   RegistryConfigTemplate,
 } from '../../../../types';
-import { validatePackagePolicy, validationHasErrors } from './validate_package_config';
+import { validatePackagePolicy, validationHasErrors } from './validate_package_policy';
 
 describe('Ingest Manager - validatePackagePolicy()', () => {
   const mockPackage = ({
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/validate_package_policy.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/validate_package_policy.ts
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_configure_package.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_configure_package.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_configure_package.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_configure_package.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_define_package_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_define_package_policy.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_define_package_config.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_define_package_policy.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_select_agent_policy.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_config.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_select_agent_policy.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_package.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_select_package.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_select_package.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_select_package.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/types.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/types.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/types.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/types.ts
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/index.ts
similarity index 67%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/index.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/index.ts
index f30d02c42680cb..9ea1e77dce4761 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/index.ts
@@ -3,6 +3,6 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-export { PackagePoliciesTable } from './package_configs/package_configs_table';
-export { PackagePoliciesView } from './package_configs';
+export { PackagePoliciesTable } from './package_policies/package_policies_table';
+export { PackagePoliciesView } from './package_policies';
 export { SettingsView } from './settings';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/package_policies/index.tsx
similarity index 85%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/index.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/package_policies/index.tsx
index 03145a3f39ddf1..494407b93f2a84 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/package_policies/index.tsx
@@ -6,8 +6,8 @@
 
 import React, { memo } from 'react';
 import { AgentPolicy, PackagePolicy } from '../../../../../types';
-import { NoPackagePolicies } from './no_package_configs';
-import { PackagePoliciesTable } from './package_configs_table';
+import { NoPackagePolicies } from './no_package_policies';
+import { PackagePoliciesTable } from './package_policies_table';
 
 export const PackagePoliciesView = memo<{ agentPolicy: AgentPolicy }>(({ agentPolicy }) => {
   if (agentPolicy.package_policies.length === 0) {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/no_package_configs.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/package_policies/no_package_policies.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/no_package_configs.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/package_policies/no_package_policies.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/package_configs_table.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/package_configs_table.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/settings/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/settings/index.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/settings/index.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/settings/index.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/hooks/index.ts
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/index.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/hooks/index.ts
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/use_agent_status.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/hooks/use_agent_status.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/use_agent_status.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/hooks/use_agent_status.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/use_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/hooks/use_config.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/hooks/use_config.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/hooks/use_config.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/index.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/index.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/edit_package_policy_page/index.tsx
similarity index 97%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/edit_package_policy_page/index.tsx
index c9c5efc5cec6cb..fc3d28c9392ce4 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/edit_package_config_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/edit_package_policy_page/index.tsx
@@ -29,18 +29,18 @@ import {
 } from '../../../hooks';
 import { Loading, Error } from '../../../components';
 import { ConfirmDeployAgentPolicyModal } from '../components';
-import { CreatePackagePolicyPageLayout } from '../create_package_config_page/components';
+import { CreatePackagePolicyPageLayout } from '../create_package_policy_page/components';
 import {
   PackagePolicyValidationResults,
   validatePackagePolicy,
   validationHasErrors,
-} from '../create_package_config_page/services';
+} from '../create_package_policy_page/services';
 import {
   PackagePolicyFormState,
   CreatePackagePolicyFrom,
-} from '../create_package_config_page/types';
-import { StepConfigurePackagePolicy } from '../create_package_config_page/step_configure_package';
-import { StepDefinePackagePolicy } from '../create_package_config_page/step_define_package_config';
+} from '../create_package_policy_page/types';
+import { StepConfigurePackagePolicy } from '../create_package_policy_page/step_configure_package';
+import { StepDefinePackagePolicy } from '../create_package_policy_page/step_define_package_policy';
 
 export const EditPackagePolicyPage: React.FunctionComponent = () => {
   const {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/index.tsx
similarity index 90%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/index.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/index.tsx
index 8ef3eeee140e44..ed6d1a6e4610c5 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/index.tsx
@@ -9,8 +9,8 @@ import { PAGE_ROUTING_PATHS } from '../../constants';
 import { useBreadcrumbs } from '../../hooks';
 import { AgentPolicyListPage } from './list_page';
 import { AgentPolicyDetailsPage } from './details_page';
-import { CreatePackagePolicyPage } from './create_package_config_page';
-import { EditPackagePolicyPage } from './edit_package_config_page';
+import { CreatePackagePolicyPage } from './create_package_policy_page';
+import { EditPackagePolicyPage } from './edit_package_policy_page';
 
 export const AgentPolicyApp: React.FunctionComponent = () => {
   useBreadcrumbs('policies');
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/components/create_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/list_page/components/create_agent_policy.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/components/create_config.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/list_page/components/create_agent_policy.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/components/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/list_page/components/index.ts
similarity index 78%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/components/index.ts
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/list_page/components/index.ts
index a8d63872a37fb7..de95b6748eb6c2 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/components/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/list_page/components/index.ts
@@ -3,4 +3,4 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-export { CreateAgentPolicyFlyout } from './create_config';
+export { CreateAgentPolicyFlyout } from './create_agent_policy';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/list_page/index.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/index.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/list_page/index.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/index.tsx
index 55dbda316d759f..b605b882bc82cd 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/index.tsx
@@ -8,7 +8,7 @@ import React from 'react';
 import { HashRouter as Router, Switch, Route } from 'react-router-dom';
 import { PAGE_ROUTING_PATHS } from '../../constants';
 import { useBreadcrumbs } from '../../hooks';
-import { CreatePackagePolicyPage } from '../agent_config/create_package_config_page';
+import { CreatePackagePolicyPage } from '../agent_policy/create_package_policy_page';
 import { EPMHomePage } from './screens/home';
 import { Detail } from './screens/detail';
 
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/content.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/content.tsx
index 07e3fdb72d25fb..0443915d8224ce 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/content.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/content.tsx
@@ -13,7 +13,7 @@ import { AssetsFacetGroup } from '../../components/assets_facet_group';
 import { CenterColumn, LeftColumn, RightColumn } from './layout';
 import { OverviewPanel } from './overview_panel';
 import { SideNavLinks } from './side_nav_links';
-import { PackagePoliciesPanel } from './package_configs_panel';
+import { PackagePoliciesPanel } from './package_policies_panel';
 import { SettingsPanel } from './settings_panel';
 
 type ContentProps = PackageInfo & Pick<DetailParams, 'panel'>;
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/package_configs_panel.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/package_policies_panel.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/package_configs_panel.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/package_policies_panel.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx
index 706de48b933c47..8db714f30fcbea 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx
@@ -67,7 +67,7 @@ export const SUBTYPE_LABEL: { [key in AgentEvent['subtype']]: JSX.Element } = {
     <EuiBadge color="hollow">
       <FormattedMessage
         id="xpack.ingestManager.agentEventSubtype.policyLabel"
-        defaultMessage="Config"
+        defaultMessage="Policy"
       />
     </EuiBadge>
   ),
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/agent_policy_selection.tsx
similarity index 99%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/agent_policy_selection.tsx
index eda80905cd4526..7f23c645f9a2ea 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/config_selection.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/agent_policy_selection.tsx
@@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiSelect, EuiSpacer, EuiText, EuiButtonEmpty } from '@elastic/eui';
 import { AgentPolicy, GetEnrollmentAPIKeysResponse } from '../../../../types';
 import { sendGetEnrollmentAPIKeys, useCore } from '../../../../hooks';
-import { AgentPolicyPackageBadges } from '../agent_config_package_badges';
+import { AgentPolicyPackageBadges } from '../agent_policy_package_badges';
 
 type Props = {
   agentPolicies?: AgentPolicy[];
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/steps.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/steps.tsx
index 2b2e93616a4530..a70741d1df7f79 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/steps.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/steps.tsx
@@ -8,7 +8,7 @@ import React from 'react';
 import { EuiText, EuiButton, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { EnrollmentStepAgentPolicy } from './config_selection';
+import { EnrollmentStepAgentPolicy } from './agent_policy_selection';
 import { AgentPolicy } from '../../../../types';
 
 export const DownloadStep = () => {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_config_package_badges.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_policy_package_badges.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_config_package_badges.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_policy_package_badges.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_policy_flyout/index.tsx
similarity index 98%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_policy_flyout/index.tsx
index 740367de9e49be..0c154bf1074c07 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_policy_flyout/index.tsx
@@ -23,7 +23,7 @@ import {
 import { FormattedMessage } from '@kbn/i18n/react';
 import { Agent } from '../../../../types';
 import { sendPutAgentReassign, useCore, useGetAgentPolicies } from '../../../../hooks';
-import { AgentPolicyPackageBadges } from '../agent_config_package_badges';
+import { AgentPolicyPackageBadges } from '../agent_policy_package_badges';
 
 interface Props {
   onClose: () => void;
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/index.tsx
index 8dd329806ac5ca..527f920f243659 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/index.tsx
@@ -5,7 +5,7 @@
  */
 
 export * from './loading';
-export * from './agent_reassign_config_flyout';
+export * from './agent_reassign_policy_flyout';
 export * from './agent_enrollment_flyout';
 export * from './agent_health';
 export * from './agent_unenroll_provider';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/list_layout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/list_layout.tsx
index 9741fdd8210b21..b01dbbd57c16fd 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/list_layout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/list_layout.tsx
@@ -22,7 +22,7 @@ import { useRouteMatch } from 'react-router-dom';
 import { PAGE_ROUTING_PATHS } from '../../../constants';
 import { WithHeaderLayout } from '../../../layouts';
 import { useCapabilities, useLink, useGetAgentPolicies } from '../../../hooks';
-import { useGetAgentStatus } from '../../agent_config/details_page/hooks';
+import { useGetAgentStatus } from '../../agent_policy/details_page/hooks';
 import { AgentEnrollmentFlyout } from '../components';
 import { DonutChart } from './donut_chart';
 
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/index.tsx
index e2e723444cc116..3a0f2c3ea8d58e 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/index.tsx
@@ -5,7 +5,7 @@
  */
 export { IngestManagerOverview } from './overview';
 export { EPMApp } from './epm';
-export { AgentPolicyApp } from './agent_config';
+export { AgentPolicyApp } from './agent_policy';
 export { DataStreamApp } from './data_stream';
 export { FleetApp } from './fleet';
 
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/configuration_section.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/agent_policy_section.tsx
similarity index 100%
rename from x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/configuration_section.tsx
rename to x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/agent_policy_section.tsx
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
index 95db77612e5bfb..187b701dc4167c 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
@@ -19,7 +19,7 @@ import { WithHeaderLayout } from '../../layouts';
 import { useGetAgentPolicies, useBreadcrumbs } from '../../hooks';
 import { AgentEnrollmentFlyout } from '../fleet/components';
 import { OverviewAgentSection } from './components/agent_section';
-import { OverviewPolicySection } from './components/configuration_section';
+import { OverviewPolicySection } from './components/agent_policy_section';
 import { OverviewIntegrationSection } from './components/integration_section';
 import { OverviewDatastreamSection } from './components/datastream_section';
 
diff --git a/x-pack/plugins/ingest_manager/public/index.ts b/x-pack/plugins/ingest_manager/public/index.ts
index 9bb89f4ec07d20..75ba0e584230fb 100644
--- a/x-pack/plugins/ingest_manager/public/index.ts
+++ b/x-pack/plugins/ingest_manager/public/index.ts
@@ -16,7 +16,7 @@ export {
   CustomConfigurePackagePolicyContent,
   CustomConfigurePackagePolicyProps,
   registerPackagePolicyComponent,
-} from './applications/ingest_manager/sections/agent_config/create_package_config_page/components/custom_package_config';
+} from './applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/custom_package_policy';
 
 export { NewPackagePolicy } from './applications/ingest_manager/types';
 export * from './applications/ingest_manager/types/intra_app_route_state';
diff --git a/x-pack/plugins/ingest_manager/public/plugin.ts b/x-pack/plugins/ingest_manager/public/plugin.ts
index f1ed601da93ad2..a8cc7b72eb17f2 100644
--- a/x-pack/plugins/ingest_manager/public/plugin.ts
+++ b/x-pack/plugins/ingest_manager/public/plugin.ts
@@ -25,7 +25,7 @@ import {
   TutorialDirectoryHeaderLink,
   TutorialModuleNotice,
 } from './applications/ingest_manager/components/home_integration';
-import { registerPackagePolicyComponent } from './applications/ingest_manager/sections/agent_config/create_package_config_page/components/custom_package_config';
+import { registerPackagePolicyComponent } from './applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/custom_package_policy';
 
 export { IngestManagerConfigType } from '../common/types';
 

From bbff4a360400c58b3e1716a6e23f77dc00b65c63 Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Mon, 17 Aug 2020 09:20:01 -0700
Subject: [PATCH 21/24] Rename test file names

---
 .../apis/{agent_config => agent_policy}/agent_config.ts   | 0
 .../apis/{agent_config => agent_policy}/index.js          | 0
 .../apis/fleet/agents/complete_flow.ts                    | 6 +++---
 x-pack/test/ingest_manager_api_integration/apis/index.js  | 8 ++++----
 .../apis/{package_config => package_policy}/create.ts     | 0
 .../apis/{package_config => package_policy}/get.ts        | 0
 .../apis/{package_config => package_policy}/update.ts     | 0
 .../test/security_solution_endpoint/page_objects/index.ts | 2 +-
 ...ge.ts => ingest_manager_create_package_policy_page.ts} | 0
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename x-pack/test/ingest_manager_api_integration/apis/{agent_config => agent_policy}/agent_config.ts (100%)
 rename x-pack/test/ingest_manager_api_integration/apis/{agent_config => agent_policy}/index.js (100%)
 rename x-pack/test/ingest_manager_api_integration/apis/{package_config => package_policy}/create.ts (100%)
 rename x-pack/test/ingest_manager_api_integration/apis/{package_config => package_policy}/get.ts (100%)
 rename x-pack/test/ingest_manager_api_integration/apis/{package_config => package_policy}/update.ts (100%)
 rename x-pack/test/security_solution_endpoint/page_objects/{ingest_manager_create_package_config_page.ts => ingest_manager_create_package_policy_page.ts} (100%)

diff --git a/x-pack/test/ingest_manager_api_integration/apis/agent_config/agent_config.ts b/x-pack/test/ingest_manager_api_integration/apis/agent_policy/agent_config.ts
similarity index 100%
rename from x-pack/test/ingest_manager_api_integration/apis/agent_config/agent_config.ts
rename to x-pack/test/ingest_manager_api_integration/apis/agent_policy/agent_config.ts
diff --git a/x-pack/test/ingest_manager_api_integration/apis/agent_config/index.js b/x-pack/test/ingest_manager_api_integration/apis/agent_policy/index.js
similarity index 100%
rename from x-pack/test/ingest_manager_api_integration/apis/agent_config/index.js
rename to x-pack/test/ingest_manager_api_integration/apis/agent_policy/index.js
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/complete_flow.ts b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/complete_flow.ts
index 8d7472f0ecd8b2..2d14a7a10e6685 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/complete_flow.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/complete_flow.ts
@@ -79,8 +79,8 @@ export default function (providerContext: FtrProviderContext) {
       expect(checkinApiResponse.success).to.eql(true);
       expect(checkinApiResponse.actions).length(1);
       expect(checkinApiResponse.actions[0].type).be('CONFIG_CHANGE');
-      const configChangeAction = checkinApiResponse.actions[0];
-      const defaultOutputApiKey = configChangeAction.data.config.outputs.default.api_key;
+      const policyChangeAction = checkinApiResponse.actions[0];
+      const defaultOutputApiKey = policyChangeAction.data.config.outputs.default.api_key;
 
       // Ack actions
       const { body: ackApiResponse } = await supertestWithoutAuth
@@ -94,7 +94,7 @@ export default function (providerContext: FtrProviderContext) {
               type: 'ACTION_RESULT',
               subtype: 'ACKNOWLEDGED',
               timestamp: '2019-01-04T14:32:03.36764-05:00',
-              action_id: configChangeAction.id,
+              action_id: policyChangeAction.id,
               agent_id: enrollmentResponse.item.id,
               message: 'hello',
               payload: 'payload',
diff --git a/x-pack/test/ingest_manager_api_integration/apis/index.js b/x-pack/test/ingest_manager_api_integration/apis/index.js
index 0d18658c92a7ee..fac8a26fd6aec4 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/index.js
+++ b/x-pack/test/ingest_manager_api_integration/apis/index.js
@@ -16,11 +16,11 @@ export default function ({ loadTestFile }) {
     loadTestFile(require.resolve('./epm/index'));
 
     // Package policies
-    loadTestFile(require.resolve('./package_config/create'));
-    loadTestFile(require.resolve('./package_config/update'));
-    loadTestFile(require.resolve('./package_config/get'));
+    loadTestFile(require.resolve('./package_policy/create'));
+    loadTestFile(require.resolve('./package_policy/update'));
+    loadTestFile(require.resolve('./package_policy/get'));
 
     // Agent policies
-    loadTestFile(require.resolve('./agent_config/index'));
+    loadTestFile(require.resolve('./agent_policy/index'));
   });
 }
diff --git a/x-pack/test/ingest_manager_api_integration/apis/package_config/create.ts b/x-pack/test/ingest_manager_api_integration/apis/package_policy/create.ts
similarity index 100%
rename from x-pack/test/ingest_manager_api_integration/apis/package_config/create.ts
rename to x-pack/test/ingest_manager_api_integration/apis/package_policy/create.ts
diff --git a/x-pack/test/ingest_manager_api_integration/apis/package_config/get.ts b/x-pack/test/ingest_manager_api_integration/apis/package_policy/get.ts
similarity index 100%
rename from x-pack/test/ingest_manager_api_integration/apis/package_config/get.ts
rename to x-pack/test/ingest_manager_api_integration/apis/package_policy/get.ts
diff --git a/x-pack/test/ingest_manager_api_integration/apis/package_config/update.ts b/x-pack/test/ingest_manager_api_integration/apis/package_policy/update.ts
similarity index 100%
rename from x-pack/test/ingest_manager_api_integration/apis/package_config/update.ts
rename to x-pack/test/ingest_manager_api_integration/apis/package_policy/update.ts
diff --git a/x-pack/test/security_solution_endpoint/page_objects/index.ts b/x-pack/test/security_solution_endpoint/page_objects/index.ts
index 8cebcc4eb251ee..73ef372464d89d 100644
--- a/x-pack/test/security_solution_endpoint/page_objects/index.ts
+++ b/x-pack/test/security_solution_endpoint/page_objects/index.ts
@@ -8,7 +8,7 @@ import { pageObjects as xpackFunctionalPageObjects } from '../../functional/page
 import { EndpointPageProvider } from './endpoint_page';
 import { EndpointPolicyPageProvider } from './policy_page';
 import { EndpointPageUtils } from './page_utils';
-import { IngestManagerCreatePackagePolicy } from './ingest_manager_create_package_config_page';
+import { IngestManagerCreatePackagePolicy } from './ingest_manager_create_package_policy_page';
 
 export const pageObjects = {
   ...xpackFunctionalPageObjects,
diff --git a/x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_config_page.ts b/x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_policy_page.ts
similarity index 100%
rename from x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_config_page.ts
rename to x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_policy_page.ts

From 5f661331ff597a455e6e263aff6f42ccd31caa1c Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Mon, 17 Aug 2020 09:43:44 -0700
Subject: [PATCH 22/24] Rename missed files

---
 .../server/routes/package_policy/handlers.test.ts               | 2 +-
 ...onfigure_package_config.tsx => configure_package_policy.tsx} | 0
 x-pack/plugins/security_solution/public/plugin.tsx              | 2 +-
 .../apis/agent_policy/{agent_config.ts => agent_policy.ts}      | 0
 .../ingest_manager_api_integration/apis/agent_policy/index.js   | 2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/{configure_package_config.tsx => configure_package_policy.tsx} (100%)
 rename x-pack/test/ingest_manager_api_integration/apis/agent_policy/{agent_config.ts => agent_policy.ts} (100%)

diff --git a/x-pack/plugins/ingest_manager/server/routes/package_policy/handlers.test.ts b/x-pack/plugins/ingest_manager/server/routes/package_policy/handlers.test.ts
index 4dacabb873bea8..db23d6a139f209 100644
--- a/x-pack/plugins/ingest_manager/server/routes/package_policy/handlers.test.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/package_policy/handlers.test.ts
@@ -17,7 +17,7 @@ import { packagePolicyService } from '../../services';
 
 const packagePolicyServiceMock = packagePolicyService as jest.Mocked<PackagePolicyServiceInterface>;
 
-jest.mock('../../services/package_config', (): {
+jest.mock('../../services/package_policy', (): {
   packagePolicyService: jest.Mocked<PackagePolicyServiceInterface>;
 } => {
   return {
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_package_config.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_package_policy.tsx
similarity index 100%
rename from x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_package_config.tsx
rename to x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_package_policy.tsx
diff --git a/x-pack/plugins/security_solution/public/plugin.tsx b/x-pack/plugins/security_solution/public/plugin.tsx
index e5dd99ab675b3b..f1a933fb34d663 100644
--- a/x-pack/plugins/security_solution/public/plugin.tsx
+++ b/x-pack/plugins/security_solution/public/plugin.tsx
@@ -43,7 +43,7 @@ import {
   APP_CASES_PATH,
   APP_PATH,
 } from '../common/constants';
-import { ConfigureEndpointPackagePolicy } from './management/pages/policy/view/ingest_manager_integration/configure_package_config';
+import { ConfigureEndpointPackagePolicy } from './management/pages/policy/view/ingest_manager_integration/configure_package_policy';
 
 import { State, createStore, createInitialState } from './common/store';
 import { SecurityPageName } from './app/types';
diff --git a/x-pack/test/ingest_manager_api_integration/apis/agent_policy/agent_config.ts b/x-pack/test/ingest_manager_api_integration/apis/agent_policy/agent_policy.ts
similarity index 100%
rename from x-pack/test/ingest_manager_api_integration/apis/agent_policy/agent_config.ts
rename to x-pack/test/ingest_manager_api_integration/apis/agent_policy/agent_policy.ts
diff --git a/x-pack/test/ingest_manager_api_integration/apis/agent_policy/index.js b/x-pack/test/ingest_manager_api_integration/apis/agent_policy/index.js
index 1671c423c03c0f..a513e7991fa741 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/agent_policy/index.js
+++ b/x-pack/test/ingest_manager_api_integration/apis/agent_policy/index.js
@@ -6,6 +6,6 @@
 
 export default function loadTests({ loadTestFile }) {
   describe('Ingest Manager Endpoints', () => {
-    loadTestFile(require.resolve('./agent_config'));
+    loadTestFile(require.resolve('./agent_policy'));
   });
 }

From 96182d8b8daabb827ccff5c9b38c09b5c6376b0e Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Tue, 18 Aug 2020 13:03:33 -0700
Subject: [PATCH 23/24] Revert "Rename subtype CONFIG to POLICY (I don't think
 this string is ever sent by agent, though)"

This reverts commit 3c91e01ed98d34de18a06ae8cb06dadf3b2c77be.
---
 .../plugins/ingest_manager/common/openapi/spec_oas3.json  | 4 ++--
 .../plugins/ingest_manager/common/types/models/agent.ts   | 2 +-
 .../fleet/agent_details_page/components/type_labels.tsx   | 2 +-
 .../server/routes/agent/acks_handlers.test.ts             | 6 +++---
 .../ingest_manager/server/services/agents/acks.test.ts    | 8 ++++----
 .../plugins/ingest_manager/server/types/models/agent.ts   | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json b/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
index c83e28819db82f..8c9ede1fde9ba1 100644
--- a/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
+++ b/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
@@ -3387,7 +3387,7 @@
                     "events": [
                       {
                         "type": "ACTION_RESULT",
-                        "subtype": "POLICY",
+                        "subtype": "CONFIG",
                         "timestamp": "2019-01-04T14:32:03.36764-05:00",
                         "action_id": "51c6ad1e-a9c0-4c70-80da-99a5c51eedaf",
                         "agent_id": "a6f14bd2-1a2a-481c-9212-9494d064ffdf",
@@ -4199,7 +4199,7 @@
               "RUNNING",
               "STARTING",
               "IN_PROGRESS",
-              "POLICY",
+              "CONFIG",
               "FAILED",
               "STOPPING",
               "STOPPED",
diff --git a/x-pack/plugins/ingest_manager/common/types/models/agent.ts b/x-pack/plugins/ingest_manager/common/types/models/agent.ts
index bb78c8cb9338b3..2b8a306577e7d2 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/agent.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/agent.ts
@@ -49,7 +49,7 @@ export interface NewAgentEvent {
   | 'RUNNING'
     | 'STARTING'
     | 'IN_PROGRESS'
-    | 'POLICY'
+    | 'CONFIG'
     | 'FAILED'
     | 'STOPPING'
     | 'STOPPED'
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx
index 8db714f30fcbea..56af9519bc1dac 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx
@@ -63,7 +63,7 @@ export const SUBTYPE_LABEL: { [key in AgentEvent['subtype']]: JSX.Element } = {
       />
     </EuiBadge>
   ),
-  POLICY: (
+  CONFIG: (
     <EuiBadge color="hollow">
       <FormattedMessage
         id="xpack.ingestManager.agentEventSubtype.policyLabel"
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent/acks_handlers.test.ts b/x-pack/plugins/ingest_manager/server/routes/agent/acks_handlers.test.ts
index d665b1d412a5c5..aaed189ae3dddf 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent/acks_handlers.test.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent/acks_handlers.test.ts
@@ -20,7 +20,7 @@ describe('test acks schema', () => {
     expect(() =>
       AckEventSchema.validate({
         type: 'ACTION_RESULT',
-        subtype: 'POLICY',
+        subtype: 'CONFIG',
         timestamp: '2019-01-04T14:32:03.36764-05:00',
         agent_id: 'agent',
         message: 'hello',
@@ -31,7 +31,7 @@ describe('test acks schema', () => {
     expect(
       AckEventSchema.validate({
         type: 'ACTION_RESULT',
-        subtype: 'POLICY',
+        subtype: 'CONFIG',
         timestamp: '2019-01-04T14:32:03.36764-05:00',
         agent_id: 'agent',
         action_id: 'actionId',
@@ -60,7 +60,7 @@ describe('test acks handlers', () => {
         events: [
           {
             type: 'ACTION_RESULT',
-            subtype: 'POLICY',
+            subtype: 'CONFIG',
             timestamp: '2019-01-04T14:32:03.36764-05:00',
             action_id: 'action1',
             agent_id: 'agent',
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts b/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
index 8b105cceff5c30..80fdc305d0ba7f 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
@@ -74,7 +74,7 @@ describe('test agent acks services', () => {
       [
         {
           type: 'ACTION_RESULT',
-          subtype: 'POLICY',
+          subtype: 'CONFIG',
           timestamp: '2019-01-04T14:32:03.36764-05:00',
           action_id: 'action1',
           agent_id: 'id',
@@ -212,7 +212,7 @@ describe('test agent acks services', () => {
       [
         {
           type: 'ACTION_RESULT',
-          subtype: 'POLICY',
+          subtype: 'CONFIG',
           timestamp: '2019-01-04T14:32:03.36764-05:00',
           action_id: 'action1',
           agent_id: 'id',
@@ -355,7 +355,7 @@ describe('test agent acks services', () => {
       [
         {
           type: 'ACTION_RESULT',
-          subtype: 'POLICY',
+          subtype: 'CONFIG',
           timestamp: '2019-01-04T14:32:03.36764-05:00',
           action_id: 'action1',
           agent_id: 'id',
@@ -392,7 +392,7 @@ describe('test agent acks services', () => {
         [
           ({
             type: 'ACTION_RESULT',
-            subtype: 'POLICY',
+            subtype: 'CONFIG',
             timestamp: '2019-01-04T14:32:03.36764-05:00',
             action_id: 'action2',
             agent_id: 'id',
diff --git a/x-pack/plugins/ingest_manager/server/types/models/agent.ts b/x-pack/plugins/ingest_manager/server/types/models/agent.ts
index c188df9f0e9714..5ad98cfd406226 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/agent.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/agent.ts
@@ -26,7 +26,7 @@ const AgentEventBase = {
       schema.literal('RUNNING'),
       schema.literal('STARTING'),
       schema.literal('IN_PROGRESS'),
-      schema.literal('POLICY'),
+      schema.literal('CONFIG'),
       schema.literal('FAILED'),
       schema.literal('STOPPING'),
       schema.literal('STOPPED'),

From 301a412b80eb63d42cfb6ec3c7bb4e922fdd0788 Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Tue, 18 Aug 2020 13:59:15 -0700
Subject: [PATCH 24/24] Add migration version to updated es archiver data to
 fix tests

---
 .../endpoint/artifacts/api_feature/data.json  | 10 ++++++--
 .../es_archives/fleet/agents/data.json        | 23 ++++++++++++++++++-
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/x-pack/test/functional/es_archives/endpoint/artifacts/api_feature/data.json b/x-pack/test/functional/es_archives/endpoint/artifacts/api_feature/data.json
index 953a3728ec7170..2a62886cf3c9ac 100644
--- a/x-pack/test/functional/es_archives/endpoint/artifacts/api_feature/data.json
+++ b/x-pack/test/functional/es_archives/endpoint/artifacts/api_feature/data.json
@@ -180,7 +180,10 @@
       "references": [
       ],
       "type": "fleet-agents",
-      "updated_at": "2020-06-25T18:52:48.464Z"
+      "updated_at": "2020-06-25T18:52:48.464Z",
+      "migrationVersion": {
+        "fleet-agents": "7.10.0"
+      }
     }
   }
 }
@@ -202,7 +205,10 @@
       "references": [
       ],
       "type": "fleet-enrollment-api-keys",
-      "updated_at": "2020-06-25T17:25:30.114Z"
+      "updated_at": "2020-06-25T17:25:30.114Z",
+      "migrationVersion": {
+        "fleet-enrollment-api-keys": "7.10.0"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/x-pack/test/functional/es_archives/fleet/agents/data.json b/x-pack/test/functional/es_archives/fleet/agents/data.json
index a9d59a5f50f383..12d646de85ec3b 100644
--- a/x-pack/test/functional/es_archives/fleet/agents/data.json
+++ b/x-pack/test/functional/es_archives/fleet/agents/data.json
@@ -13,6 +13,9 @@
         "type": "PERMANENT",
         "local_metadata": {},
         "user_provided_metadata": {}
+      },
+      "migrationVersion": {
+        "fleet-agents": "7.10.0"
       }
     }
   }
@@ -32,6 +35,9 @@
         "type": "PERMANENT",
         "local_metadata": {},
         "user_provided_metadata": {}
+      },
+      "migrationVersion": {
+        "fleet-agents": "7.10.0"
       }
     }
   }
@@ -51,6 +57,9 @@
         "type": "PERMANENT",
         "local_metadata": {},
         "user_provided_metadata": {}
+      },
+      "migrationVersion": {
+        "fleet-agents": "7.10.0"
       }
     }
   }
@@ -70,6 +79,9 @@
         "type": "PERMANENT",
         "local_metadata": {},
         "user_provided_metadata": {}
+      },
+      "migrationVersion": {
+        "fleet-agents": "7.10.0"
       }
     }
   }
@@ -89,7 +101,10 @@
         "active" : true
       },
       "type" : "fleet-enrollment-api-keys",
-      "references": []
+      "references": [],
+      "migrationVersion": {
+        "fleet-enrollment-api-keys": "7.10.0"
+      }
     }
   }
 }
@@ -108,6 +123,9 @@
         "message": "State changed from STOPPED to STARTED",
         "payload": "{\"previous_state\": \"STOPPED\"}",
         "timestamp": "2019-09-20T17:30:22.950Z"
+      },
+      "migrationVersion": {
+        "fleet-agent-events": "7.10.0"
       }
     }
   }
@@ -221,6 +239,9 @@
         "revision": 2,
         "updated_at": "2020-05-07T19:34:42.533Z",
         "updated_by": "system"
+      },
+      "migrationVersion": {
+        "ingest-agent-policies": "7.10.0"
       }
     }
   }