diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
index 837e471f5..c8739b3b5 100644
--- a/core/database/build.gradle.kts
+++ b/core/database/build.gradle.kts
@@ -75,6 +75,7 @@ sqldelight {
         create("NiaDatabase") {
             packageName.set("com.google.samples.apps.nowinandroid.core.database")
             generateAsync.set(true)
+            dialect("sqlite:3.25")
         }
     }
 }
diff --git a/core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResourceEntity.sq b/core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResources.sq
similarity index 100%
rename from core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResourceEntity.sq
rename to core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResources.sq
diff --git a/core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResourceFtsEntity.sq b/core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResourcesFts.sq
similarity index 100%
rename from core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResourceFtsEntity.sq
rename to core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResourcesFts.sq
diff --git a/core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResourceTopicCrossRef.sq b/core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResourcesTopicCrossRef.sq
similarity index 100%
rename from core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResourceTopicCrossRef.sq
rename to core/database/src/commonMain/sqldelight/com/google/samples/apps/nowinandroid/core/database/NewsResourcesTopicCrossRef.sq