diff --git a/sdk/storage/storage-blob/package.json b/sdk/storage/storage-blob/package.json
index fea7fbc36f3a..a3bd77f3905e 100644
--- a/sdk/storage/storage-blob/package.json
+++ b/sdk/storage/storage-blob/package.json
@@ -21,7 +21,7 @@
   },
   "scripts": {
     "audit": "node ../../../common/scripts/rush-audit.js && rimraf node_modules package-lock.json && npm i --package-lock-only 2>&1 && npm audit",
-    "build:autorest": "autorest ./swagger/README.md --typescript --use=@microsoft.azure/autorest.typescript@5.0.0",
+    "build:autorest": "autorest ./swagger/README.md --typescript --use=@microsoft.azure/autorest.typescript@5.0.1",
     "build:browserzip": "gulp zip",
     "build:es6": "tsc -p tsconfig.json",
     "build:nodebrowser": "rollup -c 2>&1",
diff --git a/sdk/storage/storage-blob/src/generated/src/operations/appendBlob.ts b/sdk/storage/storage-blob/src/generated/src/operations/appendBlob.ts
index 5f6c7a712e14..0adca2f1b6d0 100644
--- a/sdk/storage/storage-blob/src/generated/src/operations/appendBlob.ts
+++ b/sdk/storage/storage-blob/src/generated/src/operations/appendBlob.ts
@@ -161,7 +161,8 @@ const createOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.AppendBlobCreateHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.AppendBlobCreateHeaders
     }
   },
   isXML: true,
@@ -211,7 +212,8 @@ const appendBlockOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.AppendBlobAppendBlockHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.AppendBlobAppendBlockHeaders
     }
   },
   isXML: true,
@@ -257,7 +259,8 @@ const appendBlockFromUrlOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.AppendBlobAppendBlockFromUrlHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.AppendBlobAppendBlockFromUrlHeaders
     }
   },
   isXML: true,
diff --git a/sdk/storage/storage-blob/src/generated/src/operations/blob.ts b/sdk/storage/storage-blob/src/generated/src/operations/blob.ts
index 70f34ae08f57..d9ccf406c157 100644
--- a/sdk/storage/storage-blob/src/generated/src/operations/blob.ts
+++ b/sdk/storage/storage-blob/src/generated/src/operations/blob.ts
@@ -655,7 +655,8 @@ const downloadOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlobDownloadHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.BlobDownloadHeaders
     }
   },
   isXML: true,
@@ -689,7 +690,8 @@ const getPropertiesOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlobGetPropertiesHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.BlobGetPropertiesHeaders
     }
   },
   isXML: true,
@@ -721,7 +723,8 @@ const deleteMethodOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlobDeleteHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.BlobDeleteHeaders
     }
   },
   isXML: true,
@@ -756,7 +759,8 @@ const setAccessControlOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlobSetAccessControlHeaders
     },
     default: {
-      bodyMapper: Mappers.DataLakeStorageError
+      bodyMapper: Mappers.DataLakeStorageError,
+      headersMapper: Mappers.BlobSetAccessControlHeaders
     }
   },
   isXML: true,
@@ -788,7 +792,8 @@ const getAccessControlOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlobGetAccessControlHeaders
     },
     default: {
-      bodyMapper: Mappers.DataLakeStorageError
+      bodyMapper: Mappers.DataLakeStorageError,
+      headersMapper: Mappers.BlobGetAccessControlHeaders
     }
   },
   isXML: true,
@@ -833,7 +838,8 @@ const renameOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlobRenameHeaders
     },
     default: {
-      bodyMapper: Mappers.DataLakeStorageError
+      bodyMapper: Mappers.DataLakeStorageError,
+      headersMapper: Mappers.BlobRenameHeaders
     }
   },
   isXML: true,
@@ -859,7 +865,8 @@ const undeleteOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlobUndeleteHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.BlobUndeleteHeaders
     }
   },
   isXML: true,
