diff --git a/en/azure/storageaccounts/ table-service-logging-enabled.md b/en/azure/storageaccounts/ storage-account-table-service-logging-enabled.md
similarity index 77%
rename from en/azure/storageaccounts/ table-service-logging-enabled.md
rename to en/azure/storageaccounts/ storage-account-table-service-logging-enabled.md
index 9d2d170ac..06a3c32dc 100644
--- a/en/azure/storageaccounts/ table-service-logging-enabled.md	
+++ b/en/azure/storageaccounts/ storage-account-table-service-logging-enabled.md	
@@ -18,9 +18,9 @@
 ## Detailed Remediation Steps
 
 1. Log in to the Microsoft Azure Management Console.
-2. Select the "Search resources, services, and docs" option at the top and search for "Storage accounts".</br> <img src="/resources/azure/storageaccounts/table-service-logging-enabled/step2.png"/>
-3. Select the "Storage account" by clicking on the "Name" link to access the configuration changes. </br> <img src="/resources/azure/storageaccounts/table-service-logging-enabled/step3.png"/>
-4. On the "Storage account" page, scroll down the left navigation panel and choose "Diagnostic Settings" under "Monitoring". </br> <img src="/resources/azure/storageaccounts/table-service-logging-enabled/step4.png"/>
-5. On the Diagnostic Settings page, select the "table" service to configure its diagnostics. </br> <img src="/resources/azure/storageaccounts/table-service-logging-enabled/step5.png"/>
-6. Click Add diagnostic setting to create a new logging configuration. </br> <img src="/resources/azure/storageaccounts/table-service-logging-enabled/step6.png"/>
-7. In the Log categories section, either enable the individual options (Storage Read, Storage Write, and Storage Delete) or select allLogs to enable all categories at once. </br> <img src="/resources/azure/storageaccounts/table-service-logging-enabled/step7.png"/>
\ No newline at end of file
+2. Select the "Search resources, services, and docs" option at the top and search for "Storage accounts".</br> <img src="/resources/azure/storageaccounts/storage-account-table-service-logging-enabled/step2.png"/>
+3. Select the "Storage account" by clicking on the "Name" link to access the configuration changes. </br> <img src="/resources/azure/storageaccounts/storage-account-table-service-logging-enabled/step3.png"/>
+4. On the "Storage account" page, scroll down the left navigation panel and choose "Diagnostic Settings" under "Monitoring". </br> <img src="/resources/azure/storageaccounts/storage-account-table-service-logging-enabled/step4.png"/>
+5. On the Diagnostic Settings page, select the "table" service to configure its diagnostics. </br> <img src="/resources/azure/storageaccounts/storage-account-table-service-logging-enabled/step5.png"/>
+6. Click Add diagnostic setting to create a new logging configuration. </br> <img src="/resources/azure/storageaccounts/storage-account-table-service-logging-enabled/step6.png"/>
+7. In the Log categories section, either enable the individual options (Storage Read, Storage Write, and Storage Delete) or select allLogs to enable all categories at once. </br> <img src="/resources/azure/storageaccounts/storage-account-table-service-logging-enabled/step7.png"/>
\ No newline at end of file
diff --git a/en/azure/storageaccounts/blob-service-logging-enabled.md b/en/azure/storageaccounts/storage-account-blob-service-logging-enabled.md
similarity index 77%
rename from en/azure/storageaccounts/blob-service-logging-enabled.md
rename to en/azure/storageaccounts/storage-account-blob-service-logging-enabled.md
index ee1637f9e..b76c659e5 100644
--- a/en/azure/storageaccounts/blob-service-logging-enabled.md
+++ b/en/azure/storageaccounts/storage-account-blob-service-logging-enabled.md
@@ -17,9 +17,9 @@
 ## Detailed Remediation Steps
 
 1. Log in to the Microsoft Azure Management Console.
