diff --git a/src/compatibility.ts b/src/compatibility.ts
index 57e6c0a63..ca7efb3fb 100644
--- a/src/compatibility.ts
+++ b/src/compatibility.ts
@@ -6,7 +6,7 @@
  */
 
 import { Flags } from '@oclif/core';
-import { Messages } from '@salesforce/core';
+import { Messages } from '@salesforce/core/messages';
 import { orgApiVersionFlag } from './flags/orgApiVersion.js';
 import { optionalHubFlag, optionalOrgFlag, requiredHubFlag, requiredOrgFlag } from './flags/orgFlags.js';
 
diff --git a/src/errorHandling.ts b/src/errorHandling.ts
index 7a14eb3de..826e4fb20 100644
--- a/src/errorHandling.ts
+++ b/src/errorHandling.ts
@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { SfError } from '@salesforce/core';
+import { SfError } from '@salesforce/core/sfError';
 import { Errors } from '@oclif/core';
 
 /**
diff --git a/src/flags/duration.ts b/src/flags/duration.ts
index 1c8ba3c13..39f0e2652 100644
--- a/src/flags/duration.ts
+++ b/src/flags/duration.ts
@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import { Flags } from '@oclif/core';
-import { Messages } from '@salesforce/core';
+import { Messages } from '@salesforce/core/messages';
 import { Duration } from '@salesforce/kit';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
diff --git a/src/ux/prompts.ts b/src/ux/prompts.ts
index ef03d8120..dfd1e5585 100644
--- a/src/ux/prompts.ts
+++ b/src/ux/prompts.ts
@@ -6,7 +6,7 @@
  */
 
 import { setTimeout } from 'node:timers/promises';
-import { SfError } from '@salesforce/core';
+import { SfError } from '@salesforce/core/sfError';
 import type { CancelablePromise } from '@inquirer/type';
 
 export type PromptInputs<T> = {
diff --git a/test/unit/errorHandling.test.ts b/test/unit/errorHandling.test.ts
index bdfb20e7c..e00ee75e4 100644
--- a/test/unit/errorHandling.test.ts
+++ b/test/unit/errorHandling.test.ts
@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import { expect } from 'chai';
-import { SfError } from '@salesforce/core';
+import { SfError } from '@salesforce/core/sfError';
 import { computeErrorCode, errorIsGack, errorIsTypeError } from '../../src/errorHandling.js';
 import { SfCommandError } from '../../src/SfCommandError.js';
 
diff --git a/test/unit/flags/duration.test.ts b/test/unit/flags/duration.test.ts
index 88111b9ea..7ef7baccc 100644
--- a/test/unit/flags/duration.test.ts
+++ b/test/unit/flags/duration.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { Parser } from '@oclif/core';
-import { Messages } from '@salesforce/core';
+import { Messages } from '@salesforce/core/messages';
 import { expect } from 'chai';
 import { Duration } from '@salesforce/kit';
 import { durationFlag } from '../../../src/flags/duration.js';
diff --git a/test/unit/flags/id.test.ts b/test/unit/flags/id.test.ts
index 4fbd3eed1..1b4753558 100644
--- a/test/unit/flags/id.test.ts
+++ b/test/unit/flags/id.test.ts
@@ -6,7 +6,7 @@
  */
 import { expect } from 'chai';
 import { Parser } from '@oclif/core';
-import { Messages } from '@salesforce/core';
+import { Messages } from '@salesforce/core/messages';
 import { salesforceIdFlag } from '../../../src/flags/salesforceId.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
diff --git a/test/unit/sfCommand.test.ts b/test/unit/sfCommand.test.ts
index 944e9dca9..afa32aead 100644
--- a/test/unit/sfCommand.test.ts
+++ b/test/unit/sfCommand.test.ts
@@ -6,10 +6,10 @@
  */
 import { Flags } from '@oclif/core';
 import { Errors } from '@oclif/core';
-import { Lifecycle } from '@salesforce/core';
+import { Lifecycle } from '@salesforce/core/lifecycle';
 import { TestContext } from '@salesforce/core/testSetup';
 import { assert, expect } from 'chai';
-import { SfError } from '@salesforce/core';
+import { SfError } from '@salesforce/core/sfError';
 import { Config } from '@oclif/core/interfaces';
 import { SfCommand } from '../../src/sfCommand.js';
 import { SfCommandError } from '../../src/SfCommandError.js';
diff --git a/test/unit/stubUx.test.ts b/test/unit/stubUx.test.ts
index e90b79495..73c10d546 100644
--- a/test/unit/stubUx.test.ts
+++ b/test/unit/stubUx.test.ts
@@ -7,7 +7,7 @@
 import { Interfaces } from '@oclif/core';
 import { expect } from 'chai';
 import { TestContext } from '@salesforce/core/testSetup';
-import { Lifecycle } from '@salesforce/core';
+import { Lifecycle } from '@salesforce/core/lifecycle';
 import { stubUx, stubSfCommandUx, SfCommand, Ux, stubSpinner, Flags } from '../../src/exported.js';
 
 const TABLE_DATA = Array.from({ length: 10 }).fill({ id: '123', name: 'foo', value: 'bar' }) as Array<