@@ -896,7 +903,8 @@ const setHTTPHeadersOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlobSetHTTPHeadersHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.BlobSetHTTPHeadersHeaders
     }
   },
   isXML: true,
@@ -931,7 +939,8 @@ const setMetadataOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlobSetMetadataHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.BlobSetMetadataHeaders
     }
   },
   isXML: true,
@@ -964,7 +973,8 @@ const acquireLeaseOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlobAcquireLeaseHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.BlobAcquireLeaseHeaders
     }
   },
   isXML: true,
@@ -996,7 +1006,8 @@ const releaseLeaseOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlobReleaseLeaseHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.BlobReleaseLeaseHeaders
     }
   },
   isXML: true,
@@ -1028,7 +1039,8 @@ const renewLeaseOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlobRenewLeaseHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.BlobRenewLeaseHeaders
     }
   },
   isXML: true,
@@ -1061,7 +1073,8 @@ const changeLeaseOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlobChangeLeaseHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.BlobChangeLeaseHeaders
     }
   },
   isXML: true,
@@ -1093,7 +1106,8 @@ const breakLeaseOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlobBreakLeaseHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.BlobBreakLeaseHeaders
     }
   },
   isXML: true,
@@ -1128,7 +1142,8 @@ const createSnapshotOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlobCreateSnapshotHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.BlobCreateSnapshotHeaders
     }
   },
   isXML: true,
@@ -1166,7 +1181,8 @@ const startCopyFromURLOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlobStartCopyFromURLHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.BlobStartCopyFromURLHeaders
     }
   },
   isXML: true,
@@ -1204,7 +1220,8 @@ const copyFromURLOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlobCopyFromURLHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.BlobCopyFromURLHeaders
     }
   },
   isXML: true,
@@ -1233,7 +1250,8 @@ const abortCopyFromURLOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlobAbortCopyFromURLHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.BlobAbortCopyFromURLHeaders
     }
   },
   isXML: true,
@@ -1265,7 +1283,8 @@ const setTierOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlobSetTierHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.BlobSetTierHeaders
     }
   },
   isXML: true,
@@ -1290,7 +1309,8 @@ const getAccountInfoOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlobGetAccountInfoHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.BlobGetAccountInfoHeaders
     }
   },
   isXML: true,
diff --git a/sdk/storage/storage-blob/src/generated/src/operations/blockBlob.ts b/sdk/storage/storage-blob/src/generated/src/operations/blockBlob.ts
index a565aede3c5d..8b9e5b224c14 100644
--- a/sdk/storage/storage-blob/src/generated/src/operations/blockBlob.ts
+++ b/sdk/storage/storage-blob/src/generated/src/operations/blockBlob.ts
@@ -266,7 +266,8 @@ const uploadOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlockBlobUploadHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.BlockBlobUploadHeaders
     }
   },
   isXML: true,
@@ -311,7 +312,8 @@ const stageBlockOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlockBlobStageBlockHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.BlockBlobStageBlockHeaders
     }
   },
   isXML: true,
@@ -351,7 +353,8 @@ const stageBlockFromURLOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlockBlobStageBlockFromURLHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.BlockBlobStageBlockFromURLHeaders
     }
   },
   isXML: true,
@@ -403,7 +406,8 @@ const commitBlockListOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlockBlobCommitBlockListHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.BlockBlobCommitBlockListHeaders
     }
   },
   isXML: true,
@@ -433,7 +437,8 @@ const getBlockListOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.BlockBlobGetBlockListHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.BlockBlobGetBlockListHeaders
     }
   },
   isXML: true,
diff --git a/sdk/storage/storage-blob/src/generated/src/operations/container.ts b/sdk/storage/storage-blob/src/generated/src/operations/container.ts
index 32eb83be9b18..0450197f1c19 100644
--- a/sdk/storage/storage-blob/src/generated/src/operations/container.ts
+++ b/sdk/storage/storage-blob/src/generated/src/operations/container.ts
@@ -431,7 +431,8 @@ const createOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ContainerCreateHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ContainerCreateHeaders
     }
   },
   isXML: true,
