diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/Account.kt b/app/src/main/java/com/keylesspalace/tusky/entity/Account.kt
index 547de4618..16ec4507f 100644
--- a/app/src/main/java/com/keylesspalace/tusky/entity/Account.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/entity/Account.kt
@@ -21,7 +21,7 @@ import java.util.Date
 data class Account(
     val id: String,
     @SerializedName("username") val localUsername: String,
-    @SerializedName("acct", alternate = ["subject"]) val username: String,
+    @SerializedName("acct") val username: String,
     @SerializedName("display_name") private val displayName: String?, // should never be null per Api definition, but some servers break the contract
     @SerializedName("created_at") val createdAt: Date,
     val note: String,
@@ -37,12 +37,11 @@ data class Account(
     val emojis: List<Emoji>? = emptyList(), // nullable for backward compatibility
     val fields: List<Field>? = emptyList(), // nullable for backward compatibility
     val moved: Account? = null,
-    @SerializedName("name") val notestockUsername: String? = null,
 
 ) {
 
     val name: String
-        get() = notestockUsername ?: if (displayName.isNullOrEmpty()) {
+        get() = if (displayName.isNullOrEmpty()) {
             localUsername
         } else displayName
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/Status.kt b/app/src/main/java/com/keylesspalace/tusky/entity/Status.kt
index abdeea689..d3ac6ed45 100644
--- a/app/src/main/java/com/keylesspalace/tusky/entity/Status.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/entity/Status.kt
@@ -41,7 +41,7 @@ data class Status(
     @SerializedName("spoiler_text", alternate = ["summary"]) val spoilerText: String,
     val visibility: Visibility,
     @SerializedName("media_attachments", alternate = ["attachment"]) var attachments: ArrayList<Attachment>,
-    val mentions: List<Mention>,
+    @SerializedName("mentions", alternate = ["tag"]) val mentions: List<Mention>,
     val tags: List<HashTag>?,
     val application: Application?,
     val pinned: Boolean?,
diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/TimelineAccount.kt b/app/src/main/java/com/keylesspalace/tusky/entity/TimelineAccount.kt
index 6eb89ea5d..fcb517cb9 100644
--- a/app/src/main/java/com/keylesspalace/tusky/entity/TimelineAccount.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/entity/TimelineAccount.kt
@@ -24,7 +24,7 @@ import com.google.gson.annotations.SerializedName
 data class TimelineAccount(
     val id: String,
     @SerializedName("username") val localUsername: String,
-    @SerializedName("acct") val username: String,
+    @SerializedName("acct", alternate = ["subject"]) val username: String,
     @SerializedName("display_name") val displayName: String?, // should never be null per Api definition, but some servers break the contract
     val url: String,
     val avatar: String,
@@ -34,7 +34,7 @@ data class TimelineAccount(
 ) {
 
     val name: String
-        get() = if (displayName.isNullOrEmpty()) {
+        get() = notestockUsername ?: if (displayName.isNullOrEmpty()) {
             localUsername
         } else displayName
 }