diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 85dbbe048272..f6ecc92efaf7 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -115,6 +115,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Remove deprecated fields in Docker module. {issue}11835[11835] {pull}27933[27933]
 - Remove deprecated fields in Kafka module. {pull}27938[27938]
 - Remove deprecated config option default_region from aws module. {pull}28120[28120]
+- Rename storage to storage_account metricset in the azure module for consistency. {pull}28284[28284]
 
 *Packetbeat*
 
diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
index 63346f9b198a..af9790fe86fc 100644
--- a/metricbeat/docs/fields.asciidoc
+++ b/metricbeat/docs/fields.asciidoc
@@ -6197,7 +6197,7 @@ type: object
 monitor
 
 
-*`azure.storage.*.*`*::
+*`azure.storage_account.*.*`*::
 +
 --
 storage account
diff --git a/metricbeat/docs/modules/azure.asciidoc b/metricbeat/docs/modules/azure.asciidoc
index 77c3d5760038..702deb500ae2 100644
--- a/metricbeat/docs/modules/azure.asciidoc
+++ b/metricbeat/docs/modules/azure.asciidoc
@@ -117,9 +117,9 @@ This metricset will collect metrics from the virtual machine scalesets, these me
 so the `period` for `compute_vm_scaleset` metricset  should be `300s` or multiples of `300s`.
 
 [float]
-=== `storage`
+=== `storage_account`
 This metricset will collect metrics from the storage accounts, these metrics will have a timegrain every 5 minutes,
-so the `period` for `storage` metricset  should be `300s` or multiples of `300s`.
+so the `period` for `storage_account` metricset  should be `300s` or multiples of `300s`.
 
 [float]
 === `container_instance`
@@ -209,7 +209,7 @@ metricbeat.modules:
 
 - module: azure
   metricsets:
-  - storage
+  - storage_account
   enabled: true
   period: 300s
   client_id: '${AZURE_CLIENT_ID:""}'
@@ -311,7 +311,7 @@ The following metricsets are available:
 
 * <<metricbeat-metricset-azure-monitor,monitor>>
 
-* <<metricbeat-metricset-azure-storage,storage>>
+* <<metricbeat-metricset-azure-storage_account,storage_account>>
 
 include::azure/app_insights.asciidoc[]
 
@@ -333,5 +333,5 @@ include::azure/database_account.asciidoc[]
 
 include::azure/monitor.asciidoc[]
 
-include::azure/storage.asciidoc[]
+include::azure/storage_account.asciidoc[]
 
diff --git a/metricbeat/docs/modules/azure/storage.asciidoc b/metricbeat/docs/modules/azure/storage_account.asciidoc
similarity index 53%
rename from metricbeat/docs/modules/azure/storage.asciidoc
rename to metricbeat/docs/modules/azure/storage_account.asciidoc
index 45b788d6b179..7c1904197c80 100644
--- a/metricbeat/docs/modules/azure/storage.asciidoc
+++ b/metricbeat/docs/modules/azure/storage_account.asciidoc
@@ -2,11 +2,11 @@
 This file is generated! See scripts/mage/docs_collector.go
 ////
 
-[[metricbeat-metricset-azure-storage]]
+[[metricbeat-metricset-azure-storage_account]]
 [role="xpack"]
-=== Azure storage metricset
+=== Azure storage_account metricset
 
-include::../../../../x-pack/metricbeat/module/azure/storage/_meta/docs.asciidoc[]
+include::../../../../x-pack/metricbeat/module/azure/storage_account/_meta/docs.asciidoc[]
 
 
 ==== Fields
@@ -18,5 +18,5 @@ Here is an example document generated by this metricset:
 
 [source,json]
 ----
-include::../../../../x-pack/metricbeat/module/azure/storage/_meta/data.json[]
+include::../../../../x-pack/metricbeat/module/azure/storage_account/_meta/data.json[]
 ----
diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
index 4892eff3fab1..4ca17b976d08 100644
--- a/metricbeat/docs/modules_list.asciidoc
+++ b/metricbeat/docs/modules_list.asciidoc
@@ -48,7 +48,7 @@ This file is generated! See scripts/mage/docs_collector.go
 |<<metricbeat-metricset-azure-container_service,container_service>>   
 |<<metricbeat-metricset-azure-database_account,database_account>>   
 |<<metricbeat-metricset-azure-monitor,monitor>>   
