diff --git a/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt b/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt
index 73f2c6aff6..50050ea3ff 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt
@@ -11,16 +11,16 @@ object AppCapabilities {
   @JvmStatic
   fun getCapabilities(storageCapable: Boolean): AccountAttributes.Capabilities {
     return AccountAttributes.Capabilities(
-      isUuid = false,
-      isGv2 = true,
-      isStorage = storageCapable,
-      isGv1Migration = true,
-      isSenderKey = true,
-      isAnnouncementGroup = true,
-      isChangeNumber = true,
-      isStories = true,
-      isGiftBadges = true,
-      isPnp = FeatureFlags.phoneNumberPrivacy(),
+      uuid = false,
+      gv2 = true,
+      storage = storageCapable,
+      gv1Migration = true,
+      senderKey = true,
+      announcementGroup = true,
+      changeNumber = true,
+      stories = true,
+      giftBadges = true,
+      pni = FeatureFlags.phoneNumberPrivacy(),
       paymentActivation = true
     )
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionCapabilities.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionCapabilities.java
index cf9ebcc3f8..7734f9250b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionCapabilities.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionCapabilities.java
@@ -34,15 +34,15 @@ public final class LogSectionCapabilities implements LogSection {
     RecipientRecord.Capabilities   globalCapabilities = SignalDatabase.recipients().getCapabilities(self.getId());
 
     StringBuilder builder = new StringBuilder().append("-- Local").append("\n")
-                              .append("GV2                : ").append(localCapabilities.isGv2()).append("\n")
-                              .append("GV1 Migration      : ").append(localCapabilities.isGv1Migration()).append("\n")
-                              .append("Sender Key         : ").append(localCapabilities.isSenderKey()).append("\n")
-                              .append("Announcement Groups: ").append(localCapabilities.isAnnouncementGroup()).append("\n")
-                              .append("Change Number      : ").append(localCapabilities.isChangeNumber()).append("\n")
-                              .append("Stories            : ").append(localCapabilities.isStories()).append("\n")
-                              .append("Gift Badges        : ").append(localCapabilities.isGiftBadges()).append("\n")
-                              .append("\n")
-                              .append("-- Global").append("\n");
+                                               .append("GV2                : ").append(localCapabilities.getGv2()).append("\n")
+                                               .append("GV1 Migration      : ").append(localCapabilities.getGv1Migration()).append("\n")
+                                               .append("Sender Key         : ").append(localCapabilities.getSenderKey()).append("\n")
+                                               .append("Announcement Groups: ").append(localCapabilities.getAnnouncementGroup()).append("\n")
+                                               .append("Change Number      : ").append(localCapabilities.getChangeNumber()).append("\n")
+                                               .append("Stories            : ").append(localCapabilities.getStories()).append("\n")
+                                               .append("Gift Badges        : ").append(localCapabilities.getGiftBadges()).append("\n")
+                                               .append("\n")
+                                               .append("-- Global").append("\n");
 
     if (globalCapabilities != null) {
       builder.append("GV1 Migration      : ").append(globalCapabilities.getGroupsV1MigrationCapability()).append("\n")
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/VerifyAccountRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/VerifyAccountRepository.kt
index f4568a864c..c45c89d372 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/VerifyAccountRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/VerifyAccountRepository.kt
@@ -167,13 +167,13 @@ class VerifyAccountRepository(private val context: Application) {
     val accountAttributes = AccountAttributes(
       signalingKey = null,
       registrationId = registrationData.registrationId,
-      isFetchesMessages = registrationData.isNotFcm,
+      fetchesMessages = registrationData.isNotFcm,
       pin = pin,
       registrationLock = registrationLockV2,
       unidentifiedAccessKey = unidentifiedAccessKey,
-      isUnrestrictedUnidentifiedAccess = universalUnidentifiedAccess,
+      unrestrictedUnidentifiedAccess = universalUnidentifiedAccess,
       capabilities = AppCapabilities.getCapabilities(true),
-      isDiscoverableByPhoneNumber = SignalStore.phoneNumberPrivacy().phoneNumberListingMode.isDiscoverable,
+      discoverableByPhoneNumber = SignalStore.phoneNumberPrivacy().phoneNumberListingMode.isDiscoverable,
       name = null,
       pniRegistrationId = registrationData.pniRegistrationId,
       recoveryPassword = registrationData.recoveryPassword
diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt
index 740a785e00..23374aabb8 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt
@@ -13,14 +13,14 @@ import com.fasterxml.jackson.annotation.JsonProperty
 class AccountAttributes @JsonCreator constructor(
   @JsonProperty val signalingKey: String?,
   @JsonProperty val registrationId: Int,
-  @JsonProperty val isVoice: Boolean,
-  @JsonProperty val isVideo: Boolean,
-  @JsonProperty val isFetchesMessages: Boolean,
+  @JsonProperty val voice: Boolean,
+  @JsonProperty val video: Boolean,
+  @JsonProperty val fetchesMessages: Boolean,
   @JsonProperty val pin: String?,
   @JsonProperty val registrationLock: String?,
   @JsonProperty val unidentifiedAccessKey: ByteArray?,
-  @JsonProperty val isUnrestrictedUnidentifiedAccess: Boolean,
-  @JsonProperty val isDiscoverableByPhoneNumber: Boolean,
+  @JsonProperty val unrestrictedUnidentifiedAccess: Boolean,
+  @JsonProperty val discoverableByPhoneNumber: Boolean,
   @JsonProperty val capabilities: Capabilities?,
   @JsonProperty val name: String?,
   @JsonProperty val pniRegistrationId: Int,
@@ -29,27 +29,27 @@ class AccountAttributes @JsonCreator constructor(
   constructor(
     signalingKey: String?,
     registrationId: Int,
-    isFetchesMessages: Boolean,
+    fetchesMessages: Boolean,
     pin: String?,
     registrationLock: String?,
     unidentifiedAccessKey: ByteArray?,
-    isUnrestrictedUnidentifiedAccess: Boolean,
+    unrestrictedUnidentifiedAccess: Boolean,
     capabilities: Capabilities?,
-    isDiscoverableByPhoneNumber: Boolean,
+    discoverableByPhoneNumber: Boolean,
     name: String?,
     pniRegistrationId: Int,
     recoveryPassword: String?
   ) : this(
     signalingKey = signalingKey,
     registrationId = registrationId,
-    isVoice = true,
-    isVideo = true,
-    isFetchesMessages = isFetchesMessages,
+    voice = true,
+    video = true,
+    fetchesMessages = fetchesMessages,
     pin = pin,
     registrationLock = registrationLock,
     unidentifiedAccessKey = unidentifiedAccessKey,
-    isUnrestrictedUnidentifiedAccess = isUnrestrictedUnidentifiedAccess,
-    isDiscoverableByPhoneNumber = isDiscoverableByPhoneNumber,
+    unrestrictedUnidentifiedAccess = unrestrictedUnidentifiedAccess,
+    discoverableByPhoneNumber = discoverableByPhoneNumber,
     capabilities = capabilities,
     name = name,
     pniRegistrationId = pniRegistrationId,
@@ -57,16 +57,16 @@ class AccountAttributes @JsonCreator constructor(
   )
 
   data class Capabilities @JsonCreator constructor(
-    @JsonProperty val isUuid: Boolean,
-    @JsonProperty("gv2-3") val isGv2: Boolean,
-    @JsonProperty val isStorage: Boolean,
-    @JsonProperty("gv1-migration") val isGv1Migration: Boolean,
-    @JsonProperty val isSenderKey: Boolean,
-    @JsonProperty val isAnnouncementGroup: Boolean,
-    @JsonProperty val isChangeNumber: Boolean,
-    @JsonProperty val isStories: Boolean,
-    @JsonProperty val isGiftBadges: Boolean,
-    @JsonProperty val isPnp: Boolean,
+    @JsonProperty val uuid: Boolean,
+    @JsonProperty("gv2-3") val gv2: Boolean,
+    @JsonProperty val storage: Boolean,
+    @JsonProperty("gv1-migration") val gv1Migration: Boolean,
+    @JsonProperty val senderKey: Boolean,
+    @JsonProperty val announcementGroup: Boolean,
+    @JsonProperty val changeNumber: Boolean,
+    @JsonProperty val stories: Boolean,
+    @JsonProperty val giftBadges: Boolean,
+    @JsonProperty val pni: Boolean,
     @JsonProperty val paymentActivation: Boolean
   )
 }