diff --git a/deployment_scripts/puppet/modules/bcf/manifests/p_only/ceph.pp b/deployment_scripts/puppet/modules/bcf/manifests/p_only/ceph.pp
index 75e0d5c..90ac7e5 100644
--- a/deployment_scripts/puppet/modules/bcf/manifests/p_only/ceph.pp
+++ b/deployment_scripts/puppet/modules/bcf/manifests/p_only/ceph.pp
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-class bcf::ceph {
+class bcf::p_only::ceph {
 
     include bcf
     include bcf::params
diff --git a/deployment_scripts/puppet/modules/bcf/manifests/p_only/compute.pp b/deployment_scripts/puppet/modules/bcf/manifests/p_only/compute.pp
index 6fb9f83..2264252 100644
--- a/deployment_scripts/puppet/modules/bcf/manifests/p_only/compute.pp
+++ b/deployment_scripts/puppet/modules/bcf/manifests/p_only/compute.pp
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-class bcf::compute {
+class bcf::p_only::compute {
 
     include bcf
     include bcf::params
diff --git a/deployment_scripts/puppet/modules/bcf/manifests/p_only/controller.pp b/deployment_scripts/puppet/modules/bcf/manifests/p_only/controller.pp
index 051bad3..78a90f0 100644
--- a/deployment_scripts/puppet/modules/bcf/manifests/p_only/controller.pp
+++ b/deployment_scripts/puppet/modules/bcf/manifests/p_only/controller.pp
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-class bcf::controller {
+class bcf::p_only::controller {
 
     include bcf
     include bcf::params
diff --git a/deployment_scripts/puppet/modules/bcf/manifests/p_v/ceph.pp b/deployment_scripts/puppet/modules/bcf/manifests/p_v/ceph.pp
index 75e0d5c..9737e3e 100644
--- a/deployment_scripts/puppet/modules/bcf/manifests/p_v/ceph.pp
+++ b/deployment_scripts/puppet/modules/bcf/manifests/p_v/ceph.pp
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-class bcf::ceph {
+class bcf::p_v::ceph {
 
     include bcf
     include bcf::params
diff --git a/deployment_scripts/puppet/modules/bcf/manifests/p_v/compute.pp b/deployment_scripts/puppet/modules/bcf/manifests/p_v/compute.pp
index 6fb9f83..f67327e 100644
--- a/deployment_scripts/puppet/modules/bcf/manifests/p_v/compute.pp
+++ b/deployment_scripts/puppet/modules/bcf/manifests/p_v/compute.pp
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-class bcf::compute {
+class bcf::p_v::compute {
 
     include bcf
     include bcf::params
diff --git a/deployment_scripts/puppet/modules/bcf/manifests/p_v/controller.pp b/deployment_scripts/puppet/modules/bcf/manifests/p_v/controller.pp
index e6dea66..5a75a0b 100644
--- a/deployment_scripts/puppet/modules/bcf/manifests/p_v/controller.pp
+++ b/deployment_scripts/puppet/modules/bcf/manifests/p_v/controller.pp
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-class bcf::controller {
+class bcf::p_v::controller {
 
     include bcf::params
     $binpath = "/usr/local/bin/:/bin/:/usr/bin:/usr/sbin:/usr/local/sbin:/sbin"