-|<<metricbeat-metricset-azure-storage,storage>>   
+|<<metricbeat-metricset-azure-storage_account,storage_account>>   
 |<<metricbeat-module-beat,Beat>>     |image:./images/icon-no.png[No prebuilt dashboards]    |  
 .2+| .2+|  |<<metricbeat-metricset-beat-state,state>>   
 |<<metricbeat-metricset-beat-stats,stats>>   
diff --git a/x-pack/metricbeat/include/list.go b/x-pack/metricbeat/include/list.go
index b14417a47cd3..ba9a16e5009c 100644
--- a/x-pack/metricbeat/include/list.go
+++ b/x-pack/metricbeat/include/list.go
@@ -21,7 +21,7 @@ import (
 	_ "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/app_insights"
 	_ "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/billing"
 	_ "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/monitor"
-	_ "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/storage"
+	_ "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/storage_account"
 	_ "github.com/elastic/beats/v7/x-pack/metricbeat/module/cloudfoundry"
 	_ "github.com/elastic/beats/v7/x-pack/metricbeat/module/cloudfoundry/container"
 	_ "github.com/elastic/beats/v7/x-pack/metricbeat/module/cloudfoundry/counter"
diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml
index cc078f59c89e..3b0081c9a32a 100644
--- a/x-pack/metricbeat/metricbeat.reference.yml
+++ b/x-pack/metricbeat/metricbeat.reference.yml
@@ -291,7 +291,7 @@ metricbeat.modules:
 
 - module: azure
   metricsets:
-  - storage
+  - storage_account
   enabled: true
   period: 300s
   client_id: '${AZURE_CLIENT_ID:""}'
diff --git a/x-pack/metricbeat/module/azure/_meta/config.reference.yml b/x-pack/metricbeat/module/azure/_meta/config.reference.yml
index b06e466a01f5..ba2fbf947aae 100644
--- a/x-pack/metricbeat/module/azure/_meta/config.reference.yml
+++ b/x-pack/metricbeat/module/azure/_meta/config.reference.yml
@@ -35,7 +35,7 @@
 
 - module: azure
   metricsets:
-  - storage
+  - storage_account
   enabled: true
   period: 300s
   client_id: '${AZURE_CLIENT_ID:""}'
diff --git a/x-pack/metricbeat/module/azure/_meta/config.yml b/x-pack/metricbeat/module/azure/_meta/config.yml
index f7215d4f991b..bc623b8cc9a7 100644
--- a/x-pack/metricbeat/module/azure/_meta/config.yml
+++ b/x-pack/metricbeat/module/azure/_meta/config.yml
@@ -38,7 +38,7 @@
 
 #- module: azure
 #  metricsets:
-#  - storage
+#  - storage_account
 #  enabled: true
 #  period: 300s
 #  client_id: '${AZURE_CLIENT_ID:""}'
diff --git a/x-pack/metricbeat/module/azure/_meta/docs.asciidoc b/x-pack/metricbeat/module/azure/_meta/docs.asciidoc
index 2ba2cf7a96d5..f303a760d7e2 100644
--- a/x-pack/metricbeat/module/azure/_meta/docs.asciidoc
+++ b/x-pack/metricbeat/module/azure/_meta/docs.asciidoc
@@ -107,9 +107,9 @@ This metricset will collect metrics from the virtual machine scalesets, these me
 so the `period` for `compute_vm_scaleset` metricset  should be `300s` or multiples of `300s`.
 
 [float]
-=== `storage`
+=== `storage_account`
 This metricset will collect metrics from the storage accounts, these metrics will have a timegrain every 5 minutes,
-so the `period` for `storage` metricset  should be `300s` or multiples of `300s`.
+so the `period` for `storage_account` metricset  should be `300s` or multiples of `300s`.
 
 [float]
 === `container_instance`
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/0241cc10-339d-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/0241cc10-339d-11ea-a83e-25b8612d00cc.json
index 8237a1e34f96..6709e274ca5d 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/0241cc10-339d-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/0241cc10-339d-11ea-a83e-25b8612d00cc.json
@@ -60,7 +60,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.queue_count.avg",
+                                "field": "azure.storage_account.queue_count.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -95,4 +95,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:51.088Z",
     "version": "WzM1NjgsMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/09a6f150-3399-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/09a6f150-3399-11ea-a83e-25b8612d00cc.json
index 7b57598af0b6..c6b195deb9e7 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/09a6f150-3399-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/09a6f150-3399-11ea-a83e-25b8612d00cc.json
@@ -64,7 +64,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.file_share_snapshot_count.avg",
+                                "field": "azure.storage_account.file_share_snapshot_count.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -99,4 +99,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:50.051Z",
     "version": "WzM1NTksMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/109ec950-32e6-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/109ec950-32e6-11ea-a83e-25b8612d00cc.json
index e516a19fe20b..7813488d0728 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/109ec950-32e6-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/109ec950-32e6-11ea-a83e-25b8612d00cc.json
@@ -64,7 +64,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.used_capacity.avg",
+                                "field": "azure.storage_account.used_capacity.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -99,4 +99,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:52.180Z",
     "version": "WzM1ODUsMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/17ee2920-3391-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/17ee2920-3391-11ea-a83e-25b8612d00cc.json
index ced13ebc9a2b..f1909954d4f7 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/17ee2920-3391-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/17ee2920-3391-11ea-a83e-25b8612d00cc.json
@@ -64,7 +64,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.blob_capacity.avg",
+                                "field": "azure.storage_account.blob_capacity.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -99,4 +99,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:44.945Z",
     "version": "WzM1MDksMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/2219de20-32ed-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/2219de20-32ed-11ea-a83e-25b8612d00cc.json
index 37c37ce43404..e6ad15117937 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/2219de20-32ed-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/2219de20-32ed-11ea-a83e-25b8612d00cc.json
@@ -60,7 +60,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.egress.total",
+                                "field": "azure.storage_account.egress.total",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -95,4 +95,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:52.180Z",
     "version": "WzM1ODAsMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/241a55e0-3399-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/241a55e0-3399-11ea-a83e-25b8612d00cc.json
index 096f7405179f..26a6022c4805 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/241a55e0-3399-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/241a55e0-3399-11ea-a83e-25b8612d00cc.json
@@ -64,7 +64,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.file_share_snapshot_size.avg",
+                                "field": "azure.storage_account.file_share_snapshot_size.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -99,4 +99,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:50.051Z",
     "version": "WzM1NjAsMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/2bedaca0-339d-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/2bedaca0-339d-11ea-a83e-25b8612d00cc.json
index bae3cd480c09..10050a471ea4 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/2bedaca0-339d-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/2bedaca0-339d-11ea-a83e-25b8612d00cc.json
@@ -60,7 +60,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.queue_message_count.avg",
+                                "field": "azure.storage_account.queue_message_count.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -95,4 +95,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:51.088Z",
     "version": "WzM1NjcsMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/33d645e0-32ed-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/33d645e0-32ed-11ea-a83e-25b8612d00cc.json
index df9f13116fec..36b150847ab7 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/33d645e0-32ed-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/33d645e0-32ed-11ea-a83e-25b8612d00cc.json
@@ -60,7 +60,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.ingress.total",
+                                "field": "azure.storage_account.ingress.total",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -95,4 +95,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:52.180Z",
     "version": "WzM1NzksMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/40dbc0d0-32e3-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/40dbc0d0-32e3-11ea-a83e-25b8612d00cc.json
index eefee0e3d187..2aafef4620b0 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/40dbc0d0-32e3-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/40dbc0d0-32e3-11ea-a83e-25b8612d00cc.json
@@ -63,7 +63,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.availability.avg",
+                                "field": "azure.storage_account.availability.avg",
                                 "id": "0e91b812-32e2-11ea-a93d-dd20c62559b3",
                                 "type": "avg"
                             }
