diff --git a/locales/data.json b/locales/data.json
index 494be9b52..a824aa7db 100644
--- a/locales/data.json
+++ b/locales/data.json
@@ -24,6 +24,12 @@
         "value": "Amazon Web Services"
       }
     ],
+    "awsAlt": [
+      {
+        "type": 0,
+        "value": "Amazon Web Services (AWS)"
+      }
+    ],
     "awsComputeTitle": [
       {
         "type": 0,
@@ -73,7 +79,7 @@
     "awsDetailsTitle": [
       {
         "type": 0,
-        "value": "Amazon Web Services Details"
+        "value": "Amazon Web Services details"
       }
     ],
     "awsOcpDashboardCostTitle": [
@@ -137,7 +143,7 @@
     "azureDetailsTitle": [
       {
         "type": 0,
-        "value": "Microsoft Azure Details"
+        "value": "Microsoft Azure details"
       }
     ],
     "azureOcpDashboardCostTitle": [
@@ -1259,13 +1265,13 @@
     "costModel": [
       {
         "type": 0,
-        "value": "Cost Model:"
+        "value": "Cost model:"
       }
     ],
     "costModels": [
       {
         "type": 0,
-        "value": "Cost Models"
+        "value": "Cost models"
       }
     ],
     "costModelsActions": [
@@ -1417,7 +1423,7 @@
     "costModelsDetailsTitle": [
       {
         "type": 0,
-        "value": "Cost Model Details"
+        "value": "Cost model details"
       }
     ],
     "costModelsDistributionDesc": [
@@ -1561,13 +1567,13 @@
     "costModelsSelectMeasurement": [
       {
         "type": 0,
-        "value": "Select Measurement"
+        "value": "Select measurement"
       }
     ],
     "costModelsSelectMetric": [
       {
         "type": 0,
-        "value": "Select Metric"
+        "value": "Select metric"
       }
     ],
     "costModelsSourceDelete": [
@@ -1722,12 +1728,6 @@
         "value": "No rates were added to the price list"
       }
     ],
-    "costModelsWizardOnboardAws": [
-      {
-        "type": 0,
-        "value": "Amazon Web Services (AWS)"
-      }
-    ],
     "costModelsWizardOnboardOcp": [
       {
         "type": 0,
@@ -2539,7 +2539,7 @@
     "dataDetailsCostManagementData": [
       {
         "type": 0,
-        "value": "Cost Management data"
+        "value": "Cost management data"
       }
     ],
     "dataDetailsIntegrationAndFinalization": [
@@ -4081,7 +4081,7 @@
     "errorStateNotAuthorizedTitle": [
       {
         "type": 0,
-        "value": "You don't have access to the Cost management application"
+        "value": "You don't have access to the cost management application"
       }
     ],
     "errorStateUnexpectedDesc": [
@@ -4148,7 +4148,7 @@
     "explorerChartAriaTitle": [
       {
         "type": 0,
-        "value": "Cost Explorer Chart"
+        "value": "Cost explorer chart"
       }
     ],
     "explorerChartTitle": [
@@ -4320,13 +4320,13 @@
     "explorerTableAriaLabel": [
       {
         "type": 0,
-        "value": "Cost Explorer table"
+        "value": "Cost explorer table"
       }
     ],
     "explorerTitle": [
       {
         "type": 0,
-        "value": "Cost Explorer"
+        "value": "Cost explorer"
       }
     ],
     "exportAggregateType": [
@@ -8249,13 +8249,13 @@
     "gcpCostTitle": [
       {
         "type": 0,
-        "value": "Google Cloud Platform Services cost"
+        "value": "Google Cloud Platform services cost"
       }
     ],
     "gcpCostTrendTitle": [
       {
         "type": 0,
-        "value": "Google Cloud Platform Services cumulative cost comparison ("
+        "value": "Google Cloud Platform services cumulative cost comparison ("
       },
       {
         "type": 1,
@@ -8269,7 +8269,7 @@
     "gcpDailyCostTrendTitle": [
       {
         "type": 0,
-        "value": "Google Cloud Platform Services daily cost comparison ("
+        "value": "Google Cloud Platform services daily cost comparison ("
       },
       {
         "type": 1,
@@ -8289,7 +8289,7 @@
     "gcpDetailsTitle": [
       {
         "type": 0,
-        "value": "Google Cloud Platform Details"
+        "value": "Google Cloud Platform details"
       }
     ],
     "groupByAll": [
@@ -10170,7 +10170,7 @@
     "historicalChartDayOfMonthLabel": [
       {
         "type": 0,
-        "value": "Day of Month"
+        "value": "Day of month"
       }
     ],
     "historicalChartTitle": [
@@ -10294,13 +10294,13 @@
     "ibmCostTitle": [
       {
         "type": 0,
-        "value": "IBM Cloud Services cost"
+        "value": "IBM Cloud services cost"
       }
     ],
     "ibmCostTrendTitle": [
       {
         "type": 0,
-        "value": "IBM Cloud Services cumulative cost comparison ("
+        "value": "IBM Cloud services cumulative cost comparison ("
       },
       {
         "type": 1,
@@ -10314,7 +10314,7 @@
     "ibmDailyCostTrendTitle": [
       {
         "type": 0,
-        "value": "IBM Cloud Services daily cost comparison ("
+        "value": "IBM Cloud services daily cost comparison ("
       },
       {
         "type": 1,
@@ -10334,13 +10334,13 @@
     "ibmDetailsTitle": [
       {
         "type": 0,
-        "value": "IBM Cloud Details"
+        "value": "IBM Cloud details"
       }
     ],
     "inactiveSourcesGoTo": [
       {
         "type": 0,
-        "value": "Go to Integrations for more information"
+        "value": "Go to integrations for more information"
       }
     ],
     "inactiveSourcesTitle": [
@@ -10428,7 +10428,7 @@
     "maintenanceEmptyStateDesc": [
       {
         "type": 0,
-        "value": "Cost Management is currently undergoing scheduled maintenance and will be unavailable from 13:00 - 19:00 UTC (09:00 AM - 03:00 PM EDT)."
+        "value": "Cost management is currently undergoing scheduled maintenance and will be unavailable from 13:00 - 19:00 UTC (09:00 AM - 03:00 PM EDT)."
       }
     ],
     "maintenanceEmptyStateInfo": [
@@ -10832,7 +10832,7 @@
     "metricsOperatorVersion": [
       {
         "type": 0,
-        "value": "Cost Management operator version"
+        "value": "Cost management operator version"
       }
     ],
     "monthOverMonthChange": [
@@ -11012,25 +11012,25 @@
     "noProvidersCloudCost": [
       {
         "type": 0,
-        "value": "Include Cloud provider (AWS, GCP, Azure, OCI) cost"
+        "value": "Include cloud provider (AWS, GCP, Azure, OCI) cost"
       }
     ],
     "noProvidersCloudCostDesc": [
       {
         "type": 0,
-        "value": "If you want to do only cloud provider such as AWS, Google, Azure, or Oracle, you need to set up an integration in order to start using Cost Management service."
+        "value": "If you want to do only cloud provider such as AWS, Google, Azure, or Oracle, you need to set up an integration in order to start using cost management service."
       }
     ],
     "noProvidersCloudIntegration": [
       {
         "type": 0,
-        "value": "Set up a Cloud provider integration"
+        "value": "Set up a cloud provider integration"
       }
     ],
     "noProvidersCloudIntegrationHelp": [
       {
         "type": 0,
-        "value": "If you need further help setting up Cloud provider in cost management"
+        "value": "If you need further help setting up cloud provider in cost management"
       }
     ],
     "noProvidersCloudIntegrationHelpAws": [
@@ -11112,13 +11112,13 @@
     "noProvidersGetStarted": [
       {
         "type": 0,
-        "value": "Get started with Cost management"
+        "value": "Get started with cost management"
       }
     ],
     "noProvidersMetricsOperator": [
       {
         "type": 0,
-        "value": "Install Cost Management metric operator"
+        "value": "Install cost management metric operator"
       }
     ],
     "noProvidersOcpCli": [
@@ -11158,7 +11158,7 @@
     "noProvidersOcpCostDesc": [
       {
         "type": 0,
-        "value": "Additionally to your OpenShift cluster set up, you need to set up Cost Management Metrics Operator in order to start using Cost Management service."
+        "value": "Additionally to your OpenShift cluster set up, you need to set up cost management metrics operator in order to start using cost management service."
       }
     ],
     "noProvidersRecommended": [
@@ -11230,7 +11230,7 @@
     "noProvidersStateOcpAddSources": [
       {
         "type": 0,
-        "value": "Add an OpenShift cluster to Cost Management"
+        "value": "Add an OpenShift cluster to cost management"
       }
     ],
     "noProvidersStateOcpDesc": [
@@ -11272,61 +11272,61 @@
     "notAuthorizedStateAws": [
       {
         "type": 0,
-        "value": "Amazon Web Services in Cost Management"
+        "value": "Amazon Web Services in cost management"
       }
     ],
     "notAuthorizedStateAzure": [
       {
         "type": 0,
-        "value": "Microsoft Azure in Cost Management"
+        "value": "Microsoft Azure in cost management"
       }
     ],
     "notAuthorizedStateCostModels": [
       {
         "type": 0,
-        "value": "Cost Models in Cost Management"
+        "value": "Cost models in cost management"
       }
     ],
     "notAuthorizedStateGcp": [
       {
         "type": 0,
-        "value": "Google Cloud Platform in Cost Management"
+        "value": "Google Cloud Platform in cost management"
       }
     ],
     "notAuthorizedStateIbm": [
       {
         "type": 0,
-        "value": "IBM Cloud in Cost Management"
+        "value": "IBM Cloud in cost management"
       }
     ],
     "notAuthorizedStateOci": [
       {
         "type": 0,
-        "value": "Oracle Cloud Infrastructure in Cost Management"
+        "value": "Oracle Cloud Infrastructure in cost management"
       }
     ],
     "notAuthorizedStateOcp": [
       {
         "type": 0,
-        "value": "OpenShift in Cost Management"
+        "value": "OpenShift in cost management"
       }
     ],
     "notAuthorizedStateOptimizations": [
       {
         "type": 0,
-        "value": "Optimizations in Cost Management"
+        "value": "Optimizations in cost management"
       }
     ],
     "notAuthorizedStateRhel": [
       {
         "type": 0,
-        "value": "RHEL in Cost Management"
+        "value": "RHEL in cost management"
       }
     ],
     "notAuthorizedStateSettings": [
       {
         "type": 0,
-        "value": "Settings in Cost Management"
+        "value": "Settings in cost management"
       }
     ],
     "oci": [
@@ -11384,7 +11384,7 @@
     "ociDetailsTitle": [
       {
         "type": 0,
-        "value": "Oracle Cloud Infrastructure Details"
+        "value": "Oracle Cloud Infrastructure details"
       }
     ],
     "ocp": [
@@ -11526,7 +11526,7 @@
     "ocpDetailsTitle": [
       {
         "type": 0,
-        "value": "OpenShift Details"
+        "value": "OpenShift details"
       }
     ],
     "ocpMemoryUsageAndRequests": [
@@ -11602,85 +11602,85 @@
     "overviewTitle": [
       {
         "type": 0,
-        "value": "Cost Management Overview"
+        "value": "Cost management overview"
       }
     ],
     "pageTitleAws": [
       {
         "type": 0,
-        "value": "Amazon Web Services - Cost Management | OpenShift"
+        "value": "Amazon Web Services - Cost management | OpenShift"
       }
     ],
     "pageTitleAzure": [
       {
         "type": 0,
-        "value": "Microsoft Azure - Cost Management | OpenShift"
+        "value": "Microsoft Azure - Cost management | OpenShift"
       }
     ],
     "pageTitleCostModels": [
       {
         "type": 0,
-        "value": "Cost Models - Cost Management | OpenShift"
+        "value": "Cost models - Cost management | OpenShift"
       }
     ],
     "pageTitleDefault": [
       {
         "type": 0,
-        "value": "Cost Management | OpenShift"
+        "value": "Cost management | OpenShift"
       }
     ],
     "pageTitleExplorer": [
       {
         "type": 0,
-        "value": "Cost Explorer - Cost Management | OpenShift"
+        "value": "Cost explorer - Cost management | OpenShift"
       }
     ],
     "pageTitleGcp": [
       {
         "type": 0,
-        "value": "Google Cloud Platform - Cost Management | OpenShift"
+        "value": "Google Cloud Platform - Cost management | OpenShift"
       }
     ],
     "pageTitleIbm": [
       {
         "type": 0,
-        "value": "IBM Cloud - Cost Management | OpenShift"
+        "value": "IBM Cloud - Cost management | OpenShift"
       }
     ],
     "pageTitleOci": [
       {
         "type": 0,
-        "value": "Oracle Cloud Infrastructure - Cost Management | OpenShift"
+        "value": "Oracle Cloud Infrastructure - Cost management | OpenShift"
       }
     ],
     "pageTitleOcp": [
       {
         "type": 0,
-        "value": "OpenShift - Cost Management | OpenShift"
+        "value": "OpenShift - Cost management | OpenShift"
       }
     ],
     "pageTitleOptimizations": [
       {
         "type": 0,
-        "value": "Optimizations - Cost Management | OpenShift"
+        "value": "Optimizations - Cost management | OpenShift"
       }
     ],
     "pageTitleOverview": [
       {
         "type": 0,
-        "value": "Overview - Cost Management | OpenShift"
+        "value": "Overview - Cost management | OpenShift"
       }
     ],
     "pageTitleRhel": [
       {
         "type": 0,
-        "value": "RHEL - Cost Management | OpenShift"
+        "value": "RHEL - Cost management | OpenShift"
       }
     ],
     "pageTitleSettings": [
       {
         "type": 0,
-        "value": "Settings - Cost Management | OpenShift"
+        "value": "Settings - Cost management | OpenShift"
       }
     ],
     "paginationTitle": [
@@ -12229,7 +12229,7 @@
     "rhelDetailsTitle": [
       {
         "type": 0,
-        "value": "RHEL Details"
+        "value": "RHEL details"
       }
     ],
     "rhelMemoryUsageAndRequests": [
@@ -12434,7 +12434,7 @@
     "settingsSuccessDesc": [
       {
         "type": 0,
-        "value": "Settings for Cost Management were replaced with new values"
+        "value": "Settings for cost management were replaced with new values"
       }
     ],
     "settingsSuccessPlatformProjects": [
@@ -12732,7 +12732,7 @@
     "settingsTitle": [
       {
         "type": 0,
-        "value": "Cost Management Settings"
+        "value": "Cost management settings"
       }
     ],
     "sinceDate": [
@@ -13228,7 +13228,7 @@
     "tagMappingSelectParentTagsDesc": [
       {
         "type": 0,
-        "value": "Select a parent tag key that will be mapped to child tags in the next step. This tag will be available for filtering in Cost Management."
+        "value": "Select a parent tag key that will be mapped to child tags in the next step. This tag will be available for filtering in cost management."
       }
     ],
     "tagMappingWarning": [
@@ -13252,7 +13252,7 @@
     "tagMappingWizardNavToTagMapping": [
       {
         "type": 0,
-        "value": "Go back to Cost Management Settings"
+        "value": "Go back to cost management settings"
       }
     ],
     "tagMappingWizardReview": [
diff --git a/locales/translations.json b/locales/translations.json
index d75c59957..7f00129ed 100644
--- a/locales/translations.json
+++ b/locales/translations.json
@@ -3,12 +3,13 @@
   "allOtherProjectCosts": "Project (All other costs)",
   "assignCostModel": "Assign cost model",
   "aws": "Amazon Web Services",
+  "awsAlt": "Amazon Web Services (AWS)",
   "awsComputeTitle": "Compute (EC2) instances usage",
   "awsCostTrendTitle": "Amazon Web Services cumulative cost comparison ({units})",
   "awsDailyCostTrendTitle": "Amazon Web Services daily cost comparison ({units})",
   "awsDashboardCostTitle": "Amazon Web Services cost",
   "awsDesc": "Raw cost from Amazon Web Services infrastructure.",
-  "awsDetailsTitle": "Amazon Web Services Details",
+  "awsDetailsTitle": "Amazon Web Services details",
   "awsOcpDashboardCostTitle": "Amazon Web Services filtered by OpenShift cost",
   "azure": "Microsoft Azure",
   "azureComputeTitle": "Virtual machines usage",
@@ -16,7 +17,7 @@
   "azureDailyCostTrendTitle": "Microsoft Azure daily cost comparison ({units})",
   "azureDashboardCostTitle": "Microsoft Azure cost",
   "azureDesc": "Raw cost from Azure infrastructure.",
-  "azureDetailsTitle": "Microsoft Azure Details",
+  "azureDetailsTitle": "Microsoft Azure details",
   "azureOcpDashboardCostTitle": "Microsoft Azure filtered by OpenShift cost",
   "back": "Back",
   "backToIntegrations": "Back to integrations status",
@@ -91,8 +92,8 @@
   "costDistributionType": "{value, select, distributed {Distribute through cost models} total {Don't distribute overhead costs} other {}}",
   "costManagement": "Cost management",
   "costManagementDocs": "Cost management documentation",
-  "costModel": "Cost Model:",
-  "costModels": "Cost Models",
+  "costModel": "Cost model:",
+  "costModels": "Cost models",
   "costModelsActions": "Cost model actions",
   "costModelsAddTagValues": "Add more tag values",
   "costModelsAssignSources": "{count, plural, one {Assign integration} other {Assign integrations}}",
@@ -108,7 +109,7 @@
   "costModelsDeleteSource": "You must unassign any integrations before you can delete this cost model.",
   "costModelsDesc": "Cost models can help you analyze and predict future costs. Associate a price to metrics provided by your integrations to calculate your charges for resource usage. {learnMore}",
   "costModelsDescTooLong": "Should not exceed 500 characters",
-  "costModelsDetailsTitle": "Cost Model Details",
+  "costModelsDetailsTitle": "Cost model details",
   "costModelsDistributionDesc": "The following is the type of metric that is set to be used when distributing costs to the project level breakdowns.",
   "costModelsDistributionEdit": "Edit distribution",
   "costModelsEmptyState": "What is your hybrid cloud costing you?",
@@ -132,8 +133,8 @@
   "costModelsRequiredField": "This field is required",
   "costModelsRouterErrorTitle": "Fail routing to cost model",
   "costModelsRouterServerError": "Server error: could not get the cost model.",
-  "costModelsSelectMeasurement": "Select Measurement",
-  "costModelsSelectMetric": "Select Metric",
+  "costModelsSelectMeasurement": "Select measurement",
+  "costModelsSelectMetric": "Select metric",
   "costModelsSourceDelete": "Unassign",
   "costModelsSourceDeleteSource": "Unassign integration",
   "costModelsSourceDeleteSourceDesc": "This will remove the assignment of {source} from the {costModel} cost model. You can then assign the cost model to a new integration.",
@@ -154,7 +155,6 @@
   "costModelsWizardEmptyStateTitle": "A price list has not been created.",
   "costModelsWizardGeneralInfoTitle": "Enter general information",
   "costModelsWizardNoRatesAdded": "No rates were added to the price list",
-  "costModelsWizardOnboardAws": "Amazon Web Services (AWS)",
   "costModelsWizardOnboardOcp": "Red Hat OpenShift Container Platform",
   "costModelsWizardPriceListMetric": "Select the metric you want to assign a price to, and specify a measurement unit and rate. You can optionally set multiple rates for particular tags.",
   "costModelsWizardRateAriaLabel": "Assign rate",
@@ -213,7 +213,7 @@
   "dataDetailsCloudIntegration": "Cloud integration data",
   "dataDetailsCloudIntegrationStatus": "Cloud integration status",
   "dataDetailsClusterData": "Cluster data",
-  "dataDetailsCostManagementData": "Cost Management data",
+  "dataDetailsCostManagementData": "Cost management data",
   "dataDetailsIntegrationAndFinalization": "Data integration and finalization",
   "dataDetailsIntegrationStatus": "Red Hat integration status",
   "dataDetailsProcessing": "Data processing",
@@ -299,18 +299,18 @@
   "end": "End",
   "equalsSymbol": "=",
   "errorStateNotAuthorizedDesc": "Contact the cost management administrator to provide access to this application",
-  "errorStateNotAuthorizedTitle": "You don't have access to the Cost management application",
+  "errorStateNotAuthorizedTitle": "You don't have access to the cost management application",
   "errorStateUnexpectedDesc": "We encountered an unexpected error. Contact your administrator.",
   "errorStateUnexpectedTitle": "Oops!",
   "examplesTitle": "Examples",
   "excludeLabel": "Excludes: {value}",
   "excludeValues": "{value, select, excludes {excludes} includes {includes} other {}}",
   "expiresOn": "Expires on",
-  "explorerChartAriaTitle": "Cost Explorer Chart",
+  "explorerChartAriaTitle": "Cost explorer chart",
   "explorerChartTitle": "{value, select, aws {Amazon Web Services - Top 5 Costliest} aws_ocp {Amazon Web Services filtered by OpenShift - Top 5 Costliest} azure {Microsoft Azure - Top 5 Costliest} oci {Oracle Cloud Infrastructure - Top 5 Costliest} azure_ocp {Microsoft Azure filtered by OpenShift - Top 5 Costliest} gcp {Google Cloud Platform - Top 5 Costliest} gcp_ocp {Google Cloud Platform filtered by OpenShift - Top 5 Costliest} ibm {IBM Cloud - Top 5 Costliest} ibm_ocp {IBM Cloud filtered by OpenShift - Top 5 Costliest} ocp {All OpenShift - Top 5 Costliest} ocp_cloud {All cloud filtered by OpenShift - Top 5 Costliest} other {}}",
   "explorerDateRange": "{value, select, custom {Custom}current_month_to_date {Month to date} last_ninety_days {Last 90 days} last_sixty_days {Last 60 days} last_thirty_days {Last 30 days} previous_month {Previous month} previous_month_to_date {Previous month and month to date} other {}}",
-  "explorerTableAriaLabel": "Cost Explorer table",
-  "explorerTitle": "Cost Explorer",
+  "explorerTableAriaLabel": "Cost explorer table",
+  "explorerTitle": "Cost explorer",
   "exportAggregateType": "Aggregate type",
   "exportAll": "Export all",
   "exportDesc": "The active selections from the table plus the values here will be used to generate an export file. When the file is available, download it from the {value} view.",
@@ -354,11 +354,11 @@
   "forDate": "{value} for {dateRange}",
   "gcp": "Google Cloud Platform",
   "gcpComputeTitle": "Compute instances usage",
-  "gcpCostTitle": "Google Cloud Platform Services cost",
-  "gcpCostTrendTitle": "Google Cloud Platform Services cumulative cost comparison ({units})",
-  "gcpDailyCostTrendTitle": "Google Cloud Platform Services daily cost comparison ({units})",
+  "gcpCostTitle": "Google Cloud Platform services cost",
+  "gcpCostTrendTitle": "Google Cloud Platform services cumulative cost comparison ({units})",
+  "gcpDailyCostTrendTitle": "Google Cloud Platform services daily cost comparison ({units})",
   "gcpDesc": "Raw cost from Google Cloud Platform infrastructure.",
-  "gcpDetailsTitle": "Google Cloud Platform Details",
+  "gcpDetailsTitle": "Google Cloud Platform details",
   "groupByAll": "{value, select, account {{count, plural, one {All account} other {All accounts}}} aws_category {{count, plural, one {All cost category} other {All cost categories}}} cluster {{count, plural, one {All cluster} other {All clusters}}} gcp_project {{count, plural, one {All GCP project} other {All GCP projects}}} node {{count, plural, one {All node} other {All nodes}}} org_unit_id {{count, plural, one {All organizational unit} other {All organizational units}}} payer_tenant_id {{count, plural, one {All account} other {All accounts}}} product_service {{count, plural, one {All service} other {All services}}} project {{count, plural, one {All project} other {All projects}}} region {{count, plural, one {All region} other {All regions}}} resource_location {{count, plural, one {All region} other {All regions}}} service {{count, plural, one {All service} other {All services}}} service_name {{count, plural, one {All service} other {All services}}} subscription_guid {{count, plural, one {All account} other {All accounts}}} tag {{count, plural, one {All tag} other {All tags}}} other {}}",
   "groupByLabel": "Group by",
   "groupByTop": "{value, select, account {{count, plural, one {Top account} other {Top accounts}}} aws_category {{count, plural, one {Top cost category} other {Top cost categories}}} cluster {{count, plural, one {Top cluster} other {Top clusters}}} gcp_project {{count, plural, one {Top GCP project} other {Top GCP projects}}} node {{count, plural, one {Top node} other {Top node}}} org_unit_id {{count, plural, one {Top organizational unit} other {Top organizational units}}} payer_tenant_id {{count, plural, one {Top account} other {Top accounts}}} product_service {{count, plural, one {Top service} other {Top services}}} project {{count, plural, one {Top project} other {Top projects}}} region {{count, plural, one {Top region} other {Top regions}}} resource_location {{count, plural, one {Top region} other {Top regions}}} service {{count, plural, one {Top service} other {Top services}}} service_name {{count, plural, one {Top service} other {Top services}}} subscription_guid {{count, plural, one {Top account} other {Top accounts}}} tag {{count, plural, one {Top tag} other {Top tags}}} other {}}",
@@ -366,17 +366,17 @@
   "groupByValues": "{value, select, account {{count, plural, one {account} other {accounts}}} aws_category {{count, plural, one {cost category} other {cost categories}}} cluster {{count, plural, one {cluster} other {clusters}}} gcp_project {{count, plural, one {GCP project} other {GCP projects}}} node {{count, plural, one {node} other {node}}} org_unit_id {{count, plural, one {organizational unit} other {organizational units}}} payer_tenant_id {{count, plural, one {account} other {accounts}}} product_service {{count, plural, one {service} other {services}}} project {{count, plural, one {project} other {projects}}} region {{count, plural, one {region} other {regions}}} resource_location {{count, plural, one {region} other {regions}}} service {{count, plural, one {service} other {services}}} service_name {{count, plural, one {service} other {services}}} subscription_guid {{count, plural, one {account} other {accounts}}} tag {{count, plural, one {tag} other {tags}}} other {}}",
   "groupByValuesTitleCase": "{value, select, account {{count, plural, one {Account} other {Accounts}}} aws_category {{count, plural, one {Cost category} other {Cost categories}}} cluster {{count, plural, one {Cluster} other {Clusters}}} gcp_project {{count, plural, one {GCP project} other {GCP projects}}} node {{count, plural, one {Node} other {Node}}} org_unit_id {{count, plural, one {Organizational unit} other {Organizational units}}} payer_tenant_id {{count, plural, one {Account} other {Accounts}}} product_service {{count, plural, one {Service} other {Services}}} project {{count, plural, one {Project} other {Projects}}} region {{count, plural, one {Region} other {Regions}}} resource_location {{count, plural, one {Region} other {Regions}}} service {{count, plural, one {Service} other {Services}}} service_name {{count, plural, one {Service} other {Services}}} subscription_guid {{count, plural, one {Account} other {Accounts}}} tag {{count, plural, one {Tag} other {Tags}}} other {}}",
   "historicalChartCostLabel": "Cost ({units})",
-  "historicalChartDayOfMonthLabel": "Day of Month",
+  "historicalChartDayOfMonthLabel": "Day of month",
   "historicalChartTitle": "{value, select, cost {Cost comparison} cpu {CPU usage, request, and limit comparison} instance_type {Compute usage comparison}memory {Memory usage, request, and limit comparison} modal {{name} daily usage comparison} network {Network usage comparison} storage {Storage usage comparison} virtual_machine {Virtual machine usage comparison}other {}}",
   "historicalChartUsageLabel": "{value, select, instance_type {hrs} storage {gb-mo} other {}}",
   "ibm": "IBM Cloud",
   "ibmComputeTitle": "Compute instances usage",
-  "ibmCostTitle": "IBM Cloud Services cost",
-  "ibmCostTrendTitle": "IBM Cloud Services cumulative cost comparison ({units})",
-  "ibmDailyCostTrendTitle": "IBM Cloud Services daily cost comparison ({units})",
+  "ibmCostTitle": "IBM Cloud services cost",
+  "ibmCostTrendTitle": "IBM Cloud services cumulative cost comparison ({units})",
+  "ibmDailyCostTrendTitle": "IBM Cloud services daily cost comparison ({units})",
   "ibmDesc": "Raw cost from IBM Cloud infrastructure.",
-  "ibmDetailsTitle": "IBM Cloud Details",
-  "inactiveSourcesGoTo": "Go to Integrations for more information",
+  "ibmDetailsTitle": "IBM Cloud details",
+  "inactiveSourcesGoTo": "Go to integrations for more information",
   "inactiveSourcesTitle": "A problem was detected with {value}",
   "inactiveSourcesTitleMultiplier": "A problem was detected with the following integrations",
   "infrastructure": "Infrastructure",
@@ -390,7 +390,7 @@
   "learnMore": "Learn more",
   "loadingStateDesc": "Searching for your integrations. Do not refresh the browser",
   "loadingStateTitle": "Looking for integrations...",
-  "maintenanceEmptyStateDesc": "Cost Management is currently undergoing scheduled maintenance and will be unavailable from 13:00 - 19:00 UTC (09:00 AM - 03:00 PM EDT).",
+  "maintenanceEmptyStateDesc": "Cost management is currently undergoing scheduled maintenance and will be unavailable from 13:00 - 19:00 UTC (09:00 AM - 03:00 PM EDT).",
   "maintenanceEmptyStateInfo": "For more information visit {url}",
   "maintenanceEmptyStateThanks": "We will be back soon. Thank you for your patience!",
   "manageColumnsAriaLabel": "Table column management",
@@ -412,7 +412,7 @@
   "metric": "Metric",
   "metricPlaceholder": "Filter by metrics",
   "metricValues": "{value, select, cpu {CPU} cluster {Cluster} memory {Memory} node {Node} persistent_volume_claims {Persistent volume claims} storage {Storage} other {}}",
-  "metricsOperatorVersion": "Cost Management operator version",
+  "metricsOperatorVersion": "Cost management operator version",
   "monthOverMonthChange": "Month over month change",
   "moreOptions": "More options",
   "names": "{count, plural, one {Name} other {Names}}",
@@ -432,22 +432,22 @@
   "noMappedTags": "No mapped tags",
   "noMappedTagsDesc": "Map multiple tags across data sources to be used as a single tag key for report grouping and filtering. {warning} Changes will be reflected within 24 hours. {learnMore}",
   "noMappedTagsWarning": "Tags must be enabled to be mapped.",
-  "noProvidersCloudCost": "Include Cloud provider (AWS, GCP, Azure, OCI) cost",
-  "noProvidersCloudCostDesc": "If you want to do only cloud provider such as AWS, Google, Azure, or Oracle, you need to set up an integration in order to start using Cost Management service.",
-  "noProvidersCloudIntegration": "Set up a Cloud provider integration",
-  "noProvidersCloudIntegrationHelp": "If you need further help setting up Cloud provider in cost management",
+  "noProvidersCloudCost": "Include cloud provider (AWS, GCP, Azure, OCI) cost",
+  "noProvidersCloudCostDesc": "If you want to do only cloud provider such as AWS, Google, Azure, or Oracle, you need to set up an integration in order to start using cost management service.",
+  "noProvidersCloudIntegration": "Set up a cloud provider integration",
+  "noProvidersCloudIntegrationHelp": "If you need further help setting up cloud provider in cost management",
   "noProvidersCloudIntegrationHelpAws": "Integrating Amazon Web Services data into cost management",
   "noProvidersCloudIntegrationHelpAzure": "Integrating Microsoft Azure data into cost management",
   "noProvidersCloudIntegrationHelpDesc": "The process to set up an integration for each provider varies. To learn how to add your specific integration to cost management, see the following guides:",
   "noProvidersCloudIntegrationHelpGcp": "Integrating Google Cloud data into cost management",
   "noProvidersCloudIntegrationHelpOci": "Integrating Oracle Cloud Infrastructure data into cost management",
   "noProvidersDesc": "Helps you simplify the management of your resources and costs of {ocp}, as well as public clouds like {aws}, {gcp}, {oci}, and {azure}.",
-  "noProvidersGetStarted": "Get started with Cost management",
-  "noProvidersMetricsOperator": "Install Cost Management metric operator",
+  "noProvidersGetStarted": "Get started with cost management",
+  "noProvidersMetricsOperator": "Install cost management metric operator",
   "noProvidersOcpCli": "If you want to use {cli} to install the operator, follow {link}.",
   "noProvidersOcpCliLink": "this documentation",
   "noProvidersOcpCost": "Include OpenShift cost",
-  "noProvidersOcpCostDesc": "Additionally to your OpenShift cluster set up, you need to set up Cost Management Metrics Operator in order to start using Cost Management service.",
+  "noProvidersOcpCostDesc": "Additionally to your OpenShift cluster set up, you need to set up cost management metrics operator in order to start using cost management service.",
   "noProvidersRecommended": "Recommended content",
   "noProvidersRecommendedAccomplish": "What can you accomplish with cost management?",
   "noProvidersStateAwsDesc": "Add an Amazon Web Services account to see a total cost breakdown of your spend by accounts, organizational units, services, regions, or tags.",
@@ -459,30 +459,30 @@
   "noProvidersStateGetStarted": "Get started with Integrations",
   "noProvidersStateIbmDesc": "Add an IBM Cloud account to see a total cost breakdown of your spend by accounts, services, regions, or tags.",
   "noProvidersStateIbmTitle": "Track your IBM Cloud spending!",
-  "noProvidersStateOcpAddSources": "Add an OpenShift cluster to Cost Management",
+  "noProvidersStateOcpAddSources": "Add an OpenShift cluster to cost management",
   "noProvidersStateOcpDesc": "Add an OpenShift Container Platform cluster to see a total cost breakdown of your pods by cluster, node, project, or labels.",
   "noProvidersStateOcpTitle": "Track your OpenShift spending!",
   "noProvidersStateOverviewDesc": "Add an integration, like an OpenShift Container Platform cluster or a cloud services account, to see a total cost breakdown as well as usage information like instance counts and storage.",
   "noProvidersStateOverviewTitle": "Track your spending!",
   "noProvidersTroubleshooting": "Having problem seeing data? See Troubleshooting part of the documentation",
   "noResultsFound": "No results found",
-  "notAuthorizedStateAws": "Amazon Web Services in Cost Management",
-  "notAuthorizedStateAzure": "Microsoft Azure in Cost Management",
-  "notAuthorizedStateCostModels": "Cost Models in Cost Management",
-  "notAuthorizedStateGcp": "Google Cloud Platform in Cost Management",
-  "notAuthorizedStateIbm": "IBM Cloud in Cost Management",
-  "notAuthorizedStateOci": "Oracle Cloud Infrastructure in Cost Management",
-  "notAuthorizedStateOcp": "OpenShift in Cost Management",
-  "notAuthorizedStateOptimizations": "Optimizations in Cost Management",
-  "notAuthorizedStateRhel": "RHEL in Cost Management",
-  "notAuthorizedStateSettings": "Settings in Cost Management",
+  "notAuthorizedStateAws": "Amazon Web Services in cost management",
+  "notAuthorizedStateAzure": "Microsoft Azure in cost management",
+  "notAuthorizedStateCostModels": "Cost models in cost management",
+  "notAuthorizedStateGcp": "Google Cloud Platform in cost management",
+  "notAuthorizedStateIbm": "IBM Cloud in cost management",
+  "notAuthorizedStateOci": "Oracle Cloud Infrastructure in cost management",
+  "notAuthorizedStateOcp": "OpenShift in cost management",
+  "notAuthorizedStateOptimizations": "Optimizations in cost management",
+  "notAuthorizedStateRhel": "RHEL in cost management",
+  "notAuthorizedStateSettings": "Settings in cost management",
   "oci": "Oracle Cloud Infrastructure",
   "ociComputeTitle": "Virtual machines usage",
   "ociCostTrendTitle": "Oracle Cloud Infrastructure cumulative cost comparison ({units})",
   "ociDailyCostTrendTitle": "Oracle Cloud Infrastructure daily cost comparison ({units})",
   "ociDashboardCostTitle": "Oracle Cloud Infrastructure cost",
   "ociDesc": "Raw cost from Oracle Cloud Infrastructure.",
-  "ociDetailsTitle": "Oracle Cloud Infrastructure Details",
+  "ociDetailsTitle": "Oracle Cloud Infrastructure details",
   "ocp": "OpenShift Container Platform",
   "ocpCli": "OpenShift CLI",
   "ocpCloudDashboardComputeTitle": "Compute services usage",
@@ -499,7 +499,7 @@
   "ocpDetailsInfrastructureCostDesc": "The cost based on raw usage data from the underlying infrastructure.",
   "ocpDetailsSupplementaryCost": "Supplementary cost",
   "ocpDetailsSupplementaryCostDesc": "All costs not directly attributed to the infrastructure. These costs are determined by applying a price list within a cost model to OpenShift cluster metrics.",
-  "ocpDetailsTitle": "OpenShift Details",
+  "ocpDetailsTitle": "OpenShift details",
   "ocpMemoryUsageAndRequests": "Memory usage and requests",
   "ocpVolumeUsageAndRequests": "Volume usage and requests",
   "openShift": "OpenShift",
@@ -511,20 +511,20 @@
   "overheadDesc": "Includes distributed costs {value}",
   "overviewInfoArialLabel": "A description of perspectives",
   "overviewInfoButtonArialLabel": "A dialog with a description of perspectives",
-  "overviewTitle": "Cost Management Overview",
-  "pageTitleAws": "Amazon Web Services - Cost Management | OpenShift",
-  "pageTitleAzure": "Microsoft Azure - Cost Management | OpenShift",
-  "pageTitleCostModels": "Cost Models - Cost Management | OpenShift",
-  "pageTitleDefault": "Cost Management | OpenShift",
-  "pageTitleExplorer": "Cost Explorer - Cost Management | OpenShift",
-  "pageTitleGcp": "Google Cloud Platform - Cost Management | OpenShift",
-  "pageTitleIbm": "IBM Cloud - Cost Management | OpenShift",
-  "pageTitleOci": "Oracle Cloud Infrastructure - Cost Management | OpenShift",
-  "pageTitleOcp": "OpenShift - Cost Management | OpenShift",
-  "pageTitleOptimizations": "Optimizations - Cost Management | OpenShift",
-  "pageTitleOverview": "Overview - Cost Management | OpenShift",
-  "pageTitleRhel": "RHEL - Cost Management | OpenShift",
-  "pageTitleSettings": "Settings - Cost Management | OpenShift",
+  "overviewTitle": "Cost management overview",
+  "pageTitleAws": "Amazon Web Services - Cost management | OpenShift",
+  "pageTitleAzure": "Microsoft Azure - Cost management | OpenShift",
+  "pageTitleCostModels": "Cost models - Cost management | OpenShift",
+  "pageTitleDefault": "Cost management | OpenShift",
+  "pageTitleExplorer": "Cost explorer - Cost management | OpenShift",
+  "pageTitleGcp": "Google Cloud Platform - Cost management | OpenShift",
+  "pageTitleIbm": "IBM Cloud - Cost management | OpenShift",
+  "pageTitleOci": "Oracle Cloud Infrastructure - Cost management | OpenShift",
+  "pageTitleOcp": "OpenShift - Cost management | OpenShift",
+  "pageTitleOptimizations": "Optimizations - Cost management | OpenShift",
+  "pageTitleOverview": "Overview - Cost management | OpenShift",
+  "pageTitleRhel": "RHEL - Cost management | OpenShift",
+  "pageTitleSettings": "Settings - Cost management | OpenShift",
   "paginationTitle": "{placement, select, top {{title} top pagination} bottom {{title} bottom pagination} other {{title} pagination}}",
   "percent": "{value} %",
   "percentOfCost": "{value} % of cost",
@@ -573,7 +573,7 @@
   "rhelDesc": "Total cost for Red Hat Enterprise Linux, comprising the infrastructure cost and cost calculated from metrics.",
   "rhelDetailsInfrastructureCost": "Infrastructure cost",
   "rhelDetailsSupplementaryCost": "Supplementary cost",
-  "rhelDetailsTitle": "RHEL Details",
+  "rhelDetailsTitle": "RHEL details",
   "rhelMemoryUsageAndRequests": "Memory usage and requests",
   "rhelVolumeUsageAndRequests": "Volume usage and requests",
   "save": "Save",
@@ -593,7 +593,7 @@
   "settingsErrorTitle": "Unable to save application settings",
   "settingsSuccessChanges": "Changes will be reflected in report summarizations within 24 hours",
   "settingsSuccessCostCategories": "{value, select, enable {{count, plural, one {{count} cost category key enabled} other {{count} cost category keys enabled}}} disable {{count, plural, one {{count} cost category key disabled} other {{count} cost category keys disabled}}} other {}}",
-  "settingsSuccessDesc": "Settings for Cost Management were replaced with new values",
+  "settingsSuccessDesc": "Settings for cost management were replaced with new values",
   "settingsSuccessPlatformProjects": "{value, select, add {{count, plural, one {{count} projects added to Platform projects} other {{count} project added to Platform projects}}} remove {{count, plural, one {{count} projects removed from Platform projects} other {{count} project removed from Platform projects}}} other {}}",
   "settingsSuccessTags": "{value, select, add {{count, plural, one {{count} tag key added} other {{count} tag key added}}} enable {{count, plural, one {{count} tag enabled} other {{count} tags enabled}}} disable {{count, plural, one {{count} tag disabled} other {{count} tags disabled}}} remove {{count, plural, one {{count} tag key removed} other {{count} tag key removed}}} other {}}",
   "settingsSuccessTitle": "Application settings saved",
@@ -601,7 +601,7 @@
   "settingsTagMappingDisableErrorTitle": "Can not disable a key associated with a tag mapping",
   "settingsTagsErrorDesc": "You currently have {value} tags enabled",
   "settingsTagsErrorTitle": "You can not enable more than {value} tags total",
-  "settingsTitle": "Cost Management Settings",
+  "settingsTitle": "Cost management settings",
   "sinceDate": "{dateRange}",
   "source": "{value, select, aws {Amazon Web Services source:} azure {Microsoft Azure source:} oci {Oracle Cloud Infrastructure source:} gcp {Google Cloud Platform source:} ocp {OpenShift source:} other {}}",
   "sourceType": "Integration",
@@ -645,11 +645,11 @@
   "tagMappingSelectChildTags": "Select child tags",
   "tagMappingSelectChildTagsDesc": "Select the child tags that you want to map to the parent key you selected in the previous step. Tags that have been already mapped will not be available for selection. {learnMore}",
   "tagMappingSelectParentTags": "Select parent tag",
-  "tagMappingSelectParentTagsDesc": "Select a parent tag key that will be mapped to child tags in the next step. This tag will be available for filtering in Cost Management.",
+  "tagMappingSelectParentTagsDesc": "Select a parent tag key that will be mapped to child tags in the next step. This tag will be available for filtering in cost management.",
   "tagMappingWarning": "You must enable tags to use tag mapping.",
   "tagMappingWizardDesc": "Map multiple tags across data sources to be used as a single tag key for report grouping and filtering. Changes will be reflected within 24 hours.",
   "tagMappingWizardNavToCreateTagMapping": "Create another tag mapping",
-  "tagMappingWizardNavToTagMapping": "Go back to Cost Management Settings",
+  "tagMappingWizardNavToTagMapping": "Go back to cost management settings",
   "tagMappingWizardReview": "Review details",
   "tagMappingWizardReviewDesc": "Review and confirm the tag mappings. Click {create} to create the mappings, or {back} to revise. Changes to the reports will be reflected within 24 hours.",
   "tagMappingWizardSelectChildTags": "Select child tags",
diff --git a/src/locales/messages.ts b/src/locales/messages.ts
index 440fc03f6..2fb86470c 100644
--- a/src/locales/messages.ts
+++ b/src/locales/messages.ts
@@ -21,6 +21,11 @@ export default defineMessages({
     description: 'Amazon Web Services',
     id: 'aws',
   },
+  awsAlt: {
+    defaultMessage: 'Amazon Web Services (AWS)',
+    description: 'Amazon Web Services (AWS)',
+    id: 'awsAlt',
+  },
   awsComputeTitle: {
     defaultMessage: 'Compute (EC2) instances usage',
     description: 'Compute (EC2) instances usage',
@@ -47,8 +52,8 @@ export default defineMessages({
     id: 'awsDesc',
   },
   awsDetailsTitle: {
-    defaultMessage: 'Amazon Web Services Details',
-    description: 'Amazon Web Services Details',
+    defaultMessage: 'Amazon Web Services details',
+    description: 'Amazon Web Services details',
     id: 'awsDetailsTitle',
   },
   awsOcpDashboardCostTitle: {
@@ -87,8 +92,8 @@ export default defineMessages({
     id: 'azureDesc',
   },
   azureDetailsTitle: {
-    defaultMessage: 'Microsoft Azure Details',
-    description: 'Microsoft Azure Details',
+    defaultMessage: 'Microsoft Azure details',
+    description: 'Microsoft Azure details',
     id: 'azureDetailsTitle',
   },
   azureOcpDashboardCostTitle: {
@@ -512,13 +517,13 @@ export default defineMessages({
     id: 'costManagementDocs',
   },
   costModel: {
-    defaultMessage: 'Cost Model:',
-    description: 'Cost Model:',
+    defaultMessage: 'Cost model:',
+    description: 'Cost model:',
     id: 'costModel',
   },
   costModels: {
-    defaultMessage: 'Cost Models',
-    description: 'Cost Models',
+    defaultMessage: 'Cost models',
+    description: 'Cost models',
     id: 'costModels',
   },
   costModelsActions: {
@@ -554,7 +559,7 @@ export default defineMessages({
   },
   costModelsAssignedSources: {
     defaultMessage: 'Assigned integrations',
-    description: 'Assigned integrationss',
+    description: 'Assigned integrations',
     id: 'costModelsAssignedSources',
   },
   costModelsAvailableSources: {
@@ -600,8 +605,8 @@ export default defineMessages({
     id: 'costModelsDescTooLong',
   },
   costModelsDetailsTitle: {
-    defaultMessage: 'Cost Model Details',
-    description: 'Cost Model Details',
+    defaultMessage: 'Cost model details',
+    description: 'Cost model details',
     id: 'costModelsDetailsTitle',
   },
   costModelsDistributionDesc: {
@@ -727,13 +732,13 @@ export default defineMessages({
     id: 'costModelsRouterServerError',
   },
   costModelsSelectMeasurement: {
-    defaultMessage: 'Select Measurement',
-    description: 'Select Measurement',
+    defaultMessage: 'Select measurement',
+    description: 'Select measurement',
     id: 'costModelsSelectMeasurement',
   },
   costModelsSelectMetric: {
-    defaultMessage: 'Select Metric',
-    description: 'Select Metric',
+    defaultMessage: 'Select metric',
+    description: 'Select metric',
     id: 'costModelsSelectMetric',
   },
   costModelsSourceDelete: {
@@ -838,11 +843,6 @@ export default defineMessages({
     description: 'No rates were added to the price list',
     id: 'costModelsWizardNoRatesAdded',
   },
-  costModelsWizardOnboardAws: {
-    defaultMessage: 'Amazon Web Services (AWS)',
-    description: 'Amazon Web Services (AWS)',
-    id: 'costModelsWizardOnboardAws',
-  },
   costModelsWizardOnboardOcp: {
     defaultMessage: 'Red Hat OpenShift Container Platform',
     description: 'Red Hat OpenShift Container Platform',
@@ -1202,8 +1202,8 @@ export default defineMessages({
     id: 'dataDetailsClusterData',
   },
   dataDetailsCostManagementData: {
-    defaultMessage: 'Cost Management data',
-    description: 'Cost Management data',
+    defaultMessage: 'Cost management data',
+    description: 'Cost management data',
     id: 'dataDetailsCostManagementData',
   },
   dataDetailsIntegrationAndFinalization: {
@@ -1752,8 +1752,8 @@ export default defineMessages({
     id: 'errorStateNotAuthorizedDesc',
   },
   errorStateNotAuthorizedTitle: {
-    defaultMessage: "You don't have access to the Cost management application",
-    description: "You don't have access to the Cost management application",
+    defaultMessage: "You don't have access to the cost management application",
+    description: "You don't have access to the cost management application",
     id: 'errorStateNotAuthorizedTitle',
   },
   errorStateUnexpectedDesc: {
@@ -1787,8 +1787,8 @@ export default defineMessages({
     id: 'expiresOn',
   },
   explorerChartAriaTitle: {
-    defaultMessage: 'Cost Explorer Chart',
-    description: 'Cost Explorer Chart',
+    defaultMessage: 'Cost explorer chart',
+    description: 'Cost explorer chart',
     id: 'explorerChartAriaTitle',
   },
   explorerChartTitle: {
@@ -1806,7 +1806,7 @@ export default defineMessages({
       'ocp {All OpenShift - Top 5 Costliest} ' +
       'ocp_cloud {All cloud filtered by OpenShift - Top 5 Costliest} ' +
       'other {}}',
-    description: 'Explorer chart title',
+    description: 'Cost explorer chart title',
     id: 'explorerChartTitle',
   },
   explorerDateRange: {
@@ -1824,13 +1824,13 @@ export default defineMessages({
     id: 'explorerDateRange',
   },
   explorerTableAriaLabel: {
-    defaultMessage: 'Cost Explorer table',
-    description: 'Cost Explorer table',
+    defaultMessage: 'Cost explorer table',
+    description: 'Cost explorer table',
     id: 'explorerTableAriaLabel',
   },
   explorerTitle: {
-    defaultMessage: 'Cost Explorer',
-    description: 'Cost Explorer title',
+    defaultMessage: 'Cost explorer',
+    description: 'Cost explorer title',
     id: 'explorerTitle',
   },
   exportAggregateType: {
@@ -2213,18 +2213,18 @@ export default defineMessages({
     id: 'gcpComputeTitle',
   },
   gcpCostTitle: {
-    defaultMessage: 'Google Cloud Platform Services cost',
-    description: 'Google Cloud Platform Services cost',
+    defaultMessage: 'Google Cloud Platform services cost',
+    description: 'Google Cloud Platform services cost',
     id: 'gcpCostTitle',
   },
   gcpCostTrendTitle: {
-    defaultMessage: 'Google Cloud Platform Services cumulative cost comparison ({units})',
-    description: 'Google Cloud Platform Services cumulative cost comparison ({units})',
+    defaultMessage: 'Google Cloud Platform services cumulative cost comparison ({units})',
+    description: 'Google Cloud Platform services cumulative cost comparison ({units})',
     id: 'gcpCostTrendTitle',
   },
   gcpDailyCostTrendTitle: {
-    defaultMessage: 'Google Cloud Platform Services daily cost comparison ({units})',
-    description: 'Google Cloud Platform Services daily cost comparison ({units})',
+    defaultMessage: 'Google Cloud Platform services daily cost comparison ({units})',
+    description: 'Google Cloud Platform services daily cost comparison ({units})',
     id: 'gcpDailyCostTrendTitle',
   },
   gcpDesc: {
@@ -2233,8 +2233,8 @@ export default defineMessages({
     id: 'gcpDesc',
   },
   gcpDetailsTitle: {
-    defaultMessage: 'Google Cloud Platform Details',
-    description: 'Google Cloud Platform Details',
+    defaultMessage: 'Google Cloud Platform details',
+    description: 'Google Cloud Platform details',
     id: 'gcpDetailsTitle',
   },
   groupByAll: {
@@ -2358,8 +2358,8 @@ export default defineMessages({
     id: 'historicalChartCostLabel',
   },
   historicalChartDayOfMonthLabel: {
-    defaultMessage: 'Day of Month',
-    description: 'Day of Month',
+    defaultMessage: 'Day of month',
+    description: 'Day of month',
     id: 'historicalChartDayOfMonthLabel',
   },
   historicalChartTitle: {
@@ -2393,18 +2393,18 @@ export default defineMessages({
     id: 'ibmComputeTitle',
   },
   ibmCostTitle: {
-    defaultMessage: 'IBM Cloud Services cost',
-    description: 'IBM Cloud Services cost',
+    defaultMessage: 'IBM Cloud services cost',
+    description: 'IBM Cloud services cost',
     id: 'ibmCostTitle',
   },
   ibmCostTrendTitle: {
-    defaultMessage: 'IBM Cloud Services cumulative cost comparison ({units})',
-    description: 'IBM Cloud Services cumulative cost comparison ({units})',
+    defaultMessage: 'IBM Cloud services cumulative cost comparison ({units})',
+    description: 'IBM Cloud services cumulative cost comparison ({units})',
     id: 'ibmCostTrendTitle',
   },
   ibmDailyCostTrendTitle: {
-    defaultMessage: 'IBM Cloud Services daily cost comparison ({units})',
-    description: 'IBM Cloud Services daily cost comparison ({units})',
+    defaultMessage: 'IBM Cloud services daily cost comparison ({units})',
+    description: 'IBM Cloud services daily cost comparison ({units})',
     id: 'ibmDailyCostTrendTitle',
   },
   ibmDesc: {
@@ -2413,13 +2413,13 @@ export default defineMessages({
     id: 'ibmDesc',
   },
   ibmDetailsTitle: {
-    defaultMessage: 'IBM Cloud Details',
-    description: 'IBM details title',
+    defaultMessage: 'IBM Cloud details',
+    description: 'IBM Cloud details',
     id: 'ibmDetailsTitle',
   },
   inactiveSourcesGoTo: {
-    defaultMessage: 'Go to Integrations for more information',
-    description: 'Go to Integrations for more information',
+    defaultMessage: 'Go to integrations for more information',
+    description: 'Go to integrations for more information',
     id: 'inactiveSourcesGoTo',
   },
   inactiveSourcesTitle: {
@@ -2489,8 +2489,8 @@ export default defineMessages({
   },
   maintenanceEmptyStateDesc: {
     defaultMessage:
-      'Cost Management is currently undergoing scheduled maintenance and will be unavailable from 13:00 - 19:00 UTC (09:00 AM - 03:00 PM EDT).',
-    description: 'Cost Management is currently undergoing scheduled maintenance',
+      'Cost management is currently undergoing scheduled maintenance and will be unavailable from 13:00 - 19:00 UTC (09:00 AM - 03:00 PM EDT).',
+    description: 'Cost management is currently undergoing scheduled maintenance',
     id: 'maintenanceEmptyStateDesc',
   },
   maintenanceEmptyStateInfo: {
@@ -2629,8 +2629,8 @@ export default defineMessages({
     id: 'metricValues',
   },
   metricsOperatorVersion: {
-    defaultMessage: 'Cost Management operator version',
-    description: 'Cost Management operator version',
+    defaultMessage: 'Cost management operator version',
+    description: 'Cost management operator version',
     id: 'metricsOperatorVersion',
   },
   monthOverMonthChange: {
@@ -2734,25 +2734,25 @@ export default defineMessages({
     id: 'noMappedTagsWarning',
   },
   noProvidersCloudCost: {
-    defaultMessage: 'Include Cloud provider (AWS, GCP, Azure, OCI) cost',
-    description: 'Include Cloud provider (AWS, GCP, Azure, OCI) cost',
+    defaultMessage: 'Include cloud provider (AWS, GCP, Azure, OCI) cost',
+    description: 'Include cloud provider (AWS, GCP, Azure, OCI) cost',
     id: 'noProvidersCloudCost',
   },
   noProvidersCloudCostDesc: {
     defaultMessage:
-      'If you want to do only cloud provider such as AWS, Google, Azure, or Oracle, you need to set up an integration in order to start using Cost Management service.',
+      'If you want to do only cloud provider such as AWS, Google, Azure, or Oracle, you need to set up an integration in order to start using cost management service.',
     description:
-      'If you want to do only cloud provider such as AWS, Google, Azure, or Oracle, you need to set up an integration in order to start using Cost Management service.',
+      'If you want to do only cloud provider such as AWS, Google, Azure, or Oracle, you need to set up an integration in order to start using cost management service.',
     id: 'noProvidersCloudCostDesc',
   },
   noProvidersCloudIntegration: {
-    defaultMessage: 'Set up a Cloud provider integration',
-    description: 'Set up a Cloud provider integration',
+    defaultMessage: 'Set up a cloud provider integration',
+    description: 'Set up a cloud provider integration',
     id: 'noProvidersCloudIntegration',
   },
   noProvidersCloudIntegrationHelp: {
-    defaultMessage: 'If you need further help setting up Cloud provider in cost management',
-    description: 'If you need further help setting up Cloud provider in cost management',
+    defaultMessage: 'If you need further help setting up cloud provider in cost management',
+    description: 'If you need further help setting up cloud provider in cost management',
     id: 'noProvidersCloudIntegrationHelp',
   },
   noProvidersCloudIntegrationHelpAws: {
@@ -2790,13 +2790,13 @@ export default defineMessages({
     id: 'noProvidersDesc',
   },
   noProvidersGetStarted: {
-    defaultMessage: 'Get started with Cost management',
-    description: 'Get started with Cost management',
+    defaultMessage: 'Get started with cost management',
+    description: 'Get started with cost management',
     id: 'noProvidersGetStarted',
   },
   noProvidersMetricsOperator: {
-    defaultMessage: 'Install Cost Management metric operator',
-    description: 'Install Cost Management metric operator',
+    defaultMessage: 'Install cost management metric operator',
+    description: 'Install cost management metric operator',
     id: 'noProvidersMetricsOperator',
   },
   noProvidersOcpCli: {
@@ -2816,9 +2816,9 @@ export default defineMessages({
   },
   noProvidersOcpCostDesc: {
     defaultMessage:
-      'Additionally to your OpenShift cluster set up, you need to set up Cost Management Metrics Operator in order to start using Cost Management service.',
+      'Additionally to your OpenShift cluster set up, you need to set up cost management metrics operator in order to start using cost management service.',
     description:
-      'Additionally to your OpenShift cluster set up, you need to set up Cost Management Metrics Operator in order to start using Cost Management service.',
+      'Additionally to your OpenShift cluster set up, you need to set up cost management metrics operator in order to start using cost management service.',
     id: 'noProvidersOcpCostDesc',
   },
   noProvidersRecommended: {
@@ -2885,8 +2885,8 @@ export default defineMessages({
     id: 'noProvidersStateIbmTitle',
   },
   noProvidersStateOcpAddSources: {
-    defaultMessage: 'Add an OpenShift cluster to Cost Management',
-    description: 'Add an OpenShift cluster to Cost Management',
+    defaultMessage: 'Add an OpenShift cluster to cost management',
+    description: 'Add an OpenShift cluster to cost management',
     id: 'noProvidersStateOcpAddSources',
   },
   noProvidersStateOcpDesc: {
@@ -2924,53 +2924,53 @@ export default defineMessages({
     id: 'noResultsFound',
   },
   notAuthorizedStateAws: {
-    defaultMessage: 'Amazon Web Services in Cost Management',
-    description: 'Amazon Web Services in Cost Management',
+    defaultMessage: 'Amazon Web Services in cost management',
+    description: 'Amazon Web Services in cost management',
     id: 'notAuthorizedStateAws',
   },
   notAuthorizedStateAzure: {
-    defaultMessage: 'Microsoft Azure in Cost Management',
-    description: 'Microsoft Azure in Cost Management',
+    defaultMessage: 'Microsoft Azure in cost management',
+    description: 'Microsoft Azure in cost management',
     id: 'notAuthorizedStateAzure',
   },
   notAuthorizedStateCostModels: {
-    defaultMessage: 'Cost Models in Cost Management',
-    description: 'Cost Models in Cost Management',
+    defaultMessage: 'Cost models in cost management',
+    description: 'Cost models in cost management',
     id: 'notAuthorizedStateCostModels',
   },
   notAuthorizedStateGcp: {
-    defaultMessage: 'Google Cloud Platform in Cost Management',
-    description: 'Google Cloud Platform in Cost Management',
+    defaultMessage: 'Google Cloud Platform in cost management',
+    description: 'Google Cloud Platform in cost management',
     id: 'notAuthorizedStateGcp',
   },
   notAuthorizedStateIbm: {
-    defaultMessage: 'IBM Cloud in Cost Management',
-    description: 'IBM Cloud in Cost Management',
+    defaultMessage: 'IBM Cloud in cost management',
+    description: 'IBM Cloud in cost management',
     id: 'notAuthorizedStateIbm',
   },
   notAuthorizedStateOci: {
-    defaultMessage: 'Oracle Cloud Infrastructure in Cost Management',
-    description: 'Oracle Cloud Infrastructure in Cost Management',
+    defaultMessage: 'Oracle Cloud Infrastructure in cost management',
+    description: 'Oracle Cloud Infrastructure in cost management',
     id: 'notAuthorizedStateOci',
   },
   notAuthorizedStateOcp: {
-    defaultMessage: 'OpenShift in Cost Management',
-    description: 'OpenShift in Cost Management',
+    defaultMessage: 'OpenShift in cost management',
+    description: 'OpenShift in cost management',
     id: 'notAuthorizedStateOcp',
   },
   notAuthorizedStateOptimizations: {
-    defaultMessage: 'Optimizations in Cost Management',
-    description: 'Optimizations in Cost Management',
+    defaultMessage: 'Optimizations in cost management',
+    description: 'Optimizations in cost management',
     id: 'notAuthorizedStateOptimizations',
   },
   notAuthorizedStateRhel: {
-    defaultMessage: 'RHEL in Cost Management',
-    description: 'RHEL in Cost Management',
+    defaultMessage: 'RHEL in cost management',
+    description: 'RHEL in cost management',
     id: 'notAuthorizedStateRhel',
   },
   notAuthorizedStateSettings: {
-    defaultMessage: 'Settings in Cost Management',
-    description: 'Settings in Cost Management',
+    defaultMessage: 'Settings in cost management',
+    description: 'Settings in cost management',
     id: 'notAuthorizedStateSettings',
   },
   oci: {
@@ -3004,8 +3004,8 @@ export default defineMessages({
     id: 'ociDesc',
   },
   ociDetailsTitle: {
-    defaultMessage: 'Oracle Cloud Infrastructure Details',
-    description: 'Oracle Cloud Infrastructure Details',
+    defaultMessage: 'Oracle Cloud Infrastructure details',
+    description: 'Oracle Cloud Infrastructure details',
     id: 'ociDetailsTitle',
   },
   ocp: {
@@ -3091,8 +3091,8 @@ export default defineMessages({
     id: 'ocpDetailsSupplementaryCostDesc',
   },
   ocpDetailsTitle: {
-    defaultMessage: 'OpenShift Details',
-    description: 'OpenShift Details',
+    defaultMessage: 'OpenShift details',
+    description: 'OpenShift details',
     id: 'ocpDetailsTitle',
   },
   ocpMemoryUsageAndRequests: {
@@ -3155,73 +3155,73 @@ export default defineMessages({
     id: 'overviewInfoButtonArialLabel',
   },
   overviewTitle: {
-    defaultMessage: 'Cost Management Overview',
-    description: 'Cost Management Overview',
+    defaultMessage: 'Cost management overview',
+    description: 'Cost management overview',
     id: 'overviewTitle',
   },
   pageTitleAws: {
-    defaultMessage: 'Amazon Web Services - Cost Management | OpenShift',
-    description: 'Amazon Web Services - Cost Management | OpenShift',
+    defaultMessage: 'Amazon Web Services - Cost management | OpenShift',
+    description: 'Amazon Web Services - Cost management | OpenShift',
     id: 'pageTitleAws',
   },
   pageTitleAzure: {
-    defaultMessage: 'Microsoft Azure - Cost Management | OpenShift',
-    description: 'Microsoft Azure - Cost Management | OpenShift',
+    defaultMessage: 'Microsoft Azure - Cost management | OpenShift',
+    description: 'Microsoft Azure - Cost management | OpenShift',
     id: 'pageTitleAzure',
   },
   pageTitleCostModels: {
-    defaultMessage: 'Cost Models - Cost Management | OpenShift',
-    description: 'Cost Models - Cost Management | OpenShift',
+    defaultMessage: 'Cost models - Cost management | OpenShift',
+    description: 'Cost models - Cost management | OpenShift',
     id: 'pageTitleCostModels',
   },
   pageTitleDefault: {
-    defaultMessage: 'Cost Management | OpenShift',
-    description: 'Cost Management | OpenShift',
+    defaultMessage: 'Cost management | OpenShift',
+    description: 'Cost management | OpenShift',
     id: 'pageTitleDefault',
   },
   pageTitleExplorer: {
-    defaultMessage: 'Cost Explorer - Cost Management | OpenShift',
-    description: 'Cost Explorer - Cost Management | OpenShift',
+    defaultMessage: 'Cost explorer - Cost management | OpenShift',
+    description: 'Cost explorer - Cost management | OpenShift',
     id: 'pageTitleExplorer',
   },
   pageTitleGcp: {
-    defaultMessage: 'Google Cloud Platform - Cost Management | OpenShift',
-    description: 'Google Cloud Platform - Cost Management | OpenShift',
+    defaultMessage: 'Google Cloud Platform - Cost management | OpenShift',
+    description: 'Google Cloud Platform - Cost management | OpenShift',
     id: 'pageTitleGcp',
   },
   pageTitleIbm: {
-    defaultMessage: 'IBM Cloud - Cost Management | OpenShift',
-    description: 'IBM Cloud - Cost Management | OpenShift',
+    defaultMessage: 'IBM Cloud - Cost management | OpenShift',
+    description: 'IBM Cloud - Cost management | OpenShift',
     id: 'pageTitleIbm',
   },
   pageTitleOci: {
-    defaultMessage: 'Oracle Cloud Infrastructure - Cost Management | OpenShift',
-    description: 'Oracle Cloud Infrastructure - Cost Management | OpenShift',
+    defaultMessage: 'Oracle Cloud Infrastructure - Cost management | OpenShift',
+    description: 'Oracle Cloud Infrastructure - Cost management | OpenShift',
     id: 'pageTitleOci',
   },
   pageTitleOcp: {
-    defaultMessage: 'OpenShift - Cost Management | OpenShift',
-    description: 'OpenShift - Cost Management | OpenShift',
+    defaultMessage: 'OpenShift - Cost management | OpenShift',
+    description: 'OpenShift - Cost management | OpenShift',
     id: 'pageTitleOcp',
   },
   pageTitleOptimizations: {
-    defaultMessage: 'Optimizations - Cost Management | OpenShift',
-    description: 'Optimizations - Cost Management | OpenShift',
+    defaultMessage: 'Optimizations - Cost management | OpenShift',
+    description: 'Optimizations - Cost management | OpenShift',
     id: 'pageTitleOptimizations',
   },
   pageTitleOverview: {
-    defaultMessage: 'Overview - Cost Management | OpenShift',
-    description: 'Overview - Cost Management | OpenShift',
+    defaultMessage: 'Overview - Cost management | OpenShift',
+    description: 'Overview - Cost management | OpenShift',
     id: 'pageTitleOverview',
   },
   pageTitleRhel: {
-    defaultMessage: 'RHEL - Cost Management | OpenShift',
-    description: 'RHEL - Cost Management | OpenShift',
+    defaultMessage: 'RHEL - Cost management | OpenShift',
+    description: 'RHEL - Cost management | OpenShift',
     id: 'pageTitleRhel',
   },
   pageTitleSettings: {
-    defaultMessage: 'Settings - Cost Management | OpenShift',
-    description: 'Settings - Cost Management | OpenShift',
+    defaultMessage: 'Settings - Cost management | OpenShift',
+    description: 'Settings - Cost management | OpenShift',
     id: 'pageTitleSettings',
   },
   paginationTitle: {
@@ -3490,8 +3490,8 @@ export default defineMessages({
     id: 'rhelDetailsSupplementaryCost',
   },
   rhelDetailsTitle: {
-    defaultMessage: 'RHEL Details',
-    description: 'RHEL Details',
+    defaultMessage: 'RHEL details',
+    description: 'RHEL details',
     id: 'rhelDetailsTitle',
   },
   rhelMemoryUsageAndRequests: {
@@ -3594,8 +3594,8 @@ export default defineMessages({
     id: 'settingsSuccessCostCategories',
   },
   settingsSuccessDesc: {
-    defaultMessage: 'Settings for Cost Management were replaced with new values',
-    description: 'Settings for Cost Management were replaced with new values',
+    defaultMessage: 'Settings for cost management were replaced with new values',
+    description: 'Settings for cost management were replaced with new values',
     id: 'settingsSuccessDesc',
   },
   settingsSuccessPlatformProjects: {
@@ -3644,8 +3644,8 @@ export default defineMessages({
     id: 'settingsTagsErrorTitle',
   },
   settingsTitle: {
-    defaultMessage: 'Cost Management Settings',
-    description: 'Cost Management Settings',
+    defaultMessage: 'Cost management settings',
+    description: 'Cost management settings',
     id: 'settingsTitle',
   },
   sinceDate: {
@@ -3897,9 +3897,9 @@ export default defineMessages({
   },
   tagMappingSelectParentTagsDesc: {
     defaultMessage:
-      'Select a parent tag key that will be mapped to child tags in the next step. This tag will be available for filtering in Cost Management.',
+      'Select a parent tag key that will be mapped to child tags in the next step. This tag will be available for filtering in cost management.',
     description:
-      'Select a parent tag key that will be mapped to child tags in the next step. This tag will be available for filtering in Cost Management.',
+      'Select a parent tag key that will be mapped to child tags in the next step. This tag will be available for filtering in cost management.',
     id: 'tagMappingSelectParentTagsDesc',
   },
   tagMappingWarning: {
@@ -3920,8 +3920,8 @@ export default defineMessages({
     id: 'tagMappingWizardNavToCreateTagMapping',
   },
   tagMappingWizardNavToTagMapping: {
-    defaultMessage: 'Go back to Cost Management Settings',
-    description: 'Go back to Cost Management Settings',
+    defaultMessage: 'Go back to cost management settings',
+    description: 'Go back to cost management settings',
     id: 'tagMappingWizardNavToTagMapping',
   },
   tagMappingWizardReview: {
diff --git a/src/routes/components/page/noProviders/noProviders.tsx b/src/routes/components/page/noProviders/noProviders.tsx
index eb21d4c68..556bc6206 100644
--- a/src/routes/components/page/noProviders/noProviders.tsx
+++ b/src/routes/components/page/noProviders/noProviders.tsx
@@ -99,7 +99,7 @@ const NoProviders = () => {
         <div style={styles.headerDesc}>
           {intl.formatMessage(messages.noProvidersDesc, {
             ocp: <b>{intl.formatMessage(messages.ocp)}</b>,
-            aws: <b>{intl.formatMessage(messages.aws)}</b>,
+            aws: <b>{intl.formatMessage(messages.awsAlt)}</b>,
             gcp: <b>{intl.formatMessage(messages.gcp)}</b>,
             oci: <b>{intl.formatMessage(messages.oci)}</b>,
             azure: <b>{intl.formatMessage(messages.azure)}</b>,
diff --git a/src/routes/details/ocpDetails/ocpDetails.tsx b/src/routes/details/ocpDetails/ocpDetails.tsx
index 09dcdeade..a15897e69 100644
--- a/src/routes/details/ocpDetails/ocpDetails.tsx
+++ b/src/routes/details/ocpDetails/ocpDetails.tsx
@@ -452,7 +452,14 @@ class OcpDetails extends React.Component<OcpDetailsProps, OcpDetailsState> {
         );
       }
     }
-
+    const test = true;
+    if (test) {
+      return isProviderEmptyStateToggleEnabled ? (
+        <NoProviders />
+      ) : (
+        <NoProvidersOld providerType={ProviderType.ocp} title={title} />
+      );
+    }
     return (
       <div style={styles.ocpDetails}>
         <DetailsHeader
diff --git a/src/routes/settings/costModels/components/addPriceList.test.tsx b/src/routes/settings/costModels/components/addPriceList.test.tsx
index db51486e6..ecb307a6f 100644
--- a/src/routes/settings/costModels/components/addPriceList.test.tsx
+++ b/src/routes/settings/costModels/components/addPriceList.test.tsx
@@ -127,12 +127,12 @@ describe('add-a-new-rate', () => {
     await user.type(screen.getByLabelText('Description'), 'regular rate test');
 
     // select first option for metric
-    await user.click(screen.getByLabelText('Select Metric'));
+    await user.click(screen.getByLabelText('Select metric'));
     options = await screen.findAllByRole('option');
     await user.click(options[0]);
 
     // select first option for measurement
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[3]); // Previous select options are not being removed from page
 
@@ -142,7 +142,7 @@ describe('add-a-new-rate', () => {
     // selecting a different measurement does not reset cost type to default
     await user.click(screen.getByLabelText(qr.supplradio));
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[1]);
 
@@ -151,13 +151,13 @@ describe('add-a-new-rate', () => {
     // selecting metric will reset both measurement and cost type
     await user.click(screen.getByLabelText(qr.infraradio));
 
-    await user.click(screen.getByLabelText('Select Metric'));
+    await user.click(screen.getByLabelText('Select metric'));
     options = await screen.findAllByRole('option');
     await user.click(options[1]);
 
     expect(screen.getByText(regExp(messages.costModelsRequiredField))).not.toBeNull();
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[3]); // Previous select options are not being removed from page
 
@@ -198,11 +198,11 @@ describe('add-a-new-rate', () => {
 
     await user.type(screen.getByLabelText('Description'), 'tag rate test');
 
-    await user.click(screen.getByLabelText('Select Metric'));
+    await user.click(screen.getByLabelText('Select metric'));
     options = await screen.findAllByRole('option');
     await user.click(options[0]);
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[3]); // Previous select options are not being removed from page
 
@@ -269,11 +269,11 @@ describe('add-a-new-rate', () => {
 
     render(<RenderFormDataUI submit={submit} cancel={cancel} />);
 
-    await user.click(screen.getByLabelText('Select Metric'));
+    await user.click(screen.getByLabelText('Select metric'));
     options = await screen.findAllByRole('option');
     await user.click(options[1]);
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[3]); // Previous select options are not being removed from page
 
@@ -291,13 +291,13 @@ describe('add-a-new-rate', () => {
     await user.type(tagKeyInput, '{backspace}');
     expect(screen.getByText(regExp(messages.priceListDuplicate))).not.toBeNull();
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[1]);
 
     expect(screen.queryByText(regExp(messages.priceListDuplicate))).toBeNull();
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[3]);
 
@@ -312,11 +312,11 @@ describe('add-a-new-rate', () => {
 
     await render(<RenderFormDataUI submit={submit} cancel={cancel} />);
 
-    await user.click(screen.getByLabelText('Select Metric'));
+    await user.click(screen.getByLabelText('Select metric'));
     options = await screen.findAllByRole('option');
     await user.click(options[2]);
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[0]);
     expect(screen.queryAllByLabelText(regExp(messages.costModelsEnterTagRate))).toHaveLength(0);
diff --git a/src/routes/settings/costModels/costModel/updateRateModel.test.tsx b/src/routes/settings/costModels/costModel/updateRateModel.test.tsx
index 845509e79..a4d3c192a 100644
--- a/src/routes/settings/costModels/costModel/updateRateModel.test.tsx
+++ b/src/routes/settings/costModels/costModel/updateRateModel.test.tsx
@@ -283,7 +283,7 @@ describe('update-rate', () => {
     expect(saveButton.getAttribute('disabled')).not.toBeNull();
   });
 
-  test('Select Measurement', async () => {
+  test('Select measurement', async () => {
     const user = userEvent.setup({ advanceTimers: jest.advanceTimersByTime });
     let options = null;
 
@@ -291,33 +291,33 @@ describe('update-rate', () => {
 
     const saveButton = screen.getByText(regExp(messages.save));
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[1]);
 
     expect(saveButton.getAttribute('disabled')).toBeNull();
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[0]);
 
     expect(saveButton.getAttribute('disabled')).not.toBeNull();
 
-    await user.click(screen.getByLabelText('Select Metric'));
+    await user.click(screen.getByLabelText('Select metric'));
     options = await screen.findAllByRole('option');
     await user.click(options[1]);
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[5]); // Previous select options are not being removed from page
 
     expect(saveButton.getAttribute('disabled')).toBeNull();
 
-    await user.click(screen.getByLabelText('Select Metric'));
+    await user.click(screen.getByLabelText('Select metric'));
     options = await screen.findAllByRole('option');
     await user.click(options[0]);
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[0]);
 
@@ -393,7 +393,7 @@ describe('update-rate', () => {
     let options = null;
     render(<RenderFormDataUI index={0} />);
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[1]);
 
diff --git a/src/routes/settings/costModels/costModelWizard/generalInformation.tsx b/src/routes/settings/costModels/costModelWizard/generalInformation.tsx
index 2ff795329..7b94011cb 100644
--- a/src/routes/settings/costModels/costModelWizard/generalInformation.tsx
+++ b/src/routes/settings/costModels/costModelWizard/generalInformation.tsx
@@ -49,7 +49,7 @@ class GeneralInformation extends React.Component<GeneralInformationProps, any> {
     const { intl } = this.props;
     const sourceTypeOptions = [
       {
-        label: messages.costModelsWizardOnboardAws,
+        label: messages.awsAlt,
         value: 'AWS',
       },
       {