diff --git a/src/addons/mod/forum/components/edit-post/edit-post.ts b/src/addons/mod/forum/components/edit-post/edit-post.ts
index 230333110..958db0662 100644
--- a/src/addons/mod/forum/components/edit-post/edit-post.ts
+++ b/src/addons/mod/forum/components/edit-post/edit-post.ts
@@ -19,7 +19,7 @@ import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { ModalController, Translate } from '@singletons';
 import { AddonModForumData, AddonModForumPost, AddonModForumReply } from '@addons/mod/forum/services/forum';
-import { AddonModForumHelper } from '@addons/mod/forum/services/helper';
+import { AddonModForumHelper } from '@addons/mod/forum/services/forum-helper';
 
 /**
  * Page that displays a form to edit discussion post.
diff --git a/src/addons/mod/forum/components/index/index.ts b/src/addons/mod/forum/components/index/index.ts
index 5bd493c78..77763956e 100644
--- a/src/addons/mod/forum/components/index/index.ts
+++ b/src/addons/mod/forum/components/index/index.ts
@@ -25,10 +25,10 @@ import {
     AddonModForumNewDiscussionData,
     AddonModForumReplyDiscussionData,
 } from '@addons/mod/forum/services/forum';
-import { AddonModForumOffline, AddonModForumOfflineDiscussion } from '@addons/mod/forum/services/offline';
+import { AddonModForumOffline, AddonModForumOfflineDiscussion } from '@addons/mod/forum/services/forum-offline';
 import { ModalController, PopoverController, Translate } from '@singletons';
 import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
-import { AddonModForumHelper } from '@addons/mod/forum/services/helper';
+import { AddonModForumHelper } from '@addons/mod/forum/services/forum-helper';
 import { CoreGroups, CoreGroupsProvider } from '@services/groups';
 import { CoreEvents, CoreEventObserver } from '@singletons/events';
 import {
@@ -36,7 +36,7 @@ import {
     AddonModForumManualSyncData,
     AddonModForumSyncProvider,
     AddonModForumSyncResult,
-} from '@addons/mod/forum/services/sync';
+} from '@addons/mod/forum/services/forum-sync';
 import { CoreSites } from '@services/sites';
 import { CoreUser } from '@features/user/services/user';
 import { CoreDomUtils } from '@services/utils/dom';
diff --git a/src/addons/mod/forum/components/post/post.ts b/src/addons/mod/forum/components/post/post.ts
index b87811f9c..3e244193b 100644
--- a/src/addons/mod/forum/components/post/post.ts
+++ b/src/addons/mod/forum/components/post/post.ts
@@ -44,11 +44,11 @@ import { CoreTag } from '@features/tag/services/tag';
 import { ModalController, PopoverController, Translate } from '@singletons';
 import { CoreFileEntry, CoreFileUploader } from '@features/fileuploader/services/fileuploader';
 import { IonContent } from '@ionic/angular';
-import { AddonModForumSync } from '../../services/sync';
+import { AddonModForumSync } from '../../services/forum-sync';
 import { CoreSync } from '@services/sync';
 import { CoreTextUtils } from '@services/utils/text';
-import { AddonModForumHelper } from '../../services/helper';
-import { AddonModForumOffline, AddonModForumReplyOptions } from '../../services/offline';
+import { AddonModForumHelper } from '../../services/forum-helper';
+import { AddonModForumOffline, AddonModForumReplyOptions } from '../../services/forum-offline';
 import { CoreUtils } from '@services/utils/utils';
 import { AddonModForumPostOptionsMenuComponent } from '../post-options-menu/post-options-menu';
 import { AddonModForumEditPostComponent } from '../edit-post/edit-post';
diff --git a/src/addons/mod/forum/forum.module.ts b/src/addons/mod/forum/forum.module.ts
index 62acfa715..0079e58bb 100644
--- a/src/addons/mod/forum/forum.module.ts
+++ b/src/addons/mod/forum/forum.module.ts
@@ -39,9 +39,9 @@ import { AddonModForumTagAreaHandler } from './services/handlers/tag-area';
 import { CorePushNotificationsDelegate } from '@features/pushnotifications/services/push-delegate';
 import { AddonModForumPushClickHandler } from './services/handlers/push-click';
 import { AddonModForumProvider } from './services/forum';
-import { AddonModForumOfflineProvider } from './services/offline';
-import { AddonModForumHelperProvider } from './services/helper';
-import { AddonModForumSyncProvider } from './services/sync';
+import { AddonModForumOfflineProvider } from './services/forum-offline';
+import { AddonModForumHelperProvider } from './services/forum-helper';
+import { AddonModForumSyncProvider } from './services/forum-sync';
 
 export const ADDON_MOD_FORUM_SERVICES: Type<unknown>[] = [
     AddonModForumProvider,
diff --git a/src/addons/mod/forum/pages/discussion/discussion.page.ts b/src/addons/mod/forum/pages/discussion/discussion.page.ts
index 0b154e89c..1f04eef18 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.page.ts
+++ b/src/addons/mod/forum/pages/discussion/discussion.page.ts
@@ -39,9 +39,9 @@ import {
     AddonModForumPost,
     AddonModForumProvider,
 } from '../../services/forum';
-import { AddonModForumHelper } from '../../services/helper';
-import { AddonModForumOffline } from '../../services/offline';
-import { AddonModForumSync, AddonModForumSyncProvider } from '../../services/sync';
+import { AddonModForumHelper } from '../../services/forum-helper';
+import { AddonModForumOffline } from '../../services/forum-offline';
+import { AddonModForumSync, AddonModForumSyncProvider } from '../../services/forum-sync';
 
 type SortType = 'flat-newest' | 'flat-oldest' | 'nested';
 
diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts b/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts
index 5fa1376bb..8ff69c794 100644
--- a/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts
+++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts
@@ -26,14 +26,14 @@ import {
     AddonModForumProvider,
 } from '@addons/mod/forum/services/forum';
 import { CoreEditorRichTextEditorComponent } from '@features/editor/components/rich-text-editor/rich-text-editor';
-import { AddonModForumSync, AddonModForumSyncProvider } from '@addons/mod/forum/services/sync';
+import { AddonModForumSync, AddonModForumSyncProvider } from '@addons/mod/forum/services/forum-sync';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { Translate } from '@singletons';
 import { CoreSync } from '@services/sync';
-import { AddonModForumDiscussionOptions, AddonModForumOffline } from '@addons/mod/forum/services/offline';
+import { AddonModForumDiscussionOptions, AddonModForumOffline } from '@addons/mod/forum/services/forum-offline';
 import { CoreUtils } from '@services/utils/utils';
-import { AddonModForumHelper } from '@addons/mod/forum/services/helper';
+import { AddonModForumHelper } from '@addons/mod/forum/services/forum-helper';
 import { IonRefresher } from '@ionic/angular';
 import { CoreFileUploader } from '@features/fileuploader/services/fileuploader';
 import { CoreTextUtils } from '@services/utils/text';
diff --git a/src/addons/mod/forum/services/database/offline.ts b/src/addons/mod/forum/services/database/offline.ts
index ce28a9776..7feee5936 100644
--- a/src/addons/mod/forum/services/database/offline.ts
+++ b/src/addons/mod/forum/services/database/offline.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { CoreSiteSchema } from '@services/sites';
-import { AddonModForumOfflineDiscussion, AddonModForumOfflineReply } from '../offline';
+import { AddonModForumOfflineDiscussion, AddonModForumOfflineReply } from '../forum-offline';
 
 /**
  * Database variables for AddonModForum service.
diff --git a/src/addons/mod/forum/services/helper.ts b/src/addons/mod/forum/services/forum-helper.ts
similarity index 99%
rename from src/addons/mod/forum/services/helper.ts
rename to src/addons/mod/forum/services/forum-helper.ts
index f80b1f2d6..c479f1045 100644
--- a/src/addons/mod/forum/services/helper.ts
+++ b/src/addons/mod/forum/services/forum-helper.ts
@@ -30,7 +30,7 @@ import {
     AddonModForumPost,
     AddonModForumProvider,
 } from './forum';
-import { AddonModForumDiscussionOptions, AddonModForumOffline, AddonModForumOfflineReply } from './offline';
+import { AddonModForumDiscussionOptions, AddonModForumOffline, AddonModForumOfflineReply } from './forum-offline';
 
 /**
  * Service that provides some features for forums.
diff --git a/src/addons/mod/forum/services/offline.ts b/src/addons/mod/forum/services/forum-offline.ts
similarity index 100%
rename from src/addons/mod/forum/services/offline.ts
rename to src/addons/mod/forum/services/forum-offline.ts
diff --git a/src/addons/mod/forum/services/sync.ts b/src/addons/mod/forum/services/forum-sync.ts
similarity index 99%
rename from src/addons/mod/forum/services/sync.ts
rename to src/addons/mod/forum/services/forum-sync.ts
index 1e2e518a3..4d5eb3c08 100644
--- a/src/addons/mod/forum/services/sync.ts
+++ b/src/addons/mod/forum/services/forum-sync.ts
@@ -34,8 +34,8 @@ import {
     AddonModForumAddDiscussionWSOptionsObject,
     AddonModForumProvider,
 } from './forum';
-import { AddonModForumHelper } from './helper';
-import { AddonModForumOffline, AddonModForumOfflineDiscussion, AddonModForumOfflineReply } from './offline';
+import { AddonModForumHelper } from './forum-helper';
+import { AddonModForumOffline, AddonModForumOfflineDiscussion, AddonModForumOfflineReply } from './forum-offline';
 
 declare module '@singletons/events' {
 
diff --git a/src/addons/mod/forum/services/forum.ts b/src/addons/mod/forum/services/forum.ts
index 60c8fcdc5..66dbf417c 100644
--- a/src/addons/mod/forum/services/forum.ts
+++ b/src/addons/mod/forum/services/forum.ts
@@ -27,7 +27,7 @@ import { CoreUrlUtils } from '@services/utils/url';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreStatusWithWarningsWSResponse, CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
 import { makeSingleton, Translate } from '@singletons';
-import { AddonModForumOffline, AddonModForumOfflineDiscussion, AddonModForumReplyOptions } from './offline';
+import { AddonModForumOffline, AddonModForumOfflineDiscussion, AddonModForumReplyOptions } from './forum-offline';
 
 const ROOT_CACHE_KEY = 'mmaModForum:';
 
diff --git a/src/addons/mod/forum/services/handlers/prefetch.ts b/src/addons/mod/forum/services/handlers/prefetch.ts
index 0688a5747..c303ec8a0 100644
--- a/src/addons/mod/forum/services/handlers/prefetch.ts
+++ b/src/addons/mod/forum/services/handlers/prefetch.ts
@@ -22,7 +22,7 @@ import { CoreCourse, CoreCourseAnyModuleData, CoreCourseCommonModWSOptions } fro
 import { CoreUser } from '@features/user/services/user';
 import { CoreGroups, CoreGroupsProvider } from '@services/groups';
 import { CoreUtils } from '@services/utils/utils';
-import { AddonModForumSync } from '../sync';
+import { AddonModForumSync } from '../forum-sync';
 import { makeSingleton } from '@singletons';
 
 /**
diff --git a/src/addons/mod/forum/services/handlers/sync-cron.ts b/src/addons/mod/forum/services/handlers/sync-cron.ts
index 2544f3bd1..1cb25bb45 100644
--- a/src/addons/mod/forum/services/handlers/sync-cron.ts
+++ b/src/addons/mod/forum/services/handlers/sync-cron.ts
@@ -15,7 +15,7 @@
 import { Injectable } from '@angular/core';
 import { CoreCronHandler } from '@services/cron';
 import { makeSingleton } from '@singletons';
-import { AddonModForumSync } from '../sync';
+import { AddonModForumSync } from '../forum-sync';
 
 /**
  * Synchronization cron handler.