diff --git a/manifests/firewall.pp b/manifests/firewall.pp
index 9df582626..27147fc3c 100644
--- a/manifests/firewall.pp
+++ b/manifests/firewall.pp
@@ -151,7 +151,7 @@ class tripleo::firewall(
     #     dport: 999
     #     proto: udp
     #     action: accept
-    $service_names = hiera('enabled_services', [])
+    $service_names = hiera('service_names', [])
     tripleo::firewall::service_rules { $service_names: }
 
 
diff --git a/manifests/profile/base/logging/fluentd.pp b/manifests/profile/base/logging/fluentd.pp
index a8bf87b57..fc455a091 100644
--- a/manifests/profile/base/logging/fluentd.pp
+++ b/manifests/profile/base/logging/fluentd.pp
@@ -116,7 +116,7 @@ class tripleo::profile::base::logging::fluentd (
   $fluentd_monitoring = true,
   $fluentd_monitoring_bind = '127.0.0.1',
   $fluentd_monitoring_port = 24220,
-  $service_names = hiera('enabled_services', []),
+  $service_names = hiera('service_names', []),
   $fluentd_managed_rsyslog = false
 ) {
   if $step >= 4 {
diff --git a/manifests/profile/base/logging/rsyslog.pp b/manifests/profile/base/logging/rsyslog.pp
index 5db62e9e0..47e77e83d 100644
--- a/manifests/profile/base/logging/rsyslog.pp
+++ b/manifests/profile/base/logging/rsyslog.pp
@@ -25,7 +25,7 @@
 # [*service_names*]
 #   (Optional) List of services enabled on the current role. This is used
 #   to obtain per-service configuration information.
-#   Defaults to hiera('enabled_services', [])
+#   Defaults to hiera('service_names', [])
 #
 # [*elasticsearch*]
 #   (Optional) Hash. Configuration for output plugin omelasticsearch.
@@ -47,7 +47,7 @@
 #   Defaults to undef
 class tripleo::profile::base::logging::rsyslog (
   $step                          = Integer(hiera('step')),
-  $service_names                 = hiera('enabled_services', []),
+  $service_names                 = hiera('service_names', []),
   $elasticsearch                 = undef,
   $elasticsearch_tls_ca_cert     = undef,
   $elasticsearch_tls_client_cert = undef,
diff --git a/manifests/profile/base/metrics/collectd.pp b/manifests/profile/base/metrics/collectd.pp
index 2d50570dd..564d84955 100644
--- a/manifests/profile/base/metrics/collectd.pp
+++ b/manifests/profile/base/metrics/collectd.pp
@@ -267,7 +267,7 @@ class tripleo::profile::base::metrics::collectd (
   $amqp_interval = undef,
   $qdr_mode = hiera('tripleo::profile::base::metrics::qdr::router_mode', 'edge'),
   $qdr_listens_on_external = hiera('tripleo::profile::base::metrics::qdr::listen_on_external', false),
-  $service_names = hiera('enabled_services', []),
+  $service_names = hiera('service_names', []),
   $collectd_manage_repo = false,
   $python_read_plugins = [],
   $enable_sensubility = false,
diff --git a/manifests/profile/base/neutron/plugins/ml2.pp b/manifests/profile/base/neutron/plugins/ml2.pp
index 48f3859ae..23a9da8f3 100644
--- a/manifests/profile/base/neutron/plugins/ml2.pp
+++ b/manifests/profile/base/neutron/plugins/ml2.pp
@@ -31,7 +31,7 @@
 #   We may not want to configure a ml2 plugin for a role,
 #   in spite of the fact that it is in the drivers list.
 #   Check if the required service is enabled from the service list.
-#   Defaults to hiera('enabled_services')
+#   Defaults to hiera('service_names')
 #
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
@@ -41,7 +41,7 @@
 class tripleo::profile::base::neutron::plugins::ml2 (
   $bootstrap_node    = hiera('neutron_plugin_ml2_short_bootstrap_node_name', undef),
   $mechanism_drivers = hiera('neutron::plugins::ml2::mechanism_drivers'),
-  $service_names     = hiera('enabled_services'),
+  $service_names     = hiera('service_names'),
   $step              = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
diff --git a/manifests/profile/base/nova/migration/target.pp b/manifests/profile/base/nova/migration/target.pp
index d30169733..a9df5b760 100644
--- a/manifests/profile/base/nova/migration/target.pp
+++ b/manifests/profile/base/nova/migration/target.pp
@@ -36,7 +36,7 @@
 #   (Optional) List of services enabled on the current role.
 #   If the nova_migration_target service is not enabled then migration over
 #   ssh will be disabled.
-#   Defaults to hiera('enabled_services', [])
+#   Defaults to hiera('service_names', [])
 #
 # [*wrapper_command*]
 #   (Internal) Used to override the wrapper command when proxying
@@ -46,7 +46,7 @@ class tripleo::profile::base::nova::migration::target (
   $step                = Integer(hiera('step')),
   $ssh_authorized_keys = [],
   $ssh_localaddrs      = [],
-  $services_enabled    = hiera('enabled_services', []),
+  $services_enabled    = hiera('service_names', []),
   $wrapper_command     = '/bin/nova-migration-wrapper',
 ) {
 
diff --git a/spec/fixtures/hieradata/step2.yaml b/spec/fixtures/hieradata/step2.yaml
index db7339d7f..2de2445a1 100644
--- a/spec/fixtures/hieradata/step2.yaml
+++ b/spec/fixtures/hieradata/step2.yaml
@@ -1,7 +1,7 @@
 ---
 step: 2
 # rsyslog tests
-enabled_services:
+service_names:
  - 'horizon'
 tripleo_logging_sources_horizon:
  - file: '/var/log/horizon/test.log'
diff --git a/spec/fixtures/hieradata/step4.yaml b/spec/fixtures/hieradata/step4.yaml
index 464918089..59e4b11dc 100644
--- a/spec/fixtures/hieradata/step4.yaml
+++ b/spec/fixtures/hieradata/step4.yaml
@@ -11,7 +11,7 @@ cinder::backend::dellsc_iscsi::iscsi_ip_address: '127.0.0.1'
 cinder::backend::eqlx::eqlx_chap_login: 'user'
 cinder::backend::eqlx::eqlx_chap_password: 'user'
 cinder::backend::emc_vnx::storage_vnx_pool_names: 'emc-storage-pool'
-enabled_services:
+service_names:
  - 'ceilometer_agent_central'
  - 'horizon'
 tripleo_fluentd_groups_ceilometer_agent_central: