diff --git a/munin/manifests/init.pp b/munin/manifests/init.pp
index 5bd8697..ec0894d 100644
--- a/munin/manifests/init.pp
+++ b/munin/manifests/init.pp
@@ -65,9 +65,9 @@ class munin::node {
         notify  => Exec["munin-node-configure"],
     }
 
-    @@file { "/etc/munin/conf.d/${homename}.conf":
+    @@file { "/etc/munin/conf.d/${::homename}.conf":
         ensure  => present,
-        content => "[${homename}]\n  address ${homename}\n  use_node_name yes\n",
+        content => "[${::homename}]\n  address ${::homename}\n  use_node_name yes\n",
         tag     => "munin",
     }
 
@@ -128,7 +128,7 @@ define munin::snmpnode($snmp_community="public", $snmp_version="2") {
 
     @@file { "/etc/munin/conf.d/${name}.conf":
         ensure  => present,
-        content => "[${name}]\n  address ${ipaddress}\n  use_node_name no\n",
+        content => "[${name}]\n  address ${::homename}\n  use_node_name no\n",
         tag     => "munin",
     }
 
@@ -178,7 +178,7 @@ define munin::plugin($config = "") {
     if ($config) {
         file { "/etc/munin/plugin-conf.d/${config}":
             ensure  => present,
-            source  => [ "puppet:///files/munin/plugin-conf/${config}.${fqdn}",
+            source  => [ "puppet:///files/munin/plugin-conf/${config}.${::homename}",
                          "puppet:///files/munin/plugin-conf/${config}",
                          "puppet:///modules/munin/plugin-conf/${config}", ],
             owner   => "root",
@@ -298,7 +298,7 @@ class munin::server {
         atboot  => true,
         device  => "none",
         fstype  => "tmpfs",
-        options => "uid=munin,gid=${$apache::sslserver::group},mode=0775",
+        options => "uid=munin,gid=${apache::sslserver::group},mode=0775",
         dump    => "0",
         pass    => "0",
         require => File["/var/cache/munin"],
@@ -359,7 +359,7 @@ class munin::server {
         include ssl
         file { "${ssl::certs}/munin.crt":
             ensure  => present,
-            source  => "${puppet_ssldir}/certs/${homename}.pem",
+            source  => "${::puppet_ssldir}/certs/${::homename}.pem",
             mode    => "0640",
             owner   => "root",
             group   => "munin",
@@ -367,7 +367,7 @@ class munin::server {
         }
         file { "${ssl::private}/munin.key":
             ensure  => present,
-            source  => "${puppet_ssldir}/private_keys/${homename}.pem",
+            source  => "${::puppet_ssldir}/private_keys/${::homename}.pem",
             mode    => "0640",
             owner   => "root",
             group   => "munin",