-2. Select the "Search resources, services, and docs" option at the top and search for "Storage accounts".</br> <img src="/resources/azure/storageaccounts/blob-service-logging-enabled/step2.png"/>
-3. Select the "Storage account" by clicking on the "Name" link to access the configuration changes. </br> <img src="/resources/azure/storageaccounts/blob-service-logging-enabled/step3.png"/>
-4. On the "Storage account" page, scroll down the left navigation panel and choose "Diagnostic Settings" under "Monitoring". </br> <img src="/resources/azure/storageaccounts/blob-service-logging-enabled/step4.png"/>
-5. On the Diagnostic Settings page, select the "blob" service to configure its diagnostics. </br> <img src="/resources/azure/storageaccounts/blob-service-logging-enabled/step5.png"/>
-6. Click Add diagnostic setting to create a new logging configuration. </br> <img src="/resources/azure/storageaccounts/blob-service-logging-enabled/step6.png"/>
-7. In the Log categories section, either enable the individual options (Storage Read, Storage Write, and Storage Delete) or select allLogs to enable all categories at once. </br> <img src="/resources/azure/storageaccounts/blob-service-logging-enabled/step7.png"/>
\ No newline at end of file
+2. Select the "Search resources, services, and docs" option at the top and search for "Storage accounts".</br> <img src="/resources/azure/storageaccounts/storage-account-blob-service-logging-enabled/step2.png"/>
+3. Select the "Storage account" by clicking on the "Name" link to access the configuration changes. </br> <img src="/resources/azure/storageaccounts/storage-account-blob-service-logging-enabled/step3.png"/>
+4. On the "Storage account" page, scroll down the left navigation panel and choose "Diagnostic Settings" under "Monitoring". </br> <img src="/resources/azure/storageaccounts/storage-account-blob-service-logging-enabled/step4.png"/>
+5. On the Diagnostic Settings page, select the "blob" service to configure its diagnostics. </br> <img src="/resources/azure/storageaccounts/storage-account-blob-service-logging-enabled/step5.png"/>
+6. Click Add diagnostic setting to create a new logging configuration. </br> <img src="/resources/azure/storageaccounts/storage-account-blob-service-logging-enabled/step6.png"/>
+7. In the Log categories section, either enable the individual options (Storage Read, Storage Write, and Storage Delete) or select allLogs to enable all categories at once. </br> <img src="/resources/azure/storageaccounts/storage-account-blob-service-logging-enabled/step7.png"/>
\ No newline at end of file
diff --git a/en/azure/storageaccounts/queue-service-logging-enabled.md b/en/azure/storageaccounts/storage-account-queue-service-logging-enabled.md
similarity index 77%
rename from en/azure/storageaccounts/queue-service-logging-enabled.md
rename to en/azure/storageaccounts/storage-account-queue-service-logging-enabled.md
index 5583ee0d3..54b22bf47 100644
--- a/en/azure/storageaccounts/queue-service-logging-enabled.md
+++ b/en/azure/storageaccounts/storage-account-queue-service-logging-enabled.md
@@ -18,9 +18,9 @@
 ## Detailed Remediation Steps
 
 1. Log in to the Microsoft Azure Management Console.
