diff --git a/plugins/catalog-backend/src/service/CatalogBuilder.ts b/plugins/catalog-backend/src/service/CatalogBuilder.ts
index 29f1ebae8f..489c7827c1 100644
--- a/plugins/catalog-backend/src/service/CatalogBuilder.ts
+++ b/plugins/catalog-backend/src/service/CatalogBuilder.ts
@@ -70,7 +70,7 @@ import { applyDatabaseMigrations } from '../database/migrations';
 import { DefaultCatalogProcessingEngine } from '../processing/DefaultCatalogProcessingEngine';
 import { DefaultLocationService } from './DefaultLocationService';
 import { DefaultLocationStore } from '../providers/DefaultLocationStore';
-import { NextEntitiesCatalog } from './NextEntitiesCatalog';
+import { DefaultEntitiesCatalog } from './DefaultEntitiesCatalog';
 import { DefaultCatalogProcessingOrchestrator } from '../processing/DefaultCatalogProcessingOrchestrator';
 import { Stitcher } from '../stitching/Stitcher';
 import {
@@ -404,7 +404,7 @@ export class CatalogBuilder {
       parser,
       policy,
     });
-    const unauthorizedEntitiesCatalog = new NextEntitiesCatalog(dbClient);
+    const unauthorizedEntitiesCatalog = new DefaultEntitiesCatalog(dbClient);
     const entitiesCatalog = new AuthorizedEntitiesCatalog(
       unauthorizedEntitiesCatalog,
       permissions,
diff --git a/plugins/catalog-backend/src/service/NextEntitiesCatalog.test.ts b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
similarity index 96%
rename from plugins/catalog-backend/src/service/NextEntitiesCatalog.test.ts
rename to plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
index 86fabd8955..d6d4e957f6 100644
--- a/plugins/catalog-backend/src/service/NextEntitiesCatalog.test.ts
+++ b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
@@ -25,9 +25,9 @@ import {
   DbRefreshStateRow,
   DbSearchRow,
 } from '../database/tables';
-import { NextEntitiesCatalog } from './NextEntitiesCatalog';
+import { DefaultEntitiesCatalog } from './DefaultEntitiesCatalog';
 
-describe('NextEntitiesCatalog', () => {
+describe('DefaultEntitiesCatalog', () => {
   const databases = TestDatabases.create({
     ids: ['POSTGRES_13', 'POSTGRES_9', 'SQLITE_3'],
   });
@@ -151,7 +151,7 @@ describe('NextEntitiesCatalog', () => {
         await addEntity(knex, parent, [{ entity: grandparent }]);
         await addEntity(knex, root, [{ entity: parent }]);
 
-        const catalog = new NextEntitiesCatalog(knex);
+        const catalog = new DefaultEntitiesCatalog(knex);
         const result = await catalog.entityAncestry('k:default/root');
         expect(result.rootEntityRef).toEqual('k:default/root');
 
@@ -181,7 +181,7 @@ describe('NextEntitiesCatalog', () => {
       'should throw error if the entity does not exist, %p',
       async databaseId => {
         const { knex } = await createDatabase(databaseId);
-        const catalog = new NextEntitiesCatalog(knex);
+        const catalog = new DefaultEntitiesCatalog(knex);
         await expect(() =>
           catalog.entityAncestry('k:default/root'),
         ).rejects.toThrow('No such entity k:default/root');
@@ -224,7 +224,7 @@ describe('NextEntitiesCatalog', () => {
         await addEntity(knex, parent2, [{ entity: grandparent }]);
         await addEntity(knex, root, [{ entity: parent1 }, { entity: parent2 }]);
 
-        const catalog = new NextEntitiesCatalog(knex);
+        const catalog = new DefaultEntitiesCatalog(knex);
         const result = await catalog.entityAncestry('k:default/root');
         expect(result.rootEntityRef).toEqual('k:default/root');
 
@@ -280,7 +280,7 @@ describe('NextEntitiesCatalog', () => {
         };
         await addEntityToSearch(knex, entity1);
         await addEntityToSearch(knex, entity2);
-        const catalog = new NextEntitiesCatalog(knex);
+        const catalog = new DefaultEntitiesCatalog(knex);
 
         const testFilter = {
           key: 'spec.test',
@@ -313,7 +313,7 @@ describe('NextEntitiesCatalog', () => {
         };
         await addEntityToSearch(knex, entity1);
         await addEntityToSearch(knex, entity2);
-        const catalog = new NextEntitiesCatalog(knex);
+        const catalog = new DefaultEntitiesCatalog(knex);
 
         const testFilter = {
           not: {
@@ -360,7 +360,7 @@ describe('NextEntitiesCatalog', () => {
         await addEntityToSearch(knex, entity2);
         await addEntityToSearch(knex, entity3);
         await addEntityToSearch(knex, entity4);
-        const catalog = new NextEntitiesCatalog(knex);
+        const catalog = new DefaultEntitiesCatalog(knex);
 
         const testFilter1 = {
           key: 'metadata.org',
@@ -415,7 +415,7 @@ describe('NextEntitiesCatalog', () => {
         };
         await addEntityToSearch(knex, entity1);
         await addEntityToSearch(knex, entity2);
-        const catalog = new NextEntitiesCatalog(knex);
+        const catalog = new DefaultEntitiesCatalog(knex);
 
         const testFilter1 = {
           key: 'metadata.org',
@@ -457,7 +457,7 @@ describe('NextEntitiesCatalog', () => {
         };
         await addEntityToSearch(knex, entity1);
         await addEntityToSearch(knex, entity2);
-        const catalog = new NextEntitiesCatalog(knex);
+        const catalog = new DefaultEntitiesCatalog(knex);
 
         const testFilter = {
           key: 'kind',
@@ -518,7 +518,7 @@ describe('NextEntitiesCatalog', () => {
         await addEntity(knex, unrelated, []);
         await knex('refresh_state').update({ result_hash: 'not-changed' });
 
-        const catalog = new NextEntitiesCatalog(knex);
+        const catalog = new DefaultEntitiesCatalog(knex);
         await catalog.removeEntityByUid(uid);
 
         await expect(
diff --git a/plugins/catalog-backend/src/service/NextEntitiesCatalog.ts b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
similarity index 99%
rename from plugins/catalog-backend/src/service/NextEntitiesCatalog.ts
rename to plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
index 8ca28260af..6979f94ba7 100644
--- a/plugins/catalog-backend/src/service/NextEntitiesCatalog.ts
+++ b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
@@ -150,7 +150,7 @@ function parseFilter(
   });
 }
 
-export class NextEntitiesCatalog implements EntitiesCatalog {
+export class DefaultEntitiesCatalog implements EntitiesCatalog {
   constructor(private readonly database: Knex) {}
 
   async entities(request?: EntitiesRequest): Promise<EntitiesResponse> {