diff --git a/manifests/compute/compute_common.pp b/manifests/compute.pp
similarity index 93%
rename from manifests/compute/compute_common.pp
rename to manifests/compute.pp
index 99c2d654..d2d735db 100644
--- a/manifests/compute/compute_common.pp
+++ b/manifests/compute.pp
@@ -13,10 +13,16 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-# Compute Common (controller/hypervisor)
+# == Class: privatecloud::compute
+#
+# Common class for compute nodes
+#
+# === Parameters:
+#
+# (WIP)
 #
 
-class os_compute_common(
+class privatecloud::compute(
   $nova_db_host            = $os_params::nova_db_host,
   $nova_db_user            = $os_params::nova_db_user,
   $nova_db_password        = $os_params::nova_db_password,
diff --git a/manifests/compute/compute_controller.pp b/manifests/compute/controller.pp
similarity index 98%
rename from manifests/compute/compute_controller.pp
rename to manifests/compute/controller.pp
index 2c8c5014..8fb92836 100644
--- a/manifests/compute/compute_controller.pp
+++ b/manifests/compute/controller.pp
@@ -16,7 +16,7 @@
 # Compute controller node
 #
 
-class os_compute_controller(
+class privatecloud::compute::controller(
   $ks_keystone_internal_host            = $os_params::ks_keystone_internal_host,
   $ks_nova_password                     = $os_params::ks_nova_password,
   $neutron_metadata_proxy_shared_secret = $os_params::neutron_metadata_proxy_shared_secret,
diff --git a/manifests/compute/compute_hypervisor.pp b/manifests/compute/hypervisor.pp
similarity index 98%
rename from manifests/compute/compute_hypervisor.pp
rename to manifests/compute/hypervisor.pp
index f5a7d4ea..a2db1a8c 100644
--- a/manifests/compute/compute_hypervisor.pp
+++ b/manifests/compute/hypervisor.pp
@@ -16,7 +16,7 @@
 # Hypervisor Compute node
 #
 
-class os_compute_hypervisor(
+class privatecloud::compute::hypervisor(
   $local_ip          = $ipaddress_eth1,
   $libvirt_type      = 'kvm',
 ) {
diff --git a/site.pp b/site.pp
index e5fd3834..22019db6 100644
--- a/site.pp
+++ b/site.pp
@@ -19,6 +19,7 @@
 import 'params.pp'
 
 # Import manifests
+import 'manifests/*.pp'
 import 'manifests/compute/*.pp'
 import 'manifests/database/*.pp'
 import 'manifests/image/*.pp'
@@ -34,9 +35,6 @@ node common {
 # Params
   class { 'os_params': }
 
-# Common system configuration
-  class { 'privatecloud': }
-
 }
 
 
@@ -63,6 +61,9 @@ node 'os-ci-test13', 'os-ci-test12', 'os-ci-test11', /mgmt\d+.enovance.com/ inhe
 ## Dashboard:
     class {'privatecloud::dashboard':}
 
+## Compute:
+    class {'privatecloud::compute::controller':}
+
 ## Telemetry
     class {'os_telemetry_common':}
     class {'os_telemetry_server':}
@@ -133,7 +134,7 @@ node 'os-ci-test10', /compute\d+.enovance.com/ inherits common {
   class { 'os_network_compute': }
 
 ## Compute
-  class { 'os_compute_hypervisor':
+  class { 'privatecloud::compute::hypervisor':
     local_ip => $ipaddress_eth0,
   }