@@ -458,7 +459,8 @@ const getPropertiesOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ContainerGetPropertiesHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ContainerGetPropertiesHeaders
     }
   },
   isXML: true,
@@ -487,7 +489,8 @@ const deleteMethodOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ContainerDeleteHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ContainerDeleteHeaders
     }
   },
   isXML: true,
@@ -517,7 +520,8 @@ const setMetadataOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ContainerSetMetadataHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ContainerSetMetadataHeaders
     }
   },
   isXML: true,
@@ -558,7 +562,8 @@ const getAccessPolicyOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ContainerGetAccessPolicyHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ContainerGetAccessPolicyHeaders
     }
   },
   isXML: true,
@@ -610,7 +615,8 @@ const setAccessPolicyOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ContainerSetAccessPolicyHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ContainerSetAccessPolicyHeaders
     }
   },
   isXML: true,
@@ -642,7 +648,8 @@ const acquireLeaseOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ContainerAcquireLeaseHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ContainerAcquireLeaseHeaders
     }
   },
   isXML: true,
@@ -673,7 +680,8 @@ const releaseLeaseOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ContainerReleaseLeaseHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ContainerReleaseLeaseHeaders
     }
   },
   isXML: true,
@@ -704,7 +712,8 @@ const renewLeaseOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ContainerRenewLeaseHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ContainerRenewLeaseHeaders
     }
   },
   isXML: true,
@@ -735,7 +744,8 @@ const breakLeaseOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ContainerBreakLeaseHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ContainerBreakLeaseHeaders
     }
   },
   isXML: true,
@@ -767,7 +777,8 @@ const changeLeaseOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ContainerChangeLeaseHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ContainerChangeLeaseHeaders
     }
   },
   isXML: true,
@@ -799,7 +810,8 @@ const listBlobFlatSegmentOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ContainerListBlobFlatSegmentHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ContainerListBlobFlatSegmentHeaders
     }
   },
   isXML: true,
@@ -832,7 +844,8 @@ const listBlobHierarchySegmentOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ContainerListBlobHierarchySegmentHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ContainerListBlobHierarchySegmentHeaders
     }
   },
   isXML: true,
@@ -857,7 +870,8 @@ const getAccountInfoOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ContainerGetAccountInfoHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ContainerGetAccountInfoHeaders
     }
   },
   isXML: true,
diff --git a/sdk/storage/storage-blob/src/generated/src/operations/directory.ts b/sdk/storage/storage-blob/src/generated/src/operations/directory.ts
index cc5100bbc76d..04147757d4e3 100644
--- a/sdk/storage/storage-blob/src/generated/src/operations/directory.ts
+++ b/sdk/storage/storage-blob/src/generated/src/operations/directory.ts
@@ -206,7 +206,8 @@ const createOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.DirectoryCreateHeaders
     },
     default: {
-      bodyMapper: Mappers.DataLakeStorageError
+      bodyMapper: Mappers.DataLakeStorageError,
+      headersMapper: Mappers.DirectoryCreateHeaders
     }
   },
   isXML: true,
@@ -252,7 +253,8 @@ const renameOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.DirectoryRenameHeaders
     },
     default: {
-      bodyMapper: Mappers.DataLakeStorageError
+      bodyMapper: Mappers.DataLakeStorageError,
+      headersMapper: Mappers.DirectoryRenameHeaders
     }
   },
   isXML: true,
@@ -284,7 +286,8 @@ const deleteMethodOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.DirectoryDeleteHeaders
     },
     default: {
-      bodyMapper: Mappers.DataLakeStorageError
+      bodyMapper: Mappers.DataLakeStorageError,
+      headersMapper: Mappers.DirectoryDeleteHeaders
     }
   },
   isXML: true,
@@ -319,7 +322,8 @@ const setAccessControlOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.DirectorySetAccessControlHeaders
     },
     default: {
-      bodyMapper: Mappers.DataLakeStorageError
+      bodyMapper: Mappers.DataLakeStorageError,
+      headersMapper: Mappers.DirectorySetAccessControlHeaders
     }
   },
   isXML: true,
