diff --git a/manifests/database/nosql_node.pp b/manifests/database/nosql.pp
similarity index 94%
rename from manifests/database/nosql_node.pp
rename to manifests/database/nosql.pp
index 0a4f0c2d..ec159266 100644
--- a/manifests/database/nosql_node.pp
+++ b/manifests/database/nosql.pp
@@ -16,7 +16,7 @@
 # MongoDB Server Node
 #
 
-class os_nosql_node {
+class privatecloud::database::nosql {
 
   class { 'mongodb':
     packagename => 'mongodb-10gen'
diff --git a/manifests/database/sql_node.pp b/manifests/database/sql.pp
similarity index 99%
rename from manifests/database/sql_node.pp
rename to manifests/database/sql.pp
index 4f244807..150c8f30 100644
--- a/manifests/database/sql_node.pp
+++ b/manifests/database/sql.pp
@@ -16,7 +16,7 @@
 # MySQL Galera Node
 #
 
-class os_sql_node (
+class privatecloud::database::sql (
     $local_ip                  = $ipaddress,
     $service_provider          = sysv,
     $galera_nextserver         = $os_params::galera_nextserver,
diff --git a/site.pp b/site.pp
index f3487505..6d3b99e9 100644
--- a/site.pp
+++ b/site.pp
@@ -60,8 +60,8 @@ node 'os-ci-test13', 'os-ci-test12', 'os-ci-test11', /mgmt\d+.enovance.com/ inhe
     class {'privatecloud::loadbalancer':}
 
 ## Databases:
-    class {'os_nosql_node':}
-    class {'os_sql_node':}
+    class {'privatecloud::database::sql':}
+    class {'privatecloud::database::nosql':}
 
 ## Dashboard:
     class {'privatecloud::dashboard':}