diff --git a/sdk/storage/arm-storage/src/models/fileServicesMappers.ts b/sdk/storage/arm-storage/src/models/fileServicesMappers.ts
index fda18a3b0538..4dbb4c8da022 100644
--- a/sdk/storage/arm-storage/src/models/fileServicesMappers.ts
+++ b/sdk/storage/arm-storage/src/models/fileServicesMappers.ts
@@ -12,7 +12,6 @@ export {
   BaseResource,
   BlobContainer,
   BlobServiceProperties,
-  CloudError,
   CorsRule,
   CorsRules,
   CustomDomain,
@@ -23,6 +22,8 @@ export {
   EncryptionService,
   EncryptionServices,
   Endpoints,
+  ErrorResponse,
+  ErrorResponseBody,
   FileServiceItems,
   FileServiceProperties,
   FileShare,
diff --git a/sdk/storage/arm-storage/src/models/fileSharesMappers.ts b/sdk/storage/arm-storage/src/models/fileSharesMappers.ts
index 948db0f52828..e7bb8ee4fb09 100644
--- a/sdk/storage/arm-storage/src/models/fileSharesMappers.ts
+++ b/sdk/storage/arm-storage/src/models/fileSharesMappers.ts
@@ -12,7 +12,6 @@ export {
   BaseResource,
   BlobContainer,
   BlobServiceProperties,
-  CloudError,
   CorsRule,
   CorsRules,
   CustomDomain,
@@ -23,6 +22,8 @@ export {
   EncryptionService,
   EncryptionServices,
   Endpoints,
+  ErrorResponse,
+  ErrorResponseBody,
   FileServiceProperties,
   FileShare,
   FileShareItem,
diff --git a/sdk/storage/arm-storage/src/operations/fileServices.ts b/sdk/storage/arm-storage/src/operations/fileServices.ts
index 21261dcdd234..082227bd75cb 100644
--- a/sdk/storage/arm-storage/src/operations/fileServices.ts
+++ b/sdk/storage/arm-storage/src/operations/fileServices.ts
@@ -173,7 +173,7 @@ const listOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.FileServiceItems
     },
     default: {
-      bodyMapper: Mappers.CloudError
+      bodyMapper: Mappers.ErrorResponse
     }
   },
   serializer
@@ -211,7 +211,7 @@ const setServicePropertiesOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.FileServiceProperties
     },
     default: {
-      bodyMapper: Mappers.CloudError
+      bodyMapper: Mappers.ErrorResponse
     }
   },
   serializer
@@ -237,7 +237,7 @@ const getServicePropertiesOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.FileServiceProperties
     },
     default: {
-      bodyMapper: Mappers.CloudError
+      bodyMapper: Mappers.ErrorResponse
     }
   },
   serializer
diff --git a/sdk/storage/arm-storage/src/operations/fileShares.ts b/sdk/storage/arm-storage/src/operations/fileShares.ts
index 939961c70338..719a8e867d16 100644
--- a/sdk/storage/arm-storage/src/operations/fileShares.ts
+++ b/sdk/storage/arm-storage/src/operations/fileShares.ts
@@ -339,7 +339,7 @@ const listOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.FileShareItems
     },
     default: {
-      bodyMapper: Mappers.CloudError
+      bodyMapper: Mappers.ErrorResponse
     }
   },
   serializer
@@ -384,7 +384,7 @@ const createOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.FileShare
     },
     default: {
-      bodyMapper: Mappers.CloudError
+      bodyMapper: Mappers.ErrorResponse
     }
   },
   serializer
@@ -426,7 +426,7 @@ const updateOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.FileShare
     },
     default: {
-      bodyMapper: Mappers.CloudError
+      bodyMapper: Mappers.ErrorResponse
     }
   },
   serializer
@@ -452,7 +452,7 @@ const getOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.FileShare
     },
     default: {
-      bodyMapper: Mappers.CloudError
+      bodyMapper: Mappers.ErrorResponse
     }
   },
   serializer
@@ -477,7 +477,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
     200: {},
     204: {},
     default: {
-      bodyMapper: Mappers.CloudError
+      bodyMapper: Mappers.ErrorResponse
     }
   },
   serializer
@@ -498,7 +498,7 @@ const listNextOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.FileShareItems
     },
     default: {
-      bodyMapper: Mappers.CloudError
+      bodyMapper: Mappers.ErrorResponse
     }
   },
   serializer