@@ -351,7 +355,8 @@ const getAccessControlOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.DirectoryGetAccessControlHeaders
     },
     default: {
-      bodyMapper: Mappers.DataLakeStorageError
+      bodyMapper: Mappers.DataLakeStorageError,
+      headersMapper: Mappers.DirectoryGetAccessControlHeaders
     }
   },
   isXML: true,
diff --git a/sdk/storage/storage-blob/src/generated/src/operations/pageBlob.ts b/sdk/storage/storage-blob/src/generated/src/operations/pageBlob.ts
index 1c82cf562e66..d9eaf31b77d2 100644
--- a/sdk/storage/storage-blob/src/generated/src/operations/pageBlob.ts
+++ b/sdk/storage/storage-blob/src/generated/src/operations/pageBlob.ts
@@ -365,7 +365,8 @@ const createOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.PageBlobCreateHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.PageBlobCreateHeaders
     }
   },
   isXML: true,
@@ -418,7 +419,8 @@ const uploadPagesOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.PageBlobUploadPagesHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.PageBlobUploadPagesHeaders
     }
   },
   isXML: true,
@@ -458,7 +460,8 @@ const clearPagesOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.PageBlobClearPagesHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.PageBlobClearPagesHeaders
     }
   },
   isXML: true,
@@ -506,7 +509,8 @@ const uploadPagesFromURLOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.PageBlobUploadPagesFromURLHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.PageBlobUploadPagesFromURLHeaders
     }
   },
   isXML: true,
@@ -540,7 +544,8 @@ const getPageRangesOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.PageBlobGetPageRangesHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.PageBlobGetPageRangesHeaders
     }
   },
   isXML: true,
@@ -575,7 +580,8 @@ const getPageRangesDiffOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.PageBlobGetPageRangesDiffHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.PageBlobGetPageRangesDiffHeaders
     }
   },
   isXML: true,
@@ -610,7 +616,8 @@ const resizeOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.PageBlobResizeHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.PageBlobResizeHeaders
     }
   },
   isXML: true,
@@ -643,7 +650,8 @@ const updateSequenceNumberOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.PageBlobUpdateSequenceNumberHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.PageBlobUpdateSequenceNumberHeaders
     }
   },
   isXML: true,
@@ -674,7 +682,8 @@ const copyIncrementalOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.PageBlobCopyIncrementalHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.PageBlobCopyIncrementalHeaders
     }
   },
   isXML: true,
diff --git a/sdk/storage/storage-blob/src/generated/src/operations/service.ts b/sdk/storage/storage-blob/src/generated/src/operations/service.ts
index 6f9e66e8586a..c55db7516de6 100644
--- a/sdk/storage/storage-blob/src/generated/src/operations/service.ts
+++ b/sdk/storage/storage-blob/src/generated/src/operations/service.ts
@@ -253,7 +253,8 @@ const setPropertiesOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ServiceSetPropertiesHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ServiceSetPropertiesHeaders
     }
   },
   isXML: true,
@@ -280,7 +281,8 @@ const getPropertiesOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ServiceGetPropertiesHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ServiceGetPropertiesHeaders
     }
   },
   isXML: true,
@@ -307,7 +309,8 @@ const getStatisticsOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ServiceGetStatisticsHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ServiceGetStatisticsHeaders
     }
   },
   isXML: true,
@@ -337,7 +340,8 @@ const listContainersSegmentOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ServiceListContainersSegmentHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ServiceListContainersSegmentHeaders
     }
   },
   isXML: true,
@@ -372,7 +376,8 @@ const getUserDelegationKeyOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ServiceGetUserDelegationKeyHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ServiceGetUserDelegationKeyHeaders
     }
   },
   isXML: true,
@@ -396,7 +401,8 @@ const getAccountInfoOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ServiceGetAccountInfoHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ServiceGetAccountInfoHeaders
     }
   },
   isXML: true,
