diff --git a/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignsPresenter.kt b/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignsPresenter.kt
index 3753dfb67..ffbf92540 100644
--- a/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignsPresenter.kt
+++ b/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignsPresenter.kt
@@ -3,9 +3,8 @@ package fr.free.nrw.commons.campaigns
 import android.annotation.SuppressLint
 import fr.free.nrw.commons.BasePresenter
 import fr.free.nrw.commons.campaigns.models.Campaign
-import fr.free.nrw.commons.di.CommonsApplicationModule
-import fr.free.nrw.commons.di.CommonsApplicationModule.IO_THREAD
-import fr.free.nrw.commons.di.CommonsApplicationModule.MAIN_THREAD
+import fr.free.nrw.commons.di.CommonsApplicationModule.Companion.IO_THREAD
+import fr.free.nrw.commons.di.CommonsApplicationModule.Companion.MAIN_THREAD
 import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient
 import fr.free.nrw.commons.utils.CommonsDateUtil.getIso8601DateFormatShort
 import io.reactivex.Scheduler
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionBoundaryCallback.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionBoundaryCallback.kt
index 286abb97a..3f7bffe91 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionBoundaryCallback.kt
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionBoundaryCallback.kt
@@ -3,6 +3,7 @@ package fr.free.nrw.commons.contributions
 import androidx.paging.PagedList.BoundaryCallback
 import fr.free.nrw.commons.auth.SessionManager
 import fr.free.nrw.commons.di.CommonsApplicationModule
+import fr.free.nrw.commons.di.CommonsApplicationModule.Companion.IO_THREAD
 import fr.free.nrw.commons.media.MediaClient
 import io.reactivex.Scheduler
 import io.reactivex.disposables.CompositeDisposable
@@ -20,7 +21,7 @@ class ContributionBoundaryCallback
         private val repository: ContributionsRepository,
         private val sessionManager: SessionManager,
         private val mediaClient: MediaClient,