@@ -98,4 +98,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:53.138Z",
     "version": "WzM1OTAsMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/43b31a20-339b-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/43b31a20-339b-11ea-a83e-25b8612d00cc.json
index 869daa7d5178..16a498ffbfb9 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/43b31a20-339b-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/43b31a20-339b-11ea-a83e-25b8612d00cc.json
@@ -60,7 +60,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.table_count.avg",
+                                "field": "azure.storage_account.table_count.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -95,4 +95,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:53.138Z",
     "version": "WzM1OTIsMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/453965a0-3393-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/453965a0-3393-11ea-a83e-25b8612d00cc.json
index b4d1afaca913..ddc36b3a7d61 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/453965a0-3393-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/453965a0-3393-11ea-a83e-25b8612d00cc.json
@@ -64,7 +64,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.file_capacity.avg",
+                                "field": "azure.storage_account.file_capacity.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -99,4 +99,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:50.051Z",
     "version": "WzM1NTIsMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/4eaef260-32e1-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/4eaef260-32e1-11ea-a83e-25b8612d00cc.json
index 10164bd45e28..d340ba3d7f42 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/4eaef260-32e1-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/4eaef260-32e1-11ea-a83e-25b8612d00cc.json
@@ -57,7 +57,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.ingress.total",
+                                "field": "azure.storage_account.ingress.total",
                                 "id": "f0edf191-32d5-11ea-b19d-fb5049b980ca",
                                 "type": "max"
                             }
