diff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DatabaseModule.kt b/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DatabaseModule.kt
index b159079c2..7d4dd67c8 100644
--- a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DatabaseModule.kt
+++ b/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DatabaseModule.kt
@@ -30,7 +30,7 @@ import javax.inject.Singleton
 object DatabaseModule {
     @Provides
     @Singleton
-    fun providesNiADatabase(
+    fun providesNiaDatabase(
         @ApplicationContext context: Context,
     ): NiaDatabase = Room.databaseBuilder(
         context,
diff --git a/core-network/src/debug/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt b/core-network/src/debug/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt
index 86940c651..5abcc9658 100644
--- a/core-network/src/debug/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt
+++ b/core-network/src/debug/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt
@@ -31,7 +31,7 @@ import kotlinx.serialization.json.Json
 interface NetworkModule {
 
     @Binds
-    fun bindsNiANetwork(
+    fun bindsNiaNetwork(
         niANetwork: FakeNiaNetwork
     ): NiaNetwork
 
diff --git a/core-network/src/release/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt b/core-network/src/release/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt
index b57201bea..09ffa3734 100644
--- a/core-network/src/release/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt
+++ b/core-network/src/release/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt
@@ -16,8 +16,6 @@
 
 package com.google.samples.apps.nowinandroid.core.network.di
 
-import com.google.samples.apps.nowinandroid.core.network.NiANetwork
-import com.google.samples.apps.nowinandroid.core.network.retrofit.RetrofitNiANetwork
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
@@ -31,9 +29,9 @@ import kotlinx.serialization.json.Json
 interface NetworkModule {
 
     @Binds
-    fun bindsNiANetwork(
-        niANetwork: RetrofitNiANetwork
-    ): NiANetwork
+    fun bindsNiaNetwork(
+        niANetwork: RetrofitNiaNetwork
+    ): NiaNetwork
 
     companion object {
         @Provides
diff --git a/core-network/src/test/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkTest.kt b/core-network/src/test/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkTest.kt
index c172c7da5..2081f6e1a 100644
--- a/core-network/src/test/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkTest.kt
+++ b/core-network/src/test/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkTest.kt
@@ -31,7 +31,7 @@ class FakeNiaNetworkTest {
 
     @Before
     fun setUp() {
-        subject = com.google.samples.apps.nowinandroid.core.network.fake.FakeNiaNetwork(
+        subject = FakeNiaNetwork(
             ioDispatcher = testDispatcher,
             networkJson = Json { ignoreUnknownKeys = true }
         )
diff --git a/docs/ArchitectureLearningJourney.md b/docs/ArchitectureLearningJourney.md
index 1a5112058..b3704ac7f 100644
--- a/docs/ArchitectureLearningJourney.md
+++ b/docs/ArchitectureLearningJourney.md
@@ -212,7 +212,7 @@ A repository may depend on one or more data sources. For example, the `OfflineFi
    </td>
   </tr>
   <tr>
-   <td>NiANetwork
+   <td>NiaNetwork
    </td>
    <td>Remote API accessed using Retrofit
    </td>