diff --git a/examples/init.pp b/examples/init.pp
index 5065cfc..08a212d 100644
--- a/examples/init.pp
+++ b/examples/init.pp
@@ -9,4 +9,4 @@
 # Learn more about module testing here:
 # https://docs.puppet.com/guides/tests_smoke.html
 #
-include ::motd
+include motd
diff --git a/manifests/init.pp b/manifests/init.pp
index e8a230e..6293e24 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -22,7 +22,7 @@
 #
 class motd {
   $motd_hash = {
-    'ascii'       => generate('/bin/sh', '-c', "/usr/bin/figlet -cw 60 ${$facts['networking']['hostname']}"),
+    'ascii'       => generate('/bin/sh', '-c', "/usr/bin/figlet -cw 60 ${$facts['hostname']}"),
   }
 
   file { '/etc/motd':
diff --git a/templates/motd.epp b/templates/motd.epp
index ed6868f..0315423 100644
--- a/templates/motd.epp
+++ b/templates/motd.epp
@@ -5,13 +5,13 @@
 ------------------------------------------------------------
 <%= $ascii %>
 ------------------------------------------------------------
-    Welcome to <%= $facts['networking']['fqdn'] %>
-    OS: <%= $facts['os']['name'] %> <%= $facts['os']['release']['full'] %>
-    OS Family: <%= $facts['os']['family'] %>
-    Architecture: <%= $facts['os']['architecture'] %>
+    Welcome to <%= $facts['fqdn'] %>
+    OS: <%= $facts['operatingsystem'] %> <%= $facts['operatingsystemrelease'] %>
+    OS Family: <%= $facts['osfamily'] %>
+    Architecture: <%= $facts['architecture'] %>
     Kernel Version: <%= $facts['kernelversion'] %>
-    IP: <%= $facts['networking']['ip'] %>
-    RAM: <%= $facts['memory']['system']['total'] %>
+    IP: <%= $facts['ipaddress'] %>
+    RAM: <%= $facts['memorysize'] %>
 ------------------------------------------------------------
     This system is managed by Puppet version <%= $facts['puppetversion'] %>
 ------------------------------------------------------------