diff --git a/internal/payload/outgoing/attachment.go b/internal/payload/outgoing/attachment.go
index fc9ef700c..b367c98a6 100644
--- a/internal/payload/outgoing/attachment.go
+++ b/internal/payload/outgoing/attachment.go
@@ -6,7 +6,7 @@ import (
 
 type (
 	Attachment struct {
-		ID         string      `json:"ID"`
+		ID         string      `json:"attachmentID"`
 		UserID     string      `json:"userID"`
 		Url        string      `json:"url"`
 		PreviewUrl string      `json:"previewUrl,omitempty"`
diff --git a/internal/payload/outgoing/channel.go b/internal/payload/outgoing/channel.go
index 345bb6ab6..669c0052d 100644
--- a/internal/payload/outgoing/channel.go
+++ b/internal/payload/outgoing/channel.go
@@ -24,7 +24,7 @@ type (
 
 	Channel struct {
 		// Channel to part (nil) for ALL channels
-		ID             string   `json:"ID"`
+		ID             string   `json:"channelID"`
 		Name           string   `json:"name"`
 		Topic          string   `json:"topic"`
 		Type           string   `json:"type"`
diff --git a/internal/payload/outgoing/user.go b/internal/payload/outgoing/user.go
index d9860bcf1..c8cfaae13 100644
--- a/internal/payload/outgoing/user.go
+++ b/internal/payload/outgoing/user.go
@@ -3,7 +3,7 @@ package outgoing
 type (
 	User struct {
 		// Channel to part (nil) for ALL channels
-		ID       uint64 `json:"ID,string"`
+		ID       uint64 `json:"userID,string"`
 		Name     string `json:"name"`
 		Email    string `json:"email"`
 		Username string `json:"username"`
diff --git a/messaging/types/channel.go b/messaging/types/channel.go
index 555347ca2..9acd56499 100644
--- a/messaging/types/channel.go
+++ b/messaging/types/channel.go
@@ -10,7 +10,7 @@ import (
 
 type (
 	Channel struct {
-		ID    uint64         `json:"id" db:"id"`
+		ID    uint64         `json:"channelID" db:"id"`
 		Name  string         `json:"name" db:"name"`
 		Topic string         `json:"topic" db:"topic"`
 		Type  ChannelType    `json:"type" db:"type"`