@aws-sdk/client-rds 3.180.0 → 3.183.0

package/dist-cjs/protocols/Aws_query.js

@@ -1808,17 +1808,17 @@ exports.deserializeAws_queryAddRoleToDBClusterCommand = deserializeAws_queryAddR
 const deserializeAws_queryAddRoleToDBClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DBClusterNotFoundFault":
         case "com.amazonaws.rds#DBClusterNotFoundFault":
             throw await deserializeAws_queryDBClusterNotFoundFaultResponse(parsedOutput, context);
-        case "DBClusterRoleAlreadyExistsFault":
+        case "DBClusterRoleAlreadyExists":
         case "com.amazonaws.rds#DBClusterRoleAlreadyExistsFault":
             throw await deserializeAws_queryDBClusterRoleAlreadyExistsFaultResponse(parsedOutput, context);
-        case "DBClusterRoleQuotaExceededFault":
+        case "DBClusterRoleQuotaExceeded":
         case "com.amazonaws.rds#DBClusterRoleQuotaExceededFault":
             throw await deserializeAws_queryDBClusterRoleQuotaExceededFaultResponse(parsedOutput, context);
         case "InvalidDBClusterStateFault":
@@ -1848,20 +1848,20 @@ exports.deserializeAws_queryAddRoleToDBInstanceCommand = deserializeAws_queryAdd
 const deserializeAws_queryAddRoleToDBInstanceCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
-        case "DBInstanceRoleAlreadyExistsFault":
+        case "DBInstanceRoleAlreadyExists":
         case "com.amazonaws.rds#DBInstanceRoleAlreadyExistsFault":
             throw await deserializeAws_queryDBInstanceRoleAlreadyExistsFaultResponse(parsedOutput, context);
-        case "DBInstanceRoleQuotaExceededFault":
+        case "DBInstanceRoleQuotaExceeded":
         case "com.amazonaws.rds#DBInstanceRoleQuotaExceededFault":
             throw await deserializeAws_queryDBInstanceRoleQuotaExceededFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         default:
@@ -1891,14 +1891,14 @@ exports.deserializeAws_queryAddSourceIdentifierToSubscriptionCommand = deseriali
 const deserializeAws_queryAddSourceIdentifierToSubscriptionCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "SourceNotFoundFault":
+        case "SourceNotFound":
         case "com.amazonaws.rds#SourceNotFoundFault":
             throw await deserializeAws_querySourceNotFoundFaultResponse(parsedOutput, context);
-        case "SubscriptionNotFoundFault":
+        case "SubscriptionNotFound":
         case "com.amazonaws.rds#SubscriptionNotFoundFault":
             throw await deserializeAws_querySubscriptionNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -1925,14 +1925,14 @@ exports.deserializeAws_queryAddTagsToResourceCommand = deserializeAws_queryAddTa
 const deserializeAws_queryAddTagsToResourceCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DBClusterNotFoundFault":
         case "com.amazonaws.rds#DBClusterNotFoundFault":
             throw await deserializeAws_queryDBClusterNotFoundFaultResponse(parsedOutput, context);
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
         case "DBProxyNotFoundFault":
