diff --git a/manifests/object/apply_service_to_host.pp b/manifests/object/apply_service_to_host.pp
index ff0cac3..0e1edcf 100644
--- a/manifests/object/apply_service_to_host.pp
+++ b/manifests/object/apply_service_to_host.pp
@@ -26,7 +26,7 @@ define icinga2::object::apply_service_to_host (
   $enable_active_checks = undef,
   $enable_passive_checks = undef,
   $enable_event_handler = undef,
-  $enable_flap_detection = undef,
+  $enable_flapping = undef,
   $enable_perfdata = undef,
   $event_command = undef,
   #flapping_threshold is defined as a percentage, eg. 10%, 50%, etc.
diff --git a/manifests/object/host.pp b/manifests/object/host.pp
index 818906a..f4d622c 100644
--- a/manifests/object/host.pp
+++ b/manifests/object/host.pp
@@ -26,7 +26,7 @@ define icinga2::object::host (
   $enable_active_checks = undef,
   $enable_passive_checks = undef,
   $enable_event_handler = undef,
-  $enable_flap_detection = undef,
+  $enable_flapping = undef,
   $enable_perfdata = undef,
   $event_command = undef,
   #flapping_threshold is defined as a percentage, eg. 10%, 50%, etc.
diff --git a/manifests/object/service.pp b/manifests/object/service.pp
index c61b2dc..6068da0 100644
--- a/manifests/object/service.pp
+++ b/manifests/object/service.pp
@@ -25,7 +25,7 @@ define icinga2::object::service (
   $enable_active_checks = undef,
   $enable_passive_checks = undef,
   $enable_event_handler = undef,
-  $enable_flap_detection = undef,
+  $enable_flapping = undef,
   $enable_perfdata = undef,
   $event_command = undef,
   #flapping_threshold is defined as a percentage, eg. 10%, 50%, etc.
diff --git a/templates/object_apply_service_to_host.conf.erb b/templates/object_apply_service_to_host.conf.erb
index 2f680e2..6871dd8 100644
--- a/templates/object_apply_service_to_host.conf.erb
+++ b/templates/object_apply_service_to_host.conf.erb
@@ -63,8 +63,8 @@ apply Service "<%= @object_servicename %>" to Host {
   <%- if @enable_event_handler -%>
   enable_event_handler = <%= @enable_event_handler -%>
   <%- end -%>
-  <%- if @enable_flap_detection -%>
-  enable_flap_detection = <%= @enable_flap_detection -%>
+  <%- if @enable_flapping -%>
+  enable_flapping = <%= @enable_flapping -%>
   <%- end -%>
   <%- if @enable_perfdata -%>
   enable_perfdata = <%= @enable_perfdata -%>
diff --git a/templates/object_host.conf.erb b/templates/object_host.conf.erb
index 00a3db0..130797b 100644
--- a/templates/object_host.conf.erb
+++ b/templates/object_host.conf.erb
@@ -60,8 +60,8 @@ object Host "<%= @object_hostname %>" {
   <%- if @enable_event_handler -%>
   enable_event_handler = <%= @enable_event_handler -%>
   <%- end -%>
-  <%- if @enable_flap_detection -%>
-  enable_flap_detection = <%= @enable_flap_detection -%>
+  <%- if @enable_flapping -%>
+  enable_flapping = <%= @enable_flapping -%>
   <%- end -%>
   <%- if @enable_perfdata -%>
   enable_perfdata = <%= @enable_perfdata -%>
diff --git a/templates/object_service.conf.erb b/templates/object_service.conf.erb
index e3f057f..f9d71a5 100644
--- a/templates/object_service.conf.erb
+++ b/templates/object_service.conf.erb
@@ -57,8 +57,8 @@ object Service "<%= @object_servicename %>" {
   <%- if @enable_event_handler -%>
   enable_event_handler = <%= @enable_event_handler -%>
   <%- end -%>
-  <%- if @enable_flap_detection -%>
-  enable_flap_detection = <%= @enable_flap_detection -%>
+  <%- if @enable_flapping -%>
+  enable_flapping = <%= @enable_flapping -%>
   <%- end -%>
   <%- if @enable_perfdata -%>
   enable_perfdata = <%= @enable_perfdata -%>