diff --git a/manifests/messaging_rabbit.pp b/manifests/messaging/rabbit.pp
similarity index 99%
rename from manifests/messaging_rabbit.pp
rename to manifests/messaging/rabbit.pp
index 2022bd7..607f9fa 100644
--- a/manifests/messaging_rabbit.pp
+++ b/manifests/messaging/rabbit.pp
@@ -1,4 +1,4 @@
-# == Define: oslo::messaging_rabbit
+# == Define: oslo::messaging::rabbit
 #
 # Configure oslo_messaging_rabbit options
 #
@@ -130,7 +130,7 @@
 #   Defaults to $::os_service_default
 #
 
-define oslo::messaging_rabbit(
+define oslo::messaging::rabbit(
   $amqp_durable_queues                  = $::os_service_default,
   $kombu_ssl_version                    = $::os_service_default,
   $kombu_ssl_keyfile                    = $::os_service_default,
diff --git a/spec/defines/oslo_messaging_rabbit_spec.rb b/spec/defines/oslo_messaging_rabbit_spec.rb
index 2e51726..db989a6 100644
--- a/spec/defines/oslo_messaging_rabbit_spec.rb
+++ b/spec/defines/oslo_messaging_rabbit_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'oslo::messaging_rabbit' do
+describe 'oslo::messaging::rabbit' do
 
   let (:title) { 'keystone_config' }