diff --git a/manifests/agent.pp b/manifests/agent.pp
index 3f9370de..3696a8c2 100644
--- a/manifests/agent.pp
+++ b/manifests/agent.pp
@@ -45,7 +45,7 @@ class designate::agent (
   $workers            = $::os_workers,
   $threads            = $::os_service_default,
   $listen             = $::os_service_default,
-) inherits designate {
+) inherits designate::params {
 
   include designate::deps
 
diff --git a/manifests/central.pp b/manifests/central.pp
index 88650ad2..9dec4b25 100644
--- a/manifests/central.pp
+++ b/manifests/central.pp
@@ -79,7 +79,7 @@ class designate::central (
   $scheduler_filters          = $::os_service_default,
   # DEPRECATED PARAMETERS
   $max_domain_name_len        = undef,
-) inherits designate {
+) inherits designate::params {
 
   include designate::deps
   include designate::db
diff --git a/manifests/mdns.pp b/manifests/mdns.pp
index d69c21fe..78be6d08 100644
--- a/manifests/mdns.pp
+++ b/manifests/mdns.pp
@@ -65,7 +65,7 @@ class designate::mdns (
   $storage_driver     = $::os_service_default,
   $max_message_size   = $::os_service_default,
   $listen             = $::os_service_default,
-) inherits designate {
+) inherits designate::params {
 
   include designate::deps
   include designate::db
diff --git a/manifests/producer.pp b/manifests/producer.pp
index 97704ba0..00ee7051 100644
--- a/manifests/producer.pp
+++ b/manifests/producer.pp
@@ -48,7 +48,7 @@ class designate::producer (
   $enabled_tasks  = $::os_service_default,
   # DEPRECATED PARAMETERS
   $backend_url    = undef,
-) inherits designate {
+) inherits designate::params {
 
   designate_config {
     'service:producer/workers'       : value => $workers;
diff --git a/manifests/sink.pp b/manifests/sink.pp
index c85cbffc..5743d1fa 100644
--- a/manifests/sink.pp
+++ b/manifests/sink.pp
@@ -32,7 +32,7 @@ class designate::sink (
   $enabled                       = true,
   $manage_service                = true,
   $enabled_notification_handlers = undef,
-) inherits designate {
+) inherits designate::params {
 
   include designate::deps
 
diff --git a/manifests/worker.pp b/manifests/worker.pp
index c2283462..67bfec55 100644
--- a/manifests/worker.pp
+++ b/manifests/worker.pp
@@ -9,9 +9,8 @@
 #  Defaults to 'present'
 #
 # [*worker_package_name*]
-#  (optional) Name of the package containing worker
-#  resources. Defaults to worker_package_name from
-#  designate::params
+#  (optional) Name of the package containing worker resources.
+#  Defaults to worker_package_name from designate::params
 #
 # [*enabled*]
 #   (optional) Whether to enable services.
@@ -74,7 +73,7 @@
 #
 class designate::worker(
   $package_ensure       = present,
-  $worker_package_name  = undef,
+  $worker_package_name  = $::designate::params::worker_package_name,
   $enabled              = true,
   $manage_service       = true,
   $workers              = $::os_workers,
@@ -90,10 +89,9 @@ class designate::worker(
   $worker_notify        = undef,
   $manage_package       = undef,
   $service_ensure       = undef,
-) {
+) inherits designate::params {
 
   include designate::deps
-  include designate::params
 
   if $manage_package != undef {
     warning('manage_package is dperecated and has no effect')
@@ -106,7 +104,7 @@ class designate::worker(
   designate::generic_service { 'worker':
     package_ensure => $package_ensure,
     enabled        => $enabled,
-    package_name   => pick($worker_package_name, $::designate::params::worker_package_name),
+    package_name   => $worker_package_name,
     manage_service => $manage_service,
     service_name   => $::designate::params::worker_service_name,
   }
diff --git a/manifests/zone_manager.pp b/manifests/zone_manager.pp
index 76ead819..027d1a88 100644
--- a/manifests/zone_manager.pp
+++ b/manifests/zone_manager.pp
@@ -45,7 +45,7 @@ class designate::zone_manager (
   $threads                   = $::os_service_default,
   $enabled_tasks             = $::os_service_default,
   $export_synchronous        = $::os_service_default,
-) inherits designate {
+) inherits designate::params {
 
   designate_config {
     'service:zone_manager/workers'            : value => $workers;