@@ -440,7 +446,8 @@ const submitBatchOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ServiceSubmitBatchHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ServiceSubmitBatchHeaders
     }
   },
   isXML: true,
diff --git a/sdk/storage/storage-blob/test/appendblobclient.spec.ts b/sdk/storage/storage-blob/test/appendblobclient.spec.ts
index ea72b2022bdd..2fc6895f62c4 100644
--- a/sdk/storage/storage-blob/test/appendblobclient.spec.ts
+++ b/sdk/storage/storage-blob/test/appendblobclient.spec.ts
@@ -122,6 +122,12 @@ describe("AppendBlobClient", () => {
       if (err instanceof Error && err.message.indexOf("Crc64Mismatch") != -1) {
         exceptionCaught = true;
       }
+
+      assert.equal(
+        err.details.errorCode,
+        "Crc64Mismatch",
+        "Error does not contain details property"
+      );
     }
 
     assert.ok(exceptionCaught);
diff --git a/sdk/storage/storage-file/package.json b/sdk/storage/storage-file/package.json
index b06153f7f4d7..352af2d5008f 100644
--- a/sdk/storage/storage-file/package.json
+++ b/sdk/storage/storage-file/package.json
@@ -20,7 +20,7 @@
   },
   "scripts": {
     "audit": "node ../../../common/scripts/rush-audit.js && rimraf node_modules package-lock.json && npm i --package-lock-only 2>&1 && npm audit",
-    "build:autorest": "autorest ./swagger/README.md --typescript --use=@microsoft.azure/autorest.typescript@5.0.0",
+    "build:autorest": "autorest ./swagger/README.md --typescript --use=@microsoft.azure/autorest.typescript@5.0.1",
     "build:browserzip": "gulp zip",
     "build:es6": "tsc -p tsconfig.json",
     "build:nodebrowser": "rollup -c 2>&1",
diff --git a/sdk/storage/storage-file/src/generated/src/operations/directory.ts b/sdk/storage/storage-file/src/generated/src/operations/directory.ts
index c5b33b1a2d82..0c24a9f5ac08 100644
--- a/sdk/storage/storage-file/src/generated/src/operations/directory.ts
+++ b/sdk/storage/storage-file/src/generated/src/operations/directory.ts
@@ -286,7 +286,8 @@ const createOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.DirectoryCreateHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.DirectoryCreateHeaders
     }
   },
   isXML: true,
@@ -312,7 +313,8 @@ const getPropertiesOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.DirectoryGetPropertiesHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.DirectoryGetPropertiesHeaders
     }
   },
   isXML: true,
@@ -337,7 +339,8 @@ const deleteMethodOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.DirectoryDeleteHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.DirectoryDeleteHeaders
     }
   },
   isXML: true,
@@ -368,7 +371,8 @@ const setPropertiesOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.DirectorySetPropertiesHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.DirectorySetPropertiesHeaders
     }
   },
   isXML: true,
@@ -395,7 +399,8 @@ const setMetadataOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.DirectorySetMetadataHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.DirectorySetMetadataHeaders
     }
   },
   isXML: true,
@@ -426,7 +431,8 @@ const listFilesAndDirectoriesSegmentOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.DirectoryListFilesAndDirectoriesSegmentHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.DirectoryListFilesAndDirectoriesSegmentHeaders
     }
   },
   isXML: true,
@@ -456,7 +462,8 @@ const listHandlesOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.DirectoryListHandlesHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.DirectoryListHandlesHeaders
     }
   },
   isXML: true,
@@ -485,7 +492,8 @@ const forceCloseHandlesOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.DirectoryForceCloseHandlesHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.DirectoryForceCloseHandlesHeaders
     }
   },
   isXML: true,
diff --git a/sdk/storage/storage-file/src/generated/src/operations/file.ts b/sdk/storage/storage-file/src/generated/src/operations/file.ts
index 0ffd5ad8d0a9..3619be20a1ea 100644
--- a/sdk/storage/storage-file/src/generated/src/operations/file.ts
+++ b/sdk/storage/storage-file/src/generated/src/operations/file.ts
@@ -523,7 +523,8 @@ const createOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.FileCreateHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.FileCreateHeaders
     }
   },
   isXML: true,
