diff --git a/packages/core/src/extensions/extension-store.ts b/packages/core/src/extensions/base-extension-store.ts
similarity index 91%
rename from packages/core/src/extensions/extension-store.ts
rename to packages/core/src/extensions/base-extension-store.ts
index fe9cff2a02..50cd5c9401 100644
--- a/packages/core/src/extensions/extension-store.ts
+++ b/packages/core/src/extensions/base-extension-store.ts
@@ -26,14 +26,14 @@ export interface ExtensionStoreParams<T extends object> extends BaseStoreParams<
   migrations?: Migrations<T>;
 }
 
-export abstract class ExtensionStore<T extends object> extends BaseStore<T> {
+export abstract class BaseExtensionStore<T extends object> extends BaseStore<T> {
   private static readonly instances = new WeakMap<object, any>();
 
   /**
    * @deprecated This is a form of global shared state. Just call `new Store(...)`
    */
   static createInstance<T, R extends any[]>(this: StaticThis<T, R>, ...args: R): T {
-    return getOrInsertWith(ExtensionStore.instances, this, () =>  new this(...args)) as T;
+    return getOrInsertWith(BaseExtensionStore.instances, this, () =>  new this(...args)) as T;
   }
 
   /**
@@ -42,11 +42,11 @@ export abstract class ExtensionStore<T extends object> extends BaseStore<T> {
   static getInstance<T, R extends any[]>(this: StaticThis<T, R>, strict?: true): T;
   static getInstance<T, R extends any[]>(this: StaticThis<T, R>, strict: false): T | undefined;
   static getInstance<T, R extends any[]>(this: StaticThis<T, R>, strict = true): T | undefined {
-    if (!ExtensionStore.instances.has(this) && strict) {
+    if (!BaseExtensionStore.instances.has(this) && strict) {
       throw new TypeError(`instance of ${this.name} is not created`);
     }
 
-    return ExtensionStore.instances.get(this) as (T | undefined);
+    return BaseExtensionStore.instances.get(this) as (T | undefined);
   }
 
   constructor({ migrations, ...params }: ExtensionStoreParams<T>) {
@@ -70,7 +70,7 @@ export abstract class ExtensionStore<T extends object> extends BaseStore<T> {
    * @deprecated This is a form of global shared state. Just call `new Store(...)`
    */
   static resetInstance() {
-    ExtensionStore.instances.delete(this);
+    BaseExtensionStore.instances.delete(this);
   }
 
   protected extension?: LensExtension;
diff --git a/packages/core/src/extensions/common-api/stores.ts b/packages/core/src/extensions/common-api/stores.ts
index 023fc5c7a4..b48802d155 100644
--- a/packages/core/src/extensions/common-api/stores.ts
+++ b/packages/core/src/extensions/common-api/stores.ts
@@ -4,7 +4,7 @@
  */
 
 import type { BaseStoreParams } from "../../common/base-store/base-store";
-import { ExtensionStore } from "../extension-store";
+import { BaseExtensionStore as ExtensionStore } from "../base-extension-store";
 
 export {
   BaseStoreParams,