diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/deploy.bicep b/arm/Microsoft.Storage/storageAccounts/blobServices/deploy.bicep
index 6634a0863b..3f6c6081c2 100644
--- a/arm/Microsoft.Storage/storageAccounts/blobServices/deploy.bicep
+++ b/arm/Microsoft.Storage/storageAccounts/blobServices/deploy.bicep
@@ -42,7 +42,7 @@ resource blobServices 'Microsoft.Storage/storageAccounts/blobServices@2021-06-01
 }
 
 module blobServices_container 'containers/deploy.bicep' = [for (container, index) in containers: {
-  name: '${deployment().name}-Storage-Container-${index}'
+  name: '${deployment().name}-Container-${index}'
   params: {
     storageAccountName: storageAccount.name
     blobServicesName: blobServices.name
diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/deploy.bicep b/arm/Microsoft.Storage/storageAccounts/fileServices/deploy.bicep
index 7f40d01192..1533ddc584 100644
--- a/arm/Microsoft.Storage/storageAccounts/fileServices/deploy.bicep
+++ b/arm/Microsoft.Storage/storageAccounts/fileServices/deploy.bicep
@@ -39,7 +39,7 @@ resource fileServices 'Microsoft.Storage/storageAccounts/fileServices@2021-04-01
 }
 
 module fileServices_shares 'shares/deploy.bicep' = [for (share, index) in shares: {
-  name: '${deployment().name}-Storage-File-${index}'
+  name: '${deployment().name}-File-${index}'
   params: {
     storageAccountName: storageAccount.name
     fileServicesName: fileServices.name
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/deploy.bicep b/arm/Microsoft.Storage/storageAccounts/queueServices/deploy.bicep
index e02d134fa6..27f7e9d453 100644
--- a/arm/Microsoft.Storage/storageAccounts/queueServices/deploy.bicep
+++ b/arm/Microsoft.Storage/storageAccounts/queueServices/deploy.bicep
@@ -27,7 +27,7 @@ resource queueServices 'Microsoft.Storage/storageAccounts/queueServices@2021-04-
 }
 
 module queueServices_queues 'queues/deploy.bicep' = [for (queue, index) in queues: {
-  name: '${deployment().name}-Storage-Queue-${index}'
+  name: '${deployment().name}-Queue-${index}'
   params: {
     storageAccountName: storageAccount.name
     queueServicesName: queueServices.name
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep b/arm/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep
index 08b5bc7737..90e1ce5712 100644
--- a/arm/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep
+++ b/arm/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep
@@ -27,7 +27,7 @@ resource tableServices 'Microsoft.Storage/storageAccounts/tableServices@2021-04-
 }
 
 module tableServices_tables 'tables/deploy.bicep' = [for (tableName, index) in tables: {
-  name: '${deployment().name}-Storage-Table-${index}'
+  name: '${deployment().name}-Table-${index}'
   params: {
     storageAccountName: storageAccount.name
     tableServicesName: tableServices.name