@@ -564,7 +565,8 @@ const downloadOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.FileDownloadHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.FileDownloadHeaders
     }
   },
   isXML: true,
@@ -589,7 +591,8 @@ const getPropertiesOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.FileGetPropertiesHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.FileGetPropertiesHeaders
     }
   },
   isXML: true,
@@ -613,7 +616,8 @@ const deleteMethodOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.FileDeleteHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.FileDeleteHeaders
     }
   },
   isXML: true,
@@ -650,7 +654,8 @@ const setHTTPHeadersOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.FileSetHTTPHeadersHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.FileSetHTTPHeadersHeaders
     }
   },
   isXML: true,
@@ -676,7 +681,8 @@ const setMetadataOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.FileSetMetadataHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.FileSetMetadataHeaders
     }
   },
   isXML: true,
@@ -718,7 +724,8 @@ const uploadRangeOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.FileUploadRangeHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.FileUploadRangeHeaders
     }
   },
   isXML: true,
@@ -751,7 +758,8 @@ const uploadRangeFromURLOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.FileUploadRangeFromURLHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.FileUploadRangeFromURLHeaders
     }
   },
   isXML: true,
@@ -791,7 +799,8 @@ const getRangeListOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.FileGetRangeListHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.FileGetRangeListHeaders
     }
   },
   isXML: true,
@@ -817,7 +826,8 @@ const startCopyOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.FileStartCopyHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.FileStartCopyHeaders
     }
   },
   isXML: true,
@@ -844,7 +854,8 @@ const abortCopyOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.FileAbortCopyHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.FileAbortCopyHeaders
     }
   },
   isXML: true,
@@ -873,7 +884,8 @@ const listHandlesOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.FileListHandlesHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.FileListHandlesHeaders
     }
   },
   isXML: true,
@@ -901,7 +913,8 @@ const forceCloseHandlesOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.FileForceCloseHandlesHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.FileForceCloseHandlesHeaders
     }
   },
   isXML: true,
diff --git a/sdk/storage/storage-file/src/generated/src/operations/service.ts b/sdk/storage/storage-file/src/generated/src/operations/service.ts
index b1026b1304f3..772675658cf4 100644
--- a/sdk/storage/storage-file/src/generated/src/operations/service.ts
+++ b/sdk/storage/storage-file/src/generated/src/operations/service.ts
@@ -134,7 +134,8 @@ const setPropertiesOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ServiceSetPropertiesHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ServiceSetPropertiesHeaders
     }
   },
   isXML: true,
@@ -160,7 +161,8 @@ const getPropertiesOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ServiceGetPropertiesHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ServiceGetPropertiesHeaders
     }
   },
   isXML: true,
@@ -189,7 +191,8 @@ const listSharesSegmentOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ServiceListSharesSegmentHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ServiceListSharesSegmentHeaders
     }
   },
   isXML: true,
diff --git a/sdk/storage/storage-file/src/generated/src/operations/share.ts b/sdk/storage/storage-file/src/generated/src/operations/share.ts
index 9d1231ea450d..adc28c25a4b5 100644
--- a/sdk/storage/storage-file/src/generated/src/operations/share.ts
+++ b/sdk/storage/storage-file/src/generated/src/operations/share.ts
@@ -327,7 +327,8 @@ const createOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ShareCreateHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ShareCreateHeaders
     }
   },
   isXML: true,
@@ -353,7 +354,8 @@ const getPropertiesOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ShareGetPropertiesHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ShareGetPropertiesHeaders
     }
   },
   isXML: true,
@@ -380,7 +382,8 @@ const deleteMethodOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ShareDeleteHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ShareDeleteHeaders
     }
   },
   isXML: true,
@@ -407,7 +410,8 @@ const createSnapshotOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ShareCreateSnapshotHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ShareCreateSnapshotHeaders
     }
   },
   isXML: true,