-        @param:Named(CommonsApplicationModule.IO_THREAD) private val ioThreadScheduler: Scheduler,
+        @param:Named(IO_THREAD) private val ioThreadScheduler: Scheduler,
     ) : BoundaryCallback<Contribution>() {
         private val compositeDisposable: CompositeDisposable = CompositeDisposable()
         var userName: String? = null
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListPresenter.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListPresenter.java
index 42495889d..735ff63d4 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListPresenter.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListPresenter.java
@@ -1,5 +1,7 @@
 package fr.free.nrw.commons.contributions;
 
+import static fr.free.nrw.commons.di.CommonsApplicationModule.IO_THREAD;
+
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.paging.DataSource;
@@ -34,7 +36,7 @@ public class ContributionsListPresenter implements UserActionListener {
         final ContributionBoundaryCallback contributionBoundaryCallback,
         final ContributionsRemoteDataSource contributionsRemoteDataSource,
         final ContributionsRepository repository,
-        @Named(CommonsApplicationModule.IO_THREAD) final Scheduler ioThreadScheduler) {
+        @Named(IO_THREAD) final Scheduler ioThreadScheduler) {
         this.contributionBoundaryCallback = contributionBoundaryCallback;
         this.repository = repository;
         this.ioThreadScheduler = ioThreadScheduler;
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsPresenter.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsPresenter.java
index 297a66616..495a4bc64 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsPresenter.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsPresenter.java
@@ -1,5 +1,6 @@
 package fr.free.nrw.commons.contributions;
 
+import static fr.free.nrw.commons.di.CommonsApplicationModule.IO_THREAD;
 import static fr.free.nrw.commons.utils.ImageUtils.IMAGE_OK;
 
 import androidx.work.ExistingWorkPolicy;
@@ -31,7 +32,7 @@ public class ContributionsPresenter implements UserActionListener {
     @Inject
     ContributionsPresenter(ContributionsRepository repository,
         UploadRepository uploadRepository,
-        @Named(CommonsApplicationModule.IO_THREAD) Scheduler ioThreadScheduler) {
+        @Named(IO_THREAD) Scheduler ioThreadScheduler) {
         this.contributionsRepository = repository;
         this.uploadRepository = uploadRepository;
         this.ioThreadScheduler = ioThreadScheduler;
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsRemoteDataSource.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsRemoteDataSource.kt
index 346c83b34..e8ff01b3e 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsRemoteDataSource.kt
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsRemoteDataSource.kt
@@ -1,7 +1,7 @@
 package fr.free.nrw.commons.contributions
 
 import androidx.paging.ItemKeyedDataSource
-import fr.free.nrw.commons.di.CommonsApplicationModule
+import fr.free.nrw.commons.di.CommonsApplicationModule.Companion.IO_THREAD
 import fr.free.nrw.commons.media.MediaClient
 import io.reactivex.Scheduler
 import io.reactivex.disposables.CompositeDisposable
@@ -16,7 +16,7 @@ class ContributionsRemoteDataSource
     @Inject
     constructor(
         private val mediaClient: MediaClient,
-        @param:Named(CommonsApplicationModule.IO_THREAD) private val ioThreadScheduler: Scheduler,
+        @param:Named(IO_THREAD) private val ioThreadScheduler: Scheduler,
     ) : ItemKeyedDataSource<Int, Contribution>() {
         private val compositeDisposable: CompositeDisposable = CompositeDisposable()
         var userName: String? = null
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsPresenter.java b/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsPresenter.java
index 36c558519..ecc9c19b5 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsPresenter.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsPresenter.java
@@ -1,6 +1,7 @@
 package fr.free.nrw.commons.upload;
 
 
+import static fr.free.nrw.commons.di.CommonsApplicationModule.IO_THREAD;
 import static fr.free.nrw.commons.utils.ImageUtils.IMAGE_OK;
 
 import android.content.Context;
@@ -53,7 +54,7 @@ public class PendingUploadsPresenter implements UserActionListener {
         final ContributionsRemoteDataSource contributionsRemoteDataSource,
         final ContributionsRepository contributionsRepository,
         final UploadRepository uploadRepository,
-        @Named(CommonsApplicationModule.IO_THREAD) final Scheduler ioThreadScheduler) {
+        @Named(IO_THREAD) final Scheduler ioThreadScheduler) {
         this.contributionBoundaryCallback = contributionBoundaryCallback;
         this.contributionsRepository = contributionsRepository;
         this.uploadRepository = uploadRepository;
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.kt b/app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.kt
index 712f6fc3e..210754bf4 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.kt
@@ -9,6 +9,8 @@ import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException
 import fr.free.nrw.commons.category.CategoryEditHelper
 import fr.free.nrw.commons.category.CategoryItem
 import fr.free.nrw.commons.di.CommonsApplicationModule
+import fr.free.nrw.commons.di.CommonsApplicationModule.Companion.IO_THREAD
+import fr.free.nrw.commons.di.CommonsApplicationModule.Companion.MAIN_THREAD
 import fr.free.nrw.commons.repository.UploadRepository
 import fr.free.nrw.commons.upload.depicts.proxy
 import io.reactivex.Observable
@@ -30,8 +32,8 @@ class CategoriesPresenter
     @Inject
     constructor(
         private val repository: UploadRepository,
-        @param:Named(CommonsApplicationModule.IO_THREAD) private val ioScheduler: Scheduler,
-        @param:Named(CommonsApplicationModule.MAIN_THREAD) private val mainThreadScheduler: Scheduler,
+        @param:Named(IO_THREAD) private val ioScheduler: Scheduler,
+        @param:Named(MAIN_THREAD) private val mainThreadScheduler: Scheduler,
     ) : CategoriesContract.UserActionListener {
         companion object {
             private val DUMMY: CategoriesContract.View = proxy()
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsPresenter.kt b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsPresenter.kt
index fa3eb354e..4502e3434 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsPresenter.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsPresenter.kt
@@ -7,6 +7,8 @@ import fr.free.nrw.commons.Media
 import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException
 import fr.free.nrw.commons.bookmarks.items.BookmarkItemsController
 import fr.free.nrw.commons.di.CommonsApplicationModule
+import fr.free.nrw.commons.di.CommonsApplicationModule.Companion.IO_THREAD
+import fr.free.nrw.commons.di.CommonsApplicationModule.Companion.MAIN_THREAD
 import fr.free.nrw.commons.repository.UploadRepository
 import fr.free.nrw.commons.upload.structure.depictions.DepictedItem
 import fr.free.nrw.commons.wikidata.WikidataDisambiguationItems
@@ -31,8 +33,8 @@ class DepictsPresenter
     @Inject
     constructor(
         private val repository: UploadRepository,
-        @param:Named(CommonsApplicationModule.IO_THREAD) private val ioScheduler: Scheduler,
-        @param:Named(CommonsApplicationModule.MAIN_THREAD) private val mainThreadScheduler: Scheduler,
+        @param:Named(IO_THREAD) private val ioScheduler: Scheduler,
+        @param:Named(MAIN_THREAD) private val mainThreadScheduler: Scheduler,
     ) : DepictsContract.UserActionListener {
         companion object {
             private val DUMMY = proxy<DepictsContract.View>()