diff --git a/source/lambda/intention/intention.py b/source/lambda/intention/intention.py
index 4baf552f..17a7f036 100644
--- a/source/lambda/intention/intention.py
+++ b/source/lambda/intention/intention.py
@@ -180,8 +180,6 @@ def __list_execution(event, group_name):
                 item_json["fileName"] = value.split("/").pop()
             elif key == "modelId":
                 item_json["model"] = value
-            elif key == "groupName":
-                item_json["chatbotId"] = value
             elif key == "LastModifiedTime":
                 item_json["createTime"] = value
             elif key == "LastModifiedBy":
@@ -264,6 +262,7 @@ def __create_execution(event, context, email, group_name):
         Item={
             "groupName": group_name,
             "intentionId": context.aws_request_id,
+            "chatbotId": input_body.get("chatbotId"),
             "model": execution_detail["model"],
             "index": execution_detail["index"],
             "tag": execution_detail["index"],
diff --git a/source/portal/src/pages/components/AddIntention.tsx b/source/portal/src/pages/components/AddIntention.tsx
index 87fe7956..f1850bfe 100644
--- a/source/portal/src/pages/components/AddIntention.tsx
+++ b/source/portal/src/pages/components/AddIntention.tsx
@@ -298,7 +298,7 @@ const AddIntention: React.FC<AddIntentionProps> = (props: AddIntentionProps) =>
               >
                 <SpaceBetween direction="vertical" size="l">
                   
-                  <FormField label={t('bot')} stretch={true}>
+                  <FormField label={t('chatbotName')} stretch={true}>
                     <Select
                       options={botsOption}
                       selectedOption={selectedBotOption||{}}