@@ -441,7 +445,8 @@ const createPermissionOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ShareCreatePermissionHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ShareCreatePermissionHeaders
     }
   },
   isXML: false,
@@ -469,7 +474,8 @@ const getPermissionOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ShareGetPermissionHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ShareGetPermissionHeaders
     }
   },
   isXML: true,
@@ -496,7 +502,8 @@ const setQuotaOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ShareSetQuotaHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ShareSetQuotaHeaders
     }
   },
   isXML: true,
@@ -523,7 +530,8 @@ const setMetadataOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ShareSetMetadataHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ShareSetMetadataHeaders
     }
   },
   isXML: true,
@@ -562,7 +570,8 @@ const getAccessPolicyOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ShareGetAccessPolicyHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ShareGetAccessPolicyHeaders
     }
   },
   isXML: true,
@@ -609,7 +618,8 @@ const setAccessPolicyOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ShareSetAccessPolicyHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ShareSetAccessPolicyHeaders
     }
   },
   isXML: true,
@@ -636,7 +646,8 @@ const getStatisticsOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ShareGetStatisticsHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ShareGetStatisticsHeaders
     }
   },
   isXML: true,
diff --git a/sdk/storage/storage-file/test/directoryclient.spec.ts b/sdk/storage/storage-file/test/directoryclient.spec.ts
index db2bf8793d28..75513fb0cf3e 100644
--- a/sdk/storage/storage-file/test/directoryclient.spec.ts
+++ b/sdk/storage/storage-file/test/directoryclient.spec.ts
@@ -596,6 +596,11 @@ describe("DirectoryClient", () => {
       );
     } catch (error) {
       assert.ok((error.statusCode as number) === 404);
+      assert.equal(
+        error.details.errorCode,
+        "ResourceNotFound",
+        "Error does not contain details property"
+      );
     }
     await subDirClient.delete({ spanOptions });
 
diff --git a/sdk/storage/storage-queue/package.json b/sdk/storage/storage-queue/package.json
index a5f55043af2d..774037c07166 100644
--- a/sdk/storage/storage-queue/package.json
+++ b/sdk/storage/storage-queue/package.json
@@ -19,7 +19,7 @@
   },
   "scripts": {
     "audit": "node ../../../common/scripts/rush-audit.js && rimraf node_modules package-lock.json && npm i --package-lock-only 2>&1 && npm audit",
-    "build:autorest": "autorest ./swagger/README.md --typescript --use=@microsoft.azure/autorest.typescript@5.0.0",
+    "build:autorest": "autorest ./swagger/README.md --typescript --use=@microsoft.azure/autorest.typescript@5.0.1",
     "build:browserzip": "gulp zip",
     "build:es6": "tsc -p tsconfig.json",
     "build:nodebrowser": "rollup -c 2>&1",
diff --git a/sdk/storage/storage-queue/src/generated/src/operations/messageId.ts b/sdk/storage/storage-queue/src/generated/src/operations/messageId.ts
index a131dbd8a53d..28208832ef04 100644
--- a/sdk/storage/storage-queue/src/generated/src/operations/messageId.ts
+++ b/sdk/storage/storage-queue/src/generated/src/operations/messageId.ts
@@ -142,7 +142,8 @@ const updateOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.MessageIdUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.MessageIdUpdateHeaders
     }
   },
   isXML: true,
@@ -168,7 +169,8 @@ const deleteMethodOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.MessageIdDeleteHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.MessageIdDeleteHeaders
     }
   },
   isXML: true,
diff --git a/sdk/storage/storage-queue/src/generated/src/operations/messages.ts b/sdk/storage/storage-queue/src/generated/src/operations/messages.ts
index b4bf1954384a..d42906895672 100644
--- a/sdk/storage/storage-queue/src/generated/src/operations/messages.ts
+++ b/sdk/storage/storage-queue/src/generated/src/operations/messages.ts
@@ -167,7 +167,8 @@ const dequeueOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.MessagesDequeueHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.MessagesDequeueHeaders
     }
   },
   isXML: true,
