diff --git a/src/Components/CreateImageWizard/formComponents/ReviewStep.js b/src/Components/CreateImageWizard/formComponents/ReviewStep.js
index 86ad4af6..a0c6eef0 100644
--- a/src/Components/CreateImageWizard/formComponents/ReviewStep.js
+++ b/src/Components/CreateImageWizard/formComponents/ReviewStep.js
@@ -104,13 +104,13 @@ const ReviewStep = () => {
         )}
         {getState()?.values?.['target-environment']?.vsphere && (
           <TextContent>
-            <Text component={TextVariants.h3}>VMWare vSphere (.vmdk)</Text>
+            <Text component={TextVariants.h3}>VMware vSphere (.vmdk)</Text>
             <TargetEnvOtherList />
           </TextContent>
         )}
         {getState()?.values?.['target-environment']?.['vsphere-ova'] && (
           <TextContent>
-            <Text component={TextVariants.h3}>VMWare vSphere (.ova)</Text>
+            <Text component={TextVariants.h3}>VMware vSphere (.ova)</Text>
             <TargetEnvOtherList />
           </TextContent>
         )}
diff --git a/src/Components/CreateImageWizard/formComponents/TargetEnvironment.js b/src/Components/CreateImageWizard/formComponents/TargetEnvironment.js
index 60d1ea09..7a60a6e5 100644
--- a/src/Components/CreateImageWizard/formComponents/TargetEnvironment.js
+++ b/src/Components/CreateImageWizard/formComponents/TargetEnvironment.js
@@ -243,15 +243,15 @@ const TargetEnvironment = ({ label, isRequired, ...props }) => {
           data-testid="target-private"
         >
           <Checkbox
-            label="VMWare vSphere"
+            label="VMware vSphere"
             isChecked={environment.vsphere || environment['vsphere-ova']}
             onChange={(_event, checked) => {
               handleSetEnvironment('vsphere-ova', checked);
               handleSetEnvironment('vsphere', false);
             }}
-            aria-label="VMWare checkbox"
+            aria-label="VMware checkbox"
             id="checkbox-vmware"
-            name="VMWare"
+            name="VMware"
             data-testid="checkbox-vmware"
           />
         </FormGroup>
@@ -264,7 +264,7 @@ const TargetEnvironment = ({ label, isRequired, ...props }) => {
           {allowedTargets.includes('vsphere-ova') && (
             <Radio
               name="vsphere-radio"
-              aria-label="VMWare vSphere radio button OVA"
+              aria-label="VMware vSphere radio button OVA"
               id="vsphere-radio-ova"
               label={
                 <>
@@ -276,7 +276,7 @@ const TargetEnvironment = ({ label, isRequired, ...props }) => {
                       <TextContent>
                         <Text>
                           An OVA file is a virtual appliance used by
-                          virtualization platforms such as VMWare vSphere. It is
+                          virtualization platforms such as VMware vSphere. It is
                           a package that contains files used to describe a
                           virtual machine, which includes a VMDK image, OVF
                           descriptor file and a manifest file.
@@ -299,7 +299,7 @@ const TargetEnvironment = ({ label, isRequired, ...props }) => {
           <Radio
             className="pf-u-mt-sm"
             name="vsphere-radio"
-            aria-label="VMWare vSphere radio button VMDK"
+            aria-label="VMware vSphere radio button VMDK"
             id="vsphere-radio-vmdk"
             label={
               <>
diff --git a/src/Components/CreateImageWizardV2/steps/ImageOutput/Environment.tsx b/src/Components/CreateImageWizardV2/steps/ImageOutput/Environment.tsx
index bd845cbe..0d6c8e8d 100644
--- a/src/Components/CreateImageWizardV2/steps/ImageOutput/Environment.tsx
+++ b/src/Components/CreateImageWizardV2/steps/ImageOutput/Environment.tsx
@@ -256,7 +256,7 @@ const Environment = ({ setEnvironment, environment }: EnvironmentPropType) => {
           data-testid="target-private"
         >
           <Checkbox
-            label="VMWare vSphere"
+            label="VMware vSphere"
             isChecked={
               environment.vsphere.selected ||
               environment['vsphere-ova'].selected
@@ -265,9 +265,9 @@ const Environment = ({ setEnvironment, environment }: EnvironmentPropType) => {
               handleSetEnvironment('vsphere-ova', checked);
               handleSetEnvironment('vsphere', false);
             }}
-            aria-label="VMWare checkbox"
+            aria-label="VMware checkbox"
             id="checkbox-vmware"
-            name="VMWare"
+            name="VMware"
             data-testid="checkbox-vmware"
           />
         </FormGroup>
@@ -280,7 +280,7 @@ const Environment = ({ setEnvironment, environment }: EnvironmentPropType) => {
           {environment['vsphere-ova'].authorized && (
             <Radio
               name="vsphere-radio"
-              aria-label="VMWare vSphere radio button OVA"
+              aria-label="VMware vSphere radio button OVA"
               id="vsphere-radio-ova"
               label={
                 <>
@@ -292,7 +292,7 @@ const Environment = ({ setEnvironment, environment }: EnvironmentPropType) => {
                       <TextContent>
                         <Text>
                           An OVA file is a virtual appliance used by
-                          virtualization platforms such as VMWare vSphere. It is
+                          virtualization platforms such as VMware vSphere. It is
                           a package that contains files used to describe a
                           virtual machine, which includes a VMDK image, OVF
                           descriptor file and a manifest file.
@@ -320,7 +320,7 @@ const Environment = ({ setEnvironment, environment }: EnvironmentPropType) => {
           <Radio
             className="pf-u-mt-sm"
             name="vsphere-radio"
-            aria-label="VMWare vSphere radio button VMDK"
+            aria-label="VMware vSphere radio button VMDK"
             id="vsphere-radio-vmdk"
             label={
               <>
diff --git a/src/Components/ImagesTable/Target.tsx b/src/Components/ImagesTable/Target.tsx
index f6ec2432..a5e584e7 100644
--- a/src/Components/ImagesTable/Target.tsx
+++ b/src/Components/ImagesTable/Target.tsx
@@ -16,8 +16,8 @@ const targetOptions: { [key in ImageTypes]: string } = {
   gcp: 'Google Cloud Platform',
   'guest-image': 'Virtualization - Guest image',
   'image-installer': 'Bare metal - Installer',
-  vsphere: 'VMWare vSphere',
-  'vsphere-ova': 'VMWare vSphere',
+  vsphere: 'VMware vSphere',
+  'vsphere-ova': 'VMware vSphere',
   wsl: 'Windows Subsystem for Linux',
   ami: 'Amazon Web Services',
   'rhel-edge-commit': 'RHEL Edge Commit',
diff --git a/src/test/Components/CreateImageWizard/CreateImageWizard.test.js b/src/test/Components/CreateImageWizard/CreateImageWizard.test.js
index 5b1ca0b3..19814df5 100644
--- a/src/test/Components/CreateImageWizard/CreateImageWizard.test.js
+++ b/src/test/Components/CreateImageWizard/CreateImageWizard.test.js
@@ -1184,7 +1184,7 @@ describe('Click through all steps', () => {
     await user.click(targetEnvironmentsExpandable);
     await screen.findAllByText('AWS');
     await screen.findAllByText('GCP');
-    await screen.findByText('VMWare vSphere (.ova)');
+    await screen.findByText('VMware vSphere (.ova)');
     await screen.findByText('Virtualization - Guest image (.qcow2)');
     await screen.findByText('Bare metal - Installer (.iso)');