diff --git a/manifests/defaults.pp b/manifests/defaults.pp
index 93b4cda..891c706 100644
--- a/manifests/defaults.pp
+++ b/manifests/defaults.pp
@@ -2,13 +2,13 @@
   $autoupdate         = false
   $package_name       = 'smartmontools'
   $service_name       = 'smartd'
-  $scan               = true
+  $devicescan         = true
+  $devicescan_options = false
   $devices            = []
   $device_opts        = {}
   $mail_to            = 'root'
   $warning_schedule   = 'daily' # other choices: once, diminishing
   $enable_monit       = false
-  $devicescan_options = false
 
   case $::osfamily {
     'FreeBSD': {
diff --git a/manifests/init.pp b/manifests/init.pp
index 432a355..97d5cab 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,13 +3,13 @@
               $package_name       = $smartd::defaults::package_name,
               $service_name       = $smartd::defaults::service_name,
               $config_file        = $smartd::defaults::config_file,
-              $scan               = $smartd::defaults::scan,
+              $devicescan         = $smartd::defaults::devicescan,
+              $devicescan_options = $smartd::defaults::devicescan_options,
               $devices            = $smartd::defaults::devices,
               $device_opts        = $smartd::defaults::device_opts,
               $mail_to            = $smartd::defaults::mail_to,
               $warning_schedule   = $smartd::defaults::warning_schedule,
               $enable_monit       = $smartd::defaults::enable_monit,
-              $devicescan_options = $smartd::defaults::devicescan_options,
              ) inherits smartd::defaults {
   case $ensure {
     'present': {
diff --git a/templates/smartd.conf b/templates/smartd.conf
index a070854..961ceb4 100644
--- a/templates/smartd.conf
+++ b/templates/smartd.conf
@@ -1,6 +1,6 @@
 # Managed by Puppet -- do not edit!
 DEFAULT -m <%= @mail_to %> -M <%= @warning_schedule %>
-<% if @scan -%>
+<% if @devicescan -%>
 DEVICESCAN <% if @devicescan_options %><%= @devicescan_options %><% end %>
 <% end -%>
 <% @devices.each do |device| -%>