diff --git a/bundle/manifests/odf-operator.clusterserviceversion.yaml b/bundle/manifests/odf-operator.clusterserviceversion.yaml
index 681c6fba8..cdb90dba8 100644
--- a/bundle/manifests/odf-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/odf-operator.clusterserviceversion.yaml
@@ -8,12 +8,12 @@ metadata:
           "apiVersion": "odf.openshift.io/v1alpha1",
           "kind": "StorageSystem",
           "metadata": {
-            "name": "ibm-flashsystemcluster-storagesystem",
+            "name": "my-flashsystemcluster-storagesystem",
             "namespace": "openshift-storage"
           },
           "spec": {
             "kind": "flashsystemcluster.odf.ibm.com/v1alpha1",
-            "name": "ibm-flashsystemcluster",
+            "name": "my-flashsystemcluster",
             "namespace": "openshift-storage"
           }
         },
@@ -21,12 +21,12 @@ metadata:
           "apiVersion": "odf.openshift.io/v1alpha1",
           "kind": "StorageSystem",
           "metadata": {
-            "name": "ocs-storagecluster-storagesystem",
+            "name": "my-storagecluster-storagesystem",
             "namespace": "openshift-storage"
           },
           "spec": {
             "kind": "storagecluster.ocs.openshift.io/v1",
-            "name": "ocs-storagecluster",
+            "name": "my-storagecluster",
             "namespace": "openshift-storage"
           }
         }
diff --git a/config/samples/ibm-flashsystemcluster-storagesystem.yaml b/config/samples/ibm-flashsystemcluster-storagesystem.yaml
index 6e112dfc2..2da90e7ab 100644
--- a/config/samples/ibm-flashsystemcluster-storagesystem.yaml
+++ b/config/samples/ibm-flashsystemcluster-storagesystem.yaml
@@ -1,9 +1,9 @@
 apiVersion: odf.openshift.io/v1alpha1
 kind: StorageSystem
 metadata:
-  name: ibm-flashsystemcluster-storagesystem
+  name: my-flashsystemcluster-storagesystem
   namespace: openshift-storage
 spec:
   kind: flashsystemcluster.odf.ibm.com/v1alpha1
-  name: ibm-flashsystemcluster
+  name: my-flashsystemcluster
   namespace: openshift-storage
diff --git a/config/samples/ocs-storagecluster-storagesystem.yaml b/config/samples/ocs-storagecluster-storagesystem.yaml
index 06e37e396..8c8368270 100644
--- a/config/samples/ocs-storagecluster-storagesystem.yaml
+++ b/config/samples/ocs-storagecluster-storagesystem.yaml
@@ -1,9 +1,9 @@
 apiVersion: odf.openshift.io/v1alpha1
 kind: StorageSystem
 metadata:
-  name: ocs-storagecluster-storagesystem
+  name: my-storagecluster-storagesystem
   namespace: openshift-storage
 spec:
   kind: storagecluster.ocs.openshift.io/v1
-  name: ocs-storagecluster
+  name: my-storagecluster
   namespace: openshift-storage