diff --git a/manifests/config.pp b/manifests/config.pp
index 9452dad..561868d 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -2,10 +2,10 @@
 
   if $nullmailer::manage_etc_mailname == true {
 
-    file {"nullmailer /etc/mailname for ${::fqdn}":
+    file {"nullmailer /etc/mailname for ${trusted['hostname']}.${trusted['domain']}":
       ensure  => present,
       name    => '/etc/mailname',
-      content => "${::fqdn}\n",
+      content => "${trusted['hostname']}.${trusted['domain']}\n",
     }
 
   }
diff --git a/manifests/init.pp b/manifests/init.pp
index 0372171..bfe2aa1 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,8 +3,8 @@
   $absentpackages = $nullmailer::params::absentpackages,
   $service = $nullmailer::params::service,
   $manage_etc_mailname = $nullmailer::params::manage_etc_mailname,
-  $adminaddr = "root@$::domain",
-  $remoterelay = "smtp.$::domain",
+  $adminaddr = "root@${trusted['domain']}",
+  $remoterelay = "smtp.${trusted['domain']}",
   $remoteopts = ''
 
 ) inherits nullmailer::params {
diff --git a/manifests/params.pp b/manifests/params.pp
index 4cb2fb4..26da846 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,6 +1,6 @@
 class nullmailer::params {
-  case $::operatingsystem {
-    /(Ubuntu|Debian)/: {
+  case $facts['os']['family'] {
+    'Debian': {
       $package = ['nullmailer', ]
       $absentpackages = [ 'exim4-daemon-light', 'exim4-daemon-heavy',
                           'postfix', 'sendmail-bin', 'citadel-mta',
@@ -10,7 +10,7 @@
       $manage_etc_mailname = true
     }
     default: {
-      fail("Unsupported platform: ${::operatingsystem}")
+      fail("Unsupported operating system family: ${facts['os']['family']}")
     }
   }
 }