diff --git a/cdk/examples/generative_ai_rag/app.py b/cdk/examples/generative_ai_rag/app.py
index 933072de..bdbeb58b 100644
--- a/cdk/examples/generative_ai_rag/app.py
+++ b/cdk/examples/generative_ai_rag/app.py
@@ -7,19 +7,19 @@
 from lib.gen_ai_rag_stack import GenAIRagServiceStack
 from lib.gen_ai_rag_stack_props import GenAIRagServiceStackProps
 
-from other_stack.bedrock_agent_stack import BedrockAgentStack
+from other_stack.bedrock_stack import BedrockStack
 
 app = App()
 
 env_config = dotenv_values(".env")
 
 deploy_core = bool(util.strtobool(env_config["deploy_core_stack"]))
-deploy_bedrock = bool(util.strtobool(env_config.pop("deploy_bedrock_agent")))
+deploy_bedrock = bool(util.strtobool(env_config.pop("deploy_bedrock")))
 
 if deploy_bedrock:
-    BedrockAgentStack(
+    BedrockStack(
         app,
-        "BedrockAgentStack",
+        "BedrockStack",
         env=Environment(
             account=env_config["account_number"],
             region=env_config["aws_region"],
diff --git a/cdk/examples/generative_ai_rag/sample.env b/cdk/examples/generative_ai_rag/sample.env
index a8291d19..868e0c8f 100644
--- a/cdk/examples/generative_ai_rag/sample.env
+++ b/cdk/examples/generative_ai_rag/sample.env
@@ -1,5 +1,5 @@
 deploy_core_stack="True"
-deploy_bedrock_agent="True"
+deploy_bedrock="True"
 
 # Essential Props
 account_number="<ACCOUNT_NUMBER>"
diff --git a/cdk/examples/other_stack/bedrock_agent_stack.py b/cdk/examples/other_stack/bedrock_stack.py
similarity index 96%
rename from cdk/examples/other_stack/bedrock_agent_stack.py
rename to cdk/examples/other_stack/bedrock_stack.py
index 67b74946..5564aafc 100644
--- a/cdk/examples/other_stack/bedrock_agent_stack.py
+++ b/cdk/examples/other_stack/bedrock_stack.py
@@ -10,7 +10,7 @@
 
 from constructs import Construct
 
-class BedrockAgentStack(Stack):
+class BedrockStack(Stack):
     def __init__(
         self,
         scope: Construct,
@@ -55,7 +55,7 @@ def __init__(
         )
 
         # create parameter store
-        self.agent_id_parameter = StringParameter(
+        self.kb_id_parameter = StringParameter(
             self,
             "BedrockKnowledgeBaseIdParameter",
             parameter_name="knowledge_base_id",