@@ -102,4 +102,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:53.138Z",
     "version": "WzM1OTksMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/553f9320-32e9-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/553f9320-32e9-11ea-a83e-25b8612d00cc.json
index 0f6627b68de1..dee7b907c06d 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/553f9320-32e9-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/553f9320-32e9-11ea-a83e-25b8612d00cc.json
@@ -30,11 +30,11 @@
                         "fill": 0.5,
                         "formatter": "number",
                         "id": "c9fd8ce0-32e8-11ea-84f4-e9593f8ba8f6",
-                        "label": "avg(azure.storage.transactions.total)",
+                        "label": "avg(azure.storage_account.transactions.total)",
                         "line_width": "1",
                         "metrics": [
                             {
-                                "field": "azure.storage.transactions.total",
+                                "field": "azure.storage_account.transactions.total",
                                 "id": "c9fd8ce1-32e8-11ea-84f4-e9593f8ba8f6",
                                 "type": "max"
                             }
@@ -69,4 +69,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:53.138Z",
     "version": "WzM1OTQsMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/55936920-3391-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/55936920-3391-11ea-a83e-25b8612d00cc.json
index 04fd3f4e0ea6..c76f3d417582 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/55936920-3391-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/55936920-3391-11ea-a83e-25b8612d00cc.json
@@ -60,7 +60,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.blob_count.avg",
+                                "field": "azure.storage_account.blob_count.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -95,4 +95,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:44.945Z",
     "version": "WzM1MTAsMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/599c62c0-32d7-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/599c62c0-32d7-11ea-a83e-25b8612d00cc.json
index 6b8a773ab6bb..3439502579e8 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/599c62c0-32d7-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/599c62c0-32d7-11ea-a83e-25b8612d00cc.json
@@ -57,7 +57,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.egress.total",
+                                "field": "azure.storage_account.egress.total",
                                 "id": "f0edf191-32d5-11ea-b19d-fb5049b980ca",
                                 "type": "max"
                             }
@@ -102,4 +102,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:53.138Z",
     "version": "WzM1OTgsMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/5cbf5820-339c-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/5cbf5820-339c-11ea-a83e-25b8612d00cc.json
index 9f814fa88080..affcf61c0937 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/5cbf5820-339c-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/5cbf5820-339c-11ea-a83e-25b8612d00cc.json
@@ -60,7 +60,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.table_entity_count.avg",
+                                "field": "azure.storage_account.table_entity_count.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -95,4 +95,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:53.138Z",
     "version": "WzM1OTMsMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/634b83c0-32ee-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/634b83c0-32ee-11ea-a83e-25b8612d00cc.json
index 2a80cfc0b77a..5fd3eb315eca 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/634b83c0-32ee-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/634b83c0-32ee-11ea-a83e-25b8612d00cc.json
@@ -64,7 +64,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.used_capacity.avg",
+                                "field": "azure.storage_account.used_capacity.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -99,4 +99,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:52.180Z",
     "version": "WzM1NzgsMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/685fbeb0-32eb-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/685fbeb0-32eb-11ea-a83e-25b8612d00cc.json
