diff --git a/manifests/object-storage/swift_common.pp b/manifests/object.pp
similarity index 91%
rename from manifests/object-storage/swift_common.pp
rename to manifests/object.pp
index 166805e4..f9ee4ec8 100644
--- a/manifests/object-storage/swift_common.pp
+++ b/manifests/object.pp
@@ -16,7 +16,7 @@
 # Swift nodes
 #
 
-class os_swift_common(
+class privatecloud::object(
   $swift_hash_suffix = $os_params::swift_hash_suffix
 ) {
 
@@ -26,6 +26,6 @@ class os_swift_common(
     swift_hash_suffix => $swift_hash_suffix,
   }
 
-  class {'os_swift_system::tweaking': }
+  class {'privatecloud::object::tweaking': }
 
 }
diff --git a/manifests/object-storage/swift_proxy.pp b/manifests/object/controller.pp
similarity index 98%
rename from manifests/object-storage/swift_proxy.pp
rename to manifests/object/controller.pp
index 1697e74d..26015649 100644
--- a/manifests/object-storage/swift_proxy.pp
+++ b/manifests/object/controller.pp
@@ -16,7 +16,7 @@
 # Swift Proxy node
 #
 
-class os_swift_proxy(
+class privatecloud::object::controller(
   $ks_keystone_admin_host = $os_params::ks_keystone_admin_host,
   $ks_keystone_admin_port = $os_params::ks_keystone_admin_port,
   $ks_keystone_internal_host = $os_params::ks_keystone_internal_host,
@@ -27,7 +27,7 @@ class os_swift_proxy(
   $statsd_host = $os_params::statsd_host,
   $statsd_port = $os_params::statsd_port,
   $swift_memchached = $os_params::swift_memchached
-) inherits os_swift_common {
+) {
 
   class { 'swift::proxy':
     proxy_local_net_ip => $ipaddress_eth0,
diff --git a/manifests/object-storage/swift_ringbuiler.pp b/manifests/object/ringbuilder.pp
similarity index 97%
rename from manifests/object-storage/swift_ringbuiler.pp
rename to manifests/object/ringbuilder.pp
index 7e7a9ddc..cdc9b634 100644
--- a/manifests/object-storage/swift_ringbuiler.pp
+++ b/manifests/object/ringbuilder.pp
@@ -16,11 +16,11 @@
 # Swift ring builder node
 #
 
-class os_swift_ringbuilder(
+class privatecloud::object::ringbuilder(
     $rsyncd_ipaddress            = ipaddress_eth0,
     $replicas                    = $os_params::replicas,
     $swift_rsync_max_connections = $os_params::swift_rsync_max_connections,
-) inherits os_swift_common {
+) {
 
   Ring_object_device <<| |>>
   Ring_container_device <<| |>>
diff --git a/manifests/object-storage/swift_storage.pp b/manifests/object/storage.pp
similarity index 98%
rename from manifests/object-storage/swift_storage.pp
rename to manifests/object/storage.pp
index 36736f80..f3763262 100644
--- a/manifests/object-storage/swift_storage.pp
+++ b/manifests/object/storage.pp
@@ -27,14 +27,14 @@ define set_io_scheduler(){
 }
 
 # swift storage
-class os_swift_storage (
+class privatecloud::object::storage (
   $local_ip       = $ipaddress_eth0,
   $swift_zone     = undef,
   $object_port    = '6000',
   $container_port = '6001',
   $account_port   = '6002',
   $onloopdevices  = false,
-) inherits os_swift_common {
+) {
 
   class { 'swift::storage':
     storage_local_net_ip => $local_ip,
diff --git a/manifests/object-storage/swift_tweaking.pp b/manifests/object/tweaking.pp
similarity index 98%
rename from manifests/object-storage/swift_tweaking.pp
rename to manifests/object/tweaking.pp
index 8908be4c..ae27d6aa 100644
--- a/manifests/object-storage/swift_tweaking.pp
+++ b/manifests/object/tweaking.pp
@@ -16,7 +16,7 @@
 # Swift tweaking
 #
 
-class os_swift_system::tweaking {
+class privatecloud::object::tweaking {
   file {'/etc/sysctl.d/swift-tuning.conf':
     content => "
 # disable TIME_WAIT.. wait..