diff --git a/cloud/azure/stream-analytics/monitors-stream-analytics.tf b/cloud/azure/stream-analytics/monitors-stream-analytics.tf
index f18d7f1..ea2920f 100644
--- a/cloud/azure/stream-analytics/monitors-stream-analytics.tf
+++ b/cloud/azure/stream-analytics/monitors-stream-analytics.tf
@@ -1,5 +1,5 @@
 resource "datadog_monitor" "SU_utilization" {
-  name    = "[${var.environment} SU utilization at more than ${var.su_utilization_critical}% on {{host.identifier}}]"
+  name    = "[${var.environment}] SU utilization at more than ${var.su_utilization_critical}% on {{name}}"
   message = "{{#is_alert}}\n${var.hno_escalation_group} \n{{/is_alert}} \n{{#is_recovery}}\n${var.hno_escalation_group}\n{{/is_recovery}}"
 
   query = "avg(last_5m):avg:azure.streamanalytics_streamingjobs.resource_utilization{*} by {name,resource_group} > ${var.su_utilization_critical}"
@@ -22,7 +22,7 @@ resource "datadog_monitor" "SU_utilization" {
 }
 
 resource "datadog_monitor" "failed_function_requests" {
-  name    = "[${var.environment} More than ${var.failed_function_requests_critical} failed function requests on {{host.identifier}}]"
+  name    = "[${var.environment}] More than ${var.failed_function_requests_critical} failed function requests on {{name}}"
   message = "{{#is_alert}}\n${var.hno_escalation_group} \n{{/is_alert}} \n{{#is_recovery}}\n${var.hno_escalation_group}\n{{/is_recovery}}"
 
   query = "avg(last_5m):avg:azure.streamanalytics_streamingjobs.aml_callout_failed_requests{*} by {name,resource_group} > ${var.failed_function_requests_critical}"
@@ -45,7 +45,7 @@ resource "datadog_monitor" "failed_function_requests" {
 }
 
 resource "datadog_monitor" "conversion_errors" {
-  name    = "[${var.environment} More than ${var.conversion_errors_critical} conversion errors on {{host.identifier}}]"
+  name    = "[${var.environment}] More than ${var.conversion_errors_critical} conversion errors on {{name}}"
   message = "{{#is_alert}}\n${var.hno_escalation_group} \n{{/is_alert}} \n{{#is_recovery}}\n${var.hno_escalation_group}\n{{/is_recovery}}"
 
   query = "avg(last_5m):avg:azure.streamanalytics_streamingjobs.conversion_errors{*} by {name,resource_group} > ${var.conversion_errors_critical}"
@@ -68,7 +68,7 @@ resource "datadog_monitor" "conversion_errors" {
 }
 
 resource "datadog_monitor" "runtime_errors" {
-  name    = "[${var.environment} More than ${var.runtime_errors_critical} runtime errors on {{host.identifier}}]"
+  name    = "[${var.environment}] More than ${var.runtime_errors_critical} runtime errors on {{name}}"
   message = "{{#is_alert}}\n${var.hno_escalation_group} \n{{/is_alert}} \n{{#is_recovery}}\n${var.hno_escalation_group}\n{{/is_recovery}}"
 
   query = "avg(last_5m):avg:azure.streamanalytics_streamingjobs.errors{*} by {name,resource_group} > ${var.runtime_errors_critical}"
@@ -89,4 +89,3 @@ resource "datadog_monitor" "runtime_errors" {
     critical = "${var.runtime_errors_critical}"
   }
 }
-