diff --git a/manifests/volume/volume_common.pp b/manifests/volume.pp
similarity index 98%
rename from manifests/volume/volume_common.pp
rename to manifests/volume.pp
index dcbffbf6..54b66829 100644
--- a/manifests/volume/volume_common.pp
+++ b/manifests/volume.pp
@@ -16,7 +16,7 @@
 # Volume Common
 #
 
-class os_volume_common(
+class privatecloud::volume(
   $cinder_db_host             = $os_params::cinder_db_host,
   $cinder_db_user             = $os_params::cinder_db_user,
   $cinder_db_password         = $os_params::cinder_db_password,
diff --git a/manifests/volume/volume_controller.pp b/manifests/volume/controller.pp
similarity index 97%
rename from manifests/volume/volume_controller.pp
rename to manifests/volume/controller.pp
index 0b99f6a2..608d4920 100644
--- a/manifests/volume/volume_controller.pp
+++ b/manifests/volume/controller.pp
@@ -16,7 +16,7 @@
 # Volume controller
 #
 
-class os_volume_controller(
+class privatecloud::volume::controller(
   $ks_cinder_internal_port   = $os_params::ks_cinder_internal_port,
   $ks_cinder_password        = $os_params::ks_cinder_password,
   $ks_keystone_internal_host = $os_params::ks_keystone_internal_host,
diff --git a/manifests/volume/volume_storage.pp b/manifests/volume/storage.pp
similarity index 95%
rename from manifests/volume/volume_storage.pp
rename to manifests/volume/storage.pp
index 52f42969..a9dfea3f 100644
--- a/manifests/volume/volume_storage.pp
+++ b/manifests/volume/storage.pp
@@ -16,7 +16,7 @@
 # Volume storage
 #
 
-class os_volume_storage {
+class privatecloud::volume::storage {
 
   class { 'cinder::volume::rbd':
     rbd_pool           => $os_params::cinder_rbd_pool,