diff --git a/text_2_sql/autogen/src/autogen_text_2_sql/autogen_text_2_sql.py b/text_2_sql/autogen/src/autogen_text_2_sql/autogen_text_2_sql.py
index 98d3821..f3f46a0 100644
--- a/text_2_sql/autogen/src/autogen_text_2_sql/autogen_text_2_sql.py
+++ b/text_2_sql/autogen/src/autogen_text_2_sql/autogen_text_2_sql.py
@@ -178,7 +178,7 @@ def extract_disambiguation_request(
                 )
 
                 request = DismabiguationRequestsPayload.Body.DismabiguationRequest(
-                    agent_question=disambiguation_request["agent_question"],
+                    assistant_question=disambiguation_request["assistant_question"],
                     user_choices=disambiguation_request["user_choices"],
                 )
                 request_payload.body.disambiguation_requests.append(request)
diff --git a/text_2_sql/text_2_sql_core/src/text_2_sql_core/payloads/interaction_payloads.py b/text_2_sql/text_2_sql_core/src/text_2_sql_core/payloads/interaction_payloads.py
index 80f4a20..b9fc495 100644
--- a/text_2_sql/text_2_sql_core/src/text_2_sql_core/payloads/interaction_payloads.py
+++ b/text_2_sql/text_2_sql_core/src/text_2_sql_core/payloads/interaction_payloads.py
@@ -48,7 +48,7 @@ class PayloadBase(InteractionPayloadBase):
 class DismabiguationRequestsPayload(InteractionPayloadBase):
     class Body(InteractionPayloadBase):
         class DismabiguationRequest(InteractionPayloadBase):
-            ASSISTANT_question: str | None = Field(..., alias="ASSISTANTQuestion")
+            assistant_question: str | None = Field(..., alias="AssistantQuestion")
             user_choices: list[str] | None = Field(default=None, alias="userChoices")
 
         disambiguation_requests: list[DismabiguationRequest] | None = Field(
diff --git a/text_2_sql/text_2_sql_core/src/text_2_sql_core/prompts/disambiguation_and_sql_query_generation_agent.yaml b/text_2_sql/text_2_sql_core/src/text_2_sql_core/prompts/disambiguation_and_sql_query_generation_agent.yaml
index c16cfbb..110b4a5 100644
--- a/text_2_sql/text_2_sql_core/src/text_2_sql_core/prompts/disambiguation_and_sql_query_generation_agent.yaml
+++ b/text_2_sql/text_2_sql_core/src/text_2_sql_core/prompts/disambiguation_and_sql_query_generation_agent.yaml
@@ -164,7 +164,7 @@ system_message:
             {
               \"disambiguation_requests\": [
                 {
-                  \"agent_question\": \"I'm sorry, I couldn't find any relevant database schemas for your request about [REQUEST TYPE]. I focus on providing answers in the context of the use case. Could you please provide more context or rephrase your question?\",
+                  \"assistant_question\": \"I'm sorry, I couldn't find any relevant database schemas for your request about [REQUEST TYPE]. I focus on providing answers in the context of the use case. Could you please provide more context or rephrase your question?\",
                   \"user_choices\": []
                 }
               ]
@@ -183,14 +183,14 @@ system_message:
             {
               \"disambiguation_requests\": [
                 {
-                  \"agent_question\": \"Did you mean the 'Customer Name' column or the 'Client Name' column?\",
+                  \"assistant_question\": \"Did you mean the 'Customer Name' column or the 'Client Name' column?\",
                   \"user_choices\": [
                     \"Customer Name\",
                     \"Client Name\"
                   ]
                 },
                 {
-                  \"agent_question\": \"Which sort of bike do you mean?\",
+                  \"assistant_question\": \"Which sort of bike do you mean?\",
                   \"user_choices\": [
                     \"Mountain Bike\",
                     \"Road Bike\"
@@ -208,7 +208,7 @@ system_message:
             {
               \"disambiguation_requests\": [
                 {
-                  \"agent_question\": \"Could you please rephrase your question or provide more context? I'm having trouble understanding the specifics of your request.\",
+                  \"assistant_question\": \"Could you please rephrase your question or provide more context? I'm having trouble understanding the specifics of your request.\",
                   \"user_choices\": []
                 }
               ]
@@ -223,7 +223,7 @@ system_message:
             {
               \"disambiguation_requests\": [
                 {
-                  \"agent_question\": \"Could you clarify the details of your request so I can assist you better?\",
+                  \"assistant_question\": \"Could you clarify the details of your request so I can assist you better?\",
                   \"user_choices\": []
                 }
               ]
@@ -262,11 +262,11 @@ system_message:
       {
         \"disambiguation_requests\": [
           {
-            \"agent_question\": \"<specific_question>\",
+            \"assistant_question\": \"<specific_question>\",
             \"user_choices\": [\"<choice1>\", \"<choice2>\"]
           },
           {
-            \"agent_question\": \"<specific_question>\",
+            \"assistant_question\": \"<specific_question>\",
             \"user_choices\": [\"<choice1>\", \"<choice2>\"]
           }
         ]