@@ -1941,7 +1941,7 @@ const deserializeAws_queryAddTagsToResourceCommandError = async (output, context
         case "DBProxyTargetGroupNotFoundFault":
         case "com.amazonaws.rds#DBProxyTargetGroupNotFoundFault":
             throw await deserializeAws_queryDBProxyTargetGroupNotFoundFaultResponse(parsedOutput, context);
-        case "DBSnapshotNotFoundFault":
+        case "DBSnapshotNotFound":
         case "com.amazonaws.rds#DBSnapshotNotFoundFault":
             throw await deserializeAws_queryDBSnapshotNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -1971,14 +1971,14 @@ exports.deserializeAws_queryApplyPendingMaintenanceActionCommand = deserializeAw
 const deserializeAws_queryApplyPendingMaintenanceActionCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "InvalidDBClusterStateFault":
         case "com.amazonaws.rds#InvalidDBClusterStateFault":
             throw await deserializeAws_queryInvalidDBClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         case "ResourceNotFoundFault":
@@ -2011,20 +2011,20 @@ exports.deserializeAws_queryAuthorizeDBSecurityGroupIngressCommand = deserialize
 const deserializeAws_queryAuthorizeDBSecurityGroupIngressCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "AuthorizationAlreadyExistsFault":
+        case "AuthorizationAlreadyExists":
         case "com.amazonaws.rds#AuthorizationAlreadyExistsFault":
             throw await deserializeAws_queryAuthorizationAlreadyExistsFaultResponse(parsedOutput, context);
-        case "AuthorizationQuotaExceededFault":
+        case "AuthorizationQuotaExceeded":
         case "com.amazonaws.rds#AuthorizationQuotaExceededFault":
             throw await deserializeAws_queryAuthorizationQuotaExceededFaultResponse(parsedOutput, context);
-        case "DBSecurityGroupNotFoundFault":
+        case "DBSecurityGroupNotFound":
         case "com.amazonaws.rds#DBSecurityGroupNotFoundFault":
             throw await deserializeAws_queryDBSecurityGroupNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidDBSecurityGroupStateFault":
+        case "InvalidDBSecurityGroupState":
         case "com.amazonaws.rds#InvalidDBSecurityGroupStateFault":
             throw await deserializeAws_queryInvalidDBSecurityGroupStateFaultResponse(parsedOutput, context);
         default:
@@ -2054,7 +2054,7 @@ exports.deserializeAws_queryBacktrackDBClusterCommand = deserializeAws_queryBack
 const deserializeAws_queryBacktrackDBClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -2091,11 +2091,11 @@ exports.deserializeAws_queryCancelExportTaskCommand = deserializeAws_queryCancel
 const deserializeAws_queryCancelExportTaskCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ExportTaskNotFoundFault":
+        case "ExportTaskNotFound":
         case "com.amazonaws.rds#ExportTaskNotFoundFault":
             throw await deserializeAws_queryExportTaskNotFoundFaultResponse(parsedOutput, context);
         case "InvalidExportTaskStateFault":
@@ -2128,17 +2128,17 @@ exports.deserializeAws_queryCopyDBClusterParameterGroupCommand = deserializeAws_
 const deserializeAws_queryCopyDBClusterParameterGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBParameterGroupAlreadyExistsFault":
+        case "DBParameterGroupAlreadyExists":
         case "com.amazonaws.rds#DBParameterGroupAlreadyExistsFault":
             throw await deserializeAws_queryDBParameterGroupAlreadyExistsFaultResponse(parsedOutput, context);
-        case "DBParameterGroupNotFoundFault":
+        case "DBParameterGroupNotFound":
         case "com.amazonaws.rds#DBParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBParameterGroupNotFoundFaultResponse(parsedOutput, context);
-        case "DBParameterGroupQuotaExceededFault":
+        case "DBParameterGroupQuotaExceeded":
         case "com.amazonaws.rds#DBParameterGroupQuotaExceededFault":
             throw await deserializeAws_queryDBParameterGroupQuotaExceededFaultResponse(parsedOutput, context);
         default:
@@ -2168,7 +2168,7 @@ exports.deserializeAws_queryCopyDBClusterSnapshotCommand = deserializeAws_queryC
 const deserializeAws_queryCopyDBClusterSnapshotCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -2187,7 +2187,7 @@ const deserializeAws_queryCopyDBClusterSnapshotCommandError = async (output, con
         case "KMSKeyNotAccessibleFault":
         case "com.amazonaws.rds#KMSKeyNotAccessibleFault":
             throw await deserializeAws_queryKMSKeyNotAccessibleFaultResponse(parsedOutput, context);
-        case "SnapshotQuotaExceededFault":
+        case "SnapshotQuotaExceeded":
         case "com.amazonaws.rds#SnapshotQuotaExceededFault":
             throw await deserializeAws_querySnapshotQuotaExceededFaultResponse(parsedOutput, context);
         default:
@@ -2217,17 +2217,17 @@ exports.deserializeAws_queryCopyDBParameterGroupCommand = deserializeAws_queryCo
 const deserializeAws_queryCopyDBParameterGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBParameterGroupAlreadyExistsFault":
+        case "DBParameterGroupAlreadyExists":
         case "com.amazonaws.rds#DBParameterGroupAlreadyExistsFault":
             throw await deserializeAws_queryDBParameterGroupAlreadyExistsFaultResponse(parsedOutput, context);
-        case "DBParameterGroupNotFoundFault":
+        case "DBParameterGroupNotFound":
         case "com.amazonaws.rds#DBParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBParameterGroupNotFoundFaultResponse(parsedOutput, context);
-        case "DBParameterGroupQuotaExceededFault":
+        case "DBParameterGroupQuotaExceeded":
         case "com.amazonaws.rds#DBParameterGroupQuotaExceededFault":
             throw await deserializeAws_queryDBParameterGroupQuotaExceededFaultResponse(parsedOutput, context);
         default:
@@ -2257,26 +2257,26 @@ exports.deserializeAws_queryCopyDBSnapshotCommand = deserializeAws_queryCopyDBSn
 const deserializeAws_queryCopyDBSnapshotCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "CustomAvailabilityZoneNotFoundFault":
+        case "CustomAvailabilityZoneNotFound":
         case "com.amazonaws.rds#CustomAvailabilityZoneNotFoundFault":
             throw await deserializeAws_queryCustomAvailabilityZoneNotFoundFaultResponse(parsedOutput, context);
-        case "DBSnapshotAlreadyExistsFault":
+        case "DBSnapshotAlreadyExists":
         case "com.amazonaws.rds#DBSnapshotAlreadyExistsFault":
             throw await deserializeAws_queryDBSnapshotAlreadyExistsFaultResponse(parsedOutput, context);
-        case "DBSnapshotNotFoundFault":
+        case "DBSnapshotNotFound":
         case "com.amazonaws.rds#DBSnapshotNotFoundFault":
             throw await deserializeAws_queryDBSnapshotNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidDBSnapshotStateFault":
+        case "InvalidDBSnapshotState":
         case "com.amazonaws.rds#InvalidDBSnapshotStateFault":
             throw await deserializeAws_queryInvalidDBSnapshotStateFaultResponse(parsedOutput, context);
         case "KMSKeyNotAccessibleFault":
         case "com.amazonaws.rds#KMSKeyNotAccessibleFault":
             throw await deserializeAws_queryKMSKeyNotAccessibleFaultResponse(parsedOutput, context);
-        case "SnapshotQuotaExceededFault":
+        case "SnapshotQuotaExceeded":
         case "com.amazonaws.rds#SnapshotQuotaExceededFault":
             throw await deserializeAws_querySnapshotQuotaExceededFaultResponse(parsedOutput, context);
         default:
@@ -2306,7 +2306,7 @@ exports.deserializeAws_queryCopyOptionGroupCommand = deserializeAws_queryCopyOpt
 const deserializeAws_queryCopyOptionGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -2346,7 +2346,7 @@ exports.deserializeAws_queryCreateCustomDBEngineVersionCommand = deserializeAws_
 const deserializeAws_queryCreateCustomDBEngineVersionCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -2386,7 +2386,7 @@ exports.deserializeAws_queryCreateDBClusterCommand = deserializeAws_queryCreateD
 const deserializeAws_queryCreateDBClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -2396,13 +2396,13 @@ const deserializeAws_queryCreateDBClusterCommandError = async (output, context)
         case "DBClusterNotFoundFault":
         case "com.amazonaws.rds#DBClusterNotFoundFault":
             throw await deserializeAws_queryDBClusterNotFoundFaultResponse(parsedOutput, context);
-        case "DBClusterParameterGroupNotFoundFault":
+        case "DBClusterParameterGroupNotFound":
         case "com.amazonaws.rds#DBClusterParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBClusterParameterGroupNotFoundFaultResponse(parsedOutput, context);
         case "DBClusterQuotaExceededFault":
         case "com.amazonaws.rds#DBClusterQuotaExceededFault":
             throw await deserializeAws_queryDBClusterQuotaExceededFaultResponse(parsedOutput, context);
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
         case "DBSubnetGroupDoesNotCoverEnoughAZs":
@@ -2417,13 +2417,13 @@ const deserializeAws_queryCreateDBClusterCommandError = async (output, context)
         case "GlobalClusterNotFoundFault":
         case "com.amazonaws.rds#GlobalClusterNotFoundFault":
             throw await deserializeAws_queryGlobalClusterNotFoundFaultResponse(parsedOutput, context);
-        case "InsufficientStorageClusterCapacityFault":
+        case "InsufficientStorageClusterCapacity":
         case "com.amazonaws.rds#InsufficientStorageClusterCapacityFault":
             throw await deserializeAws_queryInsufficientStorageClusterCapacityFaultResponse(parsedOutput, context);
         case "InvalidDBClusterStateFault":
         case "com.amazonaws.rds#InvalidDBClusterStateFault":
             throw await deserializeAws_queryInvalidDBClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         case "InvalidDBSubnetGroupStateFault":
@@ -2441,7 +2441,7 @@ const deserializeAws_queryCreateDBClusterCommandError = async (output, context)
         case "KMSKeyNotAccessibleFault":
         case "com.amazonaws.rds#KMSKeyNotAccessibleFault":
             throw await deserializeAws_queryKMSKeyNotAccessibleFaultResponse(parsedOutput, context);
-        case "StorageQuotaExceededFault":
+        case "StorageQuotaExceeded":
         case "com.amazonaws.rds#StorageQuotaExceededFault":
             throw await deserializeAws_queryStorageQuotaExceededFaultResponse(parsedOutput, context);
         default:
@@ -2471,7 +2471,7 @@ exports.deserializeAws_queryCreateDBClusterEndpointCommand = deserializeAws_quer
 const deserializeAws_queryCreateDBClusterEndpointCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -2484,13 +2484,13 @@ const deserializeAws_queryCreateDBClusterEndpointCommandError = async (output, c
         case "DBClusterNotFoundFault":
         case "com.amazonaws.rds#DBClusterNotFoundFault":
             throw await deserializeAws_queryDBClusterNotFoundFaultResponse(parsedOutput, context);
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
         case "InvalidDBClusterStateFault":
         case "com.amazonaws.rds#InvalidDBClusterStateFault":
             throw await deserializeAws_queryInvalidDBClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         default:
@@ -2520,14 +2520,14 @@ exports.deserializeAws_queryCreateDBClusterParameterGroupCommand = deserializeAw
 const deserializeAws_queryCreateDBClusterParameterGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBParameterGroupAlreadyExistsFault":
+        case "DBParameterGroupAlreadyExists":
         case "com.amazonaws.rds#DBParameterGroupAlreadyExistsFault":
             throw await deserializeAws_queryDBParameterGroupAlreadyExistsFaultResponse(parsedOutput, context);
-        case "DBParameterGroupQuotaExceededFault":
+        case "DBParameterGroupQuotaExceeded":
         case "com.amazonaws.rds#DBParameterGroupQuotaExceededFault":
             throw await deserializeAws_queryDBParameterGroupQuotaExceededFaultResponse(parsedOutput, context);
         default:
@@ -2557,7 +2557,7 @@ exports.deserializeAws_queryCreateDBClusterSnapshotCommand = deserializeAws_quer
 const deserializeAws_queryCreateDBClusterSnapshotCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -2573,7 +2573,7 @@ const deserializeAws_queryCreateDBClusterSnapshotCommandError = async (output, c
         case "InvalidDBClusterStateFault":
         case "com.amazonaws.rds#InvalidDBClusterStateFault":
             throw await deserializeAws_queryInvalidDBClusterStateFaultResponse(parsedOutput, context);
-        case "SnapshotQuotaExceededFault":
+        case "SnapshotQuotaExceeded":
         case "com.amazonaws.rds#SnapshotQuotaExceededFault":
             throw await deserializeAws_querySnapshotQuotaExceededFaultResponse(parsedOutput, context);
         default:
@@ -2603,11 +2603,11 @@ exports.deserializeAws_queryCreateDBInstanceCommand = deserializeAws_queryCreate
 const deserializeAws_queryCreateDBInstanceCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "AuthorizationNotFoundFault":
+        case "AuthorizationNotFound":
         case "com.amazonaws.rds#AuthorizationNotFoundFault":
             throw await deserializeAws_queryAuthorizationNotFoundFaultResponse(parsedOutput, context);
         case "BackupPolicyNotFoundFault":
@@ -2616,13 +2616,13 @@ const deserializeAws_queryCreateDBInstanceCommandError = async (output, context)
         case "DBClusterNotFoundFault":
         case "com.amazonaws.rds#DBClusterNotFoundFault":
             throw await deserializeAws_queryDBClusterNotFoundFaultResponse(parsedOutput, context);
-        case "DBInstanceAlreadyExistsFault":
+        case "DBInstanceAlreadyExists":
         case "com.amazonaws.rds#DBInstanceAlreadyExistsFault":
             throw await deserializeAws_queryDBInstanceAlreadyExistsFaultResponse(parsedOutput, context);
-        case "DBParameterGroupNotFoundFault":
+        case "DBParameterGroupNotFound":
         case "com.amazonaws.rds#DBParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBParameterGroupNotFoundFaultResponse(parsedOutput, context);
-        case "DBSecurityGroupNotFoundFault":
+        case "DBSecurityGroupNotFound":
         case "com.amazonaws.rds#DBSecurityGroupNotFoundFault":
             throw await deserializeAws_queryDBSecurityGroupNotFoundFaultResponse(parsedOutput, context);
         case "DBSubnetGroupDoesNotCoverEnoughAZs":
@@ -2634,10 +2634,10 @@ const deserializeAws_queryCreateDBInstanceCommandError = async (output, context)
         case "DomainNotFoundFault":
         case "com.amazonaws.rds#DomainNotFoundFault":
             throw await deserializeAws_queryDomainNotFoundFaultResponse(parsedOutput, context);
-        case "InstanceQuotaExceededFault":
+        case "InstanceQuotaExceeded":
         case "com.amazonaws.rds#InstanceQuotaExceededFault":
             throw await deserializeAws_queryInstanceQuotaExceededFaultResponse(parsedOutput, context);
-        case "InsufficientDBInstanceCapacityFault":
+        case "InsufficientDBInstanceCapacity":
         case "com.amazonaws.rds#InsufficientDBInstanceCapacityFault":
             throw await deserializeAws_queryInsufficientDBInstanceCapacityFaultResponse(parsedOutput, context);
         case "InvalidDBClusterStateFault":
@@ -2661,10 +2661,10 @@ const deserializeAws_queryCreateDBInstanceCommandError = async (output, context)
         case "ProvisionedIopsNotAvailableInAZFault":
         case "com.amazonaws.rds#ProvisionedIopsNotAvailableInAZFault":
             throw await deserializeAws_queryProvisionedIopsNotAvailableInAZFaultResponse(parsedOutput, context);
-        case "StorageQuotaExceededFault":
+        case "StorageQuotaExceeded":
         case "com.amazonaws.rds#StorageQuotaExceededFault":
             throw await deserializeAws_queryStorageQuotaExceededFaultResponse(parsedOutput, context);
-        case "StorageTypeNotSupportedFault":
+        case "StorageTypeNotSupported":
         case "com.amazonaws.rds#StorageTypeNotSupportedFault":
             throw await deserializeAws_queryStorageTypeNotSupportedFaultResponse(parsedOutput, context);
         default:
@@ -2694,20 +2694,20 @@ exports.deserializeAws_queryCreateDBInstanceReadReplicaCommand = deserializeAws_
 const deserializeAws_queryCreateDBInstanceReadReplicaCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBInstanceAlreadyExistsFault":
+        case "DBInstanceAlreadyExists":
         case "com.amazonaws.rds#DBInstanceAlreadyExistsFault":
             throw await deserializeAws_queryDBInstanceAlreadyExistsFaultResponse(parsedOutput, context);
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
-        case "DBParameterGroupNotFoundFault":
+        case "DBParameterGroupNotFound":
         case "com.amazonaws.rds#DBParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBParameterGroupNotFoundFaultResponse(parsedOutput, context);
-        case "DBSecurityGroupNotFoundFault":
+        case "DBSecurityGroupNotFound":
         case "com.amazonaws.rds#DBSecurityGroupNotFoundFault":
             throw await deserializeAws_queryDBSecurityGroupNotFoundFaultResponse(parsedOutput, context);
         case "DBSubnetGroupDoesNotCoverEnoughAZs":
@@ -2722,13 +2722,13 @@ const deserializeAws_queryCreateDBInstanceReadReplicaCommandError = async (outpu
         case "DomainNotFoundFault":
         case "com.amazonaws.rds#DomainNotFoundFault":
             throw await deserializeAws_queryDomainNotFoundFaultResponse(parsedOutput, context);
-        case "InstanceQuotaExceededFault":
+        case "InstanceQuotaExceeded":
         case "com.amazonaws.rds#InstanceQuotaExceededFault":
             throw await deserializeAws_queryInstanceQuotaExceededFaultResponse(parsedOutput, context);
-        case "InsufficientDBInstanceCapacityFault":
+        case "InsufficientDBInstanceCapacity":
         case "com.amazonaws.rds#InsufficientDBInstanceCapacityFault":
             throw await deserializeAws_queryInsufficientDBInstanceCapacityFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         case "InvalidDBSubnetGroupFault":
@@ -2752,10 +2752,10 @@ const deserializeAws_queryCreateDBInstanceReadReplicaCommandError = async (outpu
         case "ProvisionedIopsNotAvailableInAZFault":
         case "com.amazonaws.rds#ProvisionedIopsNotAvailableInAZFault":
             throw await deserializeAws_queryProvisionedIopsNotAvailableInAZFaultResponse(parsedOutput, context);
-        case "StorageQuotaExceededFault":
+        case "StorageQuotaExceeded":
         case "com.amazonaws.rds#StorageQuotaExceededFault":
             throw await deserializeAws_queryStorageQuotaExceededFaultResponse(parsedOutput, context);
-        case "StorageTypeNotSupportedFault":
+        case "StorageTypeNotSupported":
         case "com.amazonaws.rds#StorageTypeNotSupportedFault":
             throw await deserializeAws_queryStorageTypeNotSupportedFaultResponse(parsedOutput, context);
         default:
@@ -2785,14 +2785,14 @@ exports.deserializeAws_queryCreateDBParameterGroupCommand = deserializeAws_query
 const deserializeAws_queryCreateDBParameterGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBParameterGroupAlreadyExistsFault":
+        case "DBParameterGroupAlreadyExists":
         case "com.amazonaws.rds#DBParameterGroupAlreadyExistsFault":
             throw await deserializeAws_queryDBParameterGroupAlreadyExistsFaultResponse(parsedOutput, context);
-        case "DBParameterGroupQuotaExceededFault":
+        case "DBParameterGroupQuotaExceeded":
         case "com.amazonaws.rds#DBParameterGroupQuotaExceededFault":
             throw await deserializeAws_queryDBParameterGroupQuotaExceededFaultResponse(parsedOutput, context);
         default:
@@ -2822,7 +2822,7 @@ exports.deserializeAws_queryCreateDBProxyCommand = deserializeAws_queryCreateDBP
 const deserializeAws_queryCreateDBProxyCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -2862,7 +2862,7 @@ exports.deserializeAws_queryCreateDBProxyEndpointCommand = deserializeAws_queryC
 const deserializeAws_queryCreateDBProxyEndpointCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -2908,17 +2908,17 @@ exports.deserializeAws_queryCreateDBSecurityGroupCommand = deserializeAws_queryC
 const deserializeAws_queryCreateDBSecurityGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBSecurityGroupAlreadyExistsFault":
+        case "DBSecurityGroupAlreadyExists":
         case "com.amazonaws.rds#DBSecurityGroupAlreadyExistsFault":
             throw await deserializeAws_queryDBSecurityGroupAlreadyExistsFaultResponse(parsedOutput, context);
-        case "DBSecurityGroupNotSupportedFault":
+        case "DBSecurityGroupNotSupported":
         case "com.amazonaws.rds#DBSecurityGroupNotSupportedFault":
             throw await deserializeAws_queryDBSecurityGroupNotSupportedFaultResponse(parsedOutput, context);
-        case "DBSecurityGroupQuotaExceededFault":
+        case "QuotaExceeded.DBSecurityGroup":
         case "com.amazonaws.rds#DBSecurityGroupQuotaExceededFault":
             throw await deserializeAws_queryDBSecurityGroupQuotaExceededFaultResponse(parsedOutput, context);
         default:
@@ -2948,20 +2948,20 @@ exports.deserializeAws_queryCreateDBSnapshotCommand = deserializeAws_queryCreate
 const deserializeAws_queryCreateDBSnapshotCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
-        case "DBSnapshotAlreadyExistsFault":
+        case "DBSnapshotAlreadyExists":
         case "com.amazonaws.rds#DBSnapshotAlreadyExistsFault":
             throw await deserializeAws_queryDBSnapshotAlreadyExistsFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
-        case "SnapshotQuotaExceededFault":
+        case "SnapshotQuotaExceeded":
         case "com.amazonaws.rds#SnapshotQuotaExceededFault":
             throw await deserializeAws_querySnapshotQuotaExceededFaultResponse(parsedOutput, context);
         default:
@@ -2991,17 +2991,17 @@ exports.deserializeAws_queryCreateDBSubnetGroupCommand = deserializeAws_queryCre
 const deserializeAws_queryCreateDBSubnetGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBSubnetGroupAlreadyExistsFault":
+        case "DBSubnetGroupAlreadyExists":
         case "com.amazonaws.rds#DBSubnetGroupAlreadyExistsFault":
             throw await deserializeAws_queryDBSubnetGroupAlreadyExistsFaultResponse(parsedOutput, context);
         case "DBSubnetGroupDoesNotCoverEnoughAZs":
         case "com.amazonaws.rds#DBSubnetGroupDoesNotCoverEnoughAZs":
             throw await deserializeAws_queryDBSubnetGroupDoesNotCoverEnoughAZsResponse(parsedOutput, context);
-        case "DBSubnetGroupQuotaExceededFault":
+        case "DBSubnetGroupQuotaExceeded":
         case "com.amazonaws.rds#DBSubnetGroupQuotaExceededFault":
             throw await deserializeAws_queryDBSubnetGroupQuotaExceededFaultResponse(parsedOutput, context);
         case "DBSubnetQuotaExceededFault":
@@ -3037,29 +3037,29 @@ exports.deserializeAws_queryCreateEventSubscriptionCommand = deserializeAws_quer
 const deserializeAws_queryCreateEventSubscriptionCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "EventSubscriptionQuotaExceededFault":
+        case "EventSubscriptionQuotaExceeded":
         case "com.amazonaws.rds#EventSubscriptionQuotaExceededFault":
             throw await deserializeAws_queryEventSubscriptionQuotaExceededFaultResponse(parsedOutput, context);
-        case "SNSInvalidTopicFault":
+        case "SNSInvalidTopic":
         case "com.amazonaws.rds#SNSInvalidTopicFault":
             throw await deserializeAws_querySNSInvalidTopicFaultResponse(parsedOutput, context);
-        case "SNSNoAuthorizationFault":
+        case "SNSNoAuthorization":
         case "com.amazonaws.rds#SNSNoAuthorizationFault":
             throw await deserializeAws_querySNSNoAuthorizationFaultResponse(parsedOutput, context);
-        case "SNSTopicArnNotFoundFault":
+        case "SNSTopicArnNotFound":
         case "com.amazonaws.rds#SNSTopicArnNotFoundFault":
             throw await deserializeAws_querySNSTopicArnNotFoundFaultResponse(parsedOutput, context);
-        case "SourceNotFoundFault":
+        case "SourceNotFound":
         case "com.amazonaws.rds#SourceNotFoundFault":
             throw await deserializeAws_querySourceNotFoundFaultResponse(parsedOutput, context);
-        case "SubscriptionAlreadyExistFault":
+        case "SubscriptionAlreadyExist":
         case "com.amazonaws.rds#SubscriptionAlreadyExistFault":
             throw await deserializeAws_querySubscriptionAlreadyExistFaultResponse(parsedOutput, context);
-        case "SubscriptionCategoryNotFoundFault":
+        case "SubscriptionCategoryNotFound":
         case "com.amazonaws.rds#SubscriptionCategoryNotFoundFault":
             throw await deserializeAws_querySubscriptionCategoryNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -3089,7 +3089,7 @@ exports.deserializeAws_queryCreateGlobalClusterCommand = deserializeAws_queryCre
 const deserializeAws_queryCreateGlobalClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3132,7 +3132,7 @@ exports.deserializeAws_queryCreateOptionGroupCommand = deserializeAws_queryCreat
 const deserializeAws_queryCreateOptionGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3169,7 +3169,7 @@ exports.deserializeAws_queryDeleteCustomDBEngineVersionCommand = deserializeAws_
 const deserializeAws_queryDeleteCustomDBEngineVersionCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3206,7 +3206,7 @@ exports.deserializeAws_queryDeleteDBClusterCommand = deserializeAws_queryDeleteD
 const deserializeAws_queryDeleteDBClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3222,7 +3222,7 @@ const deserializeAws_queryDeleteDBClusterCommandError = async (output, context)
         case "InvalidDBClusterStateFault":
         case "com.amazonaws.rds#InvalidDBClusterStateFault":
             throw await deserializeAws_queryInvalidDBClusterStateFaultResponse(parsedOutput, context);
-        case "SnapshotQuotaExceededFault":
+        case "SnapshotQuotaExceeded":
         case "com.amazonaws.rds#SnapshotQuotaExceededFault":
             throw await deserializeAws_querySnapshotQuotaExceededFaultResponse(parsedOutput, context);
         default:
@@ -3252,7 +3252,7 @@ exports.deserializeAws_queryDeleteDBClusterEndpointCommand = deserializeAws_quer
 const deserializeAws_queryDeleteDBClusterEndpointCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3289,14 +3289,14 @@ exports.deserializeAws_queryDeleteDBClusterParameterGroupCommand = deserializeAw
 const deserializeAws_queryDeleteDBClusterParameterGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBParameterGroupNotFoundFault":
+        case "DBParameterGroupNotFound":
         case "com.amazonaws.rds#DBParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBParameterGroupNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidDBParameterGroupStateFault":
+        case "InvalidDBParameterGroupState":
         case "com.amazonaws.rds#InvalidDBParameterGroupStateFault":
             throw await deserializeAws_queryInvalidDBParameterGroupStateFaultResponse(parsedOutput, context);
         default:
@@ -3326,7 +3326,7 @@ exports.deserializeAws_queryDeleteDBClusterSnapshotCommand = deserializeAws_quer
 const deserializeAws_queryDeleteDBClusterSnapshotCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3363,26 +3363,26 @@ exports.deserializeAws_queryDeleteDBInstanceCommand = deserializeAws_queryDelete
 const deserializeAws_queryDeleteDBInstanceCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBInstanceAutomatedBackupQuotaExceededFault":
+        case "DBInstanceAutomatedBackupQuotaExceeded":
         case "com.amazonaws.rds#DBInstanceAutomatedBackupQuotaExceededFault":
             throw await deserializeAws_queryDBInstanceAutomatedBackupQuotaExceededFaultResponse(parsedOutput, context);
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
-        case "DBSnapshotAlreadyExistsFault":
+        case "DBSnapshotAlreadyExists":
         case "com.amazonaws.rds#DBSnapshotAlreadyExistsFault":
             throw await deserializeAws_queryDBSnapshotAlreadyExistsFaultResponse(parsedOutput, context);
         case "InvalidDBClusterStateFault":
         case "com.amazonaws.rds#InvalidDBClusterStateFault":
             throw await deserializeAws_queryInvalidDBClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
-        case "SnapshotQuotaExceededFault":
+        case "SnapshotQuotaExceeded":
         case "com.amazonaws.rds#SnapshotQuotaExceededFault":
             throw await deserializeAws_querySnapshotQuotaExceededFaultResponse(parsedOutput, context);
         default:
@@ -3412,14 +3412,14 @@ exports.deserializeAws_queryDeleteDBInstanceAutomatedBackupCommand = deserialize
 const deserializeAws_queryDeleteDBInstanceAutomatedBackupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBInstanceAutomatedBackupNotFoundFault":
+        case "DBInstanceAutomatedBackupNotFound":
         case "com.amazonaws.rds#DBInstanceAutomatedBackupNotFoundFault":
             throw await deserializeAws_queryDBInstanceAutomatedBackupNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceAutomatedBackupStateFault":
+        case "InvalidDBInstanceAutomatedBackupState":
         case "com.amazonaws.rds#InvalidDBInstanceAutomatedBackupStateFault":
             throw await deserializeAws_queryInvalidDBInstanceAutomatedBackupStateFaultResponse(parsedOutput, context);
         default:
@@ -3446,14 +3446,14 @@ exports.deserializeAws_queryDeleteDBParameterGroupCommand = deserializeAws_query
 const deserializeAws_queryDeleteDBParameterGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBParameterGroupNotFoundFault":
+        case "DBParameterGroupNotFound":
         case "com.amazonaws.rds#DBParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBParameterGroupNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidDBParameterGroupStateFault":
+        case "InvalidDBParameterGroupState":
         case "com.amazonaws.rds#InvalidDBParameterGroupStateFault":
             throw await deserializeAws_queryInvalidDBParameterGroupStateFaultResponse(parsedOutput, context);
         default:
@@ -3483,7 +3483,7 @@ exports.deserializeAws_queryDeleteDBProxyCommand = deserializeAws_queryDeleteDBP
 const deserializeAws_queryDeleteDBProxyCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3520,7 +3520,7 @@ exports.deserializeAws_queryDeleteDBProxyEndpointCommand = deserializeAws_queryD
 const deserializeAws_queryDeleteDBProxyEndpointCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3554,14 +3554,14 @@ exports.deserializeAws_queryDeleteDBSecurityGroupCommand = deserializeAws_queryD
 const deserializeAws_queryDeleteDBSecurityGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBSecurityGroupNotFoundFault":
+        case "DBSecurityGroupNotFound":
         case "com.amazonaws.rds#DBSecurityGroupNotFoundFault":
             throw await deserializeAws_queryDBSecurityGroupNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidDBSecurityGroupStateFault":
+        case "InvalidDBSecurityGroupState":
         case "com.amazonaws.rds#InvalidDBSecurityGroupStateFault":
             throw await deserializeAws_queryInvalidDBSecurityGroupStateFaultResponse(parsedOutput, context);
         default:
@@ -3591,14 +3591,14 @@ exports.deserializeAws_queryDeleteDBSnapshotCommand = deserializeAws_queryDelete
 const deserializeAws_queryDeleteDBSnapshotCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBSnapshotNotFoundFault":
+        case "DBSnapshotNotFound":
         case "com.amazonaws.rds#DBSnapshotNotFoundFault":
             throw await deserializeAws_queryDBSnapshotNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidDBSnapshotStateFault":
+        case "InvalidDBSnapshotState":
         case "com.amazonaws.rds#InvalidDBSnapshotStateFault":
             throw await deserializeAws_queryInvalidDBSnapshotStateFaultResponse(parsedOutput, context);
         default:
@@ -3625,7 +3625,7 @@ exports.deserializeAws_queryDeleteDBSubnetGroupCommand = deserializeAws_queryDel
 const deserializeAws_queryDeleteDBSubnetGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3665,14 +3665,14 @@ exports.deserializeAws_queryDeleteEventSubscriptionCommand = deserializeAws_quer
 const deserializeAws_queryDeleteEventSubscriptionCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "InvalidEventSubscriptionStateFault":
+        case "InvalidEventSubscriptionState":
         case "com.amazonaws.rds#InvalidEventSubscriptionStateFault":
             throw await deserializeAws_queryInvalidEventSubscriptionStateFaultResponse(parsedOutput, context);
-        case "SubscriptionNotFoundFault":
+        case "SubscriptionNotFound":
         case "com.amazonaws.rds#SubscriptionNotFoundFault":
             throw await deserializeAws_querySubscriptionNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -3702,7 +3702,7 @@ exports.deserializeAws_queryDeleteGlobalClusterCommand = deserializeAws_queryDel
 const deserializeAws_queryDeleteGlobalClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3736,7 +3736,7 @@ exports.deserializeAws_queryDeleteOptionGroupCommand = deserializeAws_queryDelet
 const deserializeAws_queryDeleteOptionGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3773,7 +3773,7 @@ exports.deserializeAws_queryDeregisterDBProxyTargetsCommand = deserializeAws_que
 const deserializeAws_queryDeregisterDBProxyTargetsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3816,7 +3816,7 @@ exports.deserializeAws_queryDescribeAccountAttributesCommand = deserializeAws_qu
 const deserializeAws_queryDescribeAccountAttributesCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     const parsedBody = parsedOutput.body;
@@ -3844,11 +3844,11 @@ exports.deserializeAws_queryDescribeCertificatesCommand = deserializeAws_queryDe
 const deserializeAws_queryDescribeCertificatesCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "CertificateNotFoundFault":
+        case "CertificateNotFound":
         case "com.amazonaws.rds#CertificateNotFoundFault":
             throw await deserializeAws_queryCertificateNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -3878,7 +3878,7 @@ exports.deserializeAws_queryDescribeDBClusterBacktracksCommand = deserializeAws_
 const deserializeAws_queryDescribeDBClusterBacktracksCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3915,7 +3915,7 @@ exports.deserializeAws_queryDescribeDBClusterEndpointsCommand = deserializeAws_q
 const deserializeAws_queryDescribeDBClusterEndpointsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3949,11 +3949,11 @@ exports.deserializeAws_queryDescribeDBClusterParameterGroupsCommand = deserializ
 const deserializeAws_queryDescribeDBClusterParameterGroupsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBParameterGroupNotFoundFault":
+        case "DBParameterGroupNotFound":
         case "com.amazonaws.rds#DBParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBParameterGroupNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -3983,11 +3983,11 @@ exports.deserializeAws_queryDescribeDBClusterParametersCommand = deserializeAws_
 const deserializeAws_queryDescribeDBClusterParametersCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBParameterGroupNotFoundFault":
+        case "DBParameterGroupNotFound":
         case "com.amazonaws.rds#DBParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBParameterGroupNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -4017,7 +4017,7 @@ exports.deserializeAws_queryDescribeDBClustersCommand = deserializeAws_queryDesc
 const deserializeAws_queryDescribeDBClustersCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -4051,7 +4051,7 @@ exports.deserializeAws_queryDescribeDBClusterSnapshotAttributesCommand = deseria
 const deserializeAws_queryDescribeDBClusterSnapshotAttributesCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -4085,7 +4085,7 @@ exports.deserializeAws_queryDescribeDBClusterSnapshotsCommand = deserializeAws_q
 const deserializeAws_queryDescribeDBClusterSnapshotsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -4119,7 +4119,7 @@ exports.deserializeAws_queryDescribeDBEngineVersionsCommand = deserializeAws_que
 const deserializeAws_queryDescribeDBEngineVersionsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     const parsedBody = parsedOutput.body;
@@ -4147,11 +4147,11 @@ exports.deserializeAws_queryDescribeDBInstanceAutomatedBackupsCommand = deserial
 const deserializeAws_queryDescribeDBInstanceAutomatedBackupsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBInstanceAutomatedBackupNotFoundFault":
+        case "DBInstanceAutomatedBackupNotFound":
         case "com.amazonaws.rds#DBInstanceAutomatedBackupNotFoundFault":
             throw await deserializeAws_queryDBInstanceAutomatedBackupNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -4181,11 +4181,11 @@ exports.deserializeAws_queryDescribeDBInstancesCommand = deserializeAws_queryDes
 const deserializeAws_queryDescribeDBInstancesCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -4215,11 +4215,11 @@ exports.deserializeAws_queryDescribeDBLogFilesCommand = deserializeAws_queryDesc
 const deserializeAws_queryDescribeDBLogFilesCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -4249,11 +4249,11 @@ exports.deserializeAws_queryDescribeDBParameterGroupsCommand = deserializeAws_qu
 const deserializeAws_queryDescribeDBParameterGroupsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBParameterGroupNotFoundFault":
+        case "DBParameterGroupNotFound":
         case "com.amazonaws.rds#DBParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBParameterGroupNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -4283,11 +4283,11 @@ exports.deserializeAws_queryDescribeDBParametersCommand = deserializeAws_queryDe
 const deserializeAws_queryDescribeDBParametersCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBParameterGroupNotFoundFault":
+        case "DBParameterGroupNotFound":
         case "com.amazonaws.rds#DBParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBParameterGroupNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -4317,7 +4317,7 @@ exports.deserializeAws_queryDescribeDBProxiesCommand = deserializeAws_queryDescr
 const deserializeAws_queryDescribeDBProxiesCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -4351,7 +4351,7 @@ exports.deserializeAws_queryDescribeDBProxyEndpointsCommand = deserializeAws_que
 const deserializeAws_queryDescribeDBProxyEndpointsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -4388,7 +4388,7 @@ exports.deserializeAws_queryDescribeDBProxyTargetGroupsCommand = deserializeAws_
 const deserializeAws_queryDescribeDBProxyTargetGroupsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -4428,7 +4428,7 @@ exports.deserializeAws_queryDescribeDBProxyTargetsCommand = deserializeAws_query
 const deserializeAws_queryDescribeDBProxyTargetsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -4471,11 +4471,11 @@ exports.deserializeAws_queryDescribeDBSecurityGroupsCommand = deserializeAws_que
 const deserializeAws_queryDescribeDBSecurityGroupsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBSecurityGroupNotFoundFault":
+        case "DBSecurityGroupNotFound":
         case "com.amazonaws.rds#DBSecurityGroupNotFoundFault":
             throw await deserializeAws_queryDBSecurityGroupNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -4505,11 +4505,11 @@ exports.deserializeAws_queryDescribeDBSnapshotAttributesCommand = deserializeAws
 const deserializeAws_queryDescribeDBSnapshotAttributesCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBSnapshotNotFoundFault":
+        case "DBSnapshotNotFound":
         case "com.amazonaws.rds#DBSnapshotNotFoundFault":
             throw await deserializeAws_queryDBSnapshotNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -4539,11 +4539,11 @@ exports.deserializeAws_queryDescribeDBSnapshotsCommand = deserializeAws_queryDes
 const deserializeAws_queryDescribeDBSnapshotsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBSnapshotNotFoundFault":
+        case "DBSnapshotNotFound":
         case "com.amazonaws.rds#DBSnapshotNotFoundFault":
             throw await deserializeAws_queryDBSnapshotNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -4573,7 +4573,7 @@ exports.deserializeAws_queryDescribeDBSubnetGroupsCommand = deserializeAws_query
 const deserializeAws_queryDescribeDBSubnetGroupsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -4607,7 +4607,7 @@ exports.deserializeAws_queryDescribeEngineDefaultClusterParametersCommand = dese
 const deserializeAws_queryDescribeEngineDefaultClusterParametersCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     const parsedBody = parsedOutput.body;
@@ -4635,7 +4635,7 @@ exports.deserializeAws_queryDescribeEngineDefaultParametersCommand = deserialize
 const deserializeAws_queryDescribeEngineDefaultParametersCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     const parsedBody = parsedOutput.body;
@@ -4663,7 +4663,7 @@ exports.deserializeAws_queryDescribeEventCategoriesCommand = deserializeAws_quer
 const deserializeAws_queryDescribeEventCategoriesCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     const parsedBody = parsedOutput.body;
@@ -4691,7 +4691,7 @@ exports.deserializeAws_queryDescribeEventsCommand = deserializeAws_queryDescribe
 const deserializeAws_queryDescribeEventsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     const parsedBody = parsedOutput.body;
@@ -4719,11 +4719,11 @@ exports.deserializeAws_queryDescribeEventSubscriptionsCommand = deserializeAws_q
 const deserializeAws_queryDescribeEventSubscriptionsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "SubscriptionNotFoundFault":
+        case "SubscriptionNotFound":
         case "com.amazonaws.rds#SubscriptionNotFoundFault":
             throw await deserializeAws_querySubscriptionNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -4753,11 +4753,11 @@ exports.deserializeAws_queryDescribeExportTasksCommand = deserializeAws_queryDes
 const deserializeAws_queryDescribeExportTasksCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ExportTaskNotFoundFault":
+        case "ExportTaskNotFound":
         case "com.amazonaws.rds#ExportTaskNotFoundFault":
             throw await deserializeAws_queryExportTaskNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -4787,7 +4787,7 @@ exports.deserializeAws_queryDescribeGlobalClustersCommand = deserializeAws_query
 const deserializeAws_queryDescribeGlobalClustersCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -4821,7 +4821,7 @@ exports.deserializeAws_queryDescribeOptionGroupOptionsCommand = deserializeAws_q
 const deserializeAws_queryDescribeOptionGroupOptionsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     const parsedBody = parsedOutput.body;
@@ -4849,7 +4849,7 @@ exports.deserializeAws_queryDescribeOptionGroupsCommand = deserializeAws_queryDe
 const deserializeAws_queryDescribeOptionGroupsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -4883,7 +4883,7 @@ exports.deserializeAws_queryDescribeOrderableDBInstanceOptionsCommand = deserial
 const deserializeAws_queryDescribeOrderableDBInstanceOptionsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     const parsedBody = parsedOutput.body;
@@ -4911,7 +4911,7 @@ exports.deserializeAws_queryDescribePendingMaintenanceActionsCommand = deseriali
 const deserializeAws_queryDescribePendingMaintenanceActionsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -4945,11 +4945,11 @@ exports.deserializeAws_queryDescribeReservedDBInstancesCommand = deserializeAws_
 const deserializeAws_queryDescribeReservedDBInstancesCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ReservedDBInstanceNotFoundFault":
+        case "ReservedDBInstanceNotFound":
         case "com.amazonaws.rds#ReservedDBInstanceNotFoundFault":
             throw await deserializeAws_queryReservedDBInstanceNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -4979,11 +4979,11 @@ exports.deserializeAws_queryDescribeReservedDBInstancesOfferingsCommand = deseri
 const deserializeAws_queryDescribeReservedDBInstancesOfferingsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ReservedDBInstancesOfferingNotFoundFault":
+        case "ReservedDBInstancesOfferingNotFound":
         case "com.amazonaws.rds#ReservedDBInstancesOfferingNotFoundFault":
             throw await deserializeAws_queryReservedDBInstancesOfferingNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -5013,7 +5013,7 @@ exports.deserializeAws_queryDescribeSourceRegionsCommand = deserializeAws_queryD
 const deserializeAws_queryDescribeSourceRegionsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     const parsedBody = parsedOutput.body;
@@ -5041,14 +5041,14 @@ exports.deserializeAws_queryDescribeValidDBInstanceModificationsCommand = deseri
 const deserializeAws_queryDescribeValidDBInstanceModificationsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         default:
@@ -5078,11 +5078,11 @@ exports.deserializeAws_queryDownloadDBLogFilePortionCommand = deserializeAws_que
 const deserializeAws_queryDownloadDBLogFilePortionCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
         case "DBLogFileNotFoundFault":
@@ -5115,7 +5115,7 @@ exports.deserializeAws_queryFailoverDBClusterCommand = deserializeAws_queryFailo
 const deserializeAws_queryFailoverDBClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -5125,7 +5125,7 @@ const deserializeAws_queryFailoverDBClusterCommandError = async (output, context
         case "InvalidDBClusterStateFault":
         case "com.amazonaws.rds#InvalidDBClusterStateFault":
             throw await deserializeAws_queryInvalidDBClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         default:
@@ -5155,7 +5155,7 @@ exports.deserializeAws_queryFailoverGlobalClusterCommand = deserializeAws_queryF
 const deserializeAws_queryFailoverGlobalClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -5198,14 +5198,14 @@ exports.deserializeAws_queryListTagsForResourceCommand = deserializeAws_queryLis
 const deserializeAws_queryListTagsForResourceCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DBClusterNotFoundFault":
         case "com.amazonaws.rds#DBClusterNotFoundFault":
             throw await deserializeAws_queryDBClusterNotFoundFaultResponse(parsedOutput, context);
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
         case "DBProxyNotFoundFault":
@@ -5214,7 +5214,7 @@ const deserializeAws_queryListTagsForResourceCommandError = async (output, conte
         case "DBProxyTargetGroupNotFoundFault":
         case "com.amazonaws.rds#DBProxyTargetGroupNotFoundFault":
             throw await deserializeAws_queryDBProxyTargetGroupNotFoundFaultResponse(parsedOutput, context);
-        case "DBSnapshotNotFoundFault":
+        case "DBSnapshotNotFound":
         case "com.amazonaws.rds#DBSnapshotNotFoundFault":
             throw await deserializeAws_queryDBSnapshotNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -5244,14 +5244,14 @@ exports.deserializeAws_queryModifyActivityStreamCommand = deserializeAws_queryMo
 const deserializeAws_queryModifyActivityStreamCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         case "ResourceNotFoundFault":
@@ -5284,11 +5284,11 @@ exports.deserializeAws_queryModifyCertificatesCommand = deserializeAws_queryModi
 const deserializeAws_queryModifyCertificatesCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "CertificateNotFoundFault":
+        case "CertificateNotFound":
         case "com.amazonaws.rds#CertificateNotFoundFault":
             throw await deserializeAws_queryCertificateNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -5318,7 +5318,7 @@ exports.deserializeAws_queryModifyCurrentDBClusterCapacityCommand = deserializeA
 const deserializeAws_queryModifyCurrentDBClusterCapacityCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -5358,7 +5358,7 @@ exports.deserializeAws_queryModifyCustomDBEngineVersionCommand = deserializeAws_
 const deserializeAws_queryModifyCustomDBEngineVersionCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -5395,7 +5395,7 @@ exports.deserializeAws_queryModifyDBClusterCommand = deserializeAws_queryModifyD
 const deserializeAws_queryModifyDBClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -5405,7 +5405,7 @@ const deserializeAws_queryModifyDBClusterCommandError = async (output, context)
         case "DBClusterNotFoundFault":
         case "com.amazonaws.rds#DBClusterNotFoundFault":
             throw await deserializeAws_queryDBClusterNotFoundFaultResponse(parsedOutput, context);
-        case "DBClusterParameterGroupNotFoundFault":
+        case "DBClusterParameterGroupNotFound":
         case "com.amazonaws.rds#DBClusterParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBClusterParameterGroupNotFoundFaultResponse(parsedOutput, context);
         case "DBSubnetGroupNotFoundFault":
@@ -5417,10 +5417,10 @@ const deserializeAws_queryModifyDBClusterCommandError = async (output, context)
         case "InvalidDBClusterStateFault":
         case "com.amazonaws.rds#InvalidDBClusterStateFault":
             throw await deserializeAws_queryInvalidDBClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
-        case "InvalidDBSecurityGroupStateFault":
+        case "InvalidDBSecurityGroupState":
         case "com.amazonaws.rds#InvalidDBSecurityGroupStateFault":
             throw await deserializeAws_queryInvalidDBSecurityGroupStateFaultResponse(parsedOutput, context);
         case "InvalidDBSubnetGroupStateFault":
@@ -5432,7 +5432,7 @@ const deserializeAws_queryModifyDBClusterCommandError = async (output, context)
         case "InvalidVPCNetworkStateFault":
         case "com.amazonaws.rds#InvalidVPCNetworkStateFault":
             throw await deserializeAws_queryInvalidVPCNetworkStateFaultResponse(parsedOutput, context);
-        case "StorageQuotaExceededFault":
+        case "StorageQuotaExceeded":
         case "com.amazonaws.rds#StorageQuotaExceededFault":
             throw await deserializeAws_queryStorageQuotaExceededFaultResponse(parsedOutput, context);
         default:
@@ -5462,14 +5462,14 @@ exports.deserializeAws_queryModifyDBClusterEndpointCommand = deserializeAws_quer
 const deserializeAws_queryModifyDBClusterEndpointCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DBClusterEndpointNotFoundFault":
         case "com.amazonaws.rds#DBClusterEndpointNotFoundFault":
             throw await deserializeAws_queryDBClusterEndpointNotFoundFaultResponse(parsedOutput, context);
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
         case "InvalidDBClusterEndpointStateFault":
@@ -5478,7 +5478,7 @@ const deserializeAws_queryModifyDBClusterEndpointCommandError = async (output, c
         case "InvalidDBClusterStateFault":
         case "com.amazonaws.rds#InvalidDBClusterStateFault":
             throw await deserializeAws_queryInvalidDBClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         default:
@@ -5508,14 +5508,14 @@ exports.deserializeAws_queryModifyDBClusterParameterGroupCommand = deserializeAw
 const deserializeAws_queryModifyDBClusterParameterGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBParameterGroupNotFoundFault":
+        case "DBParameterGroupNotFound":
         case "com.amazonaws.rds#DBParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBParameterGroupNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidDBParameterGroupStateFault":
+        case "InvalidDBParameterGroupState":
         case "com.amazonaws.rds#InvalidDBParameterGroupStateFault":
             throw await deserializeAws_queryInvalidDBParameterGroupStateFaultResponse(parsedOutput, context);
         default:
@@ -5545,7 +5545,7 @@ exports.deserializeAws_queryModifyDBClusterSnapshotAttributeCommand = deserializ
 const deserializeAws_queryModifyDBClusterSnapshotAttributeCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -5555,7 +5555,7 @@ const deserializeAws_queryModifyDBClusterSnapshotAttributeCommandError = async (
         case "InvalidDBClusterSnapshotStateFault":
         case "com.amazonaws.rds#InvalidDBClusterSnapshotStateFault":
             throw await deserializeAws_queryInvalidDBClusterSnapshotStateFaultResponse(parsedOutput, context);
-        case "SharedSnapshotQuotaExceededFault":
+        case "SharedSnapshotQuotaExceeded":
         case "com.amazonaws.rds#SharedSnapshotQuotaExceededFault":
             throw await deserializeAws_querySharedSnapshotQuotaExceededFaultResponse(parsedOutput, context);
         default:
@@ -5585,47 +5585,47 @@ exports.deserializeAws_queryModifyDBInstanceCommand = deserializeAws_queryModify
 const deserializeAws_queryModifyDBInstanceCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "AuthorizationNotFoundFault":
+        case "AuthorizationNotFound":
         case "com.amazonaws.rds#AuthorizationNotFoundFault":
             throw await deserializeAws_queryAuthorizationNotFoundFaultResponse(parsedOutput, context);
         case "BackupPolicyNotFoundFault":
         case "com.amazonaws.rds#BackupPolicyNotFoundFault":
             throw await deserializeAws_queryBackupPolicyNotFoundFaultResponse(parsedOutput, context);
-        case "CertificateNotFoundFault":
+        case "CertificateNotFound":
         case "com.amazonaws.rds#CertificateNotFoundFault":
             throw await deserializeAws_queryCertificateNotFoundFaultResponse(parsedOutput, context);
-        case "DBInstanceAlreadyExistsFault":
+        case "DBInstanceAlreadyExists":
         case "com.amazonaws.rds#DBInstanceAlreadyExistsFault":
             throw await deserializeAws_queryDBInstanceAlreadyExistsFaultResponse(parsedOutput, context);
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
-        case "DBParameterGroupNotFoundFault":
+        case "DBParameterGroupNotFound":
         case "com.amazonaws.rds#DBParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBParameterGroupNotFoundFaultResponse(parsedOutput, context);
-        case "DBSecurityGroupNotFoundFault":
+        case "DBSecurityGroupNotFound":
         case "com.amazonaws.rds#DBSecurityGroupNotFoundFault":
             throw await deserializeAws_queryDBSecurityGroupNotFoundFaultResponse(parsedOutput, context);
-        case "DBUpgradeDependencyFailureFault":
+        case "DBUpgradeDependencyFailure":
         case "com.amazonaws.rds#DBUpgradeDependencyFailureFault":
             throw await deserializeAws_queryDBUpgradeDependencyFailureFaultResponse(parsedOutput, context);
         case "DomainNotFoundFault":
         case "com.amazonaws.rds#DomainNotFoundFault":
             throw await deserializeAws_queryDomainNotFoundFaultResponse(parsedOutput, context);
-        case "InsufficientDBInstanceCapacityFault":
+        case "InsufficientDBInstanceCapacity":
         case "com.amazonaws.rds#InsufficientDBInstanceCapacityFault":
             throw await deserializeAws_queryInsufficientDBInstanceCapacityFaultResponse(parsedOutput, context);
         case "InvalidDBClusterStateFault":
         case "com.amazonaws.rds#InvalidDBClusterStateFault":
             throw await deserializeAws_queryInvalidDBClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
-        case "InvalidDBSecurityGroupStateFault":
+        case "InvalidDBSecurityGroupState":
         case "com.amazonaws.rds#InvalidDBSecurityGroupStateFault":
             throw await deserializeAws_queryInvalidDBSecurityGroupStateFaultResponse(parsedOutput, context);
         case "InvalidVPCNetworkStateFault":
@@ -5643,10 +5643,10 @@ const deserializeAws_queryModifyDBInstanceCommandError = async (output, context)
         case "ProvisionedIopsNotAvailableInAZFault":
         case "com.amazonaws.rds#ProvisionedIopsNotAvailableInAZFault":
             throw await deserializeAws_queryProvisionedIopsNotAvailableInAZFaultResponse(parsedOutput, context);
-        case "StorageQuotaExceededFault":
+        case "StorageQuotaExceeded":
         case "com.amazonaws.rds#StorageQuotaExceededFault":
             throw await deserializeAws_queryStorageQuotaExceededFaultResponse(parsedOutput, context);
-        case "StorageTypeNotSupportedFault":
+        case "StorageTypeNotSupported":
         case "com.amazonaws.rds#StorageTypeNotSupportedFault":
             throw await deserializeAws_queryStorageTypeNotSupportedFaultResponse(parsedOutput, context);
         default:
@@ -5676,14 +5676,14 @@ exports.deserializeAws_queryModifyDBParameterGroupCommand = deserializeAws_query
 const deserializeAws_queryModifyDBParameterGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBParameterGroupNotFoundFault":
+        case "DBParameterGroupNotFound":
         case "com.amazonaws.rds#DBParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBParameterGroupNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidDBParameterGroupStateFault":
+        case "InvalidDBParameterGroupState":
         case "com.amazonaws.rds#InvalidDBParameterGroupStateFault":
             throw await deserializeAws_queryInvalidDBParameterGroupStateFaultResponse(parsedOutput, context);
         default:
@@ -5713,7 +5713,7 @@ exports.deserializeAws_queryModifyDBProxyCommand = deserializeAws_queryModifyDBP
 const deserializeAws_queryModifyDBProxyCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -5753,7 +5753,7 @@ exports.deserializeAws_queryModifyDBProxyEndpointCommand = deserializeAws_queryM
 const deserializeAws_queryModifyDBProxyEndpointCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -5796,7 +5796,7 @@ exports.deserializeAws_queryModifyDBProxyTargetGroupCommand = deserializeAws_que
 const deserializeAws_queryModifyDBProxyTargetGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -5836,11 +5836,11 @@ exports.deserializeAws_queryModifyDBSnapshotCommand = deserializeAws_queryModify
 const deserializeAws_queryModifyDBSnapshotCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBSnapshotNotFoundFault":
+        case "DBSnapshotNotFound":
         case "com.amazonaws.rds#DBSnapshotNotFoundFault":
             throw await deserializeAws_queryDBSnapshotNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -5870,17 +5870,17 @@ exports.deserializeAws_queryModifyDBSnapshotAttributeCommand = deserializeAws_qu
 const deserializeAws_queryModifyDBSnapshotAttributeCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBSnapshotNotFoundFault":
+        case "DBSnapshotNotFound":
         case "com.amazonaws.rds#DBSnapshotNotFoundFault":
             throw await deserializeAws_queryDBSnapshotNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidDBSnapshotStateFault":
+        case "InvalidDBSnapshotState":
         case "com.amazonaws.rds#InvalidDBSnapshotStateFault":
             throw await deserializeAws_queryInvalidDBSnapshotStateFaultResponse(parsedOutput, context);
-        case "SharedSnapshotQuotaExceededFault":
+        case "SharedSnapshotQuotaExceeded":
         case "com.amazonaws.rds#SharedSnapshotQuotaExceededFault":
             throw await deserializeAws_querySharedSnapshotQuotaExceededFaultResponse(parsedOutput, context);
         default:
@@ -5910,7 +5910,7 @@ exports.deserializeAws_queryModifyDBSubnetGroupCommand = deserializeAws_queryMod
 const deserializeAws_queryModifyDBSubnetGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -5956,26 +5956,26 @@ exports.deserializeAws_queryModifyEventSubscriptionCommand = deserializeAws_quer
 const deserializeAws_queryModifyEventSubscriptionCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "EventSubscriptionQuotaExceededFault":
+        case "EventSubscriptionQuotaExceeded":
         case "com.amazonaws.rds#EventSubscriptionQuotaExceededFault":
             throw await deserializeAws_queryEventSubscriptionQuotaExceededFaultResponse(parsedOutput, context);
-        case "SNSInvalidTopicFault":
+        case "SNSInvalidTopic":
         case "com.amazonaws.rds#SNSInvalidTopicFault":
             throw await deserializeAws_querySNSInvalidTopicFaultResponse(parsedOutput, context);
-        case "SNSNoAuthorizationFault":
+        case "SNSNoAuthorization":
         case "com.amazonaws.rds#SNSNoAuthorizationFault":
             throw await deserializeAws_querySNSNoAuthorizationFaultResponse(parsedOutput, context);
-        case "SNSTopicArnNotFoundFault":
+        case "SNSTopicArnNotFound":
         case "com.amazonaws.rds#SNSTopicArnNotFoundFault":
             throw await deserializeAws_querySNSTopicArnNotFoundFaultResponse(parsedOutput, context);
-        case "SubscriptionCategoryNotFoundFault":
+        case "SubscriptionCategoryNotFound":
         case "com.amazonaws.rds#SubscriptionCategoryNotFoundFault":
             throw await deserializeAws_querySubscriptionCategoryNotFoundFaultResponse(parsedOutput, context);
-        case "SubscriptionNotFoundFault":
+        case "SubscriptionNotFound":
         case "com.amazonaws.rds#SubscriptionNotFoundFault":
             throw await deserializeAws_querySubscriptionNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -6005,7 +6005,7 @@ exports.deserializeAws_queryModifyGlobalClusterCommand = deserializeAws_queryMod
 const deserializeAws_queryModifyGlobalClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -6015,7 +6015,7 @@ const deserializeAws_queryModifyGlobalClusterCommandError = async (output, conte
         case "InvalidDBClusterStateFault":
         case "com.amazonaws.rds#InvalidDBClusterStateFault":
             throw await deserializeAws_queryInvalidDBClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         case "InvalidGlobalClusterStateFault":
@@ -6048,7 +6048,7 @@ exports.deserializeAws_queryModifyOptionGroupCommand = deserializeAws_queryModif
 const deserializeAws_queryModifyOptionGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -6085,14 +6085,14 @@ exports.deserializeAws_queryPromoteReadReplicaCommand = deserializeAws_queryProm
 const deserializeAws_queryPromoteReadReplicaCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         default:
@@ -6122,7 +6122,7 @@ exports.deserializeAws_queryPromoteReadReplicaDBClusterCommand = deserializeAws_
 const deserializeAws_queryPromoteReadReplicaDBClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -6159,17 +6159,17 @@ exports.deserializeAws_queryPurchaseReservedDBInstancesOfferingCommand = deseria
 const deserializeAws_queryPurchaseReservedDBInstancesOfferingCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ReservedDBInstanceAlreadyExistsFault":
+        case "ReservedDBInstanceAlreadyExists":
         case "com.amazonaws.rds#ReservedDBInstanceAlreadyExistsFault":
             throw await deserializeAws_queryReservedDBInstanceAlreadyExistsFaultResponse(parsedOutput, context);
-        case "ReservedDBInstanceQuotaExceededFault":
+        case "ReservedDBInstanceQuotaExceeded":
         case "com.amazonaws.rds#ReservedDBInstanceQuotaExceededFault":
             throw await deserializeAws_queryReservedDBInstanceQuotaExceededFaultResponse(parsedOutput, context);
-        case "ReservedDBInstancesOfferingNotFoundFault":
+        case "ReservedDBInstancesOfferingNotFound":
         case "com.amazonaws.rds#ReservedDBInstancesOfferingNotFoundFault":
             throw await deserializeAws_queryReservedDBInstancesOfferingNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -6199,7 +6199,7 @@ exports.deserializeAws_queryRebootDBClusterCommand = deserializeAws_queryRebootD
 const deserializeAws_queryRebootDBClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -6209,7 +6209,7 @@ const deserializeAws_queryRebootDBClusterCommandError = async (output, context)
         case "InvalidDBClusterStateFault":
         case "com.amazonaws.rds#InvalidDBClusterStateFault":
             throw await deserializeAws_queryInvalidDBClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         default:
@@ -6239,14 +6239,14 @@ exports.deserializeAws_queryRebootDBInstanceCommand = deserializeAws_queryReboot
 const deserializeAws_queryRebootDBInstanceCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         default:
@@ -6276,14 +6276,14 @@ exports.deserializeAws_queryRegisterDBProxyTargetsCommand = deserializeAws_query
 const deserializeAws_queryRegisterDBProxyTargetsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DBClusterNotFoundFault":
         case "com.amazonaws.rds#DBClusterNotFoundFault":
             throw await deserializeAws_queryDBClusterNotFoundFaultResponse(parsedOutput, context);
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
         case "DBProxyNotFoundFault":
@@ -6301,7 +6301,7 @@ const deserializeAws_queryRegisterDBProxyTargetsCommandError = async (output, co
         case "InvalidDBClusterStateFault":
         case "com.amazonaws.rds#InvalidDBClusterStateFault":
             throw await deserializeAws_queryInvalidDBClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         case "InvalidDBProxyStateFault":
@@ -6334,7 +6334,7 @@ exports.deserializeAws_queryRemoveFromGlobalClusterCommand = deserializeAws_quer
 const deserializeAws_queryRemoveFromGlobalClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -6371,14 +6371,14 @@ exports.deserializeAws_queryRemoveRoleFromDBClusterCommand = deserializeAws_quer
 const deserializeAws_queryRemoveRoleFromDBClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DBClusterNotFoundFault":
         case "com.amazonaws.rds#DBClusterNotFoundFault":
             throw await deserializeAws_queryDBClusterNotFoundFaultResponse(parsedOutput, context);
-        case "DBClusterRoleNotFoundFault":
+        case "DBClusterRoleNotFound":
         case "com.amazonaws.rds#DBClusterRoleNotFoundFault":
             throw await deserializeAws_queryDBClusterRoleNotFoundFaultResponse(parsedOutput, context);
         case "InvalidDBClusterStateFault":
@@ -6408,17 +6408,17 @@ exports.deserializeAws_queryRemoveRoleFromDBInstanceCommand = deserializeAws_que
 const deserializeAws_queryRemoveRoleFromDBInstanceCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
-        case "DBInstanceRoleNotFoundFault":
+        case "DBInstanceRoleNotFound":
         case "com.amazonaws.rds#DBInstanceRoleNotFoundFault":
             throw await deserializeAws_queryDBInstanceRoleNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         default:
@@ -6448,14 +6448,14 @@ exports.deserializeAws_queryRemoveSourceIdentifierFromSubscriptionCommand = dese
 const deserializeAws_queryRemoveSourceIdentifierFromSubscriptionCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "SourceNotFoundFault":
+        case "SourceNotFound":
         case "com.amazonaws.rds#SourceNotFoundFault":
             throw await deserializeAws_querySourceNotFoundFaultResponse(parsedOutput, context);
-        case "SubscriptionNotFoundFault":
+        case "SubscriptionNotFound":
         case "com.amazonaws.rds#SubscriptionNotFoundFault":
             throw await deserializeAws_querySubscriptionNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -6482,14 +6482,14 @@ exports.deserializeAws_queryRemoveTagsFromResourceCommand = deserializeAws_query
 const deserializeAws_queryRemoveTagsFromResourceCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DBClusterNotFoundFault":
         case "com.amazonaws.rds#DBClusterNotFoundFault":
             throw await deserializeAws_queryDBClusterNotFoundFaultResponse(parsedOutput, context);
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
         case "DBProxyNotFoundFault":
@@ -6498,7 +6498,7 @@ const deserializeAws_queryRemoveTagsFromResourceCommandError = async (output, co
         case "DBProxyTargetGroupNotFoundFault":
         case "com.amazonaws.rds#DBProxyTargetGroupNotFoundFault":
             throw await deserializeAws_queryDBProxyTargetGroupNotFoundFaultResponse(parsedOutput, context);
-        case "DBSnapshotNotFoundFault":
+        case "DBSnapshotNotFound":
         case "com.amazonaws.rds#DBSnapshotNotFoundFault":
             throw await deserializeAws_queryDBSnapshotNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -6528,14 +6528,14 @@ exports.deserializeAws_queryResetDBClusterParameterGroupCommand = deserializeAws
 const deserializeAws_queryResetDBClusterParameterGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBParameterGroupNotFoundFault":
+        case "DBParameterGroupNotFound":
         case "com.amazonaws.rds#DBParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBParameterGroupNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidDBParameterGroupStateFault":
+        case "InvalidDBParameterGroupState":
         case "com.amazonaws.rds#InvalidDBParameterGroupStateFault":
             throw await deserializeAws_queryInvalidDBParameterGroupStateFaultResponse(parsedOutput, context);
         default:
@@ -6565,14 +6565,14 @@ exports.deserializeAws_queryResetDBParameterGroupCommand = deserializeAws_queryR
 const deserializeAws_queryResetDBParameterGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBParameterGroupNotFoundFault":
+        case "DBParameterGroupNotFound":
         case "com.amazonaws.rds#DBParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBParameterGroupNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidDBParameterGroupStateFault":
+        case "InvalidDBParameterGroupState":
         case "com.amazonaws.rds#InvalidDBParameterGroupStateFault":
             throw await deserializeAws_queryInvalidDBParameterGroupStateFaultResponse(parsedOutput, context);
         default:
@@ -6602,7 +6602,7 @@ exports.deserializeAws_queryRestoreDBClusterFromS3Command = deserializeAws_query
 const deserializeAws_queryRestoreDBClusterFromS3CommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -6612,7 +6612,7 @@ const deserializeAws_queryRestoreDBClusterFromS3CommandError = async (output, co
         case "DBClusterNotFoundFault":
         case "com.amazonaws.rds#DBClusterNotFoundFault":
             throw await deserializeAws_queryDBClusterNotFoundFaultResponse(parsedOutput, context);
-        case "DBClusterParameterGroupNotFoundFault":
+        case "DBClusterParameterGroupNotFound":
         case "com.amazonaws.rds#DBClusterParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBClusterParameterGroupNotFoundFaultResponse(parsedOutput, context);
         case "DBClusterQuotaExceededFault":
@@ -6624,7 +6624,7 @@ const deserializeAws_queryRestoreDBClusterFromS3CommandError = async (output, co
         case "DomainNotFoundFault":
         case "com.amazonaws.rds#DomainNotFoundFault":
             throw await deserializeAws_queryDomainNotFoundFaultResponse(parsedOutput, context);
-        case "InsufficientStorageClusterCapacityFault":
+        case "InsufficientStorageClusterCapacity":
         case "com.amazonaws.rds#InsufficientStorageClusterCapacityFault":
             throw await deserializeAws_queryInsufficientStorageClusterCapacityFaultResponse(parsedOutput, context);
         case "InvalidDBClusterStateFault":
@@ -6645,7 +6645,7 @@ const deserializeAws_queryRestoreDBClusterFromS3CommandError = async (output, co
         case "KMSKeyNotAccessibleFault":
         case "com.amazonaws.rds#KMSKeyNotAccessibleFault":
             throw await deserializeAws_queryKMSKeyNotAccessibleFaultResponse(parsedOutput, context);
-        case "StorageQuotaExceededFault":
+        case "StorageQuotaExceeded":
         case "com.amazonaws.rds#StorageQuotaExceededFault":
             throw await deserializeAws_queryStorageQuotaExceededFaultResponse(parsedOutput, context);
         default:
@@ -6675,14 +6675,14 @@ exports.deserializeAws_queryRestoreDBClusterFromSnapshotCommand = deserializeAws
 const deserializeAws_queryRestoreDBClusterFromSnapshotCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DBClusterAlreadyExistsFault":
         case "com.amazonaws.rds#DBClusterAlreadyExistsFault":
             throw await deserializeAws_queryDBClusterAlreadyExistsFaultResponse(parsedOutput, context);
-        case "DBClusterParameterGroupNotFoundFault":
+        case "DBClusterParameterGroupNotFound":
         case "com.amazonaws.rds#DBClusterParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBClusterParameterGroupNotFoundFaultResponse(parsedOutput, context);
         case "DBClusterQuotaExceededFault":
@@ -6691,7 +6691,7 @@ const deserializeAws_queryRestoreDBClusterFromSnapshotCommandError = async (outp
         case "DBClusterSnapshotNotFoundFault":
         case "com.amazonaws.rds#DBClusterSnapshotNotFoundFault":
             throw await deserializeAws_queryDBClusterSnapshotNotFoundFaultResponse(parsedOutput, context);
-        case "DBSnapshotNotFoundFault":
+        case "DBSnapshotNotFound":
         case "com.amazonaws.rds#DBSnapshotNotFoundFault":
             throw await deserializeAws_queryDBSnapshotNotFoundFaultResponse(parsedOutput, context);
         case "DBSubnetGroupNotFoundFault":
@@ -6703,13 +6703,13 @@ const deserializeAws_queryRestoreDBClusterFromSnapshotCommandError = async (outp
         case "InsufficientDBClusterCapacityFault":
         case "com.amazonaws.rds#InsufficientDBClusterCapacityFault":
             throw await deserializeAws_queryInsufficientDBClusterCapacityFaultResponse(parsedOutput, context);
-        case "InsufficientStorageClusterCapacityFault":
+        case "InsufficientStorageClusterCapacity":
         case "com.amazonaws.rds#InsufficientStorageClusterCapacityFault":
             throw await deserializeAws_queryInsufficientStorageClusterCapacityFaultResponse(parsedOutput, context);
         case "InvalidDBClusterSnapshotStateFault":
         case "com.amazonaws.rds#InvalidDBClusterSnapshotStateFault":
             throw await deserializeAws_queryInvalidDBClusterSnapshotStateFaultResponse(parsedOutput, context);
-        case "InvalidDBSnapshotStateFault":
+        case "InvalidDBSnapshotState":
         case "com.amazonaws.rds#InvalidDBSnapshotStateFault":
             throw await deserializeAws_queryInvalidDBSnapshotStateFaultResponse(parsedOutput, context);
         case "InvalidRestoreFault":
@@ -6727,7 +6727,7 @@ const deserializeAws_queryRestoreDBClusterFromSnapshotCommandError = async (outp
         case "OptionGroupNotFoundFault":
         case "com.amazonaws.rds#OptionGroupNotFoundFault":
             throw await deserializeAws_queryOptionGroupNotFoundFaultResponse(parsedOutput, context);
-        case "StorageQuotaExceededFault":
+        case "StorageQuotaExceeded":
         case "com.amazonaws.rds#StorageQuotaExceededFault":
             throw await deserializeAws_queryStorageQuotaExceededFaultResponse(parsedOutput, context);
         default:
@@ -6757,7 +6757,7 @@ exports.deserializeAws_queryRestoreDBClusterToPointInTimeCommand = deserializeAw
 const deserializeAws_queryRestoreDBClusterToPointInTimeCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -6767,7 +6767,7 @@ const deserializeAws_queryRestoreDBClusterToPointInTimeCommandError = async (out
         case "DBClusterNotFoundFault":
         case "com.amazonaws.rds#DBClusterNotFoundFault":
             throw await deserializeAws_queryDBClusterNotFoundFaultResponse(parsedOutput, context);
-        case "DBClusterParameterGroupNotFoundFault":
+        case "DBClusterParameterGroupNotFound":
         case "com.amazonaws.rds#DBClusterParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBClusterParameterGroupNotFoundFaultResponse(parsedOutput, context);
         case "DBClusterQuotaExceededFault":
@@ -6785,7 +6785,7 @@ const deserializeAws_queryRestoreDBClusterToPointInTimeCommandError = async (out
         case "InsufficientDBClusterCapacityFault":
         case "com.amazonaws.rds#InsufficientDBClusterCapacityFault":
             throw await deserializeAws_queryInsufficientDBClusterCapacityFaultResponse(parsedOutput, context);
-        case "InsufficientStorageClusterCapacityFault":
+        case "InsufficientStorageClusterCapacity":
         case "com.amazonaws.rds#InsufficientStorageClusterCapacityFault":
             throw await deserializeAws_queryInsufficientStorageClusterCapacityFaultResponse(parsedOutput, context);
         case "InvalidDBClusterSnapshotStateFault":
@@ -6794,7 +6794,7 @@ const deserializeAws_queryRestoreDBClusterToPointInTimeCommandError = async (out
         case "InvalidDBClusterStateFault":
         case "com.amazonaws.rds#InvalidDBClusterStateFault":
             throw await deserializeAws_queryInvalidDBClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidDBSnapshotStateFault":
+        case "InvalidDBSnapshotState":
         case "com.amazonaws.rds#InvalidDBSnapshotStateFault":
             throw await deserializeAws_queryInvalidDBSnapshotStateFaultResponse(parsedOutput, context);
         case "InvalidRestoreFault":
@@ -6812,7 +6812,7 @@ const deserializeAws_queryRestoreDBClusterToPointInTimeCommandError = async (out
         case "OptionGroupNotFoundFault":
         case "com.amazonaws.rds#OptionGroupNotFoundFault":
             throw await deserializeAws_queryOptionGroupNotFoundFaultResponse(parsedOutput, context);
-        case "StorageQuotaExceededFault":
+        case "StorageQuotaExceeded":
         case "com.amazonaws.rds#StorageQuotaExceededFault":
             throw await deserializeAws_queryStorageQuotaExceededFaultResponse(parsedOutput, context);
         default:
@@ -6842,26 +6842,26 @@ exports.deserializeAws_queryRestoreDBInstanceFromDBSnapshotCommand = deserialize
 const deserializeAws_queryRestoreDBInstanceFromDBSnapshotCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "AuthorizationNotFoundFault":
+        case "AuthorizationNotFound":
         case "com.amazonaws.rds#AuthorizationNotFoundFault":
             throw await deserializeAws_queryAuthorizationNotFoundFaultResponse(parsedOutput, context);
         case "BackupPolicyNotFoundFault":
         case "com.amazonaws.rds#BackupPolicyNotFoundFault":
             throw await deserializeAws_queryBackupPolicyNotFoundFaultResponse(parsedOutput, context);
-        case "DBInstanceAlreadyExistsFault":
+        case "DBInstanceAlreadyExists":
         case "com.amazonaws.rds#DBInstanceAlreadyExistsFault":
             throw await deserializeAws_queryDBInstanceAlreadyExistsFaultResponse(parsedOutput, context);
-        case "DBParameterGroupNotFoundFault":
+        case "DBParameterGroupNotFound":
         case "com.amazonaws.rds#DBParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBParameterGroupNotFoundFaultResponse(parsedOutput, context);
-        case "DBSecurityGroupNotFoundFault":
+        case "DBSecurityGroupNotFound":
         case "com.amazonaws.rds#DBSecurityGroupNotFoundFault":
             throw await deserializeAws_queryDBSecurityGroupNotFoundFaultResponse(parsedOutput, context);
-        case "DBSnapshotNotFoundFault":
+        case "DBSnapshotNotFound":
         case "com.amazonaws.rds#DBSnapshotNotFoundFault":
             throw await deserializeAws_queryDBSnapshotNotFoundFaultResponse(parsedOutput, context);
         case "DBSubnetGroupDoesNotCoverEnoughAZs":
@@ -6873,13 +6873,13 @@ const deserializeAws_queryRestoreDBInstanceFromDBSnapshotCommandError = async (o
         case "DomainNotFoundFault":
         case "com.amazonaws.rds#DomainNotFoundFault":
             throw await deserializeAws_queryDomainNotFoundFaultResponse(parsedOutput, context);
-        case "InstanceQuotaExceededFault":
+        case "InstanceQuotaExceeded":
         case "com.amazonaws.rds#InstanceQuotaExceededFault":
             throw await deserializeAws_queryInstanceQuotaExceededFaultResponse(parsedOutput, context);
-        case "InsufficientDBInstanceCapacityFault":
+        case "InsufficientDBInstanceCapacity":
         case "com.amazonaws.rds#InsufficientDBInstanceCapacityFault":
             throw await deserializeAws_queryInsufficientDBInstanceCapacityFaultResponse(parsedOutput, context);
-        case "InvalidDBSnapshotStateFault":
+        case "InvalidDBSnapshotState":
         case "com.amazonaws.rds#InvalidDBSnapshotStateFault":
             throw await deserializeAws_queryInvalidDBSnapshotStateFaultResponse(parsedOutput, context);
         case "InvalidRestoreFault":
@@ -6903,10 +6903,10 @@ const deserializeAws_queryRestoreDBInstanceFromDBSnapshotCommandError = async (o
         case "ProvisionedIopsNotAvailableInAZFault":
         case "com.amazonaws.rds#ProvisionedIopsNotAvailableInAZFault":
             throw await deserializeAws_queryProvisionedIopsNotAvailableInAZFaultResponse(parsedOutput, context);
-        case "StorageQuotaExceededFault":
+        case "StorageQuotaExceeded":
         case "com.amazonaws.rds#StorageQuotaExceededFault":
             throw await deserializeAws_queryStorageQuotaExceededFaultResponse(parsedOutput, context);
-        case "StorageTypeNotSupportedFault":
+        case "StorageTypeNotSupported":
         case "com.amazonaws.rds#StorageTypeNotSupportedFault":
             throw await deserializeAws_queryStorageTypeNotSupportedFaultResponse(parsedOutput, context);
         default:
@@ -6936,23 +6936,23 @@ exports.deserializeAws_queryRestoreDBInstanceFromS3Command = deserializeAws_quer
 const deserializeAws_queryRestoreDBInstanceFromS3CommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "AuthorizationNotFoundFault":
+        case "AuthorizationNotFound":
         case "com.amazonaws.rds#AuthorizationNotFoundFault":
             throw await deserializeAws_queryAuthorizationNotFoundFaultResponse(parsedOutput, context);
         case "BackupPolicyNotFoundFault":
         case "com.amazonaws.rds#BackupPolicyNotFoundFault":
             throw await deserializeAws_queryBackupPolicyNotFoundFaultResponse(parsedOutput, context);
-        case "DBInstanceAlreadyExistsFault":
+        case "DBInstanceAlreadyExists":
         case "com.amazonaws.rds#DBInstanceAlreadyExistsFault":
             throw await deserializeAws_queryDBInstanceAlreadyExistsFaultResponse(parsedOutput, context);
-        case "DBParameterGroupNotFoundFault":
+        case "DBParameterGroupNotFound":
         case "com.amazonaws.rds#DBParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBParameterGroupNotFoundFaultResponse(parsedOutput, context);
-        case "DBSecurityGroupNotFoundFault":
+        case "DBSecurityGroupNotFound":
         case "com.amazonaws.rds#DBSecurityGroupNotFoundFault":
             throw await deserializeAws_queryDBSecurityGroupNotFoundFaultResponse(parsedOutput, context);
         case "DBSubnetGroupDoesNotCoverEnoughAZs":
@@ -6961,10 +6961,10 @@ const deserializeAws_queryRestoreDBInstanceFromS3CommandError = async (output, c
         case "DBSubnetGroupNotFoundFault":
         case "com.amazonaws.rds#DBSubnetGroupNotFoundFault":
             throw await deserializeAws_queryDBSubnetGroupNotFoundFaultResponse(parsedOutput, context);
-        case "InstanceQuotaExceededFault":
+        case "InstanceQuotaExceeded":
         case "com.amazonaws.rds#InstanceQuotaExceededFault":
             throw await deserializeAws_queryInstanceQuotaExceededFaultResponse(parsedOutput, context);
-        case "InsufficientDBInstanceCapacityFault":
+        case "InsufficientDBInstanceCapacity":
         case "com.amazonaws.rds#InsufficientDBInstanceCapacityFault":
             throw await deserializeAws_queryInsufficientDBInstanceCapacityFaultResponse(parsedOutput, context);
         case "InvalidS3BucketFault":
@@ -6988,10 +6988,10 @@ const deserializeAws_queryRestoreDBInstanceFromS3CommandError = async (output, c
         case "ProvisionedIopsNotAvailableInAZFault":
         case "com.amazonaws.rds#ProvisionedIopsNotAvailableInAZFault":
             throw await deserializeAws_queryProvisionedIopsNotAvailableInAZFaultResponse(parsedOutput, context);
-        case "StorageQuotaExceededFault":
+        case "StorageQuotaExceeded":
         case "com.amazonaws.rds#StorageQuotaExceededFault":
             throw await deserializeAws_queryStorageQuotaExceededFaultResponse(parsedOutput, context);
-        case "StorageTypeNotSupportedFault":
+        case "StorageTypeNotSupported":
         case "com.amazonaws.rds#StorageTypeNotSupportedFault":
             throw await deserializeAws_queryStorageTypeNotSupportedFaultResponse(parsedOutput, context);
         default:
@@ -7021,29 +7021,29 @@ exports.deserializeAws_queryRestoreDBInstanceToPointInTimeCommand = deserializeA
 const deserializeAws_queryRestoreDBInstanceToPointInTimeCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "AuthorizationNotFoundFault":
+        case "AuthorizationNotFound":
         case "com.amazonaws.rds#AuthorizationNotFoundFault":
             throw await deserializeAws_queryAuthorizationNotFoundFaultResponse(parsedOutput, context);
         case "BackupPolicyNotFoundFault":
         case "com.amazonaws.rds#BackupPolicyNotFoundFault":
             throw await deserializeAws_queryBackupPolicyNotFoundFaultResponse(parsedOutput, context);
-        case "DBInstanceAlreadyExistsFault":
+        case "DBInstanceAlreadyExists":
         case "com.amazonaws.rds#DBInstanceAlreadyExistsFault":
             throw await deserializeAws_queryDBInstanceAlreadyExistsFaultResponse(parsedOutput, context);
-        case "DBInstanceAutomatedBackupNotFoundFault":
+        case "DBInstanceAutomatedBackupNotFound":
         case "com.amazonaws.rds#DBInstanceAutomatedBackupNotFoundFault":
             throw await deserializeAws_queryDBInstanceAutomatedBackupNotFoundFaultResponse(parsedOutput, context);
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
-        case "DBParameterGroupNotFoundFault":
+        case "DBParameterGroupNotFound":
         case "com.amazonaws.rds#DBParameterGroupNotFoundFault":
             throw await deserializeAws_queryDBParameterGroupNotFoundFaultResponse(parsedOutput, context);
-        case "DBSecurityGroupNotFoundFault":
+        case "DBSecurityGroupNotFound":
         case "com.amazonaws.rds#DBSecurityGroupNotFoundFault":
             throw await deserializeAws_queryDBSecurityGroupNotFoundFaultResponse(parsedOutput, context);
         case "DBSubnetGroupDoesNotCoverEnoughAZs":
@@ -7055,13 +7055,13 @@ const deserializeAws_queryRestoreDBInstanceToPointInTimeCommandError = async (ou
         case "DomainNotFoundFault":
         case "com.amazonaws.rds#DomainNotFoundFault":
             throw await deserializeAws_queryDomainNotFoundFaultResponse(parsedOutput, context);
-        case "InstanceQuotaExceededFault":
+        case "InstanceQuotaExceeded":
         case "com.amazonaws.rds#InstanceQuotaExceededFault":
             throw await deserializeAws_queryInstanceQuotaExceededFaultResponse(parsedOutput, context);
-        case "InsufficientDBInstanceCapacityFault":
+        case "InsufficientDBInstanceCapacity":
         case "com.amazonaws.rds#InsufficientDBInstanceCapacityFault":
             throw await deserializeAws_queryInsufficientDBInstanceCapacityFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         case "InvalidRestoreFault":
@@ -7082,16 +7082,16 @@ const deserializeAws_queryRestoreDBInstanceToPointInTimeCommandError = async (ou
         case "OptionGroupNotFoundFault":
         case "com.amazonaws.rds#OptionGroupNotFoundFault":
             throw await deserializeAws_queryOptionGroupNotFoundFaultResponse(parsedOutput, context);
-        case "PointInTimeRestoreNotEnabledFault":
+        case "PointInTimeRestoreNotEnabled":
         case "com.amazonaws.rds#PointInTimeRestoreNotEnabledFault":
             throw await deserializeAws_queryPointInTimeRestoreNotEnabledFaultResponse(parsedOutput, context);
         case "ProvisionedIopsNotAvailableInAZFault":
         case "com.amazonaws.rds#ProvisionedIopsNotAvailableInAZFault":
             throw await deserializeAws_queryProvisionedIopsNotAvailableInAZFaultResponse(parsedOutput, context);
-        case "StorageQuotaExceededFault":
+        case "StorageQuotaExceeded":
         case "com.amazonaws.rds#StorageQuotaExceededFault":
             throw await deserializeAws_queryStorageQuotaExceededFaultResponse(parsedOutput, context);
-        case "StorageTypeNotSupportedFault":
+        case "StorageTypeNotSupported":
         case "com.amazonaws.rds#StorageTypeNotSupportedFault":
             throw await deserializeAws_queryStorageTypeNotSupportedFaultResponse(parsedOutput, context);
         default:
@@ -7121,17 +7121,17 @@ exports.deserializeAws_queryRevokeDBSecurityGroupIngressCommand = deserializeAws
 const deserializeAws_queryRevokeDBSecurityGroupIngressCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "AuthorizationNotFoundFault":
+        case "AuthorizationNotFound":
         case "com.amazonaws.rds#AuthorizationNotFoundFault":
             throw await deserializeAws_queryAuthorizationNotFoundFaultResponse(parsedOutput, context);
-        case "DBSecurityGroupNotFoundFault":
+        case "DBSecurityGroupNotFound":
         case "com.amazonaws.rds#DBSecurityGroupNotFoundFault":
             throw await deserializeAws_queryDBSecurityGroupNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidDBSecurityGroupStateFault":
+        case "InvalidDBSecurityGroupState":
         case "com.amazonaws.rds#InvalidDBSecurityGroupStateFault":
             throw await deserializeAws_queryInvalidDBSecurityGroupStateFaultResponse(parsedOutput, context);
         default:
@@ -7161,20 +7161,20 @@ exports.deserializeAws_queryStartActivityStreamCommand = deserializeAws_querySta
 const deserializeAws_queryStartActivityStreamCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DBClusterNotFoundFault":
         case "com.amazonaws.rds#DBClusterNotFoundFault":
             throw await deserializeAws_queryDBClusterNotFoundFaultResponse(parsedOutput, context);
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
         case "InvalidDBClusterStateFault":
         case "com.amazonaws.rds#InvalidDBClusterStateFault":
             throw await deserializeAws_queryInvalidDBClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         case "KMSKeyNotAccessibleFault":
@@ -7210,7 +7210,7 @@ exports.deserializeAws_queryStartDBClusterCommand = deserializeAws_queryStartDBC
 const deserializeAws_queryStartDBClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -7220,7 +7220,7 @@ const deserializeAws_queryStartDBClusterCommandError = async (output, context) =
         case "InvalidDBClusterStateFault":
         case "com.amazonaws.rds#InvalidDBClusterStateFault":
             throw await deserializeAws_queryInvalidDBClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         default:
@@ -7250,17 +7250,17 @@ exports.deserializeAws_queryStartDBInstanceCommand = deserializeAws_queryStartDB
 const deserializeAws_queryStartDBInstanceCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "AuthorizationNotFoundFault":
+        case "AuthorizationNotFound":
         case "com.amazonaws.rds#AuthorizationNotFoundFault":
             throw await deserializeAws_queryAuthorizationNotFoundFaultResponse(parsedOutput, context);
         case "DBClusterNotFoundFault":
         case "com.amazonaws.rds#DBClusterNotFoundFault":
             throw await deserializeAws_queryDBClusterNotFoundFaultResponse(parsedOutput, context);
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
         case "DBSubnetGroupDoesNotCoverEnoughAZs":
@@ -7269,13 +7269,13 @@ const deserializeAws_queryStartDBInstanceCommandError = async (output, context)
         case "DBSubnetGroupNotFoundFault":
         case "com.amazonaws.rds#DBSubnetGroupNotFoundFault":
             throw await deserializeAws_queryDBSubnetGroupNotFoundFaultResponse(parsedOutput, context);
-        case "InsufficientDBInstanceCapacityFault":
+        case "InsufficientDBInstanceCapacity":
         case "com.amazonaws.rds#InsufficientDBInstanceCapacityFault":
             throw await deserializeAws_queryInsufficientDBInstanceCapacityFaultResponse(parsedOutput, context);
         case "InvalidDBClusterStateFault":
         case "com.amazonaws.rds#InvalidDBClusterStateFault":
             throw await deserializeAws_queryInvalidDBClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         case "InvalidSubnet":
@@ -7314,23 +7314,23 @@ exports.deserializeAws_queryStartDBInstanceAutomatedBackupsReplicationCommand =
 const deserializeAws_queryStartDBInstanceAutomatedBackupsReplicationCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBInstanceAutomatedBackupQuotaExceededFault":
+        case "DBInstanceAutomatedBackupQuotaExceeded":
         case "com.amazonaws.rds#DBInstanceAutomatedBackupQuotaExceededFault":
             throw await deserializeAws_queryDBInstanceAutomatedBackupQuotaExceededFaultResponse(parsedOutput, context);
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         case "KMSKeyNotAccessibleFault":
         case "com.amazonaws.rds#KMSKeyNotAccessibleFault":
             throw await deserializeAws_queryKMSKeyNotAccessibleFaultResponse(parsedOutput, context);
-        case "StorageTypeNotSupportedFault":
+        case "StorageTypeNotSupported":
         case "com.amazonaws.rds#StorageTypeNotSupportedFault":
             throw await deserializeAws_queryStorageTypeNotSupportedFaultResponse(parsedOutput, context);
         default:
@@ -7360,29 +7360,29 @@ exports.deserializeAws_queryStartExportTaskCommand = deserializeAws_queryStartEx
 const deserializeAws_queryStartExportTaskCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DBClusterSnapshotNotFoundFault":
         case "com.amazonaws.rds#DBClusterSnapshotNotFoundFault":
             throw await deserializeAws_queryDBClusterSnapshotNotFoundFaultResponse(parsedOutput, context);
-        case "DBSnapshotNotFoundFault":
+        case "DBSnapshotNotFound":
         case "com.amazonaws.rds#DBSnapshotNotFoundFault":
             throw await deserializeAws_queryDBSnapshotNotFoundFaultResponse(parsedOutput, context);
-        case "ExportTaskAlreadyExistsFault":
+        case "ExportTaskAlreadyExists":
         case "com.amazonaws.rds#ExportTaskAlreadyExistsFault":
             throw await deserializeAws_queryExportTaskAlreadyExistsFaultResponse(parsedOutput, context);
-        case "IamRoleMissingPermissionsFault":
+        case "IamRoleMissingPermissions":
         case "com.amazonaws.rds#IamRoleMissingPermissionsFault":
             throw await deserializeAws_queryIamRoleMissingPermissionsFaultResponse(parsedOutput, context);
-        case "IamRoleNotFoundFault":
+        case "IamRoleNotFound":
         case "com.amazonaws.rds#IamRoleNotFoundFault":
             throw await deserializeAws_queryIamRoleNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidExportOnlyFault":
+        case "InvalidExportOnly":
         case "com.amazonaws.rds#InvalidExportOnlyFault":
             throw await deserializeAws_queryInvalidExportOnlyFaultResponse(parsedOutput, context);
-        case "InvalidExportSourceStateFault":
+        case "InvalidExportSourceState":
         case "com.amazonaws.rds#InvalidExportSourceStateFault":
             throw await deserializeAws_queryInvalidExportSourceStateFaultResponse(parsedOutput, context);
         case "InvalidS3BucketFault":
@@ -7418,20 +7418,20 @@ exports.deserializeAws_queryStopActivityStreamCommand = deserializeAws_queryStop
 const deserializeAws_queryStopActivityStreamCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DBClusterNotFoundFault":
         case "com.amazonaws.rds#DBClusterNotFoundFault":
             throw await deserializeAws_queryDBClusterNotFoundFaultResponse(parsedOutput, context);
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
         case "InvalidDBClusterStateFault":
         case "com.amazonaws.rds#InvalidDBClusterStateFault":
             throw await deserializeAws_queryInvalidDBClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         case "ResourceNotFoundFault":
@@ -7464,7 +7464,7 @@ exports.deserializeAws_queryStopDBClusterCommand = deserializeAws_queryStopDBClu
 const deserializeAws_queryStopDBClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -7474,7 +7474,7 @@ const deserializeAws_queryStopDBClusterCommandError = async (output, context) =>
         case "InvalidDBClusterStateFault":
         case "com.amazonaws.rds#InvalidDBClusterStateFault":
             throw await deserializeAws_queryInvalidDBClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         default:
@@ -7504,23 +7504,23 @@ exports.deserializeAws_queryStopDBInstanceCommand = deserializeAws_queryStopDBIn
 const deserializeAws_queryStopDBInstanceCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
-        case "DBSnapshotAlreadyExistsFault":
+        case "DBSnapshotAlreadyExists":
         case "com.amazonaws.rds#DBSnapshotAlreadyExistsFault":
             throw await deserializeAws_queryDBSnapshotAlreadyExistsFaultResponse(parsedOutput, context);
         case "InvalidDBClusterStateFault":
         case "com.amazonaws.rds#InvalidDBClusterStateFault":
             throw await deserializeAws_queryInvalidDBClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
-        case "SnapshotQuotaExceededFault":
+        case "SnapshotQuotaExceeded":
         case "com.amazonaws.rds#SnapshotQuotaExceededFault":
             throw await deserializeAws_querySnapshotQuotaExceededFaultResponse(parsedOutput, context);
         default:
@@ -7550,14 +7550,14 @@ exports.deserializeAws_queryStopDBInstanceAutomatedBackupsReplicationCommand = d
 const deserializeAws_queryStopDBInstanceAutomatedBackupsReplicationCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         default:
@@ -7587,14 +7587,14 @@ exports.deserializeAws_querySwitchoverReadReplicaCommand = deserializeAws_queryS
 const deserializeAws_querySwitchoverReadReplicaCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "DBInstanceNotFoundFault":
+        case "DBInstanceNotFound":
         case "com.amazonaws.rds#DBInstanceNotFoundFault":
             throw await deserializeAws_queryDBInstanceNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidDBInstanceStateFault":
+        case "InvalidDBInstanceState":
         case "com.amazonaws.rds#InvalidDBInstanceStateFault":
             throw await deserializeAws_queryInvalidDBInstanceStateFaultResponse(parsedOutput, context);
         default:
@@ -19352,6 +19352,14 @@ const parseBody = (streamBody, context) => collectBodyString(streamBody, context
     }
     return {};
 });
+const parseErrorBody = async (errorBody, context) => {
+    var _a;
+    const value = await parseBody(errorBody, context);
+    if (value.Error) {
+        value.Error.message = (_a = value.Error.message) !== null && _a !== void 0 ? _a : value.Error.Message;
+    }
+    return value;
+};
 const buildFormUrlencodedString = (formEntries) => Object.entries(formEntries)
     .map(([key, value]) => (0, smithy_client_1.extendedEncodeURIComponent)(key) + "=" + (0, smithy_client_1.extendedEncodeURIComponent)(value))
     .join("&");