diff --git a/manifests/init.pp b/manifests/init.pp
index 71832351..cd8fbf92 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -74,7 +74,7 @@ This node is under the control of Puppet ${::puppetversion}.
 
   if $::osfamily == 'RedHat' and $rhn_registration {
     create_resources('rhn_register', {
-      "${::hostname}" => $rhn_registration
+      "rhn-${::hostname}" => $rhn_registration
     } )
   }
 }
diff --git a/spec/classes/cloud_init_spec.rb b/spec/classes/cloud_init_spec.rb
index 652da0c1..7cbab7ac 100644
--- a/spec/classes/cloud_init_spec.rb
+++ b/spec/classes/cloud_init_spec.rb
@@ -87,7 +87,7 @@ describe 'cloud' do
 
 #    it_configures 'private cloud node'
 
-    it { should contain_rhn_register('redhat1') }
+    it { should contain_rhn_register('rhn-redhat1') }
   end
 
   context 'on other platforms' do