diff --git a/src/core/features/tag/pages/index/index.page.ts b/src/core/features/tag/pages/index/index.page.ts
index 9366303b1..3dc89b254 100644
--- a/src/core/features/tag/pages/index/index.page.ts
+++ b/src/core/features/tag/pages/index/index.page.ts
@@ -17,7 +17,7 @@ import { IonRefresher } from '@ionic/angular';
 import { CoreDomUtils } from '@services/utils/dom';
 // import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreTag } from '@features/tag/services/tag';
-import { CoreTagAreaDelegate } from '@/core/features/tag/services/tag-area-delegate';
+import { CoreTagAreaDelegate } from '@features/tag/services/tag-area-delegate';
 import { ActivatedRoute, Router } from '@angular/router';
 import { CoreTagFeedElement } from '../../services/tag-helper';
 
diff --git a/src/core/features/tag/services/handlers/index.link.ts b/src/core/features/tag/services/handlers/index-link.ts
similarity index 100%
rename from src/core/features/tag/services/handlers/index.link.ts
rename to src/core/features/tag/services/handlers/index-link.ts
diff --git a/src/core/features/tag/services/handlers/tag.mainmenu.ts b/src/core/features/tag/services/handlers/mainmenu.ts
similarity index 100%
rename from src/core/features/tag/services/handlers/tag.mainmenu.ts
rename to src/core/features/tag/services/handlers/mainmenu.ts
diff --git a/src/core/features/tag/services/handlers/search.link.ts b/src/core/features/tag/services/handlers/search-link.ts
similarity index 100%
rename from src/core/features/tag/services/handlers/search.link.ts
rename to src/core/features/tag/services/handlers/search-link.ts
diff --git a/src/core/features/tag/tag.module.ts b/src/core/features/tag/tag.module.ts
index ec058f983..45db517af 100644
--- a/src/core/features/tag/tag.module.ts
+++ b/src/core/features/tag/tag.module.ts
@@ -17,9 +17,9 @@ import { Routes } from '@angular/router';
 import { CoreMainMenuDelegate } from '@features/mainmenu/services/mainmenu-delegate';
 import { CoreMainMenuRoutingModule } from '../mainmenu/mainmenu-routing.module';
 import { CoreContentLinksDelegate } from '@features/contentlinks/services/contentlinks-delegate';
-import { CoreTagMainMenuHandler, CoreTagMainMenuHandlerService } from './services/handlers/tag.mainmenu';
-import { CoreTagIndexLinkHandler } from './services/handlers/index.link';
-import { CoreTagSearchLinkHandler } from './services/handlers/search.link';
+import { CoreTagMainMenuHandler, CoreTagMainMenuHandlerService } from './services/handlers/mainmenu';
+import { CoreTagIndexLinkHandler } from './services/handlers/index-link';
+import { CoreTagSearchLinkHandler } from './services/handlers/search-link';
 
 const routes: Routes = [
     {
diff --git a/src/core/features/user/components/tag-area/tag-area.ts b/src/core/features/user/components/tag-area/tag-area.ts
index 116ecb0dc..279109892 100644
--- a/src/core/features/user/components/tag-area/tag-area.ts
+++ b/src/core/features/user/components/tag-area/tag-area.ts
@@ -14,7 +14,7 @@
 
 import { Component, Input } from '@angular/core';
 
-import { CoreUserTagFeedElement } from '@features/user/services/handlers/tag-area-handler';
+import { CoreUserTagFeedElement } from '@features/user/services/handlers/tag-area';
 
 /**
  * Component to render the user tag area.
diff --git a/src/core/features/user/services/handlers/tag-area-handler.ts b/src/core/features/user/services/handlers/tag-area.ts
similarity index 100%
rename from src/core/features/user/services/handlers/tag-area-handler.ts
rename to src/core/features/user/services/handlers/tag-area.ts
diff --git a/src/core/features/user/user.module.ts b/src/core/features/user/user.module.ts
index 8d0528ce9..e0bdc99cb 100644
--- a/src/core/features/user/user.module.ts
+++ b/src/core/features/user/user.module.ts
@@ -25,7 +25,7 @@ import { CoreContentLinksDelegate } from '@features/contentlinks/services/conten
 import { CoreUserProfileLinkHandler } from './services/handlers/profile-link';
 import { CoreCronDelegate } from '@services/cron';
 import { CoreUserSyncCronHandler } from './services/handlers/sync-cron';
-import { CoreUserTagAreaHandler } from './services/handlers/tag-area-handler';
+import { CoreUserTagAreaHandler } from './services/handlers/tag-area';
 import { CoreTagAreaDelegate } from '@features/tag/services/tag-area-delegate';
 
 const routes: Routes = [