diff --git a/examples/full.pp b/examples/full.pp
index 2862ac8d2..9e28ed7ca 100644
--- a/examples/full.pp
+++ b/examples/full.pp
@@ -1,10 +1,7 @@
-class { 'rabbitmq::repo::apt':
-  pin => '900',
-}
-
--> class { 'rabbitmq::server':
+class { 'rabbitmq':
   delete_guest_user => true,
-#  version           => '2.4.1',
+  repos_ensure      => true,
+  package_apt_pin   => 900,
 }
 
 -> rabbitmq_user { 'dan':
diff --git a/examples/plugin.pp b/examples/plugin.pp
index 6c5605b9e..01b8fbdc4 100644
--- a/examples/plugin.pp
+++ b/examples/plugin.pp
@@ -1,11 +1,11 @@
-class { 'rabbitmq::server':
-    config_stomp => true,
-}
-
 $rabbitmq_plugins = [ 'amqp_client', 'rabbitmq_stomp' ]
 
+class { 'rabbitmq':
+  config_stomp => true,
+}
+
 rabbitmq_plugin { $rabbitmq_plugins:
   ensure   => present,
-  require  => Class['rabbitmq::server'],
+  require  => Class['rabbitmq'],
   provider => 'rabbitmqplugins',
 }
diff --git a/examples/server.pp b/examples/server.pp
deleted file mode 100644
index caea89377..000000000
--- a/examples/server.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class { 'rabbitmq::server':
-  port              => '5672',
-  delete_guest_user => true,
-  version           => 'latest',
-}
diff --git a/examples/service.pp b/examples/service.pp
deleted file mode 100644
index 9a00d2b6d..000000000
--- a/examples/service.pp
+++ /dev/null
@@ -1 +0,0 @@
-class { 'rabbitmq::service': }
diff --git a/examples/site.pp b/examples/site.pp
index 75ebcfed3..a3b19d433 100644
--- a/examples/site.pp
+++ b/examples/site.pp
@@ -2,14 +2,14 @@
 
   $rabbitmq_plugins = [ 'amqp_client', 'rabbitmq_stomp' ]
 
-  class { 'rabbitmq::server':
+  class { 'rabbitmq':
     config => '[ {rabbit_stomp, [{tcp_listeners, [1234]} ]} ].',
   }
 
   # Required for MCollective
   rabbitmq_plugin { $rabbitmq_plugins:
     ensure   => present,
-    require  => Class['rabbitmq::server'],
+    require  => Class['rabbitmq'],
     provider => 'rabbitmqplugins',
   }
 }