diff --git a/src/app/browse-by/browse-by-page.module.ts b/src/app/browse-by/browse-by-page.module.ts
index d91be38726..554a6c4f46 100644
--- a/src/app/browse-by/browse-by-page.module.ts
+++ b/src/app/browse-by/browse-by-page.module.ts
@@ -4,7 +4,7 @@ import { BrowseByModule } from './browse-by.module';
 import { ItemDataService } from '../core/data/item-data.service';
 import { BrowseService } from '../core/browse/browse.service';
 import { BrowseByGuard } from './browse-by-guard';
-import { SharedBrowseByModule } from '../shared/shared-browse-by/shared-browse-by.module';
+import { SharedBrowseByModule } from '../shared/browse-by/shared-browse-by.module';
 
 @NgModule({
   imports: [
diff --git a/src/app/browse-by/browse-by.module.ts b/src/app/browse-by/browse-by.module.ts
index 0a7f45c1e2..a7643464dc 100644
--- a/src/app/browse-by/browse-by.module.ts
+++ b/src/app/browse-by/browse-by.module.ts
@@ -9,7 +9,7 @@ import { ComcolModule } from '../shared/comcol/comcol.module';
 import { ThemedBrowseByMetadataPageComponent } from './browse-by-metadata-page/themed-browse-by-metadata-page.component';
 import { ThemedBrowseByDatePageComponent } from './browse-by-date-page/themed-browse-by-date-page.component';
 import { ThemedBrowseByTitlePageComponent } from './browse-by-title-page/themed-browse-by-title-page.component';
-import { SharedBrowseByModule } from '../shared/shared-browse-by/shared-browse-by.module';
+import { SharedBrowseByModule } from '../shared/browse-by/shared-browse-by.module';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
diff --git a/src/app/shared/shared-browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
similarity index 100%
rename from src/app/shared/shared-browse-by/browse-by.component.html
rename to src/app/shared/browse-by/browse-by.component.html
diff --git a/src/app/shared/shared-browse-by/browse-by.component.scss b/src/app/shared/browse-by/browse-by.component.scss
similarity index 100%
rename from src/app/shared/shared-browse-by/browse-by.component.scss
rename to src/app/shared/browse-by/browse-by.component.scss
diff --git a/src/app/shared/shared-browse-by/browse-by.component.spec.ts b/src/app/shared/browse-by/browse-by.component.spec.ts
similarity index 100%
rename from src/app/shared/shared-browse-by/browse-by.component.spec.ts
rename to src/app/shared/browse-by/browse-by.component.spec.ts
diff --git a/src/app/shared/shared-browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts
similarity index 100%
rename from src/app/shared/shared-browse-by/browse-by.component.ts
rename to src/app/shared/browse-by/browse-by.component.ts
diff --git a/src/app/shared/shared-browse-by/shared-browse-by.module.ts b/src/app/shared/browse-by/shared-browse-by.module.ts
similarity index 100%
rename from src/app/shared/shared-browse-by/shared-browse-by.module.ts
rename to src/app/shared/browse-by/shared-browse-by.module.ts
diff --git a/src/themes/custom/eager-theme.module.ts b/src/themes/custom/eager-theme.module.ts
index 7e30ca734e..55067403ed 100644
--- a/src/themes/custom/eager-theme.module.ts
+++ b/src/themes/custom/eager-theme.module.ts
@@ -45,7 +45,7 @@ import { CommunityListElementComponent } from './app/shared/object-list/communit
 import { CollectionListElementComponent} from './app/shared/object-list/collection-list-element/collection-list-element.component';
 import { ResultsBackButtonComponent } from './app/shared/results-back-button/results-back-button.component';
 import { CollectionDropdownComponent } from './app/shared/collection-dropdown/collection-dropdown.component';
-import { SharedBrowseByModule } from '../../app/shared/shared-browse-by/shared-browse-by.module';
+import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
 import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
 
 
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index 868a2c59a2..b42164d77d 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -117,7 +117,7 @@ import { BrowseByTitlePageComponent } from './app/browse-by/browse-by-title-page
 import {
   ExternalSourceEntryImportModalComponent
 } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component';
-import { SharedBrowseByModule } from '../../app/shared/shared-browse-by/shared-browse-by.module';
+import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
 import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
 
 const DECLARATIONS = [
diff --git a/src/themes/dspace/eager-theme.module.ts b/src/themes/dspace/eager-theme.module.ts
index d9cb24c808..6cb4de83e5 100644
--- a/src/themes/dspace/eager-theme.module.ts
+++ b/src/themes/dspace/eager-theme.module.ts
@@ -9,7 +9,7 @@ import { HeaderNavbarWrapperComponent } from './app/header-nav-wrapper/header-na
 import { SearchModule } from '../../app/shared/search/search.module';
 import { RootModule } from '../../app/root.module';
 import { NavbarModule } from '../../app/navbar/navbar.module';
-import { SharedBrowseByModule } from '../../app/shared/shared-browse-by/shared-browse-by.module';
+import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
 import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
 
 /**
diff --git a/src/themes/dspace/lazy-theme.module.ts b/src/themes/dspace/lazy-theme.module.ts
index 9aa24377a2..7ebf04ef59 100644
--- a/src/themes/dspace/lazy-theme.module.ts
+++ b/src/themes/dspace/lazy-theme.module.ts
@@ -57,7 +57,7 @@ import { ComcolModule } from '../../app/shared/comcol/comcol.module';
 import { RootModule } from '../../app/root.module';
 import { BrowseByPageModule } from '../../app/browse-by/browse-by-page.module';
 import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
-import { SharedBrowseByModule } from '../../app/shared/shared-browse-by/shared-browse-by.module';
+import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
 
 const DECLARATIONS = [
 ];