diff --git a/api/src/main/java/dev/msfjarvis/lobsters/model/LobstersPost.kt b/api/src/main/java/dev/msfjarvis/lobsters/model/LobstersPost.kt
index 1f6f4458..7c34f859 100644
--- a/api/src/main/java/dev/msfjarvis/lobsters/model/LobstersPost.kt
+++ b/api/src/main/java/dev/msfjarvis/lobsters/model/LobstersPost.kt
@@ -15,6 +15,6 @@ class LobstersPost(
   @Json(name = "comment_count") val commentCount: Long,
   val description: String,
   @Json(name = "comments_url") val commentsUrl: String,
-  @Json(name = "submitter_user") val submitterUser: Submitter,
+  @Json(name = "submitter_user") val submitter: User,
   val tags: List<String>,
 )
diff --git a/api/src/main/java/dev/msfjarvis/lobsters/model/Submitter.kt b/api/src/main/java/dev/msfjarvis/lobsters/model/User.kt
similarity index 97%
rename from api/src/main/java/dev/msfjarvis/lobsters/model/Submitter.kt
rename to api/src/main/java/dev/msfjarvis/lobsters/model/User.kt
index 8f32f9a4..4073c85b 100644
--- a/api/src/main/java/dev/msfjarvis/lobsters/model/Submitter.kt
+++ b/api/src/main/java/dev/msfjarvis/lobsters/model/User.kt
@@ -4,7 +4,7 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-class Submitter(
+class User(
   val username: String,
   @Json(name = "created_at") val createdAt: String,
   @Json(name = "is_admin") val isAdmin: Boolean,
diff --git a/api/src/test/java/dev/msfjarvis/lobsters/data/api/LobstersApiTest.kt b/api/src/test/java/dev/msfjarvis/lobsters/data/api/LobstersApiTest.kt
index b01aa089..7beb07ae 100644
--- a/api/src/test/java/dev/msfjarvis/lobsters/data/api/LobstersApiTest.kt
+++ b/api/src/test/java/dev/msfjarvis/lobsters/data/api/LobstersApiTest.kt
@@ -60,7 +60,7 @@ class LobstersApiTest {
   @Test
   fun `no moderator posts in test data`() = runBlocking {
     val posts = apiClient.getHottestPosts(1)
-    val moderatorPosts = posts.asSequence().filter { it.submitterUser.isModerator }.toSet()
+    val moderatorPosts = posts.asSequence().filter { it.submitter.isModerator }.toSet()
     assertTrue(moderatorPosts.isEmpty())
   }
 
diff --git a/app/src/main/java/dev/msfjarvis/lobsters/util/DatabaseExtensions.kt b/app/src/main/java/dev/msfjarvis/lobsters/util/DatabaseExtensions.kt
index 9bd4a120..d2bfb281 100644
--- a/app/src/main/java/dev/msfjarvis/lobsters/util/DatabaseExtensions.kt
+++ b/app/src/main/java/dev/msfjarvis/lobsters/util/DatabaseExtensions.kt
@@ -11,8 +11,8 @@ fun LobstersPost.toDbModel(): SavedPost {
     url = url,
     createdAt = createdAt,
     commentsUrl = commentsUrl,
-    submitterName = submitterUser.username,
-    submitterAvatarUrl = submitterUser.avatarUrl,
+    submitterName = submitter.username,
+    submitterAvatarUrl = submitter.avatarUrl,
     tags = tags,
   )
 }
diff --git a/desktop/src/jvmMain/kotlin/dev/msfjarvis/lobsters/ui/Main.kt b/desktop/src/jvmMain/kotlin/dev/msfjarvis/lobsters/ui/Main.kt
index d0865822..21677386 100644
--- a/desktop/src/jvmMain/kotlin/dev/msfjarvis/lobsters/ui/Main.kt
+++ b/desktop/src/jvmMain/kotlin/dev/msfjarvis/lobsters/ui/Main.kt
@@ -71,8 +71,8 @@ fun toDbModel(post: LobstersPost): SavedPost {
     url = post.url,
     createdAt = post.createdAt,
     commentsUrl = post.commentsUrl,
-    submitterName = post.submitterUser.username,
-    submitterAvatarUrl = post.submitterUser.avatarUrl,
+    submitterName = post.submitter.username,
+    submitterAvatarUrl = post.submitter.avatarUrl,
     tags = post.tags,
   )
 }