diff --git a/README.md b/README.md
index d5c8405b..77cc27a9 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ providers).
 ```puppet
 class { 'corosync':
   authkey        => '/var/lib/puppet/ssl/certs/ca.pem',
-  bind_address   => $::ipaddress,
+  bind_address   => $facts['networking']['ip'],
   cluster_name   => 'mycluster',
   enable_secauth => true,
 }
diff --git a/spec/acceptance/cs_order_spec.rb b/spec/acceptance/cs_order_spec.rb
index a97e1802..f008f800 100644
--- a/spec/acceptance/cs_order_spec.rb
+++ b/spec/acceptance/cs_order_spec.rb
@@ -105,7 +105,7 @@ class { 'corosync':
     end
   end
 
-  if fact('osfamily') == 'RedHat'
+  if fact('os.family') == 'RedHat'
     it 'creates a simple order constraint with Mandatory as kind' do
       shell('cibadmin --query | grep first_then_two') do |r|
         expect(r.stdout).to match(%r{kind="Mandatory"})
@@ -165,7 +165,7 @@ class { 'corosync':
     end
   end
 
-  if fact('osfamily') == 'RedHat'
+  if fact('os.family') == 'RedHat'
     it 'creates a more complex order constraint with Optional as kind' do
       shell('cibadmin --query | grep one_then_two_complex') do |r|
         expect(r.stdout).to match(%r{kind="Optional"})
diff --git a/spec/acceptance/cs_primitive_spec.rb b/spec/acceptance/cs_primitive_spec.rb
index 7ffdb6f1..823be675 100644
--- a/spec/acceptance/cs_primitive_spec.rb
+++ b/spec/acceptance/cs_primitive_spec.rb
@@ -328,7 +328,7 @@ class { 'corosync':
             },
           }
       EOS
-      if fact('osfamily') == 'RedHat'
+      if fact('os.family') == 'RedHat'
         apply_manifest(pp, catch_failures: true, debug: false, trace: true)
         apply_manifest(pp, catch_changes: true, debug: false, trace: true)
         shell('pcs stonith show') do |r|
diff --git a/spec/acceptance/cs_rsc_defaults_spec.rb b/spec/acceptance/cs_rsc_defaults_spec.rb
index 581efe06..389cd38a 100644
--- a/spec/acceptance/cs_rsc_defaults_spec.rb
+++ b/spec/acceptance/cs_rsc_defaults_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper_acceptance'
 
 describe 'corosync' do
-  if fact('osfamily') == 'Debian'
+  if fact('os.family') == 'Debian'
     cert = '-----BEGIN CERTIFICATE-----
 MIIDVzCCAj+gAwIBAgIJAJNCo5ZPmKegMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNV
 BAYTAlhYMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQg