diff --git a/python/.env.example b/python/.env.example
index 58602848434d..d63e29eb17c3 100644
--- a/python/.env.example
+++ b/python/.env.example
@@ -1,7 +1,7 @@
 OPENAI_API_KEY=""
-OPEN_AI_CHAT_MODEL_ID=""
-OPEN_AI_TEXT_MODEL_ID=""
-OPEN_AI_EMBEDDING_MODEL_ID=""
+OPENAI_CHAT_MODEL_ID=""
+OPENAI_TEXT_MODEL_ID=""
+OPENAI_EMBEDDING_MODEL_ID=""
 OPENAI_ORG_ID=""
 AZURE_OPENAI_CHAT_DEPLOYMENT_NAME=""
 AZURE_OPENAI_TEXT_DEPLOYMENT_NAME=""
diff --git a/python/samples/getting_started/.env.example b/python/samples/getting_started/.env.example
index 5334bd632329..60ad7fd8db16 100644
--- a/python/samples/getting_started/.env.example
+++ b/python/samples/getting_started/.env.example
@@ -1,8 +1,8 @@
 GLOBAL_LLM_SERVICE=""
 OPENAI_API_KEY=""
-OPEN_AI_CHAT_MODEL_ID=""
-OPEN_AI_TEXT_MODEL_ID=""
-OPEN_AI_EMBEDDING_MODEL_ID=""
+OPENAI_CHAT_MODEL_ID=""
+OPENAI_TEXT_MODEL_ID=""
+OPENAI_EMBEDDING_MODEL_ID=""
 OPENAI_ORG_ID=""
 AZURE_OPENAI_CHAT_DEPLOYMENT_NAME=""
 AZURE_OPENAI_TEXT_DEPLOYMENT_NAME=""
diff --git a/python/samples/getting_started/third_party/.env.example b/python/samples/getting_started/third_party/.env.example
index 413f1a63cb58..9a1b4b6cfb38 100644
--- a/python/samples/getting_started/third_party/.env.example
+++ b/python/samples/getting_started/third_party/.env.example
@@ -1,8 +1,8 @@
 GLOBAL_LLM_SERVICE=""
 OPENAI_API_KEY=""
-OPEN_AI_CHAT_MODEL_ID=""
-OPEN_AI_TEXT_MODEL_ID=""
-OPEN_AI_EMBEDDING_MODEL_ID=""
+OPENAI_CHAT_MODEL_ID=""
+OPENAI_TEXT_MODEL_ID=""
+OPENAI_EMBEDDING_MODEL_ID=""
 OPENAI_ORG_ID=""
 AZURE_OPENAI_CHAT_DEPLOYMENT_NAME=""
 AZURE_OPENAI_TEXT_DEPLOYMENT_NAME=""
diff --git a/python/samples/learn_resources/.env.example b/python/samples/learn_resources/.env.example
index 4a524a2c16bd..91f4c1e4f992 100644
--- a/python/samples/learn_resources/.env.example
+++ b/python/samples/learn_resources/.env.example
@@ -1,7 +1,7 @@
 OPENAI_API_KEY=""
-OPEN_AI_CHAT_MODEL_ID=""
-OPEN_AI_TEXT_MODEL_ID=""
-OPEN_AI_EMBEDDING_MODEL_ID=""
+OPENAI_CHAT_MODEL_ID=""
+OPENAI_TEXT_MODEL_ID=""
+OPENAI_EMBEDDING_MODEL_ID=""
 OPENAI_ORG_ID=""
 AZURE_OPENAI_CHAT_DEPLOYMENT_NAME=""
 AZURE_OPENAI_TEXT_DEPLOYMENT_NAME=""
diff --git a/python/samples/learn_resources/README.md b/python/samples/learn_resources/README.md
index f36b03bca2b3..283d3f0d01c4 100644
--- a/python/samples/learn_resources/README.md
+++ b/python/samples/learn_resources/README.md
@@ -23,13 +23,13 @@ Copy the `.env.example` file to a new file named `.env`. Then, copy those keys i
 ```
 GLOBAL_LLM_SERVICE="OpenAI" # Toggle between "OpenAI" or "AzureOpenAI"
 
-OPEN_AI_CHAT_MODEL_ID="gpt-3.5-turbo-0125"
-OPEN_AI_TEXT_MODEL_ID="gpt-3.5-turbo-instruct"
+OPENAI_CHAT_MODEL_ID="gpt-3.5-turbo-0125"
+OPENAI_TEXT_MODEL_ID="gpt-3.5-turbo-instruct"
 OPENAI_API_KEY=""
 OPENAI_ORG_ID=""
 
-AZURE_OPEN_AI_CHAT_DEPLOYMENT_NAME="gpt-35-turbo"
-AZURE_OPEN_AI_TEXT_DEPLOYMENT_NAME="gpt-35-turbo-instruct"
+AZURE_OPENAI_CHAT_DEPLOYMENT_NAME="gpt-35-turbo"
+AZURE_OPENAI_TEXT_DEPLOYMENT_NAME="gpt-35-turbo-instruct"
 AZURE_OPENAI_ENDPOINT=""
 AZURE_OPENAI_API_KEY=""
 AZURE_OPENAI_API_VERSION=""
diff --git a/python/samples/learn_resources/evaluate_with_prompt_flow.py b/python/samples/learn_resources/evaluate_with_prompt_flow.py
index edb42782ff15..60fcd3bf9385 100644
--- a/python/samples/learn_resources/evaluate_with_prompt_flow.py
+++ b/python/samples/learn_resources/evaluate_with_prompt_flow.py
@@ -11,11 +11,11 @@
 
 # Load the configuration from the .env file
 config = dotenv_values(".env")
-deployment_type = config.get("AZURE_OPEN_AI_DEPLOYMENT_TYPE", None)
+deployment_type = config.get("AZURE_OPENAI_DEPLOYMENT_TYPE", None)
 if deployment_type == "chat-completion":
-    deployment_name = config.get("AZURE_OPEN_AI_CHAT_COMPLETION_DEPLOYMENT_NAME", None)
+    deployment_name = config.get("AZURE_OPENAI_CHAT_COMPLETION_DEPLOYMENT_NAME", None)
 elif deployment_type == "text-completion":
-    deployment_name = config.get("AZURE_OPEN_AI_TEXT_COMPLETION_DEPLOYMENT_NAME", None)
+    deployment_name = config.get("AZURE_OPENAI_TEXT_COMPLETION_DEPLOYMENT_NAME", None)
 
 # Define the inputs of the flow
 inputs = {
@@ -28,8 +28,8 @@
 connection = AzureOpenAIConnection(
     name="AzureOpenAIConnection",
     type="Custom",
-    api_key=config.get("AZURE_OPEN_AI__API_KEY", None),
-    api_base=config.get("AZURE_OPEN_AI__ENDPOINT", None),
+    api_key=config.get("AZURE_OPENAI_API_KEY", None),
+    api_base=config.get("AZURE_OPENAI_ENDPOINT", None),
     api_version="2023-03-15-preview",
 )