-2. Select the "Search resources, services, and docs" option at the top and search for "Storage accounts".</br> <img src="/resources/azure/storageaccounts/queue-service-logging-enabled/step2.png"/>
-3. Select the "Storage account" by clicking on the "Name" link to access the configuration changes. </br> <img src="/resources/azure/storageaccounts/queue-service-logging-enabled/step3.png"/>
-4. On the "Storage account" page, scroll down the left navigation panel and choose "Diagnostic Settings" under "Monitoring". </br> <img src="/resources/azure/storageaccounts/queue-service-logging-enabled/step4.png"/>
-5. On the Diagnostic Settings page, select the "queue" service to configure its diagnostics. </br> <img src="/resources/azure/storageaccounts/queue-service-logging-enabled/step5.png"/>
-6. Click Add diagnostic setting to create a new logging configuration. </br> <img src="/resources/azure/storageaccounts/queue-service-logging-enabled/step6.png"/>
-7. In the Log categories section, either enable the individual options (Storage Read, Storage Write, and Storage Delete) or select allLogs to enable all categories at once. </br> <img src="/resources/azure/storageaccounts/queue-service-logging-enabled/step7.png"/>
\ No newline at end of file
+2. Select the "Search resources, services, and docs" option at the top and search for "Storage accounts".</br> <img src="/resources/azure/storageaccounts/storage-account-queue-service-logging-enabled/step2.png"/>
+3. Select the "Storage account" by clicking on the "Name" link to access the configuration changes. </br> <img src="/resources/azure/storageaccounts/storage-account-queue-service-logging-enabled/step3.png"/>
+4. On the "Storage account" page, scroll down the left navigation panel and choose "Diagnostic Settings" under "Monitoring". </br> <img src="/resources/azure/storageaccounts/storage-account-queue-service-logging-enabled/step4.png"/>
+5. On the Diagnostic Settings page, select the "queue" service to configure its diagnostics. </br> <img src="/resources/azure/storageaccounts/storage-account-queue-service-logging-enabled/step5.png"/>
+6. Click Add diagnostic setting to create a new logging configuration. </br> <img src="/resources/azure/storageaccounts/storage-account-queue-service-logging-enabled/step6.png"/>
+7. In the Log categories section, either enable the individual options (Storage Read, Storage Write, and Storage Delete) or select allLogs to enable all categories at once. </br> <img src="/resources/azure/storageaccounts/storage-account-queue-service-logging-enabled/step7.png"/>
\ No newline at end of file
diff --git a/resources/azure/storageaccounts/blob-service-logging-enabled/step2.png b/resources/azure/storageaccounts/storage-account-blob-service-logging-enabled/step2.png
similarity index 100%
rename from resources/azure/storageaccounts/blob-service-logging-enabled/step2.png
rename to resources/azure/storageaccounts/storage-account-blob-service-logging-enabled/step2.png
diff --git a/resources/azure/storageaccounts/blob-service-logging-enabled/step3.png b/resources/azure/storageaccounts/storage-account-blob-service-logging-enabled/step3.png
similarity index 100%
rename from resources/azure/storageaccounts/blob-service-logging-enabled/step3.png
rename to resources/azure/storageaccounts/storage-account-blob-service-logging-enabled/step3.png
diff --git a/resources/azure/storageaccounts/blob-service-logging-enabled/step4.png b/resources/azure/storageaccounts/storage-account-blob-service-logging-enabled/step4.png
similarity index 100%
rename from resources/azure/storageaccounts/blob-service-logging-enabled/step4.png
rename to resources/azure/storageaccounts/storage-account-blob-service-logging-enabled/step4.png
diff --git a/resources/azure/storageaccounts/blob-service-logging-enabled/step5.png b/resources/azure/storageaccounts/storage-account-blob-service-logging-enabled/step5.png
similarity index 100%
rename from resources/azure/storageaccounts/blob-service-logging-enabled/step5.png
rename to resources/azure/storageaccounts/storage-account-blob-service-logging-enabled/step5.png
diff --git a/resources/azure/storageaccounts/blob-service-logging-enabled/step6.png b/resources/azure/storageaccounts/storage-account-blob-service-logging-enabled/step6.png
similarity index 100%
rename from resources/azure/storageaccounts/blob-service-logging-enabled/step6.png
rename to resources/azure/storageaccounts/storage-account-blob-service-logging-enabled/step6.png
diff --git a/resources/azure/storageaccounts/blob-service-logging-enabled/step7.png b/resources/azure/storageaccounts/storage-account-blob-service-logging-enabled/step7.png
similarity index 100%
rename from resources/azure/storageaccounts/blob-service-logging-enabled/step7.png
rename to resources/azure/storageaccounts/storage-account-blob-service-logging-enabled/step7.png
diff --git a/resources/azure/storageaccounts/queue-service-logging-enabled/step2.png b/resources/azure/storageaccounts/storage-account-queue-service-logging-enabled/step2.png
similarity index 100%
rename from resources/azure/storageaccounts/queue-service-logging-enabled/step2.png
rename to resources/azure/storageaccounts/storage-account-queue-service-logging-enabled/step2.png
diff --git a/resources/azure/storageaccounts/queue-service-logging-enabled/step3.png b/resources/azure/storageaccounts/storage-account-queue-service-logging-enabled/step3.png
similarity index 100%
rename from resources/azure/storageaccounts/queue-service-logging-enabled/step3.png
rename to resources/azure/storageaccounts/storage-account-queue-service-logging-enabled/step3.png
diff --git a/resources/azure/storageaccounts/queue-service-logging-enabled/step4.png b/resources/azure/storageaccounts/storage-account-queue-service-logging-enabled/step4.png
similarity index 100%
rename from resources/azure/storageaccounts/queue-service-logging-enabled/step4.png
rename to resources/azure/storageaccounts/storage-account-queue-service-logging-enabled/step4.png
diff --git a/resources/azure/storageaccounts/queue-service-logging-enabled/step5.png b/resources/azure/storageaccounts/storage-account-queue-service-logging-enabled/step5.png
similarity index 100%
rename from resources/azure/storageaccounts/queue-service-logging-enabled/step5.png
rename to resources/azure/storageaccounts/storage-account-queue-service-logging-enabled/step5.png
diff --git a/resources/azure/storageaccounts/queue-service-logging-enabled/step6.png b/resources/azure/storageaccounts/storage-account-queue-service-logging-enabled/step6.png
similarity index 100%
rename from resources/azure/storageaccounts/queue-service-logging-enabled/step6.png
rename to resources/azure/storageaccounts/storage-account-queue-service-logging-enabled/step6.png
diff --git a/resources/azure/storageaccounts/queue-service-logging-enabled/step7.png b/resources/azure/storageaccounts/storage-account-queue-service-logging-enabled/step7.png
similarity index 100%
rename from resources/azure/storageaccounts/queue-service-logging-enabled/step7.png
rename to resources/azure/storageaccounts/storage-account-queue-service-logging-enabled/step7.png
diff --git a/resources/azure/storageaccounts/table-service-logging-enabled/step2.png b/resources/azure/storageaccounts/storage-account-table-service-logging-enabled/step2.png
similarity index 100%
rename from resources/azure/storageaccounts/table-service-logging-enabled/step2.png
rename to resources/azure/storageaccounts/storage-account-table-service-logging-enabled/step2.png
diff --git a/resources/azure/storageaccounts/table-service-logging-enabled/step3.png b/resources/azure/storageaccounts/storage-account-table-service-logging-enabled/step3.png
similarity index 100%
rename from resources/azure/storageaccounts/table-service-logging-enabled/step3.png
rename to resources/azure/storageaccounts/storage-account-table-service-logging-enabled/step3.png
diff --git a/resources/azure/storageaccounts/table-service-logging-enabled/step4.png b/resources/azure/storageaccounts/storage-account-table-service-logging-enabled/step4.png
similarity index 100%
rename from resources/azure/storageaccounts/table-service-logging-enabled/step4.png
rename to resources/azure/storageaccounts/storage-account-table-service-logging-enabled/step4.png
diff --git a/resources/azure/storageaccounts/table-service-logging-enabled/step5.png b/resources/azure/storageaccounts/storage-account-table-service-logging-enabled/step5.png
similarity index 100%
rename from resources/azure/storageaccounts/table-service-logging-enabled/step5.png
rename to resources/azure/storageaccounts/storage-account-table-service-logging-enabled/step5.png
diff --git a/resources/azure/storageaccounts/table-service-logging-enabled/step6.png b/resources/azure/storageaccounts/storage-account-table-service-logging-enabled/step6.png
similarity index 100%
rename from resources/azure/storageaccounts/table-service-logging-enabled/step6.png
rename to resources/azure/storageaccounts/storage-account-table-service-logging-enabled/step6.png
diff --git a/resources/azure/storageaccounts/table-service-logging-enabled/step7.png b/resources/azure/storageaccounts/storage-account-table-service-logging-enabled/step7.png
similarity index 100%
rename from resources/azure/storageaccounts/table-service-logging-enabled/step7.png
rename to resources/azure/storageaccounts/storage-account-table-service-logging-enabled/step7.png