red-hat-storage · openshift-merge-bot · Sep 16, 2025 · Sep 10, 2025
diff --git a/cypress/support.ts b/cypress/support.ts
@@ -66,11 +66,11 @@ Cypress.Commands.add('install', () => {
       cy.get('button').contains('Next').click();
       cy.get('button').contains('Next').click();
       cy.get('button')
-        .contains('Create StorageSystem')
-        .as('Create StorageSystem Button');
-      cy.get('@Create StorageSystem Button').click();
+        .contains('Create storage system')
+        .as('Create storage system Button');
+      cy.get('@Create storage system Button').click();
       // Wait for the storage system to be created.
-      cy.get('@Create StorageSystem Button', { timeout: 10 * SECOND }).should(
+      cy.get('@Create storage system Button', { timeout: 10 * SECOND }).should(
         'not.exist'
       );
 

diff --git a/locales/en/plugin__odf-console.json b/locales/en/plugin__odf-console.json
@@ -341,7 +341,7 @@
   "Balanced mode": "Balanced mode",
   "Bandwidth": "Bandwidth",
   "Before choosing this option, read the section<1>Creating Disaster Recovery Policy on Hub cluster chapter of Regional-DR solution guide</1>to understand the impact and limitations of this feature.": "Before choosing this option, read the section<1>Creating Disaster Recovery Policy on Hub cluster chapter of Regional-DR solution guide</1>to understand the impact and limitations of this feature.",
-  "Before we can create a StorageSystem, the Local Storage Operator needs to be installed. When installation is finished come back to Data Foundation to create a StorageSystem.<1><0>Install</0></1>": "Before we can create a StorageSystem, the Local Storage Operator needs to be installed. When installation is finished come back to Data Foundation to create a StorageSystem.<1><0>Install</0></1>",
+  "Before we can create a storage system, the Local Storage Operator needs to be installed. When installation is finished come back to Data Foundation to create a storage system.<1><0>Install</0></1>": "Before we can create a storage system, the Local Storage Operator needs to be installed. When installation is finished come back to Data Foundation to create a storage system.<1><0>Install</0></1>",
   "Before you use Third-party storage": "Before you use Third-party storage",
   "billions": "billions",
   "Block": "Block",
@@ -563,8 +563,8 @@
   "Create a disaster recovery policy": "Create a disaster recovery policy",
   "Create a new StorageClass using local storage devices": "Create a new StorageClass using local storage devices",
   "Create a secret with the token for every namespace using encrypted PVCs.": "Create a secret with the token for every namespace using encrypted PVCs.",
+  "Create a storage system to represent your Data Foundation system and all its required storage and computing resources.": "Create a storage system to represent your Data Foundation system and all its required storage and computing resources.",
   "Create a StorageClient to connect to a Data Foundation system.": "Create a StorageClient to connect to a Data Foundation system.",
-  "Create a StorageSystem to represent your Data Foundation system and all its required storage and computing resources.": "Create a StorageSystem to represent your Data Foundation system and all its required storage and computing resources.",
   "Create and manage your buckets": "Create and manage your buckets",
   "Create BackingStore": "Create BackingStore",
   "Create BackingStore ": "Create BackingStore ",
@@ -600,9 +600,9 @@
   "Create Storage Cluster": "Create Storage Cluster",
   "Create storage pool": "Create storage pool",
   "Create Storage Pool": "Create Storage Pool",
+  "Create storage system": "Create storage system",
   "Create StorageClient": "Create StorageClient",
   "Create StorageConsumer": "Create StorageConsumer",
-  "Create StorageSystem": "Create StorageSystem",
   "Create via Object Bucket Claim": "Create via Object Bucket Claim",
   "Create via S3 API": "Create via S3 API",
   "Created": "Created",
@@ -1428,7 +1428,7 @@
   "Pool {{name}} creation timed out. Please check if Data Foundation operator and Rook operator are running": "Pool {{name}} creation timed out. Please check if Data Foundation operator and Rook operator are running",
   "Pool {{name}} was created with errors.": "Pool {{name}} was created with errors.",
   "Pool {{name}} was successfully created": "Pool {{name}} was successfully created",
-  "Pool creation is not supported for Data Foundation's external RHCS StorageSystem.": "Pool creation is not supported for Data Foundation's external RHCS StorageSystem.",
+  "Pool creation is not supported for Data Foundation's external RHCS storage system.": "Pool creation is not supported for Data Foundation's external RHCS storage system.",
   "Pool management tasks are not supported for default pool and Data Foundation's external mode.": "Pool management tasks are not supported for default pool and Data Foundation's external mode.",
   "Pool name": "Pool name",
   "Pool utilization information": "Pool utilization information",
@@ -1486,7 +1486,7 @@
   "Raw capacity": "Raw capacity",
   "Raw Capacity": "Raw Capacity",
   "Raw capacity is the absolute total disk space available to the array subsystem.": "Raw capacity is the absolute total disk space available to the array subsystem.",
-  "Raw capacity shows the total physical capacity from all the storage pools in the StorageSystem.": "Raw capacity shows the total physical capacity from all the storage pools in the StorageSystem.",
+  "Raw capacity shows the total physical capacity from all the storage pools in the storage system.": "Raw capacity shows the total physical capacity from all the storage pools in the storage system.",
   "Read and Write NamespaceStore ": "Read and Write NamespaceStore ",
   "Read and write NamespaceStore : ": "Read and write NamespaceStore : ",
   "Read NamespaceStores": "Read NamespaceStores",
@@ -1626,8 +1626,8 @@
   "Select a profile to customise the performance of the Data Foundation cluster to meet your requirements.": "Select a profile to customise the performance of the Data Foundation cluster to meet your requirements.",
   "Select a recipe": "Select a recipe",
   "Select a single NamespaceStore that defines the write targets of the namespace bucket.": "Select a single NamespaceStore that defines the write targets of the namespace bucket.",
+  "Select a storage system for your workloads.": "Select a storage system for your workloads.",
   "Select a StorageClass to continue": "Select a StorageClass to continue",
-  "Select a StorageSystem for your workloads.": "Select a StorageSystem for your workloads.",
   "Select all": "Select all",
   "Select an arbiter zone": "Select an arbiter zone",
   "Select an existing connection": "Select an existing connection",
@@ -1769,10 +1769,11 @@
   "Storage quota:": "Storage quota:",
   "Storage status represents the health status of Data Foundation's StorageCluster.": "Storage status represents the health status of Data Foundation's StorageCluster.",
   "Storage system": "Storage system",
-  "Storage System": "Storage System",
-  "Storage System capacity": "Storage System capacity",
-  "Storage System status": "Storage System status",
-  "Storage Systems": "Storage Systems",
+  "Storage system capacity": "Storage system capacity",
+  "Storage system details": "Storage system details",
+  "Storage system is responsible for ensuring different types of file and block storage availability, storage capacity management and generic operations on storage.": "Storage system is responsible for ensuring different types of file and block storage availability, storage capacity management and generic operations on storage.",
+  "Storage system status": "Storage system status",
+  "Storage systems": "Storage systems",
   "Storage targets that are used to store chunks of data on Multicloud Object Gateway buckets.": "Storage targets that are used to store chunks of data on Multicloud Object Gateway buckets.",
   "StorageClass": "StorageClass",
   "StorageClass encryption": "StorageClass encryption",
@@ -1782,9 +1783,6 @@
   "StorageConsumer": "StorageConsumer",
   "StorageConsumer Name": "StorageConsumer Name",
   "StorageConsumers": "StorageConsumers",
-  "StorageSystem details": "StorageSystem details",
-  "StorageSystem is responsible for ensuring different types of file and block storage availability, storage capacity management and generic operations on storage.": "StorageSystem is responsible for ensuring different types of file and block storage availability, storage capacity management and generic operations on storage.",
-  "StorageSystems": "StorageSystems",
   "Stretch Cluster": "Stretch Cluster",
   "Subscription": "Subscription",
   "Subscription deprecated": "Subscription deprecated",

diff --git a/packages/mco/components/mco-dashboard/storage-system/status-card/status-card.spec.tsx b/packages/mco/components/mco-dashboard/storage-system/status-card/status-card.spec.tsx
@@ -264,13 +264,13 @@ describe('Test ODF cluster status from different clusters and namespaces', () =>
     await user.click(screen.getByText('Systems'));
     // Storage system health
     // Popover
-    expect(screen.getByText('Storage System status')).toBeInTheDocument();
+    expect(screen.getByText('Storage system status')).toBeInTheDocument();
     expect(
       screen.getByText(
-        'StorageSystem is responsible for ensuring different types of file and block storage availability, storage capacity management and generic operations on storage.'
+        'Storage system is responsible for ensuring different types of file and block storage availability, storage capacity management and generic operations on storage.'
       )
     ).toBeInTheDocument();
-    expect(screen.getByText('Storage System (2)')).toBeInTheDocument();
+    expect(screen.getByText('Storage system (2)')).toBeInTheDocument();
     //  Operator status
     expect(screen.getAllByText('Warning')).toHaveLength(2);
     expect(screen.getByText('Critical')).toBeInTheDocument();
@@ -317,13 +317,13 @@ describe('Test ODF cluster status from different clusters and namespaces', () =>
     await user.click(screen.getByText('Systems'));
     // Storage system health
     // Popover
-    expect(screen.getByText('Storage System status')).toBeInTheDocument();
+    expect(screen.getByText('Storage system status')).toBeInTheDocument();
     expect(
       screen.getByText(
-        'StorageSystem is responsible for ensuring different types of file and block storage availability, storage capacity management and generic operations on storage.'
+        'Storage system is responsible for ensuring different types of file and block storage availability, storage capacity management and generic operations on storage.'
       )
     ).toBeInTheDocument();
-    expect(screen.getByText('Storage System (2)')).toBeInTheDocument();
+    expect(screen.getByText('Storage system (2)')).toBeInTheDocument();
     //  Operator status
     expect(screen.getAllByText('Warning')).toHaveLength(3);
     expect(screen.getByText('Critical')).toBeInTheDocument();

diff --git a/packages/mco/components/mco-dashboard/storage-system/status-card/storage-system-popup.tsx b/packages/mco/components/mco-dashboard/storage-system/status-card/storage-system-popup.tsx
@@ -77,15 +77,15 @@ export const StorageSystemPopup: React.FC<StorageSystemPopopProps> = ({
         size="md"
         data-test="storage-system-status-title"
       >
-        {t('Storage System status')}
+        {t('Storage system status')}
       </Title>
       <Flex data-test="storage-system-status-description">
         {t(
-          'StorageSystem is responsible for ensuring different types of file and block storage availability, storage capacity management and generic operations on storage.'
+          'Storage system is responsible for ensuring different types of file and block storage availability, storage capacity management and generic operations on storage.'
         )}
       </Flex>
       <Title headingLevel="h3" size="md" data-test="storage-system-count">
-        {t('Storage System')}
+        {t('Storage system')}
         {` (${systemHealthMap.length})`}
       </Title>
       <Flex>

diff --git a/packages/mco/components/mco-dashboard/storage-system/system-capacity-card/capacity-card.tsx b/packages/mco/components/mco-dashboard/storage-system/system-capacity-card/capacity-card.tsx
@@ -377,7 +377,7 @@ const SystemCapacityCard: React.FC = () => {
         >
           <FlexItem>
             <CardTitle data-test="capacity-card-title">
-              {t('Storage System capacity')}
+              {t('Storage system capacity')}
             </CardTitle>
           </FlexItem>
           <FlexItem>

diff --git a/packages/mco/components/mco-dashboard/storage-system/system-dashboard.tsx b/packages/mco/components/mco-dashboard/storage-system/system-dashboard.tsx
@@ -29,7 +29,7 @@ export const MCODashboard: React.FC = () => {
 
 const SystemDashboard: React.FC<{}> = () => {
   const { t } = useCustomTranslation();
-  const title = t('Storage System');
+  const title = t('Storage system');
   const pages = [
     {
       href: '',

diff --git a/packages/mco/i18n-comments.ts b/packages/mco/i18n-comments.ts
@@ -5,6 +5,6 @@
 // t('Relocate application')
 // t('Failover application')
 // t('DR Status')
-// t('Storage System')
+// t('Storage system')
 // t('Disaster recovery')
 // t('Data Services')
diff --git a/packages/ocs/dashboards/block-pool/raw-capacity-card.tsx b/packages/ocs/dashboards/block-pool/raw-capacity-card.tsx
@@ -55,7 +55,7 @@ export const RawCapacityCard: React.FC = () => {
   const availableCapacityMetric = getInstantVectorStats(availableData)?.[0]?.y;
   const totalCapacityMetric = usedCapacityMetric + availableCapacityMetric;
   const description = t(
-    'Raw capacity shows the total physical capacity from all the storage pools in the StorageSystem.'
+    'Raw capacity shows the total physical capacity from all the storage pools in the storage system.'
   );
 
   const loading = usedCapacityLoading || availableLoading;

diff --git a/packages/ocs/dashboards/odf-system-dashboard.tsx b/packages/ocs/dashboards/odf-system-dashboard.tsx
@@ -21,11 +21,11 @@ const ODFSystemDashboard: React.FC<{}> = ({}) => {
 
   const breadcrumbs = [
     {
-      name: t('StorageSystems'),
+      name: t('Storage systems'),
       path: '/odf/systems',
     },
     {
-      name: t('StorageSystem details'),
+      name: t('Storage system details'),
       path: '',
     },
   ];

diff --git a/packages/ocs/storage-class/sc-form.tsx b/packages/ocs/storage-class/sc-form.tsx
@@ -215,7 +215,7 @@ const StorageSystemDropdown: React.FC<{
         resourceModel={ODFStorageSystem}
       />
       <span className="help-block">
-        {t('Select a StorageSystem for your workloads.')}
+        {t('Select a storage system for your workloads.')}
       </span>
     </div>
   );

diff --git a/packages/ocs/storage-pool/CreateStoragePool.tsx b/packages/ocs/storage-pool/CreateStoragePool.tsx
@@ -346,7 +346,7 @@ const CreateStoragePoolForm: React.FC<CreateStoragePoolFormProps> = ({
       >
         <strong>
           {t(
-            "Pool creation is not supported for Data Foundation's external RHCS StorageSystem."
+            "Pool creation is not supported for Data Foundation's external RHCS storage system."
           )}
         </strong>
       </Modal>

diff --git a/packages/odf-plugin-sdk/extensions/external-storage/README.md b/packages/odf-plugin-sdk/extensions/external-storage/README.md
@@ -2,7 +2,7 @@
 
 OpenShift Data Foundation (ODF) operator supports connecting to an external vendor storage system.
 
-All external vendors can contribute their UI via the `Create storage class` step of `CreateStorageSystem` wizard.
+All external vendors can contribute their UI via the `Create storage class` step of `Create storage system` wizard.
 
 #### Prerequisite:
 

diff --git a/...create-storage-system-steps/create-local-volume-set-step/create-local-volume-set-step.tsx b/...create-storage-system-steps/create-local-volume-set-step/create-local-volume-set-step.tsx
@@ -197,9 +197,9 @@ export const LSOInstallAlert = () => {
       isInline
     >
       <Trans t={t as any} ns="plugin__odf-console">
-        Before we can create a StorageSystem, the Local Storage Operator needs
+        Before we can create a storage system, the Local Storage Operator needs
         to be installed. When installation is finished come back to Data
-        Foundation to create a StorageSystem.
+        Foundation to create a storage system.
         <div className="ceph-ocs-install__lso-alert__button">
           <Button
             type="button"

diff --git a/packages/odf/components/create-storage-system/footer.tsx b/packages/odf/components/create-storage-system/footer.tsx
@@ -447,7 +447,7 @@ export const CreateStorageSystemFooter: React.FC<
           onClick={handleNext}
         >
           {stepName === StepsName(t)[Steps.ReviewAndCreate]
-            ? t('Create StorageSystem')
+            ? t('Create storage system')
             : t('Next')}
         </Button>
         {/* Disabling the back button for the first step (Backing storage) in wizard */}

diff --git a/packages/odf/components/create-storage-system/header.tsx b/packages/odf/components/create-storage-system/header.tsx
@@ -14,10 +14,10 @@ export const CreateStorageSystemHeader: React.FC<
   return (
     <div className="odf-create-storage-system__header">
       <TextContent>
-        <Text component={TextVariants.h1}>{t('Create StorageSystem')}</Text>
+        <Text component={TextVariants.h1}>{t('Create storage system')}</Text>
         <Text component={TextVariants.small}>
           {t(
-            'Create a StorageSystem to represent your Data Foundation system and all its required storage and computing resources.'
+            'Create a storage system to represent your Data Foundation system and all its required storage and computing resources.'
           )}
         </Text>
         {!!systemNamespace && (

diff --git a/packages/odf/components/odf-dashboard/dashboard.tsx b/packages/odf/components/odf-dashboard/dashboard.tsx
@@ -83,7 +83,7 @@ const ODFDashboardPage: React.FC<{}> = () => {
       {
         id: 'systems',
         href: 'systems',
-        name: t('Storage Systems'),
+        name: t('Storage systems'),
         component: StorageSystemListPage,
         contextId: ODF_DASHBOARD_CONTEXT,
       },

diff --git a/packages/odf/components/odf-dashboard/status-card/status-card.tsx b/packages/odf/components/odf-dashboard/status-card/status-card.tsx
@@ -168,12 +168,12 @@ export const StatusCard: React.FC = () => {
           {healthySystems.length > 0 && (
             <GalleryItem>
               <HealthItem
-                title={pluralize(healthySystems.length, t('Storage System'))}
+                title={pluralize(healthySystems.length, t('Storage system'))}
                 state={HealthState.OK}
               >
                 <StatusCardPopover
                   resourceHealthMap={healthySystems}
-                  firstColumnName={t('Storage System')}
+                  firstColumnName={t('Storage system')}
                   secondColumnName={t('Health')}
                 />
               </HealthItem>
@@ -182,13 +182,13 @@ export const StatusCard: React.FC = () => {
           {unHealthySystems.length > 0 && (
             <GalleryItem>
               <HealthItem
-                title={pluralize(unHealthySystems.length, 'Storage System')}
+                title={pluralize(unHealthySystems.length, 'Storage system')}
                 state={HealthState.ERROR}
                 maxWidth="35rem"
               >
                 <StatusCardPopover
                   resourceHealthMap={unHealthySystems}
-                  firstColumnName={t('Storage System')}
+                  firstColumnName={t('Storage system')}
                   secondColumnName={t('Health')}
                 />
               </HealthItem>

diff --git a/packages/odf/components/system-list/external-systems-list.tsx b/packages/odf/components/system-list/external-systems-list.tsx
@@ -253,7 +253,7 @@ const StorageSystemList: React.FC<StorageSystemNewPageProps> = (props) => {
   return (
     <VirtualizedTable
       {...props}
-      aria-label={t('StorageSystems')}
+      aria-label={t('Storage systems')}
       columns={columns}
       Row={StorageSystemRow}
     />

diff --git a/packages/odf/components/topology/Topology.tsx b/packages/odf/components/topology/Topology.tsx
@@ -663,7 +663,7 @@ const TopologyViewErrorMessage: React.FC<TopologyViewErrorMessageProps> = ({
           t('Set up a storage cluster to view the topology')}
       </EmptyStateBody>
       {!hideCreateSSOption && (
-        <Link to={CREATE_SS_PAGE_URL}>{t('Create StorageSystem')} </Link>
+        <Link to={CREATE_SS_PAGE_URL}>{t('Create storage system')} </Link>
       )}
     </EmptyState>
   );

diff --git a/packages/shared/src/models/storage.ts b/packages/shared/src/models/storage.ts
@@ -1,8 +1,8 @@
 import { K8sModel } from '@openshift-console/dynamic-plugin-sdk/lib/api/common-types';
 
 export const ODFStorageSystem: K8sModel = {
-  label: 'Storage System',
-  labelPlural: 'Storage Systems',
+  label: 'Storage system',
+  labelPlural: 'Storage systems',
   apiVersion: 'v1alpha1',
   apiGroup: 'odf.openshift.io',
   plural: 'storagesystems',

diff --git a/plugins/mco/console-extensions.json b/plugins/mco/console-extensions.json
@@ -52,7 +52,7 @@
       "perspective": "acm",
       "insertAfter": "mco-disaster-recovery",
       "section": "mco-data-services",
-      "name": "%plugin__odf-multicluster-console~Storage System%",
+      "name": "%plugin__odf-multicluster-console~Storage system%",
       "href": "/multicloud/data-services/storagesystem"
     },
     "flags": {