diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/di/DiskModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/di/AuthDiskModule.kt
similarity index 97%
rename from app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/di/DiskModule.kt
rename to app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/di/AuthDiskModule.kt
index 35f4478a2d..1fce3bba71 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/di/DiskModule.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/di/AuthDiskModule.kt
@@ -15,7 +15,7 @@ import javax.inject.Singleton
  */
 @Module
 @InstallIn(SingletonComponent::class)
-object DiskModule {
+object AuthDiskModule {
 
     @Provides
     @Singleton
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/di/NetworkModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/di/AuthNetworkModule.kt
similarity index 98%
rename from app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/di/NetworkModule.kt
rename to app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/di/AuthNetworkModule.kt
index 4b451ffdf2..e7483b3af9 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/di/NetworkModule.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/di/AuthNetworkModule.kt
@@ -20,7 +20,7 @@ import javax.inject.Singleton
  */
 @Module
 @InstallIn(SingletonComponent::class)
-object NetworkModule {
+object AuthNetworkModule {
 
     @Provides
     @Singleton
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/di/SdkModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/di/AuthSdkModule.kt
similarity index 96%
rename from app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/di/SdkModule.kt
rename to app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/di/AuthSdkModule.kt
index 3f585eb4d3..0ff6dafb3f 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/di/SdkModule.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/sdk/di/AuthSdkModule.kt
@@ -14,7 +14,7 @@ import javax.inject.Singleton
  */
 @Module
 @InstallIn(SingletonComponent::class)
-object SdkModule {
+object AuthSdkModule {
 
     @Provides
     @Singleton
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/di/RepositoryModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/di/AuthRepositoryModule.kt
similarity index 98%
rename from app/src/main/java/com/x8bit/bitwarden/data/auth/repository/di/RepositoryModule.kt
rename to app/src/main/java/com/x8bit/bitwarden/data/auth/repository/di/AuthRepositoryModule.kt
index b759b30084..8e80527344 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/di/RepositoryModule.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/di/AuthRepositoryModule.kt
@@ -19,7 +19,7 @@ import javax.inject.Singleton
  */
 @Module
 @InstallIn(SingletonComponent::class)
-object RepositoryModule {
+object AuthRepositoryModule {
 
     @Provides
     @Singleton
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/di/DiskModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/di/PlatformDiskModule.kt
similarity index 96%
rename from app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/di/DiskModule.kt
rename to app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/di/PlatformDiskModule.kt
index 95edda210b..ca1b9c3314 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/di/DiskModule.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/di/PlatformDiskModule.kt
@@ -15,7 +15,7 @@ import javax.inject.Singleton
  */
 @Module
 @InstallIn(SingletonComponent::class)
-object DiskModule {
+object PlatformDiskModule {
 
     @Provides
     @Singleton
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/di/NetworkModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/di/PlatformNetworkModule.kt
similarity index 98%
rename from app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/di/NetworkModule.kt
rename to app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/di/PlatformNetworkModule.kt
index 2f987acd30..cd87085b3a 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/di/NetworkModule.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/di/PlatformNetworkModule.kt
@@ -24,7 +24,7 @@ import javax.inject.Singleton
  */
 @Module
 @InstallIn(SingletonComponent::class)
-object NetworkModule {
+object PlatformNetworkModule {
 
     @Provides
     @Singleton
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/di/RepositoryModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/di/PlatformRepositoryModule.kt
similarity index 98%
rename from app/src/main/java/com/x8bit/bitwarden/data/platform/repository/di/RepositoryModule.kt
rename to app/src/main/java/com/x8bit/bitwarden/data/platform/repository/di/PlatformRepositoryModule.kt
index 855766a97e..eef45d725b 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/di/RepositoryModule.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/di/PlatformRepositoryModule.kt
@@ -20,7 +20,7 @@ import javax.inject.Singleton
  */
 @Module
 @InstallIn(SingletonComponent::class)
-object RepositoryModule {
+object PlatformRepositoryModule {
 
     @Provides
     @Singleton
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/di/NetworkModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/di/VaultNetworkModule.kt
similarity index 95%
rename from app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/di/NetworkModule.kt
rename to app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/di/VaultNetworkModule.kt
index cc17eee1b7..a143b81380 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/di/NetworkModule.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/network/di/VaultNetworkModule.kt
@@ -14,7 +14,7 @@ import javax.inject.Singleton
  */
 @Module
 @InstallIn(SingletonComponent::class)
-object NetworkModule {
+object VaultNetworkModule {
 
     @Provides
     @Singleton