diff --git a/docs/management/connectors/images/bedrock-connector.png b/docs/management/connectors/images/bedrock-connector.png
index 22a537183171d..cfdb19f3fc6c2 100644
Binary files a/docs/management/connectors/images/bedrock-connector.png and b/docs/management/connectors/images/bedrock-connector.png differ
diff --git a/docs/management/connectors/images/bedrock-params.png b/docs/management/connectors/images/bedrock-params.png
index f6857e6d0ffee..23dcfe7e12091 100644
Binary files a/docs/management/connectors/images/bedrock-params.png and b/docs/management/connectors/images/bedrock-params.png differ
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_selector_inline/action_type_selector_modal.tsx b/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_selector_inline/action_type_selector_modal.tsx
index 84a72e0cd2b5f..6184525877d1c 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_selector_inline/action_type_selector_modal.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_selector_inline/action_type_selector_modal.tsx
@@ -18,6 +18,7 @@ import {
 } from '@elastic/eui';
 import { ActionType } from '@kbn/actions-plugin/common';
 import { ActionTypeRegistryContract } from '@kbn/triggers-actions-ui-plugin/public';
+import { css } from '@emotion/css/dist/emotion-css.cjs';
 import * as i18n from '../translations';
 
 interface Props {
@@ -26,6 +27,12 @@ interface Props {
   onClose: () => void;
   onSelect: (actionType: ActionType) => void;
 }
+const itemClassName = css`
+  .euiKeyPadMenuItem__label {
+    white-space: nowrap;
+    overflow: hidden;
+  }
+`;
 
 export const ActionTypeSelectorModal = ({
   actionTypes,
@@ -46,6 +53,7 @@ export const ActionTypeSelectorModal = ({
             return (
               <EuiFlexItem data-test-subj="action-option" key={actionType.id} grow={false}>
                 <EuiKeyPadMenuItem
+                  className={itemClassName}
                   key={actionType.id}
                   isDisabled={!actionType.enabled}
                   label={actionType.name}
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/content/prompts/welcome/translations.ts b/x-pack/packages/kbn-elastic-assistant/impl/content/prompts/welcome/translations.ts
index 936d27fb1005a..387c1d01422f6 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/content/prompts/welcome/translations.ts
+++ b/x-pack/packages/kbn-elastic-assistant/impl/content/prompts/welcome/translations.ts
@@ -19,7 +19,7 @@ export const WELCOME_GENERAL_2 = i18n.translate(
   'xpack.elasticAssistant.securityAssistant.content.prompts.welcome.welcomeGeneral2Prompt',
   {
     defaultMessage:
-      "First things first, we'll need to set up a Generative AI Connector to get this chat experience going! With the Generative AI Connector, you'll be able to configure access to either an OpenAI service or an AWS Bedrock service, but you better believe you'll be able to deploy your own models within your Elastic Cloud instance and use those here in the future... 😉",
+      "First things first, we'll need to set up a Generative AI Connector to get this chat experience going! With the Generative AI Connector, you'll be able to configure access to either an OpenAI service or an Amazon Bedrock service, but you better believe you'll be able to deploy your own models within your Elastic Cloud instance and use those here in the future... 😉",
   }
 );
 
diff --git a/x-pack/plugins/elastic_assistant/server/routes/evaluate/utils.ts b/x-pack/plugins/elastic_assistant/server/routes/evaluate/utils.ts
index a519398f158be..f208fe1d5739f 100644
--- a/x-pack/plugins/elastic_assistant/server/routes/evaluate/utils.ts
+++ b/x-pack/plugins/elastic_assistant/server/routes/evaluate/utils.ts
@@ -23,7 +23,7 @@ export const getLlmType = (connectorId: string, connectors: ActionResult[]): str
     // See: https://github.com/langchain-ai/langchainjs/blob/fb699647a310c620140842776f4a7432c53e02fa/langchain/src/agents/openai/index.ts#L185
     return 'openai';
   }
-  // TODO: Add support for AWS Bedrock Connector once merged
+  // TODO: Add support for Amazon Bedrock Connector once merged
   // Note: Doesn't appear to be a difference between Azure and OpenAI LLM types, so TBD for functions agent on Azure
   // See: https://github.com/langchain-ai/langchainjs/blob/fb699647a310c620140842776f4a7432c53e02fa/langchain/src/llms/openai.ts#L539
 
diff --git a/x-pack/plugins/stack_connectors/common/bedrock/constants.ts b/x-pack/plugins/stack_connectors/common/bedrock/constants.ts
index 361309a84d0a9..8071091194049 100644
--- a/x-pack/plugins/stack_connectors/common/bedrock/constants.ts
+++ b/x-pack/plugins/stack_connectors/common/bedrock/constants.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 export const BEDROCK_TITLE = i18n.translate(
   'xpack.stackConnectors.components.bedrock.connectorTypeTitle',
   {
-    defaultMessage: 'AWS Bedrock',
+    defaultMessage: 'Amazon Bedrock',
   }
 );
 export const BEDROCK_CONNECTOR_ID = '.bedrock';
diff --git a/x-pack/plugins/stack_connectors/public/connector_types/bedrock/bedrock.test.tsx b/x-pack/plugins/stack_connectors/public/connector_types/bedrock/bedrock.test.tsx
index 502ec1755bda7..a37762487a822 100644
--- a/x-pack/plugins/stack_connectors/public/connector_types/bedrock/bedrock.test.tsx
+++ b/x-pack/plugins/stack_connectors/public/connector_types/bedrock/bedrock.test.tsx
@@ -26,8 +26,8 @@ beforeAll(() => {
 describe('actionTypeRegistry.get() works', () => {
   test('connector type static data is as expected', () => {
     expect(actionTypeModel.id).toEqual(ACTION_TYPE_ID);
-    expect(actionTypeModel.selectMessage).toBe('Send a request to AWS Bedrock.');
-    expect(actionTypeModel.actionTypeTitle).toBe('AWS Bedrock');
+    expect(actionTypeModel.selectMessage).toBe('Send a request to Amazon Bedrock.');
+    expect(actionTypeModel.actionTypeTitle).toBe('Amazon Bedrock');
   });
 });
 
diff --git a/x-pack/plugins/stack_connectors/public/connector_types/bedrock/bedrock.tsx b/x-pack/plugins/stack_connectors/public/connector_types/bedrock/bedrock.tsx
index e6d674354511a..361caed6882c2 100644
--- a/x-pack/plugins/stack_connectors/public/connector_types/bedrock/bedrock.tsx
+++ b/x-pack/plugins/stack_connectors/public/connector_types/bedrock/bedrock.tsx
@@ -21,7 +21,7 @@ export function getConnectorType(): BedrockConnector {
     id: BEDROCK_CONNECTOR_ID,
     iconClass: lazy(() => import('./logo')),
     selectMessage: i18n.translate('xpack.stackConnectors.components.bedrock.selectMessageText', {
-      defaultMessage: 'Send a request to AWS Bedrock.',
+      defaultMessage: 'Send a request to Amazon Bedrock.',
     }),
     actionTypeTitle: BEDROCK_TITLE,
     validateParams: async (
diff --git a/x-pack/plugins/stack_connectors/public/connector_types/bedrock/constants.tsx b/x-pack/plugins/stack_connectors/public/connector_types/bedrock/constants.tsx
index 7ee3e35cecf15..88fc42e004bf8 100644
--- a/x-pack/plugins/stack_connectors/public/connector_types/bedrock/constants.tsx
+++ b/x-pack/plugins/stack_connectors/public/connector_types/bedrock/constants.tsx
@@ -33,7 +33,7 @@ export const bedrockConfig: ConfigFieldSchema[] = [
     defaultValue: DEFAULT_BEDROCK_URL,
     helpText: (
       <FormattedMessage
-        defaultMessage="The AWS Bedrock API endpoint URL. For more information on the URL, refer to the {bedrockAPIUrlDocs}."
+        defaultMessage="The Amazon Bedrock API endpoint URL. For more information on the URL, refer to the {bedrockAPIUrlDocs}."
         id="xpack.stackConnectors.components.bedrock.bedrockDocumentation"
         values={{
           bedrockAPIUrlDocs: (
diff --git a/x-pack/plugins/stack_connectors/public/connector_types/bedrock/translations.ts b/x-pack/plugins/stack_connectors/public/connector_types/bedrock/translations.ts
index 37c8165b76048..6906f691ffcae 100644
--- a/x-pack/plugins/stack_connectors/public/connector_types/bedrock/translations.ts
+++ b/x-pack/plugins/stack_connectors/public/connector_types/bedrock/translations.ts
@@ -40,7 +40,7 @@ export const SECRET = i18n.translate('xpack.stackConnectors.components.bedrock.s
 });
 
 export const BEDROCK = i18n.translate('xpack.stackConnectors.components.bedrock.title', {
-  defaultMessage: 'AWS Bedrock',
+  defaultMessage: 'Amazon Bedrock',
 });
 
 export const DOCUMENTATION = i18n.translate(
diff --git a/x-pack/plugins/stack_connectors/server/connector_types/bedrock/index.test.ts b/x-pack/plugins/stack_connectors/server/connector_types/bedrock/index.test.ts
index 78a1937bf76c2..ba4f8290b34f7 100644
--- a/x-pack/plugins/stack_connectors/server/connector_types/bedrock/index.test.ts
+++ b/x-pack/plugins/stack_connectors/server/connector_types/bedrock/index.test.ts
@@ -33,9 +33,9 @@ describe('Bedrock Connector', () => {
     configurationUtilities = actionsConfigMock.create();
     connectorType = getConnectorType();
   });
-  test('exposes the connector as `AWS Bedrock` with id `.bedrock`', () => {
+  test('exposes the connector as `Amazon Bedrock` with id `.bedrock`', () => {
     expect(connectorType.id).toEqual('.bedrock');
-    expect(connectorType.name).toEqual('AWS Bedrock');
+    expect(connectorType.name).toEqual('Amazon Bedrock');
   });
   describe('config validation', () => {
     test('config validation passes when only required fields are provided', () => {
@@ -55,7 +55,7 @@ describe('Bedrock Connector', () => {
       expect(() => {
         configValidator(config, { configurationUtilities });
       }).toThrowErrorMatchingInlineSnapshot(
-        '"Error configuring AWS Bedrock action: Error: URL Error: Invalid URL: example.com/do-something"'
+        '"Error configuring Amazon Bedrock action: Error: URL Error: Invalid URL: example.com/do-something"'
       );
     });
 
@@ -75,7 +75,7 @@ describe('Bedrock Connector', () => {
       expect(() => {
         configValidator(config, { configurationUtilities: configUtils });
       }).toThrowErrorMatchingInlineSnapshot(
-        `"Error configuring AWS Bedrock action: Error: error validating url: target url is not present in allowedHosts"`
+        `"Error configuring Amazon Bedrock action: Error: error validating url: target url is not present in allowedHosts"`
       );
     });
   });
diff --git a/x-pack/plugins/stack_connectors/server/connector_types/bedrock/index.ts b/x-pack/plugins/stack_connectors/server/connector_types/bedrock/index.ts
index 11050628203a9..02b2bff9a93ae 100644
--- a/x-pack/plugins/stack_connectors/server/connector_types/bedrock/index.ts
+++ b/x-pack/plugins/stack_connectors/server/connector_types/bedrock/index.ts
@@ -43,7 +43,7 @@ export const configValidator = (configObject: Config, validatorServices: Validat
   } catch (err) {
     throw new Error(
       i18n.translate('xpack.stackConnectors.bedrock.configurationErrorApiProvider', {
-        defaultMessage: 'Error configuring AWS Bedrock action: {err}',
+        defaultMessage: 'Error configuring Amazon Bedrock action: {err}',
         values: {
           err,
         },
diff --git a/x-pack/plugins/stack_connectors/server/plugin.test.ts b/x-pack/plugins/stack_connectors/server/plugin.test.ts
index c728ee92cea40..c5c16a29647fd 100644
--- a/x-pack/plugins/stack_connectors/server/plugin.test.ts
+++ b/x-pack/plugins/stack_connectors/server/plugin.test.ts
@@ -164,7 +164,7 @@ describe('Stack Connectors Plugin', () => {
         4,
         expect.objectContaining({
           id: '.bedrock',
-          name: 'AWS Bedrock',
+          name: 'Amazon Bedrock',
         })
       );
       expect(actionsSetup.registerSubActionConnectorType).toHaveBeenNthCalledWith(
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/bedrock.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/bedrock.ts
index 8d4412cf37a19..4983d19d36b69 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/bedrock.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/bedrock.ts
@@ -160,7 +160,7 @@ export default function bedrockTest({ getService }: FtrProviderContext) {
               statusCode: 400,
               error: 'Bad Request',
               message:
-                'error validating action type config: Error configuring AWS Bedrock action: Error: error validating url: target url "http://bedrock.mynonexistent.com" is not added to the Kibana config xpack.actions.allowedHosts',
+                'error validating action type config: Error configuring Amazon Bedrock action: Error: error validating url: target url "http://bedrock.mynonexistent.com" is not added to the Kibana config xpack.actions.allowedHosts',
             });
           });
       });
@@ -280,7 +280,7 @@ export default function bedrockTest({ getService }: FtrProviderContext) {
             status: 'error',
             retry: true,
             message: 'an error occurred while running the action',
-            service_message: `Sub action "invalidAction" is not registered. Connector id: ${bedrockActionId}. Connector name: AWS Bedrock. Connector type: .bedrock`,
+            service_message: `Sub action "invalidAction" is not registered. Connector id: ${bedrockActionId}. Connector name: Amazon Bedrock. Connector type: .bedrock`,
           });
         });
       });