diff --git a/appview/database/models.go b/appview/database/models.go
index e2e374c..1be1cf7 100644
--- a/appview/database/models.go
+++ b/appview/database/models.go
@@ -12,7 +12,7 @@ func (FirehoseCursor) TableName() string { return "firehose_cursor" }
 
 type Subscription struct {
 	ID          uint      `gorm:"primaryKey"`
-	DID         string    `gorm:"size:255;not null;index:idx_subscriptions_did_rkey,unique;index:idx_subscriptions_did"`
+	DID         string    `gorm:"column:did;size:255;not null;index:idx_subscriptions_did_rkey,unique;index:idx_subscriptions_did"`
 	Rkey        string    `gorm:"size:512;not null;index:idx_subscriptions_did_rkey,unique"`
 	FeedID      int64     `gorm:"not null;index:idx_subscriptions_feed_id"`
 	FeedURL     string    `gorm:"size:2048"`
@@ -25,9 +25,9 @@ func (Subscription) TableName() string { return "subscriptions" }
 
 type Comment struct {
 	ID          uint      `gorm:"primaryKey"`
-	DID         string    `gorm:"size:255;not null;index:idx_comments_did_rkey,unique;index:idx_comments_did"`
+	DID         string    `gorm:"column:did;size:255;not null;index:idx_comments_did_rkey,unique;index:idx_comments_did"`
 	Rkey        string    `gorm:"size:512;not null;index:idx_comments_did_rkey,unique"`
-	ATURI       string    `gorm:"size:1024;index;not null"`
+	ATURI       string    `gorm:"column:at_uri;size:1024;index;not null"`
 	FeedID      int64     `gorm:"not null;index:idx_comments_episode"`
 	EpisodeID   int64     `gorm:"not null;index:idx_comments_episode"`
 	EpisodeGuid string    `gorm:"size:512"`
@@ -45,7 +45,7 @@ func (Comment) TableName() string { return "comments" }
 
 type Recommendation struct {
 	ID          uint      `gorm:"primaryKey"`
-	DID         string    `gorm:"size:255;not null;index:idx_recommendations_did_rkey,unique;index:idx_recommendations_did"`
+	DID         string    `gorm:"column:did;size:255;not null;index:idx_recommendations_did_rkey,unique;index:idx_recommendations_did"`
 	Rkey        string    `gorm:"size:512;not null;index:idx_recommendations_did_rkey,unique"`
 	FeedID      int64     `gorm:"not null;index:idx_recommendations_episode"`
 	EpisodeID   int64     `gorm:"not null;index:idx_recommendations_episode"`
@@ -60,7 +60,7 @@ func (Recommendation) TableName() string { return "recommendations" }
 
 type PodcastList struct {
 	ID          uint      `gorm:"primaryKey"`
-	DID         string    `gorm:"size:255;not null;index:idx_lists_did_rkey,unique;index:idx_lists_did"`
+	DID         string    `gorm:"column:did;size:255;not null;index:idx_lists_did_rkey,unique;index:idx_lists_did"`
 	Rkey        string    `gorm:"size:512;not null;index:idx_lists_did_rkey,unique"`
 	Name        string    `gorm:"size:500;not null"`
 	Description string    `gorm:"type:text"`
@@ -73,7 +73,7 @@ func (PodcastList) TableName() string { return "podcast_lists" }
 
 type Bookmark struct {
 	ID          uint      `gorm:"primaryKey"`
-	DID         string    `gorm:"size:255;not null;index:idx_bookmarks_did_rkey,unique;index:idx_bookmarks_did"`
+	DID         string    `gorm:"column:did;size:255;not null;index:idx_bookmarks_did_rkey,unique;index:idx_bookmarks_did"`
 	Rkey        string    `gorm:"size:512;not null;index:idx_bookmarks_did_rkey,unique"`
 	FeedID      int64     `gorm:"not null;index:idx_bookmarks_episode"`
 	EpisodeID   int64     `gorm:"not null;index:idx_bookmarks_episode"`
@@ -87,7 +87,7 @@ type Bookmark struct {
 func (Bookmark) TableName() string { return "bookmarks" }
 
 type Profile struct {
-	DID            string    `gorm:"primaryKey;size:255"`
+	DID            string    `gorm:"column:did;primaryKey;size:255"`
 	DisplayName    string    `gorm:"size:640"`
 	Description    string    `gorm:"type:text"`
 	FavoriteGenres []byte    `gorm:"type:jsonb"`
@@ -130,7 +130,7 @@ func (EpisodeStats) TableName() string { return "episode_stats" }
 
 type EpisodeState struct {
 	ID          uint      `gorm:"primaryKey"`
-	DID         string    `gorm:"size:255;not null;index:idx_episode_states_did_rkey,unique;index:idx_episode_states_did"`
+	DID         string    `gorm:"column:did;size:255;not null;index:idx_episode_states_did_rkey,unique;index:idx_episode_states_did"`
 	Rkey        string    `gorm:"size:512;not null;index:idx_episode_states_did_rkey,unique"`
 	FeedID      int64     `gorm:"not null;index:idx_episode_states_episode,unique"`
 	EpisodeID   int64     `gorm:"not null;index:idx_episode_states_episode,unique"`
@@ -150,10 +150,10 @@ func (EpisodeState) TableName() string { return "episode_states" }
 
 type Block struct {
 	ID         uint      `gorm:"primaryKey"`
-	DID        string    `gorm:"size:255;not null;index:idx_blocks_did_rkey,unique;index:idx_blocks_did;index:idx_blocks_did_subject,unique"`
+	DID        string    `gorm:"column:did;size:255;not null;index:idx_blocks_did_rkey,unique;index:idx_blocks_did;index:idx_blocks_did_subject,unique"`
 	Rkey       string    `gorm:"size:512;not null;index:idx_blocks_did_rkey,unique"`
-	ATURI      string    `gorm:"size:1024;not null;index"`
-	SubjectDID string    `gorm:"size:255;not null;index:idx_blocks_subject;index:idx_blocks_did_subject,unique"`
+	ATURI      string    `gorm:"column:at_uri;size:1024;not null;index"`
+	SubjectDID string    `gorm:"column:subject_did;size:255;not null;index:idx_blocks_subject;index:idx_blocks_did_subject,unique"`
 	CreatedAt  string    `gorm:"size:64;not null"`
 	IndexedAt  time.Time `gorm:"autoCreateTime"`
 }
@@ -162,7 +162,7 @@ func (Block) TableName() string { return "blocks" }
 
 type Report struct {
 	ID         uint      `gorm:"primaryKey"`
-	DID        string    `gorm:"size:255;not null;index:idx_reports_did_rkey,unique;index:idx_reports_did"`
+	DID        string    `gorm:"column:did;size:255;not null;index:idx_reports_did_rkey,unique;index:idx_reports_did"`
 	Rkey       string    `gorm:"size:512;not null;index:idx_reports_did_rkey,unique"`
 	SubjectURI string    `gorm:"size:1024;not null"`
 	ReasonType string    `gorm:"size:64;not null"`