diff --git a/plugins/search/src/components/FiltersNext/FiltersButtonNext.tsx b/plugins/search/src/components/SearchFiltersNext/FiltersButtonNext.tsx
similarity index 100%
rename from plugins/search/src/components/FiltersNext/FiltersButtonNext.tsx
rename to plugins/search/src/components/SearchFiltersNext/FiltersButtonNext.tsx
diff --git a/plugins/search/src/components/FiltersNext/FiltersNext.tsx b/plugins/search/src/components/SearchFiltersNext/SearchFiltersNext.tsx
similarity index 98%
rename from plugins/search/src/components/FiltersNext/FiltersNext.tsx
rename to plugins/search/src/components/SearchFiltersNext/SearchFiltersNext.tsx
index 6b833dbf5a..92c65f4a57 100644
--- a/plugins/search/src/components/FiltersNext/FiltersNext.tsx
+++ b/plugins/search/src/components/SearchFiltersNext/SearchFiltersNext.tsx
@@ -171,7 +171,7 @@ const SelectFilter = ({ fieldName, values }: ValuedFilterProps) => {
   );
 };
 
-export const FiltersNext = ({ definitions }: FiltersProps) => {
+export const SearchFiltersNext = ({ definitions }: FiltersProps) => {
   const classes = useFilterStyles();
 
   return (
diff --git a/plugins/search/src/components/FiltersNext/index.tsx b/plugins/search/src/components/SearchFiltersNext/index.tsx
similarity index 90%
rename from plugins/search/src/components/FiltersNext/index.tsx
rename to plugins/search/src/components/SearchFiltersNext/index.tsx
index 574a31e93f..d45eadc79a 100644
--- a/plugins/search/src/components/FiltersNext/index.tsx
+++ b/plugins/search/src/components/SearchFiltersNext/index.tsx
@@ -15,4 +15,4 @@
  */
 
 export { FiltersButtonNext } from './FiltersButtonNext';
-export { FiltersNext, FilterType } from './FiltersNext';
+export { SearchFiltersNext, FilterType } from './SearchFiltersNext';
diff --git a/plugins/search/src/components/SearchPageNext/SearchPageNext.tsx b/plugins/search/src/components/SearchPageNext/SearchPageNext.tsx
index 441ca2b6a2..691f01b2cb 100644
--- a/plugins/search/src/components/SearchPageNext/SearchPageNext.tsx
+++ b/plugins/search/src/components/SearchPageNext/SearchPageNext.tsx
@@ -20,7 +20,7 @@ import { Grid } from '@material-ui/core';
 import { SearchBarNext } from '../SearchBarNext';
 import { SearchResultNext } from '../SearchResultNext';
 import { SearchContextProvider } from '../SearchContext';
-import { FiltersNext, FilterType } from '../FiltersNext';
+import { SearchFiltersNext, FilterType } from '../SearchFiltersNext';
 
 const defaultFilterDefinitions = [
   {
@@ -46,7 +46,7 @@ export const SearchPageNext = () => {
               <SearchBarNext />
             </Grid>
             <Grid item xs={3}>
-              <FiltersNext definitions={defaultFilterDefinitions} />
+              <SearchFiltersNext definitions={defaultFilterDefinitions} />
             </Grid>
             <Grid item xs={9}>
               <SearchResultNext />
diff --git a/plugins/search/src/components/index.tsx b/plugins/search/src/components/index.tsx
index 27491d6c93..aa9a443f21 100644
--- a/plugins/search/src/components/index.tsx
+++ b/plugins/search/src/components/index.tsx
@@ -15,7 +15,7 @@
  */
 
 export * from './Filters';
-export * from './FiltersNext';
+export * from './SearchFiltersNext';
 export * from './SearchBar';
 export * from './SearchBarNext';
 export * from './SearchPage';
diff --git a/plugins/search/src/index.ts b/plugins/search/src/index.ts
index 519d7fcf66..367b195f9d 100644
--- a/plugins/search/src/index.ts
+++ b/plugins/search/src/index.ts
@@ -20,6 +20,9 @@ export {
   searchPlugin as plugin,
   SearchPage,
   SearchPageNext,
+  SearchBarNext,
+  SearchResultNext,
+  SearchFiltersNext,
 } from './plugin';
 export {
   Filters,
diff --git a/plugins/search/src/plugin.ts b/plugins/search/src/plugin.ts
index e3e953e07d..03322b33aa 100644
--- a/plugins/search/src/plugin.ts
+++ b/plugins/search/src/plugin.ts
@@ -19,6 +19,7 @@ import {
   createRouteRef,
   createRoutableExtension,
   discoveryApiRef,
+  createComponentExtension,
 } from '@backstage/core';
 import { SearchClient, searchApiRef } from './apis';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
@@ -70,3 +71,30 @@ export const SearchPageNext = searchPlugin.provide(
     mountPoint: rootNextRouteRef,
   }),
 );
+
+export const SearchBarNext = searchPlugin.provide(
+  createComponentExtension({
+    component: {
+      lazy: () =>
+        import('./components/SearchBarNext').then(m => m.SearchBarNext),
+    },
+  }),
+);
+
+export const SearchResultNext = searchPlugin.provide(
+  createComponentExtension({
+    component: {
+      lazy: () =>
+        import('./components/SearchResultNext').then(m => m.SearchResultNext),
+    },
+  }),
+);
+
+export const SearchFiltersNext = searchPlugin.provide(
+  createComponentExtension({
+    component: {
+      lazy: () =>
+        import('./components/SearchFiltersNext').then(m => m.SearchFiltersNext),
+    },
+  }),
+);