diff --git a/packages/osd-pm/src/utils/validate_dependencies.ts b/packages/osd-pm/src/utils/validate_dependencies.ts
index 51a1c0eada0b..2264681b986c 100644
--- a/packages/osd-pm/src/utils/validate_dependencies.ts
+++ b/packages/osd-pm/src/utils/validate_dependencies.ts
@@ -175,7 +175,7 @@ export async function validateDependencies(osd: OpenSearchDashboards, yarnLock:
   const devOnlyProjectsInProduction = getDevOnlyProductionDepsTree(osd, 'opensearch-dashboards');
   if (devOnlyProjectsInProduction) {
     log.error(dedent`
-      Some of the packages in the production dependency chain for OpenSearch Dashboards and X-Pack are
+      Some of the packages in the production dependency chain for OpenSearch Dashboards are
       flagged with "opensearchDashboards.devOnly" in their package.json. Please check changes made to
       packages and their dependencies to ensure they don't end up in production.
 
diff --git a/src/core/server/saved_objects/migrations/core/index_migrator.test.ts b/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
index 2860de529764..4bacfda3bd5a 100644
--- a/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
+++ b/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
@@ -141,9 +141,7 @@ describe('IndexMigrator', () => {
       },
     });
 
-    await expect(new IndexMigrator(testOpts).migrate()).rejects.toThrow(
-      /use the X-Pack upgrade assistant/
-    );
+    await expect(new IndexMigrator(testOpts).migrate()).rejects.toThrow();
   });
 
   test('fails if root doc type is not "doc"', async () => {
@@ -164,9 +162,7 @@ describe('IndexMigrator', () => {
       },
     });
 
-    await expect(new IndexMigrator(testOpts).migrate()).rejects.toThrow(
-      /use the X-Pack upgrade assistant/
-    );
+    await expect(new IndexMigrator(testOpts).migrate()).rejects.toThrow();
   });
 
   test('retains unknown core field mappings from the previous index', async () => {
diff --git a/src/core/server/saved_objects/migrations/core/opensearch_index.ts b/src/core/server/saved_objects/migrations/core/opensearch_index.ts
index 0fc03ccd05c0..7df5c3881cdf 100644
--- a/src/core/server/saved_objects/migrations/core/opensearch_index.ts
+++ b/src/core/server/saved_objects/migrations/core/opensearch_index.ts
@@ -311,7 +311,7 @@ function assertIsSupportedIndex(indexInfo: FullIndexInfo) {
   if (!isV7Index) {
     throw new Error(
       `Index ${indexInfo.indexName} belongs to a version of OpenSearch Dashboards ` +
-        `that cannot be automatically migrated. Reset it or use the X-Pack upgrade assistant.`
+        `that cannot be automatically migrated. Reset it.`
     );
   }
 
diff --git a/src/dev/notice/cli.js b/src/dev/notice/cli.js
index f176d53c8fb1..2f8b01cd6c40 100644
--- a/src/dev/notice/cli.js
+++ b/src/dev/notice/cli.js
@@ -80,7 +80,7 @@ if (opts.help) {
 (async function run() {
   const path = resolve(REPO_ROOT, 'NOTICE.txt');
   const newContent = await generateNoticeFromSource({
-    productName: 'OpenSearch Dashboards source code with OpenSearch Dashboards X-Pack source code',
+    productName: 'OpenSearch Dashboards source code',
     directory: REPO_ROOT,
     log,
   });
diff --git a/src/plugins/apm_oss/server/tutorial/instructions/apm_server_instructions.ts b/src/plugins/apm_oss/server/tutorial/instructions/apm_server_instructions.ts
index 3b95625e7063..325e5e99eda5 100644
--- a/src/plugins/apm_oss/server/tutorial/instructions/apm_server_instructions.ts
+++ b/src/plugins/apm_oss/server/tutorial/instructions/apm_server_instructions.ts
@@ -36,7 +36,7 @@ export const createEditConfig = () => ({
   }),
   textPre: i18n.translate('apmOss.tutorial.editConfig.textPre', {
     defaultMessage:
-      "If you're using an X-Pack secured version of Elastic Stack, you must specify \
+      "If you're using an secured version of Elastic Stack, you must specify \
 credentials in the `apm-server.yml` config file.",
   }),
   commands: [
diff --git a/src/plugins/data/README.md b/src/plugins/data/README.md
index 383fd80a11d1..11730dcf0416 100644
--- a/src/plugins/data/README.md
+++ b/src/plugins/data/README.md
@@ -111,7 +111,7 @@ The `SearchSource` API is a convenient way to construct and run an OpenSearch se
 
 #### Default Search Strategy
 
-One benefit of using the low-level search API, is partial response support in X-Pack, allowing for a better and more responsive user experience.
+One benefit of using the low-level search API, is allowing for a better and more responsive user experience.
 In OSS only the final result is returned. 
 
 ```.ts