diff --git a/common/alerting-message/README.md b/common/alerting-message/README.md
index a752715..86eff6f 100644
--- a/common/alerting-message/README.md
+++ b/common/alerting-message/README.md
@@ -8,9 +8,9 @@ How to use this module
 module "datadog-message-alerting" {
   source            = "git::ssh://git@bitbucket.org/morea/terraform.feature.datadog.git//common/alerting-message?ref={revision}"
 
-  oncall_alert      = "${var.message_alert}"
-  oncall_warning    = "${var.message_warning}"
-  oncall_nodata     = "${var.message_nodata}"
+  message_alert      = "${var.oncall_24x7}"
+  message_warning    = "${var.oncall_business_hours}"
+  message_nodata     = "${var.oncall_nodata}"
 }
 ```
 
@@ -19,8 +19,9 @@ Purpose
 
 Creates a DataDog monitor alert message with the following inputs :
 
-* PagerDuty NBH service name
-* PagerDuty BH service name
+* A broadcast channel for critical alerts
+* A broadcast channel for nodata alerts
+* A broadcast channel for warning alerts
 * Prepend test free string
 * Append text free string
 
@@ -30,9 +31,9 @@ Inputs
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
 | append_text | Optional free text string to append to alert | string | `` | no |
-| oncall_alert | Define a broadcast channel for critical alerts | string | - | yes |
-| oncall_nodata | Define a broadcast channel for nodata alerts | string | `` | no |
-| oncall_warning | Define a broadcast channel for warning alerts | string | - | yes |
+| message_alert | Define a broadcast channel for critical alerts | string | - | yes |
+| message_nodata | Define a broadcast channel for nodata alerts | string | `` | no |
+| message_warning | Define a broadcast channel for warning alerts | string | - | yes |
 | prepend_text | Optional free text string to prepend to alert | string | `` | no |
 
 Related documentation
diff --git a/common/alerting-message/inputs.tf b/common/alerting-message/inputs.tf
index da4a755..7a0e3ec 100644
--- a/common/alerting-message/inputs.tf
+++ b/common/alerting-message/inputs.tf
@@ -1,14 +1,14 @@
-variable "oncall_alert" {
+variable "message_alert" {
   description = "Define a broadcast channel for critical alerts"
   type        = "string"
 }
 
-variable "oncall_warning" {
+variable "message_warning" {
   description = "Define a broadcast channel for warning alerts"
   type        = "string"
 }
 
-variable "oncall_nodata" {
+variable "message_nodata" {
   description = "Define a broadcast channel for nodata alerts"
   type        = "string"
   default     = ""
diff --git a/common/alerting-message/main.tf b/common/alerting-message/main.tf
index 9839765..2400d16 100644
--- a/common/alerting-message/main.tf
+++ b/common/alerting-message/main.tf
@@ -1,24 +1,24 @@
 locals {
-  oncall_nodata = "${var.oncall_nodata == "" ? var.oncall_alert : var.oncall_nodata}"
+  oncall_nodata = "${var.message_nodata == "" ? var.message_alert : var.message_nodata}"
 }
 
 data "template_file" "alerting-message" {
   template = <<EOF
 $${prepend_text}
-{{#is_alert}}$${oncall_alert}{{/is_alert}}
-{{#is_recovery}}$${oncall_alert}{{/is_recovery}}
-{{#is_warning}}$${oncall_warning}{{/is_warning}}
-{{#is_warning_recovery}}$${oncall_warning}{{/is_warning_recovery}}
-{{#is_no_data}}$${oncall_nodata}{{/is_no_data}}
-{{#is_no_data_recovery}}$${oncall_nodata}{{/is_no_data_recovery}}
+{{#is_alert}}$${message_alert}{{/is_alert}}
+{{#is_recovery}}$${message_alert}{{/is_recovery}}
+{{#is_warning}}$${message_warning}{{/is_warning}}
+{{#is_warning_recovery}}$${message_warning}{{/is_warning_recovery}}
+{{#is_no_data}}$${message_nodata}{{/is_no_data}}
+{{#is_no_data_recovery}}$${message_nodata}{{/is_no_data_recovery}}
 $${append_text}
 EOF
 
   vars {
-    oncall_alert   = "${var.oncall_alert}"
-    oncall_warning = "${var.oncall_warning}"
-    oncall_nodata  = "${local.oncall_nodata}"
-    prepend_text   = "${var.prepend_text}"
-    append_text    = "${var.append_text}"
+    message_alert   = "${var.message_alert}"
+    message_warning = "${var.message_warning}"
+    message_nodata  = "${local.oncall_nodata}"
+    prepend_text    = "${var.prepend_text}"
+    append_text     = "${var.append_text}"
   }
 }