diff --git a/sdk/ai/azure-ai-projects/.env.template b/sdk/ai/azure-ai-projects/.env.template
index 1c18021a4e7d..5449d0303d4b 100644
--- a/sdk/ai/azure-ai-projects/.env.template
+++ b/sdk/ai/azure-ai-projects/.env.template
@@ -17,7 +17,7 @@
 #  `https://<your-ai-services-account-name>.services.ai.azure.com/api/projects/<your-project-name>`
 AZURE_AI_PROJECT_ENDPOINT=
 AZURE_AI_MODEL_DEPLOYMENT_NAME=
-AGENT_NAME=
+AZURE_AI_AGENT_NAME=
 CONVERSATION_ID=
 CONNECTION_NAME=
 AZURE_AI_PROJECTS_AZURE_SUBSCRIPTION_ID=
diff --git a/sdk/ai/azure-ai-projects/samples/agents/sample_agent_retrieve_basic.py b/sdk/ai/azure-ai-projects/samples/agents/sample_agent_retrieve_basic.py
index a04bc7c64fe8..1102d326b2f3 100644
--- a/sdk/ai/azure-ai-projects/samples/agents/sample_agent_retrieve_basic.py
+++ b/sdk/ai/azure-ai-projects/samples/agents/sample_agent_retrieve_basic.py
@@ -23,7 +23,7 @@
     Set these environment variables with your own values:
     1) AZURE_AI_PROJECT_ENDPOINT - The Azure AI Project endpoint, as found in the Overview
        page of your Microsoft Foundry portal.
-    2) AGENT_NAME - The name of an existing Agent in your Microsoft Foundry project.
+    2) AZURE_AI_AGENT_NAME - The name of an existing Agent in your Microsoft Foundry project.
     3) CONVERSATION_ID - The ID of an existing Conversation associated with the Agent
 """
 
@@ -34,7 +34,7 @@
 
 load_dotenv()
 
-agent_name = os.environ["AGENT_NAME"]
+agent_name = os.environ["AZURE_AI_AGENT_NAME"]
 conversation_id = os.environ["CONVERSATION_ID"]
 
 endpoint = os.environ["AZURE_AI_PROJECT_ENDPOINT"]
diff --git a/sdk/ai/azure-ai-projects/samples/agents/sample_agent_retrieve_basic_async.py b/sdk/ai/azure-ai-projects/samples/agents/sample_agent_retrieve_basic_async.py
index 16988819741c..5cae332aa01f 100644
--- a/sdk/ai/azure-ai-projects/samples/agents/sample_agent_retrieve_basic_async.py
+++ b/sdk/ai/azure-ai-projects/samples/agents/sample_agent_retrieve_basic_async.py
@@ -23,7 +23,7 @@
     Set these environment variables with your own values:
     1) AZURE_AI_PROJECT_ENDPOINT - The Azure AI Project endpoint, as found in the Overview
        page of your Microsoft Foundry portal.
-    2) AGENT_NAME - The name of an existing Agent in your Microsoft Foundry project.
+    2) AZURE_AI_AGENT_NAME - The name of an existing Agent in your Microsoft Foundry project.
     3) CONVERSATION_ID - The ID of an existing Conversation associated with the Agent
 """
 
@@ -36,7 +36,7 @@
 load_dotenv()
 
 endpoint = os.environ["AZURE_AI_PROJECT_ENDPOINT"]
-agent_name = os.environ["AGENT_NAME"]
+agent_name = os.environ["AZURE_AI_AGENT_NAME"]
 conversation_id = os.environ["CONVERSATION_ID"]
 
 
diff --git a/sdk/ai/azure-ai-projects/samples/evaluations/sample_agent_evaluation.py b/sdk/ai/azure-ai-projects/samples/evaluations/sample_agent_evaluation.py
index 8dc67f31fa1d..4d6cd4a098c0 100644
--- a/sdk/ai/azure-ai-projects/samples/evaluations/sample_agent_evaluation.py
+++ b/sdk/ai/azure-ai-projects/samples/evaluations/sample_agent_evaluation.py
@@ -66,7 +66,7 @@
             "type": "azure_ai_evaluator",
             "name": "violence_detection",
             "evaluator_name": "builtin.violence",
-            "data_mapping": {"query": "{{item.query}}", "response": "{{item.response}}"},
+            "data_mapping": {"query": "{{item.query}}", "response": "{{sample.output_text}}"},
         }
     ]
     eval_object = openai_client.evals.create(