diff --git a/plugins/azure/fix_plugin_azure/resource/compute.py b/plugins/azure/fix_plugin_azure/resource/compute.py
index 68274c6aa0..a88cb95b86 100644
--- a/plugins/azure/fix_plugin_azure/resource/compute.py
+++ b/plugins/azure/fix_plugin_azure/resource/compute.py
@@ -44,7 +44,7 @@
 from fixlib.types import Json
 
 log = logging.getLogger("fix.plugins.azure")
-service_name = "azure_compute"
+service_name = "compute"
 
 
 @define(eq=False, slots=False)
diff --git a/plugins/azure/fix_plugin_azure/resource/containerservice.py b/plugins/azure/fix_plugin_azure/resource/containerservice.py
index e307a98183..6254c8ffa8 100644
--- a/plugins/azure/fix_plugin_azure/resource/containerservice.py
+++ b/plugins/azure/fix_plugin_azure/resource/containerservice.py
@@ -18,7 +18,7 @@
 from fixlib.json_bender import Bender, S, Bend, ForallBend
 from fixlib.types import Json
 
-service_name = "azure_container_service"
+service_name = "containers"
 log = logging.getLogger("fix.plugins.azure")
 
 
diff --git a/plugins/azure/fix_plugin_azure/resource/cosmosdb.py b/plugins/azure/fix_plugin_azure/resource/cosmosdb.py
index a18d72e671..0146f110ba 100644
--- a/plugins/azure/fix_plugin_azure/resource/cosmosdb.py
+++ b/plugins/azure/fix_plugin_azure/resource/cosmosdb.py
@@ -28,7 +28,7 @@
 from fixlib.json_bender import F, K, Bender, S, ForallBend, Bend, MapEnum, MapValue
 from fixlib.types import Json
 
-service_name = "azure_cosmosdb"
+service_name = "cosmos-db"
 log = logging.getLogger("fix.plugins.azure")
 
 
diff --git a/plugins/azure/fix_plugin_azure/resource/keyvault.py b/plugins/azure/fix_plugin_azure/resource/keyvault.py
index eb2420f488..ef02f3551a 100644
--- a/plugins/azure/fix_plugin_azure/resource/keyvault.py
+++ b/plugins/azure/fix_plugin_azure/resource/keyvault.py
@@ -22,7 +22,7 @@
 from fixlib.types import Json
 
 log = logging.getLogger("fix.plugins.azure")
-service_name = "azure_keyvault"
+service_name = "key-vault"
 
 
 @define(eq=False, slots=False)
diff --git a/plugins/azure/fix_plugin_azure/resource/machinelearning.py b/plugins/azure/fix_plugin_azure/resource/machinelearning.py
index 38481c6831..24918c6318 100644
--- a/plugins/azure/fix_plugin_azure/resource/machinelearning.py
+++ b/plugins/azure/fix_plugin_azure/resource/machinelearning.py
@@ -31,7 +31,7 @@
 from fixlib.types import Json
 
 log = logging.getLogger("fix.plugins.azure")
-service_name = "azure_machinelearning"
+service_name = "machine-learning"
 
 
 class CheckVersionIsArchived:
diff --git a/plugins/azure/fix_plugin_azure/resource/metrics.py b/plugins/azure/fix_plugin_azure/resource/metrics.py
index b2d3cef095..c476dd26a0 100644
--- a/plugins/azure/fix_plugin_azure/resource/metrics.py
+++ b/plugins/azure/fix_plugin_azure/resource/metrics.py
@@ -18,7 +18,7 @@
 from fixlib.utils import utc_str
 
 log = logging.getLogger("fix.plugins.azure")
-service_name = "azure_metric"
+service_name = "metric"
 
 
 @define(eq=False, slots=False)
diff --git a/plugins/azure/fix_plugin_azure/resource/mysql.py b/plugins/azure/fix_plugin_azure/resource/mysql.py
index 471716c633..724f2d6ffe 100644
--- a/plugins/azure/fix_plugin_azure/resource/mysql.py
+++ b/plugins/azure/fix_plugin_azure/resource/mysql.py
@@ -25,7 +25,7 @@
 from fixlib.json_bender import K, Bender, S, ForallBend, Bend, MapEnum, MapValue
 from fixlib.types import Json
 
-service_name = "azure_mysql"
+service_name = "mysql"
 log = logging.getLogger("fix.plugins.azure")
 
 
diff --git a/plugins/azure/fix_plugin_azure/resource/network.py b/plugins/azure/fix_plugin_azure/resource/network.py
index a19f900f62..06d156223c 100644
--- a/plugins/azure/fix_plugin_azure/resource/network.py
+++ b/plugins/azure/fix_plugin_azure/resource/network.py
@@ -41,7 +41,7 @@
 from fixlib.json_bender import F, Bender, S, Bend, ForallBend, AsInt, StringToUnitNumber, Upper, Lower
 from fixlib.types import Json
 
-service_name = "azure_network"
+service_name = "networking"
 log = logging.getLogger("fix.plugins.azure")
 
 
diff --git a/plugins/azure/fix_plugin_azure/resource/postgresql.py b/plugins/azure/fix_plugin_azure/resource/postgresql.py
index cb6de49ed4..38b599a2d9 100644
--- a/plugins/azure/fix_plugin_azure/resource/postgresql.py
+++ b/plugins/azure/fix_plugin_azure/resource/postgresql.py
@@ -30,7 +30,7 @@
 from fixlib.json_bender import K, Bender, S, ForallBend, Bend, MapEnum, MapValue
 from fixlib.types import Json
 
-service_name = "azure_postgresql"
+service_name = "postgresql"
 log = logging.getLogger("fix.plugins.azure")
 
 
diff --git a/plugins/azure/fix_plugin_azure/resource/sql_server.py b/plugins/azure/fix_plugin_azure/resource/sql_server.py
index b509f7e490..c7e87ef7b5 100644
--- a/plugins/azure/fix_plugin_azure/resource/sql_server.py
+++ b/plugins/azure/fix_plugin_azure/resource/sql_server.py
@@ -21,7 +21,7 @@
 from fixlib.json_bender import F, K, Bender, S, ForallBend, Bend, MapEnum
 from fixlib.types import Json
 
-service_name = "azure_sql"
+service_name = "azure-sql"
 log = logging.getLogger("fix.plugins.azure")
 
 
diff --git a/plugins/azure/fix_plugin_azure/resource/storage.py b/plugins/azure/fix_plugin_azure/resource/storage.py
index 28e3a880fe..51e7f003e1 100644
--- a/plugins/azure/fix_plugin_azure/resource/storage.py
+++ b/plugins/azure/fix_plugin_azure/resource/storage.py
@@ -30,7 +30,7 @@
 from fixlib.types import Json
 
 log = logging.getLogger("fix.plugins.azure")
-service_name = "azure_storage"
+service_name = "storage"
 
 
 @define(eq=False, slots=False)
diff --git a/plugins/azure/fix_plugin_azure/resource/web.py b/plugins/azure/fix_plugin_azure/resource/web.py
index 14b9e981b9..6ccffd3450 100644
--- a/plugins/azure/fix_plugin_azure/resource/web.py
+++ b/plugins/azure/fix_plugin_azure/resource/web.py
@@ -21,7 +21,7 @@
 from fixlib.types import Json
 
 log = logging.getLogger("fix.plugins.azure")
-service_name = "azure_web"
+service_name = "app-service"
 
 
 @define(eq=False, slots=False)