diff --git a/telemetry/definitions/commonDefinitions.json b/telemetry/definitions/commonDefinitions.json
index 552fef9de..5b074f308 100644
--- a/telemetry/definitions/commonDefinitions.json
+++ b/telemetry/definitions/commonDefinitions.json
@@ -1021,7 +1021,7 @@
                 "viewDiff"
             ],
             "type": "string",
-            "description": "Indicates the specific interaction type with a message in a conversation"
+            "description": "(Deprecated, use `interactionType` instead.) User interaction type, especially for AI-related features."
         },
         {
             "name": "cwsprChatMessageId",
@@ -1251,6 +1251,8 @@
             "description": "The id of the feature the user is interacting in. See also: `component`, `featureId`, `module`, `resourceType`.",
             "allowedValues": [
                 "amazonQ",
+                "amazonQTest",
+                "amazonQReview",
                 "awsExplorer",
                 "awsToolkit",
                 "codewhisperer",
@@ -1423,6 +1425,24 @@
             ],
             "description": "User-selected time range type while starting an insights query"
         },
+        {
+            "name": "interactionType",
+            "type": "string",
+            "description": "User interaction, especially for AI-related features.",
+            "allowedValues": [
+                "acceptDiff",
+                "insertAtCursor",
+                "copySnippet",
+                "copy",
+                "clickLink",
+                "clickFollowUp",
+                "hoverReference",
+                "upvote",
+                "downvote",
+                "clickBodyLink",
+                "viewDiff"
+            ]
+        },
         {
             "name": "invalidInputFields",
             "type": "string",
@@ -1977,34 +1997,6 @@
                 }
             ]
         },
-        {
-            "name": "amazonq_approachThumbsDown",
-            "description": "User clicked on the thumbs down button to say that they are unsatisfied",
-            "unit": "Count",
-            "metadata": [
-                {
-                    "type": "amazonqConversationId"
-                },
-                {
-                    "type": "credentialStartUrl",
-                    "required": false
-                }
-            ]
-        },
-        {
-            "name": "amazonq_approachThumbsUp",
-            "description": "User clicked on the thumbs up button, to mention that they are satisfied",
-            "unit": "Count",
-            "metadata": [
-                {
-                    "type": "amazonqConversationId"
-                },
-                {
-                    "type": "credentialStartUrl",
-                    "required": false
-                }
-            ]
-        },
         {
             "name": "amazonq_bundleExtensionIgnored",
             "description": "File extension was ignored 'count' many times during bundling process",
@@ -2156,6 +2148,27 @@
                 }
             ]
         },
+        {
+            "name": "amazonq_feedback",
+            "description": "When a user gives feedback using vote or comment or rating in the conversation",
+            "metadata": [
+                {
+                    "type": "amazonqConversationId",
+                    "required": false
+                },
+                {
+                    "type": "credentialStartUrl",
+                    "required": false
+                },
+                {
+                    "type": "featureId"
+                },
+                {
+                    "type": "interactionType",
+                    "required": false
+                }
+            ]
+        },
         {
             "name": "amazonq_interactWithMessage",
             "description": "When a user interacts with a message in the conversation",