index ef64eb6627a1..354fb8c4e77d 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/685fbeb0-32eb-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/685fbeb0-32eb-11ea-a83e-25b8612d00cc.json
@@ -34,7 +34,7 @@
                         "line_width": "1",
                         "metrics": [
                             {
-                                "field": "azure.storage.success_e2elatency.avg",
+                                "field": "azure.storage_account.success_e2elatency.avg",
                                 "id": "da4459b2-32ea-11ea-be35-cb10be813609",
                                 "type": "avg"
                             }
@@ -69,4 +69,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:53.138Z",
     "version": "WzM1OTcsMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/722ef2f0-3393-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/722ef2f0-3393-11ea-a83e-25b8612d00cc.json
index 1375258f6cfa..60d984e62617 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/722ef2f0-3393-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/722ef2f0-3393-11ea-a83e-25b8612d00cc.json
@@ -60,7 +60,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.file_count.avg",
+                                "field": "azure.storage_account.file_count.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -95,4 +95,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:50.051Z",
     "version": "WzM1NTMsMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/81f16b40-32ea-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/81f16b40-32ea-11ea-a83e-25b8612d00cc.json
index 648d11532e20..4dd5a2852e9f 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/81f16b40-32ea-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/81f16b40-32ea-11ea-a83e-25b8612d00cc.json
@@ -34,7 +34,7 @@
                         "line_width": "1",
                         "metrics": [
                             {
-                                "field": "azure.storage.success_server_latency.avg",
+                                "field": "azure.storage_account.success_server_latency.avg",
                                 "id": "e9a40232-32e9-11ea-bda2-69435df36a5c",
                                 "type": "avg"
                             }
@@ -69,4 +69,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:53.138Z",
     "version": "WzM1OTYsMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/9e991b10-3391-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/9e991b10-3391-11ea-a83e-25b8612d00cc.json
index 7af107d81dc4..f1f1701fd7a6 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/9e991b10-3391-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/9e991b10-3391-11ea-a83e-25b8612d00cc.json
@@ -60,7 +60,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.container_count.avg",
+                                "field": "azure.storage_account.container_count.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -95,4 +95,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:44.945Z",
     "version": "WzM1MTUsMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/a4bf9710-3393-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/a4bf9710-3393-11ea-a83e-25b8612d00cc.json
index 45b69e3c6cbe..6a33bf6f2302 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/a4bf9710-3393-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/a4bf9710-3393-11ea-a83e-25b8612d00cc.json
@@ -60,7 +60,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.file_share_count.avg",
+                                "field": "azure.storage_account.file_share_count.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -95,4 +95,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:50.051Z",
     "version": "WzM1NTQsMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/e159b990-339c-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/e159b990-339c-11ea-a83e-25b8612d00cc.json
index 996b84b3c60e..3f8dfbdb6265 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/e159b990-339c-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/e159b990-339c-11ea-a83e-25b8612d00cc.json
@@ -64,7 +64,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.queue_capacity.avg",
+                                "field": "azure.storage_accountS.queue_capacity.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -99,4 +99,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:51.088Z",
     "version": "WzM1NjYsMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/f528e6a0-339a-11ea-a83e-25b8612d00cc.json b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/f528e6a0-339a-11ea-a83e-25b8612d00cc.json
index e9e1b1f96ff7..33976fa8c167 100644
--- a/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/f528e6a0-339a-11ea-a83e-25b8612d00cc.json
+++ b/x-pack/metricbeat/module/azure/_meta/kibana/7/visualization/f528e6a0-339a-11ea-a83e-25b8612d00cc.json
@@ -64,7 +64,7 @@
                         "line_width": 2,
                         "metrics": [
                             {
-                                "field": "azure.storage.table_capacity.avg",
+                                "field": "azure.storage_account.table_capacity.avg",
                                 "id": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
                                 "type": "avg"
                             }
@@ -99,4 +99,4 @@
     "type": "visualization",
     "updated_at": "2021-08-04T16:30:53.138Z",
     "version": "WzM1OTEsMV0="
-}
\ No newline at end of file
+}
diff --git a/x-pack/metricbeat/module/azure/fields.go b/x-pack/metricbeat/module/azure/fields.go
index 8f3ddad984c9..76f3ec24412f 100644
--- a/x-pack/metricbeat/module/azure/fields.go
+++ b/x-pack/metricbeat/module/azure/fields.go
@@ -19,5 +19,5 @@ func init() {
 // AssetAzure returns asset data.
 // This is the base64 encoded zlib format compressed contents of module/azure.
 func AssetAzure() string {
-	return "eJzkmc9u67YSxvd5ikGWAU4ewIsL5LZdnEXRon/WxJgaK2wkkoccOsd9+oKiJMuSLMu27CaoFwZiUd/vG3JmJDJf4I12K8C/g6MHAFZc0AoeX+Lfjw8AGXnplGVl9Ar+9wAAaSyUJgtFvMVRQehpBTk+AGwUFZlfVQO/gMaS9uLxwzsbhzoTbP3LCOFQpivFqqTcodLtlUbyjXbvxmWd30eF0+ePV4KXFAaxU3JEtyE68iY4SQNgN4YZuEYHvCWpNoq6VvvhHoS8s3Rw4XjEJ2w0VuLtYDbAHVuj6Pi9LDoqzkL3Z3cBdrsCQ+12rjH3z0+jWLP+iyT3LqUfxZSxzhBRorVK5/X4x6fH84JIGduGUZkd5Gv89hZHEvbsCmmlwFNBkjsp29B8WLcSQmXXM7uC8PXHARCtLZTExXgdvTFcpkrSXhl9mBZHUuJEOsxNhQnLB02rY25gPA3xz09n+94UBo9cvNT1z8kMOOLgNGVDu2itUNqr/JX9yU7bPnHWxDjPQXeZRzhT/dczOhYZ8ngrHLkwoxdVosN7GybpbGki6ew4bzxb4Izm188aWLT1xQBqj6Op4/kwspvkTR/yX08aR98CefZCmqD52YdylDyWGSfQvyVlqISn2RtUBWW3gCflCQ/Bk2uCD1p9C+Mzf4GFPz25CbAnX3X9m7B/T+In48bAr6Q5FgdlC3t46Won3oSftTPvnpxgVSqde6GJ3417E1lwVeE+4zZfytn/EwtqFtQsaFizDPqqUu/gzlf1e441R5LUlsQdzNWo8/xZZ2RMUJ3fZQL3uPNssmEs7uKwIk2bo++SKr0bdOqfGu2J+uzw63m6oQNAblYDCtpSccqSJ7e9uaMEmTBkyW2MK1FLSosUW2xJpXE7gVtUBa4LEusdk18ym37dY6HBQsJCi4UKO992XTTCOrVFvpfrmgo19VLT0gZhyUnSjDmlQr6bd2kD7OGptq8N4V8yf7ZtZaoVi86FJ2l0djfnX39J2RL9QWIPdhlrVRRK57fYY9TSgDq+68SFz4hRFXM3qDI4R1ruRufq4tOyUdV2IR0xfhfS+P46XLxCP/S12iMYsui4JM1i+fPIvfjwsHMfrMnCYPd7JbgWHZ7u7t+yY/+ptnwLbuhSfp3YSCY06X5Y14Mn95N1HcQOoEx2eLoH1894U2ZJHnry7WmCrNrDDVKtLfNEOJ5vKDlgsWhxVSedlSwMZBvsxjiS6HlxcCN8HJ0SbuGzi7qVdu9tO6YpbWAS27J34nX4v6xDF3c/Nd27nAhAeIkFeeLPEUlrt70+EptmVJqcUNpzfGJ/7NBqt9C4nQjIUa48u93nCKhxOxFQ3Neoz7JAtdlBOBkyrtGTqDvzR46m8do8RQbBlEYrNm7+e2o+8y11KNx/Jz1e0p6Ni1uRDzyxtcV2Xv8JAAD//1lC3T4="
+	return "eJzkmc1u4zYQx+95ikGOATYP4EOB9OOwh6JFP87EmBorbCSSSw6ddZ++oCjJsiTLsi27G6wPBmJR/99/yJmRyHyCN9qtAP8Njh4AWHFBK3h8iX8/PgBk5KVTlpXRK/jhAQDSWChNFop4i6OC0NMKcnwA2CgqMr+qBn4CjSXtxeOHdzYOdSbY+pcRwqFMV4pVSblDpdsrjeQb7d6Nyzq/jwqnz1+vBC8pDGKn5IhuQ3TkTXCSBsBuDDNwjQ54S1JtFHWt9sM9CHln6eDC8YhP2GisxNvBbIA7tkbR8XtZdFSche7P7gLsdgWG2u1cY+6fn0axZv0PSe5dSj+KKWOdIaJEa5XO6/GPT4/nBZEytg2jMjvI1/jtLY4k7NkV0kqBp4Ikd1K2ofmwbiWEyq5ndgXh888DIFpbKImL8Tp6Y7hMlaS9MvowLY6kxIl0mJsKE5YPmlbH3MB4GuKfn872vSkMHrl4qetfkxlwxMFpyoZ20VqhtFf5K/uTnbZ94qyJcZ6D7jKPcKb6r2d0LDLk8VY4cmFGL6pEh/c2TNLZ0kTS2XHeeLbAGc2vnzWwaOuLAdQeR1PH82FkN8mbPuR7TxpHXwJ59kKaoPnZh3KUPJYZJ9B/JGWohKfZG1QFZbeAJ+UJD8GTa4IPWn0J4zN/gYW/PbkJsCdfdf2bsP9M4ifjxsCvpDkWB2ULe3jpaifehJ+1M++enGBVKp17oYnfjXsTWXBV4T7jNl/K2Y+JBTULahY0rFkGfVWpd3Dnq/o9x5ojSWpL4g7matR5/qwzMiaozu8ygXvceTbZMBZ3cViRps3RV0mV3g069S+N9kR9dvj1PN3QASA3qwEFbak4ZcmT297cUYJMGLLkNsaVqCWlRYottqTSuJ3ALaoC1wWJ9Y7JL5lNv++x0GAhYaHFQoWdb7suGmGd2iLfy3VNhZp6qWlpg7DkJGnGnFIh3827tAH28FTb14bwP5k/27Yy1YpF58KTNDq7m/PPv6Vsif4gsQe7jLUqCqXzW+wxamlAHd914sJnxKiKuRtUGZwjLXejc3XxadmoaruQjhi/Cml8fx0uXqGf+lrtEQxZdFySZrH8eeRefHjYuQ/WZGGw+70SXIsOT3f3b9mx/1RbvgU3dCm/TmwkE5p0P6zrwZP7yboOYgdQJjs83YPrZ7wpsyQPPfn2NEFW7eEGqdaWeSIczzeUHLBYtLiqk85KFgayDXZjHEn0vDi4ET6OTgm38NlF3Uq797Yd05Q2MIlt2TvxOvxf1qGLu5+a7l1OBCC8xII88ceIpLXbXh+JTTMqTU4o7Tk+sb/t0Gq30LidCMhRrjy73ccIqHE7EVDc16iPskC12UE4GTKu0ZOoO/O3HE3jtXmKDIIpjVZs3Pz31HzmW+pQuP9OerykPRsXO/wHmODaaju//wUAAP//FhXgig=="
 }
diff --git a/x-pack/metricbeat/module/azure/storage/_meta/data.json b/x-pack/metricbeat/module/azure/storage_account/_meta/data.json
similarity index 93%
rename from x-pack/metricbeat/module/azure/storage/_meta/data.json
rename to x-pack/metricbeat/module/azure/storage_account/_meta/data.json
index 76700ecb8d5b..435591b841cb 100644
--- a/x-pack/metricbeat/module/azure/storage/_meta/data.json
+++ b/x-pack/metricbeat/module/azure/storage_account/_meta/data.json
@@ -29,12 +29,12 @@
         "region": "westeurope"
     },
     "event": {
-        "dataset": "azure.storage",
+        "dataset": "azure.storage_account",
         "duration": 115000,
         "module": "azure"
     },
     "metricset": {
-        "name": "storage",
+        "name": "storage_account",
         "period": 10000
     },
     "service": {
diff --git a/x-pack/metricbeat/module/azure/storage/_meta/docs.asciidoc b/x-pack/metricbeat/module/azure/storage_account/_meta/docs.asciidoc
similarity index 96%
rename from x-pack/metricbeat/module/azure/storage/_meta/docs.asciidoc
rename to x-pack/metricbeat/module/azure/storage_account/_meta/docs.asciidoc
index 2a62b7d60cba..cc7433347c5c 100644
--- a/x-pack/metricbeat/module/azure/storage/_meta/docs.asciidoc
+++ b/x-pack/metricbeat/module/azure/storage_account/_meta/docs.asciidoc
@@ -1,4 +1,4 @@
-This is the storage metricset of the module azure.
+This is the storage_account metricset of the module azure.
 
 This metricset allows users to retrieve all metrics from specified storage accounts.
 
diff --git a/x-pack/metricbeat/module/azure/storage/_meta/fields.yml b/x-pack/metricbeat/module/azure/storage_account/_meta/fields.yml
similarity index 80%
rename from x-pack/metricbeat/module/azure/storage/_meta/fields.yml
rename to x-pack/metricbeat/module/azure/storage_account/_meta/fields.yml
index 0e699901c8a9..b2936a0021e1 100644
--- a/x-pack/metricbeat/module/azure/storage/_meta/fields.yml
+++ b/x-pack/metricbeat/module/azure/storage_account/_meta/fields.yml
@@ -1,4 +1,4 @@
-- name: storage.*.*
+- name: storage_account.*.*
   release: ga
   type: object
   object_type: float
diff --git a/x-pack/metricbeat/module/azure/storage/client_helper.go b/x-pack/metricbeat/module/azure/storage_account/client_helper.go
similarity index 99%
rename from x-pack/metricbeat/module/azure/storage/client_helper.go
rename to x-pack/metricbeat/module/azure/storage_account/client_helper.go
index 44e49831790b..abf170f4a928 100644
--- a/x-pack/metricbeat/module/azure/storage/client_helper.go
+++ b/x-pack/metricbeat/module/azure/storage_account/client_helper.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-package storage
+package storage_account
 
 import (
 	"fmt"
diff --git a/x-pack/metricbeat/module/azure/storage/client_helper_test.go b/x-pack/metricbeat/module/azure/storage_account/client_helper_test.go
similarity index 99%
rename from x-pack/metricbeat/module/azure/storage/client_helper_test.go
rename to x-pack/metricbeat/module/azure/storage_account/client_helper_test.go
index 0aab2a2395f1..0a5b96d3743c 100644
--- a/x-pack/metricbeat/module/azure/storage/client_helper_test.go
+++ b/x-pack/metricbeat/module/azure/storage_account/client_helper_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-package storage
+package storage_account
 
 import (
 	"reflect"
diff --git a/x-pack/metricbeat/module/azure/storage/storage.go b/x-pack/metricbeat/module/azure/storage_account/storage_account.go
similarity index 96%
rename from x-pack/metricbeat/module/azure/storage/storage.go
rename to x-pack/metricbeat/module/azure/storage_account/storage_account.go
index 4178b911d117..8c516f023a26 100644
--- a/x-pack/metricbeat/module/azure/storage/storage.go
+++ b/x-pack/metricbeat/module/azure/storage_account/storage_account.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-package storage
+package storage_account
 
 import (
 	"fmt"
@@ -23,7 +23,7 @@ var (
 // the MetricSet for each host defined in the module's configuration. After the
 // MetricSet has been created then Fetch will begin to be called periodically.
 func init() {
-	mb.Registry.MustAddMetricSet("azure", "storage", New)
+	mb.Registry.MustAddMetricSet("azure", "storage_account", New)
 }
 
 // MetricSet holds any configuration or state information. It must implement
diff --git a/x-pack/metricbeat/module/azure/storage/storage_integration_test.go b/x-pack/metricbeat/module/azure/storage_account/storage_account_integration_test.go
similarity index 88%
rename from x-pack/metricbeat/module/azure/storage/storage_integration_test.go
rename to x-pack/metricbeat/module/azure/storage_account/storage_account_integration_test.go
index b611f82694bf..9c2b33fbb321 100644
--- a/x-pack/metricbeat/module/azure/storage/storage_integration_test.go
+++ b/x-pack/metricbeat/module/azure/storage_account/storage_account_integration_test.go
@@ -5,7 +5,7 @@
 // +build integration
 // +build azure
 
-package storage
+package storage_account
 
 import (
 	"testing"
@@ -18,7 +18,7 @@ import (
 )
 
 func TestFetchMetricset(t *testing.T) {
-	config := test.GetConfig(t, "storage")
+	config := test.GetConfig(t, "storage_account")
 	metricSet := mbtest.NewReportingMetricSetV2Error(t, config)
 	events, errs := mbtest.ReportingFetchV2Error(metricSet)
 	if len(errs) > 0 {
@@ -29,7 +29,7 @@ func TestFetchMetricset(t *testing.T) {
 }
 
 func TestData(t *testing.T) {
-	config := test.GetConfig(t, "storage")
+	config := test.GetConfig(t, "storage_account")
 	metricSet := mbtest.NewFetcher(t, config)
 	metricSet.WriteEvents(t, "/")
 }
diff --git a/x-pack/metricbeat/module/azure/storage/storage_test.go b/x-pack/metricbeat/module/azure/storage_account/storage_account_test.go
similarity index 93%
rename from x-pack/metricbeat/module/azure/storage/storage_test.go
rename to x-pack/metricbeat/module/azure/storage_account/storage_account_test.go
index 2512ab6660eb..34729b242533 100644
--- a/x-pack/metricbeat/module/azure/storage/storage_test.go
+++ b/x-pack/metricbeat/module/azure/storage_account/storage_account_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-package storage
+package storage_account
 
 import (
 	"fmt"
@@ -19,7 +19,7 @@ var (
 	missingResourcesConfig = common.MapStr{
 		"module":          "azure",
 		"period":          "60s",
-		"metricsets":      []string{"storage"},
+		"metricsets":      []string{"storage_account"},
 		"client_secret":   "unique identifier",
 		"client_id":       "unique identifier",
 		"subscription_id": "unique identifier",
@@ -29,7 +29,7 @@ var (
 	resourceConfig = common.MapStr{
 		"module":          "azure",
 		"period":          "60s",
-		"metricsets":      []string{"storage"},
+		"metricsets":      []string{"storage_account"},
 		"client_secret":   "unique identifier",
 		"client_id":       "unique identifier",
 		"subscription_id": "unique identifier",
diff --git a/x-pack/metricbeat/modules.d/azure.yml.disabled b/x-pack/metricbeat/modules.d/azure.yml.disabled
index 10d00e003cfc..99ef7ea4554d 100644
--- a/x-pack/metricbeat/modules.d/azure.yml.disabled
+++ b/x-pack/metricbeat/modules.d/azure.yml.disabled
@@ -41,7 +41,7 @@
 
 #- module: azure
 #  metricsets:
-#  - storage
+#  - storage_account
 #  enabled: true
 #  period: 300s
 #  client_id: '${AZURE_CLIENT_ID:""}'