diff --git a/DB/Sources/DB/Content/AccountListJoin.swift b/DB/Sources/DB/Content/AccountListJoin.swift
index d1f06c5..1445700 100644
--- a/DB/Sources/DB/Content/AccountListJoin.swift
+++ b/DB/Sources/DB/Content/AccountListJoin.swift
@@ -14,8 +14,8 @@ struct AccountListJoin: ContentDatabaseRecord {
 
 extension AccountListJoin {
     enum Columns {
-        static let accountId = Column(AccountListJoin.CodingKeys.accountId)
-        static let listId = Column(AccountListJoin.CodingKeys.listId)
-        static let index = Column(AccountListJoin.CodingKeys.index)
+        static let accountId = Column(CodingKeys.accountId)
+        static let listId = Column(CodingKeys.listId)
+        static let index = Column(CodingKeys.index)
     }
 }
diff --git a/DB/Sources/DB/Content/AccountPinnedStatusJoin.swift b/DB/Sources/DB/Content/AccountPinnedStatusJoin.swift
index 42cc604..4cf3501 100644
--- a/DB/Sources/DB/Content/AccountPinnedStatusJoin.swift
+++ b/DB/Sources/DB/Content/AccountPinnedStatusJoin.swift
@@ -12,9 +12,9 @@ struct AccountPinnedStatusJoin: ContentDatabaseRecord {
 
 extension AccountPinnedStatusJoin {
     enum Columns {
-        static let accountId = Column(AccountPinnedStatusJoin.CodingKeys.accountId)
-        static let statusId = Column(AccountPinnedStatusJoin.CodingKeys.statusId)
-        static let index = Column(AccountPinnedStatusJoin.CodingKeys.index)
+        static let accountId = Column(CodingKeys.accountId)
+        static let statusId = Column(CodingKeys.statusId)
+        static let index = Column(CodingKeys.index)
     }
 
     static let status = belongsTo(StatusRecord.self)
diff --git a/DB/Sources/DB/Content/AccountRecord.swift b/DB/Sources/DB/Content/AccountRecord.swift
index 3acba74..75881e2 100644
--- a/DB/Sources/DB/Content/AccountRecord.swift
+++ b/DB/Sources/DB/Content/AccountRecord.swift
@@ -29,26 +29,26 @@ struct AccountRecord: ContentDatabaseRecord, Hashable {
 
 extension AccountRecord {
     enum Columns {
-        static let id = Column(AccountRecord.CodingKeys.id)
-        static let username = Column(AccountRecord.CodingKeys.username)
-        static let acct = Column(AccountRecord.CodingKeys.acct)
-        static let displayName = Column(AccountRecord.CodingKeys.displayName)
-        static let locked = Column(AccountRecord.CodingKeys.locked)
-        static let createdAt = Column(AccountRecord.CodingKeys.createdAt)
-        static let followersCount = Column(AccountRecord.CodingKeys.followersCount)
-        static let followingCount = Column(AccountRecord.CodingKeys.followingCount)
-        static let statusesCount = Column(AccountRecord.CodingKeys.statusesCount)
-        static let note = Column(AccountRecord.CodingKeys.note)
-        static let url = Column(AccountRecord.CodingKeys.url)
-        static let avatar = Column(AccountRecord.CodingKeys.avatar)
-        static let avatarStatic = Column(AccountRecord.CodingKeys.avatarStatic)
-        static let header = Column(AccountRecord.CodingKeys.header)
-        static let headerStatic = Column(AccountRecord.CodingKeys.headerStatic)
-        static let fields = Column(AccountRecord.CodingKeys.fields)
-        static let emojis = Column(AccountRecord.CodingKeys.emojis)
-        static let bot = Column(AccountRecord.CodingKeys.bot)
-        static let discoverable = Column(AccountRecord.CodingKeys.discoverable)
-        static let movedId = Column(AccountRecord.CodingKeys.movedId)
+        static let id = Column(CodingKeys.id)
+        static let username = Column(CodingKeys.username)
+        static let acct = Column(CodingKeys.acct)
+        static let displayName = Column(CodingKeys.displayName)
+        static let locked = Column(CodingKeys.locked)
+        static let createdAt = Column(CodingKeys.createdAt)
+        static let followersCount = Column(CodingKeys.followersCount)
+        static let followingCount = Column(CodingKeys.followingCount)
+        static let statusesCount = Column(CodingKeys.statusesCount)
+        static let note = Column(CodingKeys.note)
+        static let url = Column(CodingKeys.url)
+        static let avatar = Column(CodingKeys.avatar)
+        static let avatarStatic = Column(CodingKeys.avatarStatic)
+        static let header = Column(CodingKeys.header)
+        static let headerStatic = Column(CodingKeys.headerStatic)
+        static let fields = Column(CodingKeys.fields)
+        static let emojis = Column(CodingKeys.emojis)
+        static let bot = Column(CodingKeys.bot)
+        static let discoverable = Column(CodingKeys.discoverable)
+        static let movedId = Column(CodingKeys.movedId)
     }
 }
 
diff --git a/DB/Sources/DB/Content/ConversationAccountJoin.swift b/DB/Sources/DB/Content/ConversationAccountJoin.swift
index 0baf6c7..37e42f4 100644
--- a/DB/Sources/DB/Content/ConversationAccountJoin.swift
+++ b/DB/Sources/DB/Content/ConversationAccountJoin.swift
@@ -11,8 +11,8 @@ struct ConversationAccountJoin: ContentDatabaseRecord {
 
 extension ConversationAccountJoin {
     enum Columns {
-        static let conversationId = Column(ConversationAccountJoin.CodingKeys.conversationId)
-        static let accountId = Column(ConversationAccountJoin.CodingKeys.accountId)
+        static let conversationId = Column(CodingKeys.conversationId)
+        static let accountId = Column(CodingKeys.accountId)
     }
 
     static let account = belongsTo(AccountRecord.self)
diff --git a/DB/Sources/DB/Content/ConversationRecord.swift b/DB/Sources/DB/Content/ConversationRecord.swift
index a8e3a5d..89bb8cf 100644
--- a/DB/Sources/DB/Content/ConversationRecord.swift
+++ b/DB/Sources/DB/Content/ConversationRecord.swift
@@ -12,9 +12,9 @@ struct ConversationRecord: ContentDatabaseRecord, Hashable {
 
 extension ConversationRecord {
     enum Columns {
-        static let id = Column(ConversationRecord.CodingKeys.id)
-        static let unread = Column(ConversationRecord.CodingKeys.unread)
-        static let lastStatusId = Column(ConversationRecord.CodingKeys.lastStatusId)
+        static let id = Column(CodingKeys.id)
+        static let unread = Column(CodingKeys.unread)
+        static let lastStatusId = Column(CodingKeys.lastStatusId)
     }
 
     static let lastStatus = belongsTo(StatusRecord.self)
diff --git a/DB/Sources/DB/Content/IdentityProofRecord.swift b/DB/Sources/DB/Content/IdentityProofRecord.swift
index 60bd55c..2583e86 100644
--- a/DB/Sources/DB/Content/IdentityProofRecord.swift
+++ b/DB/Sources/DB/Content/IdentityProofRecord.swift
@@ -15,11 +15,11 @@ struct IdentityProofRecord: ContentDatabaseRecord, Hashable {
 
 extension IdentityProofRecord {
     enum Columns {
-        static let accountId = Column(IdentityProofRecord.CodingKeys.accountId)
-        static let provider = Column(IdentityProofRecord.CodingKeys.provider)
-        static let providerUsername = Column(IdentityProofRecord.CodingKeys.providerUsername)
-        static let profileUrl = Column(IdentityProofRecord.CodingKeys.profileUrl)
-        static let proofUrl = Column(IdentityProofRecord.CodingKeys.proofUrl)
-        static let updatedAt = Column(IdentityProofRecord.CodingKeys.updatedAt)
+        static let accountId = Column(CodingKeys.accountId)
+        static let provider = Column(CodingKeys.provider)
+        static let providerUsername = Column(CodingKeys.providerUsername)
+        static let profileUrl = Column(CodingKeys.profileUrl)
+        static let proofUrl = Column(CodingKeys.proofUrl)
+        static let updatedAt = Column(CodingKeys.updatedAt)
     }
 }
diff --git a/DB/Sources/DB/Content/LastReadIdRecord.swift b/DB/Sources/DB/Content/LastReadIdRecord.swift
index c55e2c6..0294a35 100644
--- a/DB/Sources/DB/Content/LastReadIdRecord.swift
+++ b/DB/Sources/DB/Content/LastReadIdRecord.swift
@@ -11,7 +11,7 @@ struct LastReadIdRecord: ContentDatabaseRecord, Hashable {
 
 extension LastReadIdRecord {
     enum Columns {
-        static let markerTimeline = Column(LastReadIdRecord.CodingKeys.markerTimeline)
-        static let id = Column(LastReadIdRecord.CodingKeys.id)
+        static let markerTimeline = Column(CodingKeys.markerTimeline)
+        static let id = Column(CodingKeys.id)
     }
 }
diff --git a/DB/Sources/DB/Content/LoadMoreRecord.swift b/DB/Sources/DB/Content/LoadMoreRecord.swift
index 20325e8..d982db5 100644
--- a/DB/Sources/DB/Content/LoadMoreRecord.swift
+++ b/DB/Sources/DB/Content/LoadMoreRecord.swift
@@ -12,8 +12,8 @@ struct LoadMoreRecord: ContentDatabaseRecord, Hashable {
 
 extension LoadMoreRecord {
     enum Columns {
-        static let timelineId = Column(LoadMoreRecord.CodingKeys.timelineId)
-        static let afterStatusId = Column(LoadMoreRecord.CodingKeys.afterStatusId)
-        static let beforeStatusId = Column(LoadMoreRecord.CodingKeys.beforeStatusId)
+        static let timelineId = Column(CodingKeys.timelineId)
+        static let afterStatusId = Column(CodingKeys.afterStatusId)
+        static let beforeStatusId = Column(CodingKeys.beforeStatusId)
     }
 }
diff --git a/DB/Sources/DB/Content/NotificationRecord.swift b/DB/Sources/DB/Content/NotificationRecord.swift
index 20c5ca8..ec4855b 100644
--- a/DB/Sources/DB/Content/NotificationRecord.swift
+++ b/DB/Sources/DB/Content/NotificationRecord.swift
@@ -13,10 +13,10 @@ struct NotificationRecord: ContentDatabaseRecord, Hashable {
 
 extension NotificationRecord {
     enum Columns {
-        static let id = Column(NotificationRecord.CodingKeys.id)
-        static let type = Column(NotificationRecord.CodingKeys.type)
-        static let accountId = Column(NotificationRecord.CodingKeys.accountId)
-        static let statusId = Column(NotificationRecord.CodingKeys.statusId)
+        static let id = Column(CodingKeys.id)
+        static let type = Column(CodingKeys.type)
+        static let accountId = Column(CodingKeys.accountId)
+        static let statusId = Column(CodingKeys.statusId)
     }
 
     static let account = belongsTo(AccountRecord.self)
diff --git a/DB/Sources/DB/Content/StatusAncestorJoin.swift b/DB/Sources/DB/Content/StatusAncestorJoin.swift
index 07abb35..89ed8bf 100644
--- a/DB/Sources/DB/Content/StatusAncestorJoin.swift
+++ b/DB/Sources/DB/Content/StatusAncestorJoin.swift
@@ -12,9 +12,9 @@ struct StatusAncestorJoin: ContentDatabaseRecord {
 
 extension StatusAncestorJoin {
     enum Columns {
-        static let parentId = Column(StatusAncestorJoin.CodingKeys.parentId)
-        static let statusId = Column(StatusAncestorJoin.CodingKeys.statusId)
-        static let index = Column(StatusAncestorJoin.CodingKeys.index)
+        static let parentId = Column(CodingKeys.parentId)
+        static let statusId = Column(CodingKeys.statusId)
+        static let index = Column(CodingKeys.index)
     }
 
     static let status = belongsTo(StatusRecord.self, using: ForeignKey([Columns.statusId]))
diff --git a/DB/Sources/DB/Content/StatusDescendantJoin.swift b/DB/Sources/DB/Content/StatusDescendantJoin.swift
index ed5c2e2..faf78ec 100644
--- a/DB/Sources/DB/Content/StatusDescendantJoin.swift
+++ b/DB/Sources/DB/Content/StatusDescendantJoin.swift
@@ -12,9 +12,9 @@ struct StatusDescendantJoin: ContentDatabaseRecord {
 
 extension StatusDescendantJoin {
     enum Columns {
-        static let parentId = Column(StatusDescendantJoin.CodingKeys.parentId)
-        static let statusId = Column(StatusDescendantJoin.CodingKeys.statusId)
-        static let index = Column(StatusDescendantJoin.CodingKeys.index)
+        static let parentId = Column(CodingKeys.parentId)
+        static let statusId = Column(CodingKeys.statusId)
+        static let index = Column(CodingKeys.index)
     }
 
     static let status = belongsTo(StatusRecord.self, using: ForeignKey([Columns.statusId]))
diff --git a/DB/Sources/DB/Content/StatusRecord.swift b/DB/Sources/DB/Content/StatusRecord.swift
index b80ae33..b48ce10 100644
--- a/DB/Sources/DB/Content/StatusRecord.swift
+++ b/DB/Sources/DB/Content/StatusRecord.swift
@@ -38,35 +38,35 @@ struct StatusRecord: ContentDatabaseRecord, Hashable {
 
 extension StatusRecord {
     enum Columns {
-        static let id = Column(StatusRecord.CodingKeys.id)
-        static let uri = Column(StatusRecord.CodingKeys.uri)
-        static let createdAt = Column(StatusRecord.CodingKeys.createdAt)
-        static let accountId = Column(StatusRecord.CodingKeys.accountId)
-        static let content = Column(StatusRecord.CodingKeys.content)
-        static let visibility = Column(StatusRecord.CodingKeys.visibility)
-        static let sensitive = Column(StatusRecord.CodingKeys.sensitive)
-        static let spoilerText = Column(StatusRecord.CodingKeys.spoilerText)
-        static let mediaAttachments = Column(StatusRecord.CodingKeys.mediaAttachments)
-        static let mentions = Column(StatusRecord.CodingKeys.mentions)
-        static let tags = Column(StatusRecord.CodingKeys.tags)
-        static let emojis = Column(StatusRecord.CodingKeys.emojis)
-        static let reblogsCount = Column(StatusRecord.CodingKeys.reblogsCount)
-        static let favouritesCount = Column(StatusRecord.CodingKeys.favouritesCount)
-        static let repliesCount = Column(StatusRecord.CodingKeys.repliesCount)
-        static let application = Column(StatusRecord.CodingKeys.application)
-        static let url = Column(StatusRecord.CodingKeys.url)
-        static let inReplyToId = Column(StatusRecord.CodingKeys.inReplyToId)
-        static let inReplyToAccountId = Column(StatusRecord.CodingKeys.inReplyToAccountId)
-        static let reblogId = Column(StatusRecord.CodingKeys.reblogId)
-        static let poll = Column(StatusRecord.CodingKeys.poll)
-        static let card = Column(StatusRecord.CodingKeys.card)
-        static let language = Column(StatusRecord.CodingKeys.language)
-        static let text = Column(StatusRecord.CodingKeys.text)
-        static let favourited = Column(StatusRecord.CodingKeys.favourited)
-        static let reblogged = Column(StatusRecord.CodingKeys.reblogged)
-        static let muted = Column(StatusRecord.CodingKeys.muted)
-        static let bookmarked = Column(StatusRecord.CodingKeys.bookmarked)
-        static let pinned = Column(StatusRecord.CodingKeys.pinned)
+        static let id = Column(CodingKeys.id)
+        static let uri = Column(CodingKeys.uri)
+        static let createdAt = Column(CodingKeys.createdAt)
+        static let accountId = Column(CodingKeys.accountId)
+        static let content = Column(CodingKeys.content)
+        static let visibility = Column(CodingKeys.visibility)
+        static let sensitive = Column(CodingKeys.sensitive)
+        static let spoilerText = Column(CodingKeys.spoilerText)
+        static let mediaAttachments = Column(CodingKeys.mediaAttachments)
+        static let mentions = Column(CodingKeys.mentions)
+        static let tags = Column(CodingKeys.tags)
+        static let emojis = Column(CodingKeys.emojis)
+        static let reblogsCount = Column(CodingKeys.reblogsCount)
+        static let favouritesCount = Column(CodingKeys.favouritesCount)
+        static let repliesCount = Column(CodingKeys.repliesCount)
+        static let application = Column(CodingKeys.application)
+        static let url = Column(CodingKeys.url)
+        static let inReplyToId = Column(CodingKeys.inReplyToId)
+        static let inReplyToAccountId = Column(CodingKeys.inReplyToAccountId)
+        static let reblogId = Column(CodingKeys.reblogId)
+        static let poll = Column(CodingKeys.poll)
+        static let card = Column(CodingKeys.card)
+        static let language = Column(CodingKeys.language)
+        static let text = Column(CodingKeys.text)
+        static let favourited = Column(CodingKeys.favourited)
+        static let reblogged = Column(CodingKeys.reblogged)
+        static let muted = Column(CodingKeys.muted)
+        static let bookmarked = Column(CodingKeys.bookmarked)
+        static let pinned = Column(CodingKeys.pinned)
     }
 }
 
diff --git a/DB/Sources/DB/Content/StatusShowAttachmentsToggle.swift b/DB/Sources/DB/Content/StatusShowAttachmentsToggle.swift
index 96257b5..7a31df0 100644
--- a/DB/Sources/DB/Content/StatusShowAttachmentsToggle.swift
+++ b/DB/Sources/DB/Content/StatusShowAttachmentsToggle.swift
@@ -10,6 +10,6 @@ struct StatusShowAttachmentsToggle: ContentDatabaseRecord, Hashable {
 
 extension StatusShowAttachmentsToggle {
     enum Columns {
-        static let statusId = Column(StatusShowAttachmentsToggle.CodingKeys.statusId)
+        static let statusId = Column(CodingKeys.statusId)
     }
 }
diff --git a/DB/Sources/DB/Content/StatusShowContentToggle.swift b/DB/Sources/DB/Content/StatusShowContentToggle.swift
index b344678..0e4c454 100644
--- a/DB/Sources/DB/Content/StatusShowContentToggle.swift
+++ b/DB/Sources/DB/Content/StatusShowContentToggle.swift
@@ -10,6 +10,6 @@ struct StatusShowContentToggle: ContentDatabaseRecord, Hashable {
 
 extension StatusShowContentToggle {
     enum Columns {
-        static let statusId = Column(StatusShowContentToggle.CodingKeys.statusId)
+        static let statusId = Column(CodingKeys.statusId)
     }
 }
diff --git a/DB/Sources/DB/Content/TimelineRecord.swift b/DB/Sources/DB/Content/TimelineRecord.swift
index d6d96a0..9180709 100644
--- a/DB/Sources/DB/Content/TimelineRecord.swift
+++ b/DB/Sources/DB/Content/TimelineRecord.swift
@@ -15,12 +15,12 @@ struct TimelineRecord: ContentDatabaseRecord, Hashable {
 
 extension TimelineRecord {
     enum Columns {
-        static let id = Column(TimelineRecord.CodingKeys.id)
-        static let listId = Column(TimelineRecord.CodingKeys.listId)
-        static let listTitle = Column(TimelineRecord.CodingKeys.listTitle)
-        static let tag = Column(TimelineRecord.CodingKeys.tag)
-        static let accountId = Column(TimelineRecord.CodingKeys.accountId)
-        static let profileCollection = Column(TimelineRecord.CodingKeys.profileCollection)
+        static let id = Column(CodingKeys.id)
+        static let listId = Column(CodingKeys.listId)
+        static let listTitle = Column(CodingKeys.listTitle)
+        static let tag = Column(CodingKeys.tag)
+        static let accountId = Column(CodingKeys.accountId)
+        static let profileCollection = Column(CodingKeys.profileCollection)
     }
 
     static let statusJoins = hasMany(TimelineStatusJoin.self)
diff --git a/DB/Sources/DB/Content/TimelineStatusJoin.swift b/DB/Sources/DB/Content/TimelineStatusJoin.swift
index 44239a6..969c824 100644
--- a/DB/Sources/DB/Content/TimelineStatusJoin.swift
+++ b/DB/Sources/DB/Content/TimelineStatusJoin.swift
@@ -13,7 +13,7 @@ struct TimelineStatusJoin: ContentDatabaseRecord {
 
 extension TimelineStatusJoin {
     enum Columns {
-        static let timelineId = Column(TimelineStatusJoin.CodingKeys.timelineId)
-        static let statusId = Column(TimelineStatusJoin.CodingKeys.statusId)
+        static let timelineId = Column(CodingKeys.timelineId)
+        static let statusId = Column(CodingKeys.statusId)
     }
 }
diff --git a/DB/Sources/DB/Identity/IdentityRecord.swift b/DB/Sources/DB/Identity/IdentityRecord.swift
index cc88624..966551c 100644
--- a/DB/Sources/DB/Identity/IdentityRecord.swift
+++ b/DB/Sources/DB/Identity/IdentityRecord.swift
@@ -18,15 +18,15 @@ struct IdentityRecord: Codable, Hashable, FetchableRecord, PersistableRecord {
 
 extension IdentityRecord {
     enum Columns {
-        static let id = Column(IdentityRecord.CodingKeys.id)
-        static let url = Column(IdentityRecord.CodingKeys.url)
-        static let authenticated = Column(IdentityRecord.CodingKeys.authenticated)
-        static let pending = Column(IdentityRecord.CodingKeys.pending)
-        static let lastUsedAt = Column(IdentityRecord.CodingKeys.lastUsedAt)
-        static let preferences = Column(IdentityRecord.CodingKeys.preferences)
-        static let instanceURI = Column(IdentityRecord.CodingKeys.instanceURI)
-        static let lastRegisteredDeviceToken = Column(IdentityRecord.CodingKeys.lastRegisteredDeviceToken)
-        static let pushSubscriptionAlerts = Column(IdentityRecord.CodingKeys.pushSubscriptionAlerts)
+        static let id = Column(CodingKeys.id)
+        static let url = Column(CodingKeys.url)
+        static let authenticated = Column(CodingKeys.authenticated)
+        static let pending = Column(CodingKeys.pending)
+        static let lastUsedAt = Column(CodingKeys.lastUsedAt)
+        static let preferences = Column(CodingKeys.preferences)
+        static let instanceURI = Column(CodingKeys.instanceURI)
+        static let lastRegisteredDeviceToken = Column(CodingKeys.lastRegisteredDeviceToken)
+        static let pushSubscriptionAlerts = Column(CodingKeys.pushSubscriptionAlerts)
     }
 
     static let instance = belongsTo(Identity.Instance.self)