diff --git a/.fixtures.yml b/.fixtures.yml
index 2ca6a26f..5adb1858 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -53,7 +53,7 @@ fixtures:
       ref: '11ab036fed3b252492f5400bf8fd69698d510482'
     'rabbitmq':
       repo: 'git://github.com/enovance/puppetlabs-rabbitmq'
-      ref: 'ea039dd917e17a1c2f5cf7699fdd9f40b72f0d91'
+      ref: '25420cb3c26c9a8432ab519d43c094d614d4fec4'
     'memcached':
       repo: 'git://github.com/enovance/puppet-memcached'
       ref: 'd009260de3c7623003318555ec5ca61217ea3ca1'
diff --git a/Puppetfile b/Puppetfile
index 9ea2e3ca..8a685112 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -102,7 +102,7 @@ mod 'ntp',
   :ref => 'eb02ba2937ce86fb609ae41499767244b78ec58d'
 mod 'rabbitmq',
   :git => 'git://github.com/enovance/puppetlabs-rabbitmq.git',
-  :ref => 'ea039dd917e17a1c2f5cf7699fdd9f40b72f0d91'
+  :ref => '25420cb3c26c9a8432ab519d43c094d614d4fec4'
 mod 'rhnreg_ks',
   :git => 'git://github.com/enovance/puppet-rhnreg_ks.git',
   :ref => '8fdc051992b44a09f39d3b510d7cd6db5ed5ff66'
diff --git a/manifests/messaging.pp b/manifests/messaging.pp
index fef95467..56d59f71 100644
--- a/manifests/messaging.pp
+++ b/manifests/messaging.pp
@@ -33,22 +33,22 @@ class cloud::messaging(
   $rabbit_password = $os_params::rabbit_password
 ){
 
-  class { 'rabbitmq::server':
+  class { 'rabbitmq':
     delete_guest_user        => true,
     config_cluster           => true,
-    cluster_disk_nodes       => $rabbit_names,
+    cluster_nodes            => $rabbit_names,
     wipe_db_on_cookie_change => true,
   }
 
   rabbitmq_vhost { '/':
     provider => 'rabbitmqctl',
-    require  => Class['rabbitmq::server'],
+    require  => Class['rabbitmq'],
   }
   rabbitmq_user { ['nova','glance','neutron','cinder','ceilometer','heat']:
     admin    => true,
     password => $rabbit_password,
     provider => 'rabbitmqctl',
-    require  => Class['rabbitmq::server']
+    require  => Class['rabbitmq']
   }
   rabbitmq_user_permissions {[
     'nova@/',
diff --git a/spec/classes/cloud_messaging_spec.rb b/spec/classes/cloud_messaging_spec.rb
index fb33683c..0b72bce6 100644
--- a/spec/classes/cloud_messaging_spec.rb
+++ b/spec/classes/cloud_messaging_spec.rb
@@ -30,10 +30,10 @@ describe 'cloud::messaging' do
     end
 
     it 'configure rabbitmq-server' do
-      should contain_class('rabbitmq::server').with(
+      should contain_class('rabbitmq').with(
           :delete_guest_user        => true,
           :config_cluster           => true,
-          :cluster_disk_nodes       => params[:rabbit_names],
+          :cluster_nodes            => params[:rabbit_names],
           :wipe_db_on_cookie_change => true
         )
     end