diff --git a/chat.go b/chat.go
index ea0db08..c7930ba 100644
--- a/chat.go
+++ b/chat.go
@@ -10,16 +10,16 @@ import (
 type User struct {
 	ID int64 `json:"id"`
 
-	FirstName           string   `json:"first_name"`
-	LastName            string   `json:"last_name"`
-	IsForum             bool     `json:"is_forum"`
-	Username            string   `json:"username"`
-	LanguageCode        string   `json:"language_code"`
-	IsBot               bool     `json:"is_bot"`
-	IsPremium           bool     `json:"is_premium"`
-	AddedToMenu         bool     `json:"added_to_attachment_menu"`
-	Usernames           []string `json:"active_usernames"`
-	CustomEmojiStatusID string   `json:"emoji_status_custom_emoji_id"`
+	FirstName         string   `json:"first_name"`
+	LastName          string   `json:"last_name"`
+	IsForum           bool     `json:"is_forum"`
+	Username          string   `json:"username"`
+	LanguageCode      string   `json:"language_code"`
+	IsBot             bool     `json:"is_bot"`
+	IsPremium         bool     `json:"is_premium"`
+	AddedToMenu       bool     `json:"added_to_attachment_menu"`
+	Usernames         []string `json:"active_usernames"`
+	CustomEmojiStatus string   `json:"emoji_status_custom_emoji_id"`
 
 	// Returns only in getMe
 	CanJoinGroups   bool `json:"can_join_groups"`
diff --git a/message.go b/message.go
index 245b0c8..e00e169 100644
--- a/message.go
+++ b/message.go
@@ -63,7 +63,7 @@ type Message struct {
 	LastEdit int64 `json:"edit_date"`
 
 	// (Optional) True, if the message is sent to a forum topic.
-	IsTopicMessage bool `json:"is_topic_message"`
+	TopicMessage bool `json:"is_topic_message"`
 
 	// (Optional) Message can't be forwarded.
 	Protected bool `json:"has_protected_content,omitempty"`