diff --git a/manifests/messaging/messaging_server.pp b/manifests/messaging.pp
similarity index 98%
rename from manifests/messaging/messaging_server.pp
rename to manifests/messaging.pp
index b8f97e4e..2a4e8a47 100644
--- a/manifests/messaging/messaging_server.pp
+++ b/manifests/messaging.pp
@@ -16,7 +16,7 @@
 # RabbitMQ node
 #
 
-class os_messaging_server(
+class privatecloud::messaging(
   $rabbit_names    = $os_params::rabbit_names,
   $rabbit_password = $os_params::rabbit_password
 ){
diff --git a/site.pp b/site.pp
index 2825c022..627ce826 100644
--- a/site.pp
+++ b/site.pp
@@ -22,7 +22,6 @@ import 'params.pp'
 import 'manifests/compute/*.pp'
 import 'manifests/database/*.pp'
 import 'manifests/image/*.pp'
-import 'manifests/messaging/*.pp'
 import 'manifests/monitoring/*.pp'
 import 'manifests/network/*.pp'
 import 'manifests/object-storage/*.pp'
@@ -85,7 +84,7 @@ node 'os-ci-test13', 'os-ci-test12', 'os-ci-test11', /mgmt\d+.enovance.com/ inhe
     Class['os_swift_ringbuilder'] -> Class['os_swift_proxy']
 
 # Messaging
-    class {'os_messaging_server': }
+    class {'privatecloud::messaging': }
 
 # Cache
     class {'privatecloud::cache': }