@@ -192,7 +193,8 @@ const clearOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.MessagesClearHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.MessagesClearHeaders
     }
   },
   isXML: true,
@@ -240,7 +242,8 @@ const enqueueOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.MessagesEnqueueHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.MessagesEnqueueHeaders
     }
   },
   isXML: true,
@@ -280,7 +283,8 @@ const peekOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.MessagesPeekHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.MessagesPeekHeaders
     }
   },
   isXML: true,
diff --git a/sdk/storage/storage-queue/src/generated/src/operations/queue.ts b/sdk/storage/storage-queue/src/generated/src/operations/queue.ts
index 8037523cb039..c14f99bdcaeb 100644
--- a/sdk/storage/storage-queue/src/generated/src/operations/queue.ts
+++ b/sdk/storage/storage-queue/src/generated/src/operations/queue.ts
@@ -198,7 +198,8 @@ const createOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.QueueCreateHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.QueueCreateHeaders
     }
   },
   isXML: true,
@@ -223,7 +224,8 @@ const deleteMethodOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.QueueDeleteHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.QueueDeleteHeaders
     }
   },
   isXML: true,
@@ -249,7 +251,8 @@ const getPropertiesOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.QueueGetPropertiesHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.QueueGetPropertiesHeaders
     }
   },
   isXML: true,
@@ -276,7 +279,8 @@ const setMetadataOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.QueueSetMetadataHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.QueueSetMetadataHeaders
     }
   },
   isXML: true,
@@ -315,7 +319,8 @@ const getAccessPolicyOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.QueueGetAccessPolicyHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.QueueGetAccessPolicyHeaders
     }
   },
   isXML: true,
@@ -362,7 +367,8 @@ const setAccessPolicyOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.QueueSetAccessPolicyHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.QueueSetAccessPolicyHeaders
     }
   },
   isXML: true,
diff --git a/sdk/storage/storage-queue/src/generated/src/operations/service.ts b/sdk/storage/storage-queue/src/generated/src/operations/service.ts
index 338fc7d39b59..1febd9fa5d0d 100644
--- a/sdk/storage/storage-queue/src/generated/src/operations/service.ts
+++ b/sdk/storage/storage-queue/src/generated/src/operations/service.ts
@@ -160,7 +160,8 @@ const setPropertiesOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ServiceSetPropertiesHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ServiceSetPropertiesHeaders
     }
   },
   isXML: true,
@@ -187,7 +188,8 @@ const getPropertiesOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ServiceGetPropertiesHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ServiceGetPropertiesHeaders
     }
   },
   isXML: true,
@@ -214,7 +216,8 @@ const getStatisticsOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ServiceGetStatisticsHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ServiceGetStatisticsHeaders
     }
   },
   isXML: true,
@@ -244,7 +247,8 @@ const listQueuesSegmentOperationSpec: coreHttp.OperationSpec = {
       headersMapper: Mappers.ServiceListQueuesSegmentHeaders
     },
     default: {
-      bodyMapper: Mappers.StorageError
+      bodyMapper: Mappers.StorageError,
+      headersMapper: Mappers.ServiceListQueuesSegmentHeaders
     }
   },
   isXML: true,
diff --git a/sdk/storage/storage-queue/test/queueserviceclient.spec.ts b/sdk/storage/storage-queue/test/queueserviceclient.spec.ts
index e66c0afe9c93..154184840f04 100644
--- a/sdk/storage/storage-queue/test/queueserviceclient.spec.ts
+++ b/sdk/storage/storage-queue/test/queueserviceclient.spec.ts
@@ -338,6 +338,7 @@ describe("QueueServiceClient", () => {
     } catch (error) {
       err = error;
     }
+    assert.equal(err.details.errorCode, "QueueNotFound", "Error does not contain details property");
     assert.ok(err.message.includes("QueueNotFound"), "Error doesn't say `QueueNotFound`");
   });
 });