diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/ChatMessage.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/ChatMessage.kt
index a0e8a101009..ac3251c4333 100644
--- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/ChatMessage.kt
+++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/ChatMessage.kt
@@ -3,6 +3,8 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat
 
+import com.fasterxml.jackson.annotation.JsonProperty
+
 data class ChatMessage(
     val type: MessageType? = MessageType.ANSWER,
     val header: MessageHeader? = null,
@@ -68,20 +70,34 @@ data class Changes(
 )
 
 enum class IconType {
+    @JsonProperty("file")
     FILE,
+
+    @JsonProperty("folder")
     FOLDER,
+
+    @JsonProperty("code-block")
     CODE_BLOCK,
+
+    @JsonProperty("list-add")
     LIST_ADD,
+
+    @JsonProperty("magic")
     MAGIC,
+
+    @JsonProperty("help")
     HELP,
+
+    @JsonProperty("trash")
     TRASH,
+
+    @JsonProperty("search")
     SEARCH,
+
+    @JsonProperty("calendar")
     CALENDAR,
     ;
 
-    val value: String
-        get() = name.lowercase().replace('_', '-')
-
     companion object {
         private val stringToEnum: Map<String, IconType> = entries.associateBy { it.name.lowercase() }
 
@@ -90,38 +106,55 @@ enum class IconType {
 }
 
 enum class Status {
+    @JsonProperty("info")
     INFO,
+
+    @JsonProperty("success")
     SUCCESS,
+
+    @JsonProperty("warning")
     WARNING,
-    ERROR,
-    ;
 
-    val value: String
-        get() = name.lowercase()
+    @JsonProperty("error")
+    ERROR,
 }
 
 enum class ButtonStatus {
+    @JsonProperty("main")
     MAIN,
+
+    @JsonProperty("primary")
     PRIMARY,
+
+    @JsonProperty("clear")
     CLEAR,
+
+    @JsonProperty("info")
     INFO,
+
+    @JsonProperty("success")
     SUCCESS,
+
+    @JsonProperty("warning")
     WARNING,
-    ERROR,
-    ;
 
-    val value: String
-        get() = name.lowercase()
+    @JsonProperty("error")
+    ERROR,
 }
 
 enum class MessageType {
+    @JsonProperty("answer")
     ANSWER,
+
+    @JsonProperty("prompt")
     PROMPT,
+
+    @JsonProperty("system-prompt")
     SYSTEM_PROMPT,
+
+    @JsonProperty("directive")
     DIRECTIVE,
-    TOOL,
-    ;
 
-    val value: String
-        get() = name.lowercase().replace('_', '-')
+    @JsonProperty("tool")
+    TOOL,
 }