diff --git a/modules/cnf-installing-the-performance-addon-operator.adoc b/modules/cnf-installing-the-performance-addon-operator.adoc
index b826bce285..034817b10d 100644
--- a/modules/cnf-installing-the-performance-addon-operator.adoc
+++ b/modules/cnf-installing-the-performance-addon-operator.adoc
@@ -30,7 +30,7 @@ and then save the YAML in the `pao-namespace.yaml` file:
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: performance-addon-operator
+  name: openshift-performance-addon-operator
   labels:
     openshift.io/run-level: "1"
 ----
@@ -51,7 +51,7 @@ pao-operatorgroup.yaml` file:
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
 metadata:
-  name: performance-addon-operator
+  name: openshift-performance-addon-operator
   namespace: openshift-performance-addon-operator
 spec:
   targetNamespaces:
@@ -81,11 +81,11 @@ $ oc get packagemanifest performance-addon-operator -n openshift-marketplace -o
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
-  name: performance-addon-operator-subscription
+  name: openshift-performance-addon-operator-subscription
   namespace: openshift-performance-addon-operator
 spec:
   channel: <channel> <1>
-  name: performance-addon-operator
+  name: openshift-performance-addon-operator
   source: redhat-operators <2>
   sourceNamespace: openshift-marketplace
 ----
diff --git a/openshift_images/cnf-building-and-deploying-a-dpdk-payload.adoc b/openshift_images/cnf-building-and-deploying-a-dpdk-payload.adoc
index e66015d90d..dc36b61875 100644
--- a/openshift_images/cnf-building-and-deploying-a-dpdk-payload.adoc
+++ b/openshift_images/cnf-building-and-deploying-a-dpdk-payload.adoc
@@ -1,6 +1,6 @@
 // Epic CNF-40
-[id="cnf-building-and-deploying-a-dpdk-payload"]
-= Building and deploying a DPDK payload using the S2I image
+[id="cnf-building-and-deploying-a-dpdk-application"]
+= Building and deploying a DPDK application using the S2I image
 include::modules/common-attributes.adoc[]
 :context: building-deploying-DPDK-using-s2i-image
 toc::[]