diff --git a/integration/user_api_bucket_test.go b/integration/user_api_bucket_test.go
index 6758066fd..7a8acc3eb 100644
--- a/integration/user_api_bucket_test.go
+++ b/integration/user_api_bucket_test.go
@@ -33,8 +33,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/minio/console/models"
 	"github.com/minio/minio-go/v7"
+
+	"github.com/minio/console/models"
 	"github.com/minio/minio-go/v7/pkg/credentials"
 	"github.com/stretchr/testify/assert"
 )
@@ -3182,13 +3183,13 @@ func TestEnableBucketEncryption(t *testing.T) {
 			404, resp.StatusCode, "Status Code is incorrect")
 	}
 	bodyBytes, _ = io.ReadAll(resp.Body)
-	result2 := models.Error{}
+	result2 := models.APIError{}
 	err = json.Unmarshal(bodyBytes, &result2)
 	if err != nil {
 		log.Println(err)
 		assert.Nil(err)
 	}
-	dereferencedPointerDetailedMessage := *result2.DetailedMessage
+	dereferencedPointerDetailedMessage := result2.DetailedMessage
 	assert.Equal("error server side encryption configuration not found", dereferencedPointerDetailedMessage, dereferencedPointerDetailedMessage)
 }
 
diff --git a/models/error.go b/models/api_error.go
similarity index 51%
rename from models/error.go
rename to models/api_error.go
index c982aa899..f9078b532 100644
--- a/models/error.go
+++ b/models/api_error.go
@@ -25,72 +25,34 @@ package models
 import (
 	"context"
 
-	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
-	"github.com/go-openapi/validate"
 )
 
-// Error error
+// APIError Api error
 //
-// swagger:model error
-type Error struct {
-
-	// code
-	Code int32 `json:"code,omitempty"`
+// swagger:model ApiError
+type APIError struct {
 
 	// detailed message
-	// Required: true
-	DetailedMessage *string `json:"detailedMessage"`
+	DetailedMessage string `json:"detailedMessage,omitempty"`
 
 	// message
-	// Required: true
-	Message *string `json:"message"`
+	Message string `json:"message,omitempty"`
 }
 
-// Validate validates this error
-func (m *Error) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateDetailedMessage(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateMessage(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
+// Validate validates this Api error
+func (m *APIError) Validate(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *Error) validateDetailedMessage(formats strfmt.Registry) error {
-
-	if err := validate.Required("detailedMessage", "body", m.DetailedMessage); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *Error) validateMessage(formats strfmt.Registry) error {
-
-	if err := validate.Required("message", "body", m.Message); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// ContextValidate validates this error based on context it is used
-func (m *Error) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+// ContextValidate validates this Api error based on context it is used
+func (m *APIError) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	return nil
 }
 
 // MarshalBinary interface implementation
-func (m *Error) MarshalBinary() ([]byte, error) {
+func (m *APIError) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -98,8 +60,8 @@ func (m *Error) MarshalBinary() ([]byte, error) {
 }
 
 // UnmarshalBinary interface implementation
-func (m *Error) UnmarshalBinary(b []byte) error {
-	var res Error
+func (m *APIError) UnmarshalBinary(b []byte) error {
+	var res APIError
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}
diff --git a/portal-ui/src/api/consoleApi.ts b/portal-ui/src/api/consoleApi.ts
index 34fb5fe48..4aab8f4f6 100644
--- a/portal-ui/src/api/consoleApi.ts
+++ b/portal-ui/src/api/consoleApi.ts
@@ -131,11 +131,9 @@ export interface MakeBucketRequest {
   retention?: PutBucketRetentionRequest;
 }
 
-export interface Error {
-  /** @format int32 */
-  code?: number;
-  message: string;
-  detailedMessage: string;
+export interface ApiError {
+  message?: string;
+  detailedMessage?: string;
 }
 
 export interface User {
@@ -1713,10 +1711,9 @@ export class HttpClient<SecurityDataType = unknown> {
             ? { "Content-Type": type }
             : {}),
         },
-        signal:
-          (cancelToken
-            ? this.createAbortSignal(cancelToken)
-            : requestParams.signal) || null,
+        signal: cancelToken
+          ? this.createAbortSignal(cancelToken)
+          : requestParams.signal,
         body:
           typeof body === "undefined" || body === null
             ? null
@@ -1771,7 +1768,7 @@ export class Api<
      * @request GET:/login
      */
     loginDetail: (params: RequestParams = {}) =>
-      this.request<LoginDetails, Error>({
+      this.request<LoginDetails, ApiError>({
         path: `/login`,
         method: "GET",
         format: "json",
@@ -1787,7 +1784,7 @@ export class Api<
      * @request POST:/login
      */
     login: (body: LoginRequest, params: RequestParams = {}) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/login`,
         method: "POST",
         body: body,
@@ -1807,7 +1804,7 @@ export class Api<
       body: LoginOauth2AuthRequest,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/login/oauth2/auth`,
         method: "POST",
         body: body,
@@ -1826,7 +1823,7 @@ export class Api<
      * @secure
      */
     logout: (body: LogoutRequest, params: RequestParams = {}) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/logout`,
         method: "POST",
         body: body,
@@ -1846,7 +1843,7 @@ export class Api<
      * @secure
      */
     sessionCheck: (params: RequestParams = {}) =>
-      this.request<SessionResponse, Error>({
+      this.request<SessionResponse, ApiError>({
         path: `/session`,
         method: "GET",
         secure: true,
@@ -1864,7 +1861,7 @@ export class Api<
      * @request GET:/check-version
      */
     checkMinIoVersion: (params: RequestParams = {}) =>
-      this.request<CheckVersionResponse, Error>({
+      this.request<CheckVersionResponse, ApiError>({
         path: `/check-version`,
         method: "GET",
         format: "json",
@@ -1885,7 +1882,7 @@ export class Api<
       body: AccountChangePasswordRequest,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/account/change-password`,
         method: "POST",
         body: body,
@@ -1907,7 +1904,7 @@ export class Api<
       body: ChangeUserPasswordRequest,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/account/change-user-password`,
         method: "POST",
         body: body,
@@ -1927,7 +1924,7 @@ export class Api<
      * @secure
      */
     listBuckets: (params: RequestParams = {}) =>
-      this.request<ListBucketsResponse, Error>({
+      this.request<ListBucketsResponse, ApiError>({
         path: `/buckets`,
         method: "GET",
         secure: true,
@@ -1945,7 +1942,7 @@ export class Api<
      * @secure
      */
     makeBucket: (body: MakeBucketRequest, params: RequestParams = {}) =>
-      this.request<MakeBucketsResponse, Error>({
+      this.request<MakeBucketsResponse, ApiError>({
         path: `/buckets`,
         method: "POST",
         body: body,
@@ -1965,7 +1962,7 @@ export class Api<
      * @secure
      */
     bucketInfo: (name: string, params: RequestParams = {}) =>
-      this.request<Bucket, Error>({
+      this.request<Bucket, ApiError>({
         path: `/buckets/${name}`,
         method: "GET",
         secure: true,
@@ -1983,7 +1980,7 @@ export class Api<
      * @secure
      */
     deleteBucket: (name: string, params: RequestParams = {}) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${name}`,
         method: "DELETE",
         secure: true,
@@ -2003,7 +2000,7 @@ export class Api<
       bucketName: string,
       params: RequestParams = {},
     ) =>
-      this.request<GetBucketRetentionConfig, Error>({
+      this.request<GetBucketRetentionConfig, ApiError>({
         path: `/buckets/${bucketName}/retention`,
         method: "GET",
         secure: true,
@@ -2025,7 +2022,7 @@ export class Api<
       body: PutBucketRetentionRequest,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${bucketName}/retention`,
         method: "PUT",
         body: body,
@@ -2055,7 +2052,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<ListObjectsResponse, Error>({
+      this.request<ListObjectsResponse, ApiError>({
         path: `/buckets/${bucketName}/objects`,
         method: "GET",
         query: query,
@@ -2085,7 +2082,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${bucketName}/objects`,
         method: "DELETE",
         query: query,
@@ -2111,7 +2108,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${bucketName}/delete-objects`,
         method: "POST",
         query: query,
@@ -2138,7 +2135,7 @@ export class Api<
       data?: any,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${bucketName}/objects/upload`,
         method: "POST",
         query: query,
@@ -2162,7 +2159,7 @@ export class Api<
       objectList: string[],
       params: RequestParams = {},
     ) =>
-      this.request<File, Error>({
+      this.request<File, ApiError>({
         path: `/buckets/${bucketName}/objects/download-multiple`,
         method: "POST",
         body: objectList,
@@ -2191,7 +2188,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<File, Error>({
+      this.request<File, ApiError>({
         path: `/buckets/${bucketName}/objects/download`,
         method: "GET",
         query: query,
@@ -2217,7 +2214,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<IamEntity, Error>({
+      this.request<IamEntity, ApiError>({
         path: `/buckets/${bucketName}/objects/share`,
         method: "GET",
         query: query,
@@ -2244,7 +2241,7 @@ export class Api<
       body: PutObjectLegalHoldRequest,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${bucketName}/objects/legalhold`,
         method: "PUT",
         query: query,
@@ -2272,7 +2269,7 @@ export class Api<
       body: PutObjectRetentionRequest,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${bucketName}/objects/retention`,
         method: "PUT",
         query: query,
@@ -2299,7 +2296,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${bucketName}/objects/retention`,
         method: "DELETE",
         query: query,
@@ -2325,7 +2322,7 @@ export class Api<
       body: PutObjectTagsRequest,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${bucketName}/objects/tags`,
         method: "PUT",
         query: query,
@@ -2352,7 +2349,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${bucketName}/objects/restore`,
         method: "PUT",
         query: query,
@@ -2376,7 +2373,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<Metadata, Error>({
+      this.request<Metadata, ApiError>({
         path: `/buckets/${bucketName}/objects/metadata`,
         method: "GET",
         query: query,
@@ -2399,7 +2396,7 @@ export class Api<
       body: PutBucketTagsRequest,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${bucketName}/tags`,
         method: "PUT",
         body: body,
@@ -2422,7 +2419,7 @@ export class Api<
       body: SetBucketPolicyRequest,
       params: RequestParams = {},
     ) =>
-      this.request<Bucket, Error>({
+      this.request<Bucket, ApiError>({
         path: `/buckets/${name}/set-policy`,
         method: "PUT",
         body: body,
@@ -2442,7 +2439,7 @@ export class Api<
      * @secure
      */
     getBucketQuota: (name: string, params: RequestParams = {}) =>
-      this.request<BucketQuota, Error>({
+      this.request<BucketQuota, ApiError>({
         path: `/buckets/${name}/quota`,
         method: "GET",
         secure: true,
@@ -2464,7 +2461,7 @@ export class Api<
       body: SetBucketQuota,
       params: RequestParams = {},
     ) =>
-      this.request<Bucket, Error>({
+      this.request<Bucket, ApiError>({
         path: `/buckets/${name}/quota`,
         method: "PUT",
         body: body,
@@ -2493,7 +2490,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<ListBucketEventsResponse, Error>({
+      this.request<ListBucketEventsResponse, ApiError>({
         path: `/buckets/${bucketName}/events`,
         method: "GET",
         query: query,
@@ -2516,7 +2513,7 @@ export class Api<
       body: BucketEventRequest,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${bucketName}/events`,
         method: "POST",
         body: body,
@@ -2540,7 +2537,7 @@ export class Api<
       body: NotificationDeleteRequest,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${bucketName}/events/${arn}`,
         method: "DELETE",
         body: body,
@@ -2559,7 +2556,7 @@ export class Api<
      * @secure
      */
     getBucketReplication: (bucketName: string, params: RequestParams = {}) =>
-      this.request<BucketReplicationResponse, Error>({
+      this.request<BucketReplicationResponse, ApiError>({
         path: `/buckets/${bucketName}/replication`,
         method: "GET",
         secure: true,
@@ -2581,7 +2578,7 @@ export class Api<
       ruleId: string,
       params: RequestParams = {},
     ) =>
-      this.request<BucketReplicationRule, Error>({
+      this.request<BucketReplicationRule, ApiError>({
         path: `/buckets/${bucketName}/replication/${ruleId}`,
         method: "GET",
         secure: true,
@@ -2604,7 +2601,7 @@ export class Api<
       body: MultiBucketReplicationEdit,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${bucketName}/replication/${ruleId}`,
         method: "PUT",
         body: body,
@@ -2627,7 +2624,7 @@ export class Api<
       ruleId: string,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${bucketName}/replication/${ruleId}`,
         method: "DELETE",
         secure: true,
@@ -2647,7 +2644,7 @@ export class Api<
       bucketName: string,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${bucketName}/delete-all-replication-rules`,
         method: "DELETE",
         secure: true,
@@ -2668,7 +2665,7 @@ export class Api<
       rules: BucketReplicationRuleList,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${bucketName}/delete-selected-replication-rules`,
         method: "DELETE",
         body: rules,
@@ -2687,7 +2684,7 @@ export class Api<
      * @secure
      */
     getBucketVersioning: (bucketName: string, params: RequestParams = {}) =>
-      this.request<BucketVersioningResponse, Error>({
+      this.request<BucketVersioningResponse, ApiError>({
         path: `/buckets/${bucketName}/versioning`,
         method: "GET",
         secure: true,
@@ -2709,7 +2706,7 @@ export class Api<
       body: SetBucketVersioning,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${bucketName}/versioning`,
         method: "PUT",
         body: body,
@@ -2731,7 +2728,7 @@ export class Api<
       bucketName: string,
       params: RequestParams = {},
     ) =>
-      this.request<BucketObLockingResponse, Error>({
+      this.request<BucketObLockingResponse, ApiError>({
         path: `/buckets/${bucketName}/object-locking`,
         method: "GET",
         secure: true,
@@ -2753,7 +2750,7 @@ export class Api<
       body: BucketEncryptionRequest,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${bucketName}/encryption/enable`,
         method: "POST",
         body: body,
@@ -2772,7 +2769,7 @@ export class Api<
      * @secure
      */
     disableBucketEncryption: (bucketName: string, params: RequestParams = {}) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${bucketName}/encryption/disable`,
         method: "POST",
         secure: true,
@@ -2789,7 +2786,7 @@ export class Api<
      * @secure
      */
     getBucketEncryptionInfo: (bucketName: string, params: RequestParams = {}) =>
-      this.request<BucketEncryptionInfo, Error>({
+      this.request<BucketEncryptionInfo, ApiError>({
         path: `/buckets/${bucketName}/encryption/info`,
         method: "GET",
         secure: true,
@@ -2807,7 +2804,7 @@ export class Api<
      * @secure
      */
     getBucketLifecycle: (bucketName: string, params: RequestParams = {}) =>
-      this.request<BucketLifecycleResponse, Error>({
+      this.request<BucketLifecycleResponse, ApiError>({
         path: `/buckets/${bucketName}/lifecycle`,
         method: "GET",
         secure: true,
@@ -2829,7 +2826,7 @@ export class Api<
       body: AddBucketLifecycle,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${bucketName}/lifecycle`,
         method: "POST",
         body: body,
@@ -2851,7 +2848,7 @@ export class Api<
       body: AddMultiBucketLifecycle,
       params: RequestParams = {},
     ) =>
-      this.request<MultiLifecycleResult, Error>({
+      this.request<MultiLifecycleResult, ApiError>({
         path: `/buckets/multi-lifecycle`,
         method: "POST",
         body: body,
@@ -2876,7 +2873,7 @@ export class Api<
       body: UpdateBucketLifecycle,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${bucketName}/lifecycle/${lifecycleId}`,
         method: "PUT",
         body: body,
@@ -2899,7 +2896,7 @@ export class Api<
       lifecycleId: string,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/buckets/${bucketName}/lifecycle/${lifecycleId}`,
         method: "DELETE",
         secure: true,
@@ -2923,7 +2920,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<RewindResponse, Error>({
+      this.request<RewindResponse, ApiError>({
         path: `/buckets/${bucketName}/rewind/${date}`,
         method: "GET",
         query: query,
@@ -2946,7 +2943,7 @@ export class Api<
       body: ListExternalBucketsParams,
       params: RequestParams = {},
     ) =>
-      this.request<ListBucketsResponse, Error>({
+      this.request<ListBucketsResponse, ApiError>({
         path: `/list-external-buckets`,
         method: "POST",
         body: body,
@@ -2970,7 +2967,7 @@ export class Api<
       body: MultiBucketReplication,
       params: RequestParams = {},
     ) =>
-      this.request<MultiBucketResponseState, Error>({
+      this.request<MultiBucketResponseState, ApiError>({
         path: `/buckets-replication`,
         method: "POST",
         body: body,
@@ -2999,7 +2996,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<ServiceAccounts, Error>({
+      this.request<ServiceAccounts, ApiError>({
         path: `/service-accounts`,
         method: "GET",
         query: query,
@@ -3021,7 +3018,7 @@ export class Api<
       body: ServiceAccountRequest,
       params: RequestParams = {},
     ) =>
-      this.request<ServiceAccountCreds, Error>({
+      this.request<ServiceAccountCreds, ApiError>({
         path: `/service-accounts`,
         method: "POST",
         body: body,
@@ -3040,7 +3037,7 @@ export class Api<
      * @secure
      */
     deleteServiceAccount: (accessKey: string, params: RequestParams = {}) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/service-accounts/${accessKey}`,
         method: "DELETE",
         secure: true,
@@ -3060,7 +3057,7 @@ export class Api<
       selectedSA: string[],
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/service-accounts/delete-multi`,
         method: "DELETE",
         body: selectedSA,
@@ -3078,7 +3075,7 @@ export class Api<
      * @secure
      */
     getServiceAccountPolicy: (accessKey: string, params: RequestParams = {}) =>
-      this.request<IamEntity, Error>({
+      this.request<IamEntity, ApiError>({
         path: `/service-accounts/${accessKey}/policy`,
         method: "GET",
         secure: true,
@@ -3100,7 +3097,7 @@ export class Api<
       policy: AddServiceAccountPolicyRequest,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/service-accounts/${accessKey}/policy`,
         method: "PUT",
         body: policy,
@@ -3123,7 +3120,7 @@ export class Api<
       body: ServiceAccountRequestCreds,
       params: RequestParams = {},
     ) =>
-      this.request<ServiceAccountCreds, Error>({
+      this.request<ServiceAccountCreds, ApiError>({
         path: `/service-account-credentials`,
         method: "POST",
         body: body,
@@ -3151,7 +3148,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<ListUsersResponse, Error>({
+      this.request<ListUsersResponse, ApiError>({
         path: `/users`,
         method: "GET",
         query: query,
@@ -3170,7 +3167,7 @@ export class Api<
      * @secure
      */
     addUser: (body: AddUserRequest, params: RequestParams = {}) =>
-      this.request<User, Error>({
+      this.request<User, ApiError>({
         path: `/users`,
         method: "POST",
         body: body,
@@ -3193,7 +3190,7 @@ export class Api<
       selectedUsers: string[],
       params: RequestParams = {},
     ) =>
-      this.request<UserServiceAccountSummary, Error>({
+      this.request<UserServiceAccountSummary, ApiError>({
         path: `/users/service-accounts`,
         method: "POST",
         body: selectedUsers,
@@ -3213,7 +3210,7 @@ export class Api<
      * @secure
      */
     getUserInfo: (name: string, params: RequestParams = {}) =>
-      this.request<User, Error>({
+      this.request<User, ApiError>({
         path: `/user/${name}`,
         method: "GET",
         secure: true,
@@ -3235,7 +3232,7 @@ export class Api<
       body: UpdateUser,
       params: RequestParams = {},
     ) =>
-      this.request<User, Error>({
+      this.request<User, ApiError>({
         path: `/user/${name}`,
         method: "PUT",
         body: body,
@@ -3255,7 +3252,7 @@ export class Api<
      * @secure
      */
     removeUser: (name: string, params: RequestParams = {}) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/user/${name}`,
         method: "DELETE",
         secure: true,
@@ -3276,7 +3273,7 @@ export class Api<
       body: UpdateUserGroups,
       params: RequestParams = {},
     ) =>
-      this.request<User, Error>({
+      this.request<User, ApiError>({
         path: `/user/${name}/groups`,
         method: "PUT",
         body: body,
@@ -3296,7 +3293,7 @@ export class Api<
      * @secure
      */
     getUserPolicy: (params: RequestParams = {}) =>
-      this.request<IamEntity, Error>({
+      this.request<IamEntity, ApiError>({
         path: `/user/policy`,
         method: "GET",
         secure: true,
@@ -3314,7 +3311,7 @@ export class Api<
      * @secure
      */
     getSaUserPolicy: (name: string, params: RequestParams = {}) =>
-      this.request<AUserPolicyResponse, Error>({
+      this.request<AUserPolicyResponse, ApiError>({
         path: `/user/${name}/policies`,
         method: "GET",
         secure: true,
@@ -3332,7 +3329,7 @@ export class Api<
      * @secure
      */
     listAUserServiceAccounts: (name: string, params: RequestParams = {}) =>
-      this.request<ServiceAccounts, Error>({
+      this.request<ServiceAccounts, ApiError>({
         path: `/user/${name}/service-accounts`,
         method: "GET",
         secure: true,
@@ -3354,7 +3351,7 @@ export class Api<
       body: ServiceAccountRequest,
       params: RequestParams = {},
     ) =>
-      this.request<ServiceAccountCreds, Error>({
+      this.request<ServiceAccountCreds, ApiError>({
         path: `/user/${name}/service-accounts`,
         method: "POST",
         body: body,
@@ -3377,7 +3374,7 @@ export class Api<
       body: ServiceAccountRequestCreds,
       params: RequestParams = {},
     ) =>
-      this.request<ServiceAccountCreds, Error>({
+      this.request<ServiceAccountCreds, ApiError>({
         path: `/user/${name}/service-account-credentials`,
         method: "POST",
         body: body,
@@ -3397,7 +3394,7 @@ export class Api<
      * @secure
      */
     bulkUpdateUsersGroups: (body: BulkUserGroups, params: RequestParams = {}) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/users-groups-bulk`,
         method: "PUT",
         body: body,
@@ -3425,7 +3422,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<ListGroupsResponse, Error>({
+      this.request<ListGroupsResponse, ApiError>({
         path: `/groups`,
         method: "GET",
         query: query,
@@ -3444,7 +3441,7 @@ export class Api<
      * @secure
      */
     addGroup: (body: AddGroupRequest, params: RequestParams = {}) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/groups`,
         method: "POST",
         body: body,
@@ -3464,7 +3461,7 @@ export class Api<
      * @secure
      */
     groupInfo: (name: string, params: RequestParams = {}) =>
-      this.request<Group, Error>({
+      this.request<Group, ApiError>({
         path: `/group/${name}`,
         method: "GET",
         secure: true,
@@ -3482,7 +3479,7 @@ export class Api<
      * @secure
      */
     removeGroup: (name: string, params: RequestParams = {}) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/group/${name}`,
         method: "DELETE",
         secure: true,
@@ -3503,7 +3500,7 @@ export class Api<
       body: UpdateGroupRequest,
       params: RequestParams = {},
     ) =>
-      this.request<Group, Error>({
+      this.request<Group, ApiError>({
         path: `/group/${name}`,
         method: "PUT",
         body: body,
@@ -3532,7 +3529,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<ListPoliciesResponse, Error>({
+      this.request<ListPoliciesResponse, ApiError>({
         path: `/policies`,
         method: "GET",
         query: query,
@@ -3551,7 +3548,7 @@ export class Api<
      * @secure
      */
     addPolicy: (body: AddPolicyRequest, params: RequestParams = {}) =>
-      this.request<Policy, Error>({
+      this.request<Policy, ApiError>({
         path: `/policies`,
         method: "POST",
         body: body,
@@ -3571,7 +3568,7 @@ export class Api<
      * @secure
      */
     listUsersForPolicy: (policy: string, params: RequestParams = {}) =>
-      this.request<string[], Error>({
+      this.request<string[], ApiError>({
         path: `/policies/${policy}/users`,
         method: "GET",
         secure: true,
@@ -3589,7 +3586,7 @@ export class Api<
      * @secure
      */
     listGroupsForPolicy: (policy: string, params: RequestParams = {}) =>
-      this.request<string[], Error>({
+      this.request<string[], ApiError>({
         path: `/policies/${policy}/groups`,
         method: "GET",
         secure: true,
@@ -3617,7 +3614,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<ListPoliciesResponse, Error>({
+      this.request<ListPoliciesResponse, ApiError>({
         path: `/bucket-policy/${bucket}`,
         method: "GET",
         query: query,
@@ -3641,7 +3638,7 @@ export class Api<
       prefixaccess: PrefixAccessPair,
       params: RequestParams = {},
     ) =>
-      this.request<boolean, Error>({
+      this.request<boolean, ApiError>({
         path: `/bucket/${bucket}/access-rules`,
         method: "PUT",
         body: prefixaccess,
@@ -3670,7 +3667,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<ListAccessRulesResponse, Error>({
+      this.request<ListAccessRulesResponse, ApiError>({
         path: `/bucket/${bucket}/access-rules`,
         method: "GET",
         query: query,
@@ -3693,7 +3690,7 @@ export class Api<
       prefix: PrefixWrapper,
       params: RequestParams = {},
     ) =>
-      this.request<boolean, Error>({
+      this.request<boolean, ApiError>({
         path: `/bucket/${bucket}/access-rules`,
         method: "DELETE",
         body: prefix,
@@ -3723,7 +3720,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<string[], Error>({
+      this.request<string[], ApiError>({
         path: `/bucket-users/${bucket}`,
         method: "GET",
         query: query,
@@ -3743,7 +3740,7 @@ export class Api<
      * @secure
      */
     policyInfo: (name: string, params: RequestParams = {}) =>
-      this.request<Policy, Error>({
+      this.request<Policy, ApiError>({
         path: `/policy/${name}`,
         method: "GET",
         secure: true,
@@ -3761,7 +3758,7 @@ export class Api<
      * @secure
      */
     removePolicy: (name: string, params: RequestParams = {}) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/policy/${name}`,
         method: "DELETE",
         secure: true,
@@ -3787,7 +3784,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<ListConfigResponse, Error>({
+      this.request<ListConfigResponse, ApiError>({
         path: `/configs`,
         method: "GET",
         query: query,
@@ -3806,7 +3803,7 @@ export class Api<
      * @secure
      */
     configInfo: (name: string, params: RequestParams = {}) =>
-      this.request<Configuration[], Error>({
+      this.request<Configuration[], ApiError>({
         path: `/configs/${name}`,
         method: "GET",
         secure: true,
@@ -3828,7 +3825,7 @@ export class Api<
       body: SetConfigRequest,
       params: RequestParams = {},
     ) =>
-      this.request<SetConfigResponse, Error>({
+      this.request<SetConfigResponse, ApiError>({
         path: `/configs/${name}`,
         method: "PUT",
         body: body,
@@ -3848,7 +3845,7 @@ export class Api<
      * @secure
      */
     resetConfig: (name: string, params: RequestParams = {}) =>
-      this.request<SetConfigResponse, Error>({
+      this.request<SetConfigResponse, ApiError>({
         path: `/configs/${name}/reset`,
         method: "POST",
         secure: true,
@@ -3866,7 +3863,7 @@ export class Api<
      * @secure
      */
     exportConfig: (params: RequestParams = {}) =>
-      this.request<ConfigExportResponse, Error>({
+      this.request<ConfigExportResponse, ApiError>({
         path: `/configs/export`,
         method: "GET",
         secure: true,
@@ -3890,7 +3887,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/configs/import`,
         method: "POST",
         body: data,
@@ -3910,7 +3907,7 @@ export class Api<
      * @secure
      */
     setPolicy: (body: SetPolicyNameRequest, params: RequestParams = {}) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/set-policy`,
         method: "PUT",
         body: body,
@@ -3933,7 +3930,7 @@ export class Api<
       body: SetPolicyMultipleNameRequest,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/set-policy-multi`,
         method: "PUT",
         body: body,
@@ -3953,7 +3950,7 @@ export class Api<
      * @secure
      */
     restartService: (params: RequestParams = {}) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/service/restart`,
         method: "POST",
         secure: true,
@@ -3971,7 +3968,7 @@ export class Api<
      * @secure
      */
     profilingStart: (body: ProfilingStartRequest, params: RequestParams = {}) =>
-      this.request<StartProfilingList, Error>({
+      this.request<StartProfilingList, ApiError>({
         path: `/profiling/start`,
         method: "POST",
         body: body,
@@ -3991,7 +3988,7 @@ export class Api<
      * @secure
      */
     profilingStop: (params: RequestParams = {}) =>
-      this.request<File, Error>({
+      this.request<File, ApiError>({
         path: `/profiling/stop`,
         method: "POST",
         secure: true,
@@ -4009,7 +4006,7 @@ export class Api<
      * @secure
      */
     subnetRegToken: (params: RequestParams = {}) =>
-      this.request<SubnetRegTokenResponse, Error>({
+      this.request<SubnetRegTokenResponse, ApiError>({
         path: `/subnet/registration-token`,
         method: "GET",
         secure: true,
@@ -4027,7 +4024,7 @@ export class Api<
      * @secure
      */
     subnetInfo: (params: RequestParams = {}) =>
-      this.request<License, Error>({
+      this.request<License, ApiError>({
         path: `/subnet/info`,
         method: "GET",
         secure: true,
@@ -4050,7 +4047,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<ApiKey, Error>({
+      this.request<ApiKey, ApiError>({
         path: `/subnet/apikey`,
         method: "GET",
         query: query,
@@ -4069,7 +4066,7 @@ export class Api<
      * @secure
      */
     subnetRegister: (body: SubnetRegisterRequest, params: RequestParams = {}) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/subnet/register`,
         method: "POST",
         body: body,
@@ -4088,7 +4085,7 @@ export class Api<
      * @secure
      */
     subnetLogin: (body: SubnetLoginRequest, params: RequestParams = {}) =>
-      this.request<SubnetLoginResponse, Error>({
+      this.request<SubnetLoginResponse, ApiError>({
         path: `/subnet/login`,
         method: "POST",
         body: body,
@@ -4108,7 +4105,7 @@ export class Api<
      * @secure
      */
     subnetLoginMfa: (body: SubnetLoginMFARequest, params: RequestParams = {}) =>
-      this.request<SubnetLoginResponse, Error>({
+      this.request<SubnetLoginResponse, ApiError>({
         path: `/subnet/login/mfa`,
         method: "POST",
         body: body,
@@ -4135,7 +4132,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<AdminInfoResponse, Error>({
+      this.request<AdminInfoResponse, ApiError>({
         path: `/admin/info`,
         method: "GET",
         query: query,
@@ -4163,7 +4160,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<WidgetDetails, Error>({
+      this.request<WidgetDetails, ApiError>({
         path: `/admin/info/widgets/${widgetId}`,
         method: "GET",
         query: query,
@@ -4182,7 +4179,7 @@ export class Api<
      * @secure
      */
     arnList: (params: RequestParams = {}) =>
-      this.request<ArnsResponse, Error>({
+      this.request<ArnsResponse, ApiError>({
         path: `/admin/arns`,
         method: "GET",
         secure: true,
@@ -4200,7 +4197,7 @@ export class Api<
      * @secure
      */
     notificationEndpointList: (params: RequestParams = {}) =>
-      this.request<NotifEndpointResponse, Error>({
+      this.request<NotifEndpointResponse, ApiError>({
         path: `/admin/notification_endpoints`,
         method: "GET",
         secure: true,
@@ -4221,7 +4218,7 @@ export class Api<
       body: NotificationEndpoint,
       params: RequestParams = {},
     ) =>
-      this.request<SetNotificationEndpointResponse, Error>({
+      this.request<SetNotificationEndpointResponse, ApiError>({
         path: `/admin/notification_endpoints`,
         method: "POST",
         body: body,
@@ -4241,7 +4238,7 @@ export class Api<
      * @secure
      */
     getSiteReplicationInfo: (params: RequestParams = {}) =>
-      this.request<SiteReplicationInfoResponse, Error>({
+      this.request<SiteReplicationInfoResponse, ApiError>({
         path: `/admin/site-replication`,
         method: "GET",
         secure: true,
@@ -4262,7 +4259,7 @@ export class Api<
       body: SiteReplicationAddRequest,
       params: RequestParams = {},
     ) =>
-      this.request<SiteReplicationAddResponse, Error>({
+      this.request<SiteReplicationAddResponse, ApiError>({
         path: `/admin/site-replication`,
         method: "POST",
         body: body,
@@ -4282,7 +4279,7 @@ export class Api<
      * @secure
      */
     siteReplicationEdit: (body: PeerInfo, params: RequestParams = {}) =>
-      this.request<PeerSiteEditResponse, Error>({
+      this.request<PeerSiteEditResponse, ApiError>({
         path: `/admin/site-replication`,
         method: "PUT",
         body: body,
@@ -4302,7 +4299,7 @@ export class Api<
      * @secure
      */
     siteReplicationRemove: (body: PeerInfoRemove, params: RequestParams = {}) =>
-      this.request<PeerSiteRemoveResponse, Error>({
+      this.request<PeerSiteRemoveResponse, ApiError>({
         path: `/admin/site-replication`,
         method: "DELETE",
         body: body,
@@ -4350,7 +4347,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<SiteReplicationStatusResponse, Error>({
+      this.request<SiteReplicationStatusResponse, ApiError>({
         path: `/admin/site-replication/status`,
         method: "GET",
         query: query,
@@ -4369,7 +4366,7 @@ export class Api<
      * @secure
      */
     tiersList: (params: RequestParams = {}) =>
-      this.request<TierListResponse, Error>({
+      this.request<TierListResponse, ApiError>({
         path: `/admin/tiers`,
         method: "GET",
         secure: true,
@@ -4387,7 +4384,7 @@ export class Api<
      * @secure
      */
     addTier: (body: Tier, params: RequestParams = {}) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/admin/tiers`,
         method: "POST",
         body: body,
@@ -4410,7 +4407,7 @@ export class Api<
       name: string,
       params: RequestParams = {},
     ) =>
-      this.request<Tier, Error>({
+      this.request<Tier, ApiError>({
         path: `/admin/tiers/${type}/${name}`,
         method: "GET",
         secure: true,
@@ -4433,7 +4430,7 @@ export class Api<
       body: TierCredentialsRequest,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/admin/tiers/${type}/${name}/credentials`,
         method: "PUT",
         body: body,
@@ -4459,7 +4456,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<File, Error>({
+      this.request<File, ApiError>({
         path: `/admin/inspect`,
         method: "GET",
         query: query,
@@ -4478,7 +4475,7 @@ export class Api<
      * @secure
      */
     listNodes: (params: RequestParams = {}) =>
-      this.request<string[], Error>({
+      this.request<string[], ApiError>({
         path: `/nodes`,
         method: "GET",
         secure: true,
@@ -4497,7 +4494,7 @@ export class Api<
      * @secure
      */
     listRemoteBuckets: (params: RequestParams = {}) =>
-      this.request<ListRemoteBucketsResponse, Error>({
+      this.request<ListRemoteBucketsResponse, ApiError>({
         path: `/remote-buckets`,
         method: "GET",
         secure: true,
@@ -4515,7 +4512,7 @@ export class Api<
      * @secure
      */
     addRemoteBucket: (body: CreateRemoteBucket, params: RequestParams = {}) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/remote-buckets`,
         method: "POST",
         body: body,
@@ -4534,7 +4531,7 @@ export class Api<
      * @secure
      */
     remoteBucketDetails: (name: string, params: RequestParams = {}) =>
-      this.request<RemoteBucket, Error>({
+      this.request<RemoteBucket, ApiError>({
         path: `/remote-buckets/${name}`,
         method: "GET",
         secure: true,
@@ -4556,7 +4553,7 @@ export class Api<
       arn: string,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/remote-buckets/${sourceBucketName}/${arn}`,
         method: "DELETE",
         secure: true,
@@ -4593,7 +4590,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<LogSearchResponse, Error>({
+      this.request<LogSearchResponse, ApiError>({
         path: `/logs/search`,
         method: "GET",
         query: query,
@@ -4613,7 +4610,7 @@ export class Api<
      * @secure
      */
     kmsStatus: (params: RequestParams = {}) =>
-      this.request<KmsStatusResponse, Error>({
+      this.request<KmsStatusResponse, ApiError>({
         path: `/kms/status`,
         method: "GET",
         secure: true,
@@ -4631,7 +4628,7 @@ export class Api<
      * @secure
      */
     kmsMetrics: (params: RequestParams = {}) =>
-      this.request<KmsMetricsResponse, Error>({
+      this.request<KmsMetricsResponse, ApiError>({
         path: `/kms/metrics`,
         method: "GET",
         secure: true,
@@ -4649,7 +4646,7 @@ export class Api<
      * @secure
      */
     kmsapIs: (params: RequestParams = {}) =>
-      this.request<KmsAPIsResponse, Error>({
+      this.request<KmsAPIsResponse, ApiError>({
         path: `/kms/apis`,
         method: "GET",
         secure: true,
@@ -4667,7 +4664,7 @@ export class Api<
      * @secure
      */
     kmsVersion: (params: RequestParams = {}) =>
-      this.request<KmsVersionResponse, Error>({
+      this.request<KmsVersionResponse, ApiError>({
         path: `/kms/version`,
         method: "GET",
         secure: true,
@@ -4685,7 +4682,7 @@ export class Api<
      * @secure
      */
     kmsCreateKey: (body: KmsCreateKeyRequest, params: RequestParams = {}) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/kms/keys`,
         method: "POST",
         body: body,
@@ -4710,7 +4707,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<KmsListKeysResponse, Error>({
+      this.request<KmsListKeysResponse, ApiError>({
         path: `/kms/keys`,
         method: "GET",
         query: query,
@@ -4729,7 +4726,7 @@ export class Api<
      * @secure
      */
     kmsKeyStatus: (name: string, params: RequestParams = {}) =>
-      this.request<KmsKeyStatusResponse, Error>({
+      this.request<KmsKeyStatusResponse, ApiError>({
         path: `/kms/keys/${name}`,
         method: "GET",
         secure: true,
@@ -4747,7 +4744,7 @@ export class Api<
      * @secure
      */
     kmsDeleteKey: (name: string, params: RequestParams = {}) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/kms/keys/${name}`,
         method: "DELETE",
         secure: true,
@@ -4768,7 +4765,7 @@ export class Api<
       body: KmsImportKeyRequest,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/kms/keys/${name}/import`,
         method: "POST",
         body: body,
@@ -4787,7 +4784,7 @@ export class Api<
      * @secure
      */
     kmsSetPolicy: (body: KmsSetPolicyRequest, params: RequestParams = {}) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/kms/policies`,
         method: "POST",
         body: body,
@@ -4812,7 +4809,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<KmsListPoliciesResponse, Error>({
+      this.request<KmsListPoliciesResponse, ApiError>({
         path: `/kms/policies`,
         method: "GET",
         query: query,
@@ -4831,7 +4828,7 @@ export class Api<
      * @secure
      */
     kmsGetPolicy: (name: string, params: RequestParams = {}) =>
-      this.request<KmsGetPolicyResponse, Error>({
+      this.request<KmsGetPolicyResponse, ApiError>({
         path: `/kms/policies/${name}`,
         method: "GET",
         secure: true,
@@ -4849,7 +4846,7 @@ export class Api<
      * @secure
      */
     kmsDeletePolicy: (name: string, params: RequestParams = {}) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/kms/policies/${name}`,
         method: "DELETE",
         secure: true,
@@ -4870,7 +4867,7 @@ export class Api<
       body: KmsAssignPolicyRequest,
       params: RequestParams = {},
     ) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/kms/policies/${name}/assign`,
         method: "POST",
         body: body,
@@ -4889,7 +4886,7 @@ export class Api<
      * @secure
      */
     kmsDescribePolicy: (name: string, params: RequestParams = {}) =>
-      this.request<KmsDescribePolicyResponse, Error>({
+      this.request<KmsDescribePolicyResponse, ApiError>({
         path: `/kms/policies/${name}/describe`,
         method: "GET",
         secure: true,
@@ -4907,7 +4904,7 @@ export class Api<
      * @secure
      */
     kmsDeleteIdentity: (name: string, params: RequestParams = {}) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/kms/identities/${name}`,
         method: "DELETE",
         secure: true,
@@ -4924,7 +4921,7 @@ export class Api<
      * @secure
      */
     kmsDescribeIdentity: (name: string, params: RequestParams = {}) =>
-      this.request<KmsDescribeIdentityResponse, Error>({
+      this.request<KmsDescribeIdentityResponse, ApiError>({
         path: `/kms/identities/${name}/describe`,
         method: "GET",
         secure: true,
@@ -4942,7 +4939,7 @@ export class Api<
      * @secure
      */
     kmsDescribeSelfIdentity: (params: RequestParams = {}) =>
-      this.request<KmsDescribeSelfIdentityResponse, Error>({
+      this.request<KmsDescribeSelfIdentityResponse, ApiError>({
         path: `/kms/describe-self/identity`,
         method: "GET",
         secure: true,
@@ -4966,7 +4963,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<KmsListIdentitiesResponse, Error>({
+      this.request<KmsListIdentitiesResponse, ApiError>({
         path: `/kms/identities`,
         method: "GET",
         query: query,
@@ -4990,7 +4987,7 @@ export class Api<
       body: IdpServerConfiguration,
       params: RequestParams = {},
     ) =>
-      this.request<SetIDPResponse, Error>({
+      this.request<SetIDPResponse, ApiError>({
         path: `/idp/${type}`,
         method: "POST",
         body: body,
@@ -5009,7 +5006,7 @@ export class Api<
      * @secure
      */
     listConfigurations: (type: string, params: RequestParams = {}) =>
-      this.request<IdpListConfigurationsResponse, Error>({
+      this.request<IdpListConfigurationsResponse, ApiError>({
         path: `/idp/${type}`,
         method: "GET",
         secure: true,
@@ -5031,7 +5028,7 @@ export class Api<
       type: string,
       params: RequestParams = {},
     ) =>
-      this.request<IdpServerConfiguration, Error>({
+      this.request<IdpServerConfiguration, ApiError>({
         path: `/idp/${type}/${name}`,
         method: "GET",
         secure: true,
@@ -5053,7 +5050,7 @@ export class Api<
       type: string,
       params: RequestParams = {},
     ) =>
-      this.request<SetIDPResponse, Error>({
+      this.request<SetIDPResponse, ApiError>({
         path: `/idp/${type}/${name}`,
         method: "DELETE",
         secure: true,
@@ -5076,7 +5073,7 @@ export class Api<
       body: IdpServerConfiguration,
       params: RequestParams = {},
     ) =>
-      this.request<SetIDPResponse, Error>({
+      this.request<SetIDPResponse, ApiError>({
         path: `/idp/${type}/${name}`,
         method: "PUT",
         body: body,
@@ -5096,7 +5093,7 @@ export class Api<
      * @secure
      */
     getLdapEntities: (body: LdapEntitiesRequest, params: RequestParams = {}) =>
-      this.request<LdapEntities, Error>({
+      this.request<LdapEntities, ApiError>({
         path: `/ldap-entities`,
         method: "POST",
         body: body,
@@ -5129,7 +5126,7 @@ export class Api<
       },
       params: RequestParams = {},
     ) =>
-      this.request<ReleaseListResponse, Error>({
+      this.request<ReleaseListResponse, ApiError>({
         path: `/releases`,
         method: "GET",
         query: query,
@@ -5149,7 +5146,7 @@ export class Api<
      * @secure
      */
     getCallHomeOptionValue: (params: RequestParams = {}) =>
-      this.request<CallHomeGetResponse, Error>({
+      this.request<CallHomeGetResponse, ApiError>({
         path: `/support/callhome`,
         method: "GET",
         secure: true,
@@ -5167,7 +5164,7 @@ export class Api<
      * @secure
      */
     setCallHomeStatus: (body: CallHomeSetStatus, params: RequestParams = {}) =>
-      this.request<void, Error>({
+      this.request<void, ApiError>({
         path: `/support/callhome`,
         method: "PUT",
         body: body,
diff --git a/portal-ui/src/api/errors.ts b/portal-ui/src/api/errors.ts
index fbe355ef4..0f6f4951e 100644
--- a/portal-ui/src/api/errors.ts
+++ b/portal-ui/src/api/errors.ts
@@ -15,20 +15,18 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { ErrorResponseHandler } from "../common/types";
-import { Error } from "./consoleApi";
+import { ApiError } from "./consoleApi";
 
 // errorToHandler translates a swagger error to a ErrorResponseHandler which
 // is legacy, when all API calls are using the swagger API, we can remove this.
-export const errorToHandler = (e: Error): ErrorResponseHandler => {
+export const errorToHandler = (e: ApiError): ErrorResponseHandler => {
   if (!e) {
     return {
-      statusCode: 0,
       errorMessage: "",
       detailedError: "",
     };
   }
   return {
-    statusCode: e.code,
     errorMessage: e.message || "",
     detailedError: e.detailedMessage || "",
   };
diff --git a/portal-ui/src/api/index.ts b/portal-ui/src/api/index.ts
index af5064e1b..4344ae985 100644
--- a/portal-ui/src/api/index.ts
+++ b/portal-ui/src/api/index.ts
@@ -1,4 +1,4 @@
-import { Api, HttpResponse, Error, FullRequestParams } from "./consoleApi";
+import { Api, HttpResponse, FullRequestParams, ApiError } from "./consoleApi";
 
 export let api = new Api();
 api.baseUrl = `${new URL(document.baseURI).pathname}api/v1`;
@@ -25,15 +25,17 @@ api.request = async <T = any, E = any>({
     cancelToken,
     ...params,
   });
-  return internalResp.then(CommonAPIValidation);
+  return internalResp.catch((e) => CommonAPIValidation(e));
 };
 
 export function CommonAPIValidation<D, E>(
   res: HttpResponse<D, E>,
 ): HttpResponse<D, E> {
-  const err = res.error as Error;
-  if (err && err.code === 403 && err.message === "invalid session") {
-    document.location = "/";
+  const err = res.error as ApiError;
+  if (err && res.status === 403 && err.message === "invalid session") {
+    if (window.location.pathname !== "/login") {
+      document.location = "/login";
+    }
   }
-  return res;
+  throw res;
 }
diff --git a/portal-ui/src/screens/Console/Buckets/BucketDetails/EnableBucketEncryption.tsx b/portal-ui/src/screens/Console/Buckets/BucketDetails/EnableBucketEncryption.tsx
index 053672f6e..91adf25e8 100644
--- a/portal-ui/src/screens/Console/Buckets/BucketDetails/EnableBucketEncryption.tsx
+++ b/portal-ui/src/screens/Console/Buckets/BucketDetails/EnableBucketEncryption.tsx
@@ -26,10 +26,9 @@ import {
   Select,
 } from "mds";
 import {
+  ApiError,
   BucketEncryptionInfo,
   BucketEncryptionType,
-  Error,
-  HttpResponse,
   KmsKeyInfo,
 } from "api/consoleApi";
 import { api } from "api";
@@ -108,8 +107,8 @@ const EnableBucketEncryption = ({
           setLoading(false);
           closeModalAndRefresh();
         })
-        .catch(async (res: HttpResponse<void, Error>) => {
-          const err = (await res.json()) as Error;
+        .catch(async (res) => {
+          const err = (await res.json()) as ApiError;
           setLoading(false);
           dispatch(setModalErrorSnackMessage(errorToHandler(err)));
         });
@@ -124,8 +123,8 @@ const EnableBucketEncryption = ({
           closeModalAndRefresh();
         })
 
-        .catch(async (res: HttpResponse<void, Error>) => {
-          const err = (await res.json()) as Error;
+        .catch(async (res) => {
+          const err = (await res.json()) as ApiError;
           setLoading(false);
           dispatch(setModalErrorSnackMessage(errorToHandler(err)));
         });
diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket/AddBucket.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket/AddBucket.tsx
index 661c1827e..64f1bc658 100644
--- a/portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket/AddBucket.tsx
+++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket/AddBucket.tsx
@@ -71,12 +71,7 @@ import { hasPermission } from "../../../../../common/SecureComponent";
 import BucketNamingRules from "./BucketNamingRules";
 import PageHeaderWrapper from "../../../Common/PageHeaderWrapper/PageHeaderWrapper";
 import { api } from "../../../../../api";
-import {
-  Error,
-  HttpResponse,
-  ListBucketsResponse,
-  ObjectRetentionMode,
-} from "../../../../../api/consoleApi";
+import { ObjectRetentionMode } from "../../../../../api/consoleApi";
 import { errorToHandler } from "../../../../../api/errors";
 import HelpMenu from "../../../HelpMenu";
 import CSVMultiSelector from "../../../Common/FormComponents/CSVMultiSelector/CSVMultiSelector";
@@ -183,7 +178,7 @@ const AddBucket = () => {
     const fetchRecords = () => {
       api.buckets
         .listBuckets()
-        .then((res: HttpResponse<ListBucketsResponse, Error>) => {
+        .then((res) => {
           if (res.data) {
             var bucketList: string[] = [];
             if (res.data.buckets != null && res.data.buckets.length > 0) {
diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx
index f8a988dcb..0b34e677a 100644
--- a/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx
+++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx
@@ -48,12 +48,7 @@ import { selFeatures } from "../../consoleSlice";
 import { setLoadingObjects } from "../../ObjectBrowser/objectBrowserSlice";
 import PageHeaderWrapper from "../../Common/PageHeaderWrapper/PageHeaderWrapper";
 import { api } from "../../../../api";
-import {
-  Bucket,
-  Error,
-  HttpResponse,
-  ListBucketsResponse,
-} from "../../../../api/consoleApi";
+import { Bucket } from "../../../../api/consoleApi";
 import { errorToHandler } from "../../../../api/errors";
 import HelpMenu from "../../HelpMenu";
 import AutoColorIcon from "../../Common/Components/AutoColorIcon";
@@ -91,18 +86,16 @@ const ListBuckets = () => {
     if (loading) {
       const fetchRecords = () => {
         setLoading(true);
-        api.buckets
-          .listBuckets()
-          .then((res: HttpResponse<ListBucketsResponse, Error>) => {
-            if (res.data) {
-              setLoading(false);
-              setRecords(res.data.buckets || []);
-              dispatch(setLoadingObjects(true));
-            } else if (res.error) {
-              setLoading(false);
-              dispatch(setErrorSnackMessage(errorToHandler(res.error)));
-            }
-          });
+        api.buckets.listBuckets().then((res) => {
+          if (res.data) {
+            setLoading(false);
+            setRecords(res.data.buckets || []);
+            dispatch(setLoadingObjects(true));
+          } else if (res.error) {
+            setLoading(false);
+            dispatch(setErrorSnackMessage(errorToHandler(res.error)));
+          }
+        });
       };
       fetchRecords();
     }
diff --git a/portal-ui/src/screens/Console/CommandBar.tsx b/portal-ui/src/screens/Console/CommandBar.tsx
index 09268792d..a93327431 100644
--- a/portal-ui/src/screens/Console/CommandBar.tsx
+++ b/portal-ui/src/screens/Console/CommandBar.tsx
@@ -37,12 +37,7 @@ import { Box } from "@mui/material";
 import { MenuExpandedIcon } from "mds";
 import { useSelector } from "react-redux";
 import { selFeatures } from "./consoleSlice";
-import {
-  Bucket,
-  Error,
-  HttpResponse,
-  ListBucketsResponse,
-} from "../../api/consoleApi";
+import { Bucket } from "../../api/consoleApi";
 import { api } from "../../api";
 
 const useStyles = makeStyles((theme: Theme) => ({
@@ -137,13 +132,11 @@ const CommandBar = () => {
   const [buckets, setBuckets] = useState<Bucket[]>([]);
 
   const invokeListBucketsApi = () => {
-    api.buckets
-      .listBuckets()
-      .then((res: HttpResponse<ListBucketsResponse, Error>) => {
-        if (res.data !== undefined) {
-          setBuckets(res.data.buckets || []);
-        }
-      });
+    api.buckets.listBuckets().then((res) => {
+      if (res.data !== undefined) {
+        setBuckets(res.data.buckets || []);
+      }
+    });
   };
 
   const fetchBuckets = useCallback(() => {
diff --git a/portal-ui/src/screens/Console/Configurations/TiersConfiguration/AddTierConfiguration.tsx b/portal-ui/src/screens/Console/Configurations/TiersConfiguration/AddTierConfiguration.tsx
index 2f6518c0b..14f084ce0 100644
--- a/portal-ui/src/screens/Console/Configurations/TiersConfiguration/AddTierConfiguration.tsx
+++ b/portal-ui/src/screens/Console/Configurations/TiersConfiguration/AddTierConfiguration.tsx
@@ -49,7 +49,7 @@ import PageHeaderWrapper from "../../Common/PageHeaderWrapper/PageHeaderWrapper"
 import HelpMenu from "../../HelpMenu";
 import { api } from "api";
 import { errorToHandler } from "api/errors";
-import { Error, HttpResponse } from "api/consoleApi";
+import { ApiError } from "api/consoleApi";
 
 const styles = (theme: Theme) =>
   createStyles({
@@ -198,8 +198,8 @@ const AddTierConfiguration = ({ classes }: IAddNotificationEndpointProps) => {
           setSaving(false);
           navigate(IAM_PAGES.TIERS);
         })
-        .catch(async (res: HttpResponse<void, Error>) => {
-          const err = (await res.json()) as Error;
+        .catch(async (res) => {
+          const err = (await res.json()) as ApiError;
           setSaving(false);
           dispatch(setErrorSnackMessage(errorToHandler(err)));
         });
diff --git a/portal-ui/src/screens/Console/ObjectBrowser/OBBucketList.tsx b/portal-ui/src/screens/Console/ObjectBrowser/OBBucketList.tsx
index bda57e381..a6d129b80 100644
--- a/portal-ui/src/screens/Console/ObjectBrowser/OBBucketList.tsx
+++ b/portal-ui/src/screens/Console/ObjectBrowser/OBBucketList.tsx
@@ -54,12 +54,7 @@ import AButton from "../Common/AButton/AButton";
 import makeStyles from "@mui/styles/makeStyles";
 import { niceBytesInt } from "../../../common/utils";
 import PageHeaderWrapper from "../Common/PageHeaderWrapper/PageHeaderWrapper";
-import {
-  Bucket,
-  Error,
-  HttpResponse,
-  ListBucketsResponse,
-} from "../../../api/consoleApi";
+import { Bucket } from "../../../api/consoleApi";
 import { api } from "../../../api";
 import { errorToHandler } from "../../../api/errors";
 import { setLoadingObjects } from "./objectBrowserSlice";
@@ -104,7 +99,7 @@ const OBListBuckets = () => {
         setLoading(true);
         api.buckets
           .listBuckets()
-          .then((res: HttpResponse<ListBucketsResponse, Error>) => {
+          .then((res) => {
             if (res.data) {
               setLoading(false);
               setRecords(res.data.buckets || []);
diff --git a/portal-ui/src/screens/Console/Policies/AddPolicyScreen.tsx b/portal-ui/src/screens/Console/Policies/AddPolicyScreen.tsx
index fd4c16c68..3d334ccc9 100644
--- a/portal-ui/src/screens/Console/Policies/AddPolicyScreen.tsx
+++ b/portal-ui/src/screens/Console/Policies/AddPolicyScreen.tsx
@@ -18,12 +18,12 @@ import React, { Fragment, useEffect, useState } from "react";
 import {
   AddAccessRuleIcon,
   BackLink,
+  Box,
   Button,
   FormLayout,
-  PageLayout,
-  Box,
   Grid,
   InputBox,
+  PageLayout,
 } from "mds";
 import AddPolicyHelpBox from "./AddPolicyHelpBox";
 import CodeMirrorWrapper from "../Common/FormComponents/CodeMirrorWrapper/CodeMirrorWrapper";
@@ -35,7 +35,6 @@ import { useNavigate } from "react-router-dom";
 import { useAppDispatch } from "../../../store";
 import { emptyPolicy } from "./utils";
 import { api } from "../../../api";
-import { Error, HttpResponse, Policy } from "../../../api/consoleApi";
 
 const AddPolicyScreen = () => {
   const dispatch = useAppDispatch();
@@ -56,11 +55,11 @@ const AddPolicyScreen = () => {
         name: policyName,
         policy: policyDefinition,
       })
-      .then((res: HttpResponse<Policy, Error>) => {
+      .then((res) => {
         setAddLoading(false);
         navigate(`${IAM_PAGES.POLICIES}`);
       })
-      .catch((err: HttpResponse<Policy, Error>) => {
+      .catch((err) => {
         setAddLoading(false);
         dispatch(
           setErrorSnackMessage({
diff --git a/portal-ui/src/screens/Console/Policies/ListPolicies.tsx b/portal-ui/src/screens/Console/Policies/ListPolicies.tsx
index fa0bd0fa6..a95680bd0 100644
--- a/portal-ui/src/screens/Console/Policies/ListPolicies.tsx
+++ b/portal-ui/src/screens/Console/Policies/ListPolicies.tsx
@@ -41,12 +41,7 @@ import {
   hasPermission,
   SecureComponent,
 } from "../../../common/SecureComponent";
-import {
-  Error,
-  HttpResponse,
-  ListPoliciesResponse,
-  Policy,
-} from "../../../api/consoleApi";
+import { Policy } from "../../../api/consoleApi";
 import { encodeURLString } from "../../../common/utils";
 import { setErrorSnackMessage, setHelpName } from "../../../systemSlice";
 import { useAppDispatch } from "../../../store";
@@ -101,7 +96,7 @@ const ListPolicies = () => {
       if (canDisplayPolicies) {
         api.policies
           .listPolicies()
-          .then((res: HttpResponse<ListPoliciesResponse, Error>) => {
+          .then((res) => {
             const policies = res.data.policies ?? [];
 
             policies.sort((pa, pb) => {
diff --git a/portal-ui/src/screens/Console/Policies/PolicyDetails.tsx b/portal-ui/src/screens/Console/Policies/PolicyDetails.tsx
index 8bf9a0b6a..dbed67204 100644
--- a/portal-ui/src/screens/Console/Policies/PolicyDetails.tsx
+++ b/portal-ui/src/screens/Console/Policies/PolicyDetails.tsx
@@ -68,7 +68,7 @@ import { selFeatures } from "../consoleSlice";
 import { useAppDispatch } from "../../../store";
 import TooltipWrapper from "../Common/TooltipWrapper/TooltipWrapper";
 import PageHeaderWrapper from "../Common/PageHeaderWrapper/PageHeaderWrapper";
-import { Error, HttpResponse, Policy } from "../../../api/consoleApi";
+import { Policy } from "../../../api/consoleApi";
 import { api } from "../../../api";
 import HelpMenu from "../HelpMenu";
 import SearchBox from "../Common/SearchBox";
@@ -160,7 +160,7 @@ const PolicyDetails = () => {
           dispatch(setSnackBarMessage("Policy successfully updated"));
           refreshPolicyDetails();
         })
-        .catch((err: HttpResponse<Policy, Error>) => {
+        .catch((err) => {
           setAddLoading(false);
           dispatch(
             setErrorSnackMessage({
@@ -183,7 +183,7 @@ const PolicyDetails = () => {
         if (displayUsers && !ldapIsEnabled) {
           api.policies
             .listUsersForPolicy(encodeURLString(policyName))
-            .then((result: HttpResponse<string[], Error>) => {
+            .then((result) => {
               setUserList(result.data ?? []);
               setLoadingUsers(false);
             })
@@ -202,7 +202,7 @@ const PolicyDetails = () => {
         if (displayGroups && !ldapIsEnabled) {
           api.policies
             .listGroupsForPolicy(encodeURLString(policyName))
-            .then((result: HttpResponse<string[], Error>) => {
+            .then((result) => {
               setGroupList(result.data ?? []);
               setLoadingGroups(false);
             })
@@ -220,7 +220,7 @@ const PolicyDetails = () => {
         if (displayPolicy) {
           api.policy
             .policyInfo(encodeURLString(policyName))
-            .then((result: HttpResponse<Policy, Error>) => {
+            .then((result) => {
               if (result.data) {
                 setPolicy(result.data);
                 setPolicyDefinition(
diff --git a/portal-ui/src/screens/Console/Policies/PolicySelectors.tsx b/portal-ui/src/screens/Console/Policies/PolicySelectors.tsx
index c7c9f8dc9..b9975d4c1 100644
--- a/portal-ui/src/screens/Console/Policies/PolicySelectors.tsx
+++ b/portal-ui/src/screens/Console/Policies/PolicySelectors.tsx
@@ -16,7 +16,7 @@
 
 import React, { Fragment, useCallback, useEffect, useState } from "react";
 import { LinearProgress } from "@mui/material";
-import { DataTable, Grid, Box } from "mds";
+import { Box, DataTable, Grid } from "mds";
 import { policySort } from "../../../utils/sortFunctions";
 import { ErrorResponseHandler } from "../../../common/types";
 import SearchBox from "../Common/SearchBox";
@@ -25,11 +25,6 @@ import { AppState, useAppDispatch } from "../../../store";
 import { setSelectedPolicies } from "../Users/AddUsersSlice";
 import { useSelector } from "react-redux";
 import { api } from "../../../api";
-import {
-  Error,
-  HttpResponse,
-  ListPoliciesResponse,
-} from "../../../api/consoleApi";
 
 interface ISelectPolicyProps {
   selectedPolicy?: string[];
@@ -52,7 +47,7 @@ const PolicySelectors = ({ noTitle = false }: ISelectPolicyProps) => {
 
     api.policies
       .listPolicies()
-      .then((res: HttpResponse<ListPoliciesResponse, Error>) => {
+      .then((res) => {
         const policies = res.data.policies ?? [];
         isLoading(false);
         setRecords(policies.sort(policySort));
diff --git a/portal-ui/src/screens/LoginPage/loginThunks.ts b/portal-ui/src/screens/LoginPage/loginThunks.ts
index 8b74093c3..c617e44a3 100644
--- a/portal-ui/src/screens/LoginPage/loginThunks.ts
+++ b/portal-ui/src/screens/LoginPage/loginThunks.ts
@@ -20,13 +20,7 @@ import { setErrorSnackMessage, userLogged } from "../../systemSlice";
 import { setNavigateTo } from "./loginSlice";
 import { getTargetPath } from "./Login";
 import { api } from "api";
-import {
-  CheckVersionResponse,
-  Error,
-  HttpResponse,
-  LoginDetails,
-  LoginRequest,
-} from "api/consoleApi";
+import { ApiError, LoginRequest } from "api/consoleApi";
 import { errorToHandler } from "api/errors";
 
 export const doLoginAsync = createAsyncThunk(
@@ -52,14 +46,14 @@ export const doLoginAsync = createAsyncThunk(
 
     return api.login
       .login(payload)
-      .then((res: HttpResponse<void, Error>) => {
+      .then((res) => {
         // We set the state in redux
         dispatch(userLogged(true));
         localStorage.setItem("userLoggedIn", accessKey);
         dispatch(setNavigateTo(getTargetPath()));
       })
-      .catch(async (res: HttpResponse<void, Error>) => {
-        const err = (await res.json()) as Error;
+      .catch(async (res) => {
+        const err = (await res.json()) as ApiError;
         dispatch(setErrorSnackMessage(errorToHandler(err)));
         return rejectWithValue(false);
       });
@@ -70,13 +64,13 @@ export const getFetchConfigurationAsync = createAsyncThunk(
   async (_, { dispatch, rejectWithValue }) => {
     return api.login
       .loginDetail()
-      .then((res: HttpResponse<LoginDetails, Error>) => {
+      .then((res) => {
         if (res.data) {
           return res.data;
         }
       })
-      .catch(async (res: HttpResponse<LoginDetails, Error>) => {
-        const err = (await res.json()) as Error;
+      .catch(async (res) => {
+        const err = (await res.json()) as ApiError;
         dispatch(setErrorSnackMessage(errorToHandler(err)));
         return rejectWithValue(false);
       });
@@ -88,13 +82,13 @@ export const getVersionAsync = createAsyncThunk(
   async (_, { getState, rejectWithValue, dispatch }) => {
     return api.checkVersion
       .checkMinIoVersion()
-      .then((res: HttpResponse<CheckVersionResponse, Error>) => {
+      .then((res) => {
         if (res.data !== undefined) {
           return res.data.latest_version;
         }
       })
-      .catch(async (res: HttpResponse<CheckVersionResponse, Error>) => {
-        const err = (await res.json()) as Error;
+      .catch(async (res) => {
+        const err = (await res.json()) as ApiError;
         dispatch(setErrorSnackMessage(errorToHandler(err)));
         return rejectWithValue(false);
       });
diff --git a/portal-ui/src/screens/LoginPage/sessionThunk.ts b/portal-ui/src/screens/LoginPage/sessionThunk.ts
index bff517556..47cae0b3d 100644
--- a/portal-ui/src/screens/LoginPage/sessionThunk.ts
+++ b/portal-ui/src/screens/LoginPage/sessionThunk.ts
@@ -17,12 +17,6 @@
 import { createAsyncThunk } from "@reduxjs/toolkit";
 import { setErrorSnackMessage } from "../../systemSlice";
 import { api } from "api";
-import {
-  Error,
-  HttpResponse,
-  SessionResponse,
-  ListObjectsResponse,
-} from "api/consoleApi";
 import { errorToHandler } from "api/errors";
 import {
   saveSessionResponse,
@@ -32,11 +26,11 @@ import { SessionCallStates } from "../Console/consoleSlice.types";
 
 import {
   globalSetDistributedSetup,
-  setOverrideStyles,
   setAnonymousMode,
+  setOverrideStyles,
+  userLogged,
 } from "../../../src/systemSlice";
 import { getOverrideColorVariants } from "../../utils/stylesUtils";
-import { userLogged } from "../../../src/systemSlice";
 import { AppState } from "../../store";
 
 export const fetchSession = createAsyncThunk(
@@ -48,7 +42,7 @@ export const fetchSession = createAsyncThunk(
 
     return api.session
       .sessionCheck()
-      .then((res: HttpResponse<SessionResponse, Error>) => {
+      .then((res) => {
         dispatch(userLogged(true));
         dispatch(saveSessionResponse(res.data));
         dispatch(globalSetDistributedSetup(res.data.distributedMode || false));
@@ -63,7 +57,7 @@ export const fetchSession = createAsyncThunk(
           }
         }
       })
-      .catch(async (res: HttpResponse<SessionResponse, Error>) => {
+      .catch(async (res) => {
         if (screen === "browser") {
           const bucket = pathnameParts.length >= 3 ? pathnameParts[2] : "";
           // no bucket, no business
@@ -80,7 +74,7 @@ export const fetchSession = createAsyncThunk(
             .then(() => {
               dispatch(setAnonymousMode());
             })
-            .catch((res: HttpResponse<ListObjectsResponse, Error>) => {
+            .catch((res) => {
               dispatch(setErrorSnackMessage(errorToHandler(res.error)));
             })
             .finally(() => {
diff --git a/portal-ui/tests-examples/demo-todo-app.spec.ts b/portal-ui/tests-examples/demo-todo-app.spec.ts
new file mode 100644
index 000000000..9d60868fe
--- /dev/null
+++ b/portal-ui/tests-examples/demo-todo-app.spec.ts
@@ -0,0 +1,505 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2023 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import { test, expect, type Page } from "@playwright/test";
+
+test.beforeEach(async ({ page }) => {
+  await page.goto("https://demo.playwright.dev/todomvc");
+});
+
+const TODO_ITEMS = [
+  "buy some cheese",
+  "feed the cat",
+  "book a doctors appointment",
+];
+
+test.describe("New Todo", () => {
+  test("should allow me to add todo items", async ({ page }) => {
+    // create a new todo locator
+    const newTodo = page.getByPlaceholder("What needs to be done?");
+
+    // Create 1st todo.
+    await newTodo.fill(TODO_ITEMS[0]);
+    await newTodo.press("Enter");
+
+    // Make sure the list only has one todo item.
+    await expect(page.getByTestId("todo-title")).toHaveText([TODO_ITEMS[0]]);
+
+    // Create 2nd todo.
+    await newTodo.fill(TODO_ITEMS[1]);
+    await newTodo.press("Enter");
+
+    // Make sure the list now has two todo items.
+    await expect(page.getByTestId("todo-title")).toHaveText([
+      TODO_ITEMS[0],
+      TODO_ITEMS[1],
+    ]);
+
+    await checkNumberOfTodosInLocalStorage(page, 2);
+  });
+
+  test("should clear text input field when an item is added", async ({
+    page,
+  }) => {
+    // create a new todo locator
+    const newTodo = page.getByPlaceholder("What needs to be done?");
+
+    // Create one todo item.
+    await newTodo.fill(TODO_ITEMS[0]);
+    await newTodo.press("Enter");
+
+    // Check that input is empty.
+    await expect(newTodo).toBeEmpty();
+    await checkNumberOfTodosInLocalStorage(page, 1);
+  });
+
+  test("should append new items to the bottom of the list", async ({
+    page,
+  }) => {
+    // Create 3 items.
+    await createDefaultTodos(page);
+
+    // create a todo count locator
+    const todoCount = page.getByTestId("todo-count");
+
+    // Check test using different methods.
+    await expect(page.getByText("3 items left")).toBeVisible();
+    await expect(todoCount).toHaveText("3 items left");
+    await expect(todoCount).toContainText("3");
+    await expect(todoCount).toHaveText(/3/);
+
+    // Check all items in one call.
+    await expect(page.getByTestId("todo-title")).toHaveText(TODO_ITEMS);
+    await checkNumberOfTodosInLocalStorage(page, 3);
+  });
+});
+
+test.describe("Mark all as completed", () => {
+  test.beforeEach(async ({ page }) => {
+    await createDefaultTodos(page);
+    await checkNumberOfTodosInLocalStorage(page, 3);
+  });
+
+  test.afterEach(async ({ page }) => {
+    await checkNumberOfTodosInLocalStorage(page, 3);
+  });
+
+  test("should allow me to mark all items as completed", async ({ page }) => {
+    // Complete all todos.
+    await page.getByLabel("Mark all as complete").check();
+
+    // Ensure all todos have 'completed' class.
+    await expect(page.getByTestId("todo-item")).toHaveClass([
+      "completed",
+      "completed",
+      "completed",
+    ]);
+    await checkNumberOfCompletedTodosInLocalStorage(page, 3);
+  });
+
+  test("should allow me to clear the complete state of all items", async ({
+    page,
+  }) => {
+    const toggleAll = page.getByLabel("Mark all as complete");
+    // Check and then immediately uncheck.
+    await toggleAll.check();
+    await toggleAll.uncheck();
+
+    // Should be no completed classes.
+    await expect(page.getByTestId("todo-item")).toHaveClass(["", "", ""]);
+  });
+
+  test("complete all checkbox should update state when items are completed / cleared", async ({
+    page,
+  }) => {
+    const toggleAll = page.getByLabel("Mark all as complete");
+    await toggleAll.check();
+    await expect(toggleAll).toBeChecked();
+    await checkNumberOfCompletedTodosInLocalStorage(page, 3);
+
+    // Uncheck first todo.
+    const firstTodo = page.getByTestId("todo-item").nth(0);
+    await firstTodo.getByRole("checkbox").uncheck();
+
+    // Reuse toggleAll locator and make sure its not checked.
+    await expect(toggleAll).not.toBeChecked();
+
+    await firstTodo.getByRole("checkbox").check();
+    await checkNumberOfCompletedTodosInLocalStorage(page, 3);
+
+    // Assert the toggle all is checked again.
+    await expect(toggleAll).toBeChecked();
+  });
+});
+
+test.describe("Item", () => {
+  test("should allow me to mark items as complete", async ({ page }) => {
+    // create a new todo locator
+    const newTodo = page.getByPlaceholder("What needs to be done?");
+
+    // Create two items.
+    for (const item of TODO_ITEMS.slice(0, 2)) {
+      await newTodo.fill(item);
+      await newTodo.press("Enter");
+    }
+
+    // Check first item.
+    const firstTodo = page.getByTestId("todo-item").nth(0);
+    await firstTodo.getByRole("checkbox").check();
+    await expect(firstTodo).toHaveClass("completed");
+
+    // Check second item.
+    const secondTodo = page.getByTestId("todo-item").nth(1);
+    await expect(secondTodo).not.toHaveClass("completed");
+    await secondTodo.getByRole("checkbox").check();
+
+    // Assert completed class.
+    await expect(firstTodo).toHaveClass("completed");
+    await expect(secondTodo).toHaveClass("completed");
+  });
+
+  test("should allow me to un-mark items as complete", async ({ page }) => {
+    // create a new todo locator
+    const newTodo = page.getByPlaceholder("What needs to be done?");
+
+    // Create two items.
+    for (const item of TODO_ITEMS.slice(0, 2)) {
+      await newTodo.fill(item);
+      await newTodo.press("Enter");
+    }
+
+    const firstTodo = page.getByTestId("todo-item").nth(0);
+    const secondTodo = page.getByTestId("todo-item").nth(1);
+    const firstTodoCheckbox = firstTodo.getByRole("checkbox");
+
+    await firstTodoCheckbox.check();
+    await expect(firstTodo).toHaveClass("completed");
+    await expect(secondTodo).not.toHaveClass("completed");
+    await checkNumberOfCompletedTodosInLocalStorage(page, 1);
+
+    await firstTodoCheckbox.uncheck();
+    await expect(firstTodo).not.toHaveClass("completed");
+    await expect(secondTodo).not.toHaveClass("completed");
+    await checkNumberOfCompletedTodosInLocalStorage(page, 0);
+  });
+
+  test("should allow me to edit an item", async ({ page }) => {
+    await createDefaultTodos(page);
+
+    const todoItems = page.getByTestId("todo-item");
+    const secondTodo = todoItems.nth(1);
+    await secondTodo.dblclick();
+    await expect(secondTodo.getByRole("textbox", { name: "Edit" })).toHaveValue(
+      TODO_ITEMS[1],
+    );
+    await secondTodo
+      .getByRole("textbox", { name: "Edit" })
+      .fill("buy some sausages");
+    await secondTodo.getByRole("textbox", { name: "Edit" }).press("Enter");
+
+    // Explicitly assert the new text value.
+    await expect(todoItems).toHaveText([
+      TODO_ITEMS[0],
+      "buy some sausages",
+      TODO_ITEMS[2],
+    ]);
+    await checkTodosInLocalStorage(page, "buy some sausages");
+  });
+});
+
+test.describe("Editing", () => {
+  test.beforeEach(async ({ page }) => {
+    await createDefaultTodos(page);
+    await checkNumberOfTodosInLocalStorage(page, 3);
+  });
+
+  test("should hide other controls when editing", async ({ page }) => {
+    const todoItem = page.getByTestId("todo-item").nth(1);
+    await todoItem.dblclick();
+    await expect(todoItem.getByRole("checkbox")).not.toBeVisible();
+    await expect(
+      todoItem.locator("label", {
+        hasText: TODO_ITEMS[1],
+      }),
+    ).not.toBeVisible();
+    await checkNumberOfTodosInLocalStorage(page, 3);
+  });
+
+  test("should save edits on blur", async ({ page }) => {
+    const todoItems = page.getByTestId("todo-item");
+    await todoItems.nth(1).dblclick();
+    await todoItems
+      .nth(1)
+      .getByRole("textbox", { name: "Edit" })
+      .fill("buy some sausages");
+    await todoItems
+      .nth(1)
+      .getByRole("textbox", { name: "Edit" })
+      .dispatchEvent("blur");
+
+    await expect(todoItems).toHaveText([
+      TODO_ITEMS[0],
+      "buy some sausages",
+      TODO_ITEMS[2],
+    ]);
+    await checkTodosInLocalStorage(page, "buy some sausages");
+  });
+
+  test("should trim entered text", async ({ page }) => {
+    const todoItems = page.getByTestId("todo-item");
+    await todoItems.nth(1).dblclick();
+    await todoItems
+      .nth(1)
+      .getByRole("textbox", { name: "Edit" })
+      .fill("    buy some sausages    ");
+    await todoItems
+      .nth(1)
+      .getByRole("textbox", { name: "Edit" })
+      .press("Enter");
+
+    await expect(todoItems).toHaveText([
+      TODO_ITEMS[0],
+      "buy some sausages",
+      TODO_ITEMS[2],
+    ]);
+    await checkTodosInLocalStorage(page, "buy some sausages");
+  });
+
+  test("should remove the item if an empty text string was entered", async ({
+    page,
+  }) => {
+    const todoItems = page.getByTestId("todo-item");
+    await todoItems.nth(1).dblclick();
+    await todoItems.nth(1).getByRole("textbox", { name: "Edit" }).fill("");
+    await todoItems
+      .nth(1)
+      .getByRole("textbox", { name: "Edit" })
+      .press("Enter");
+
+    await expect(todoItems).toHaveText([TODO_ITEMS[0], TODO_ITEMS[2]]);
+  });
+
+  test("should cancel edits on escape", async ({ page }) => {
+    const todoItems = page.getByTestId("todo-item");
+    await todoItems.nth(1).dblclick();
+    await todoItems
+      .nth(1)
+      .getByRole("textbox", { name: "Edit" })
+      .fill("buy some sausages");
+    await todoItems
+      .nth(1)
+      .getByRole("textbox", { name: "Edit" })
+      .press("Escape");
+    await expect(todoItems).toHaveText(TODO_ITEMS);
+  });
+});
+
+test.describe("Counter", () => {
+  test("should display the current number of todo items", async ({ page }) => {
+    // create a new todo locator
+    const newTodo = page.getByPlaceholder("What needs to be done?");
+
+    // create a todo count locator
+    const todoCount = page.getByTestId("todo-count");
+
+    await newTodo.fill(TODO_ITEMS[0]);
+    await newTodo.press("Enter");
+
+    await expect(todoCount).toContainText("1");
+
+    await newTodo.fill(TODO_ITEMS[1]);
+    await newTodo.press("Enter");
+    await expect(todoCount).toContainText("2");
+
+    await checkNumberOfTodosInLocalStorage(page, 2);
+  });
+});
+
+test.describe("Clear completed button", () => {
+  test.beforeEach(async ({ page }) => {
+    await createDefaultTodos(page);
+  });
+
+  test("should display the correct text", async ({ page }) => {
+    await page.locator(".todo-list li .toggle").first().check();
+    await expect(
+      page.getByRole("button", { name: "Clear completed" }),
+    ).toBeVisible();
+  });
+
+  test("should remove completed items when clicked", async ({ page }) => {
+    const todoItems = page.getByTestId("todo-item");
+    await todoItems.nth(1).getByRole("checkbox").check();
+    await page.getByRole("button", { name: "Clear completed" }).click();
+    await expect(todoItems).toHaveCount(2);
+    await expect(todoItems).toHaveText([TODO_ITEMS[0], TODO_ITEMS[2]]);
+  });
+
+  test("should be hidden when there are no items that are completed", async ({
+    page,
+  }) => {
+    await page.locator(".todo-list li .toggle").first().check();
+    await page.getByRole("button", { name: "Clear completed" }).click();
+    await expect(
+      page.getByRole("button", { name: "Clear completed" }),
+    ).toBeHidden();
+  });
+});
+
+test.describe("Persistence", () => {
+  test("should persist its data", async ({ page }) => {
+    // create a new todo locator
+    const newTodo = page.getByPlaceholder("What needs to be done?");
+
+    for (const item of TODO_ITEMS.slice(0, 2)) {
+      await newTodo.fill(item);
+      await newTodo.press("Enter");
+    }
+
+    const todoItems = page.getByTestId("todo-item");
+    const firstTodoCheck = todoItems.nth(0).getByRole("checkbox");
+    await firstTodoCheck.check();
+    await expect(todoItems).toHaveText([TODO_ITEMS[0], TODO_ITEMS[1]]);
+    await expect(firstTodoCheck).toBeChecked();
+    await expect(todoItems).toHaveClass(["completed", ""]);
+
+    // Ensure there is 1 completed item.
+    await checkNumberOfCompletedTodosInLocalStorage(page, 1);
+
+    // Now reload.
+    await page.reload();
+    await expect(todoItems).toHaveText([TODO_ITEMS[0], TODO_ITEMS[1]]);
+    await expect(firstTodoCheck).toBeChecked();
+    await expect(todoItems).toHaveClass(["completed", ""]);
+  });
+});
+
+test.describe("Routing", () => {
+  test.beforeEach(async ({ page }) => {
+    await createDefaultTodos(page);
+    // make sure the app had a chance to save updated todos in storage
+    // before navigating to a new view, otherwise the items can get lost :(
+    // in some frameworks like Durandal
+    await checkTodosInLocalStorage(page, TODO_ITEMS[0]);
+  });
+
+  test("should allow me to display active items", async ({ page }) => {
+    const todoItem = page.getByTestId("todo-item");
+    await page.getByTestId("todo-item").nth(1).getByRole("checkbox").check();
+
+    await checkNumberOfCompletedTodosInLocalStorage(page, 1);
+    await page.getByRole("link", { name: "Active" }).click();
+    await expect(todoItem).toHaveCount(2);
+    await expect(todoItem).toHaveText([TODO_ITEMS[0], TODO_ITEMS[2]]);
+  });
+
+  test("should respect the back button", async ({ page }) => {
+    const todoItem = page.getByTestId("todo-item");
+    await page.getByTestId("todo-item").nth(1).getByRole("checkbox").check();
+
+    await checkNumberOfCompletedTodosInLocalStorage(page, 1);
+
+    await test.step("Showing all items", async () => {
+      await page.getByRole("link", { name: "All" }).click();
+      await expect(todoItem).toHaveCount(3);
+    });
+
+    await test.step("Showing active items", async () => {
+      await page.getByRole("link", { name: "Active" }).click();
+    });
+
+    await test.step("Showing completed items", async () => {
+      await page.getByRole("link", { name: "Completed" }).click();
+    });
+
+    await expect(todoItem).toHaveCount(1);
+    await page.goBack();
+    await expect(todoItem).toHaveCount(2);
+    await page.goBack();
+    await expect(todoItem).toHaveCount(3);
+  });
+
+  test("should allow me to display completed items", async ({ page }) => {
+    await page.getByTestId("todo-item").nth(1).getByRole("checkbox").check();
+    await checkNumberOfCompletedTodosInLocalStorage(page, 1);
+    await page.getByRole("link", { name: "Completed" }).click();
+    await expect(page.getByTestId("todo-item")).toHaveCount(1);
+  });
+
+  test("should allow me to display all items", async ({ page }) => {
+    await page.getByTestId("todo-item").nth(1).getByRole("checkbox").check();
+    await checkNumberOfCompletedTodosInLocalStorage(page, 1);
+    await page.getByRole("link", { name: "Active" }).click();
+    await page.getByRole("link", { name: "Completed" }).click();
+    await page.getByRole("link", { name: "All" }).click();
+    await expect(page.getByTestId("todo-item")).toHaveCount(3);
+  });
+
+  test("should highlight the currently applied filter", async ({ page }) => {
+    await expect(page.getByRole("link", { name: "All" })).toHaveClass(
+      "selected",
+    );
+
+    //create locators for active and completed links
+    const activeLink = page.getByRole("link", { name: "Active" });
+    const completedLink = page.getByRole("link", { name: "Completed" });
+    await activeLink.click();
+
+    // Page change - active items.
+    await expect(activeLink).toHaveClass("selected");
+    await completedLink.click();
+
+    // Page change - completed items.
+    await expect(completedLink).toHaveClass("selected");
+  });
+});
+
+async function createDefaultTodos(page: Page) {
+  // create a new todo locator
+  const newTodo = page.getByPlaceholder("What needs to be done?");
+
+  for (const item of TODO_ITEMS) {
+    await newTodo.fill(item);
+    await newTodo.press("Enter");
+  }
+}
+
+async function checkNumberOfTodosInLocalStorage(page: Page, expected: number) {
+  return await page.waitForFunction((e) => {
+    return JSON.parse(localStorage["react-todos"]).length === e;
+  }, expected);
+}
+
+async function checkNumberOfCompletedTodosInLocalStorage(
+  page: Page,
+  expected: number,
+) {
+  return await page.waitForFunction((e) => {
+    return (
+      JSON.parse(localStorage["react-todos"]).filter(
+        (todo: any) => todo.completed,
+      ).length === e
+    );
+  }, expected);
+}
+
+async function checkTodosInLocalStorage(page: Page, title: string) {
+  return await page.waitForFunction((t) => {
+    return JSON.parse(localStorage["react-todos"])
+      .map((todo: any) => todo.title)
+      .includes(t);
+  }, title);
+}
diff --git a/restapi/admin_arns.go b/restapi/admin_arns.go
index d4920f8e1..8c4387293 100644
--- a/restapi/admin_arns.go
+++ b/restapi/admin_arns.go
@@ -31,7 +31,7 @@ func registerAdminArnsHandlers(api *operations.ConsoleAPI) {
 	api.SystemArnListHandler = systemApi.ArnListHandlerFunc(func(params systemApi.ArnListParams, session *models.Principal) middleware.Responder {
 		arnsResp, err := getArnsResponse(session, params)
 		if err != nil {
-			return systemApi.NewArnListDefault(int(err.Code)).WithPayload(err)
+			return systemApi.NewArnListDefault(err.Code).WithPayload(err.APIError)
 		}
 		return systemApi.NewArnListOK().WithPayload(arnsResp)
 	})
@@ -50,7 +50,7 @@ func getArns(ctx context.Context, client MinioAdmin) (*models.ArnsResponse, erro
 }
 
 // getArnsResponse returns a list of active arns in the instance
-func getArnsResponse(session *models.Principal, params systemApi.ArnListParams) (*models.ArnsResponse, *models.Error) {
+func getArnsResponse(session *models.Principal, params systemApi.ArnListParams) (*models.ArnsResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
diff --git a/restapi/admin_config.go b/restapi/admin_config.go
index 50643e083..3c8ba5867 100644
--- a/restapi/admin_config.go
+++ b/restapi/admin_config.go
@@ -36,7 +36,7 @@ func registerConfigHandlers(api *operations.ConsoleAPI) {
 	api.ConfigurationListConfigHandler = cfgApi.ListConfigHandlerFunc(func(params cfgApi.ListConfigParams, session *models.Principal) middleware.Responder {
 		configListResp, err := getListConfigResponse(session, params)
 		if err != nil {
-			return cfgApi.NewListConfigDefault(int(err.Code)).WithPayload(err)
+			return cfgApi.NewListConfigDefault(err.Code).WithPayload(err.APIError)
 		}
 		return cfgApi.NewListConfigOK().WithPayload(configListResp)
 	})
@@ -44,7 +44,7 @@ func registerConfigHandlers(api *operations.ConsoleAPI) {
 	api.ConfigurationConfigInfoHandler = cfgApi.ConfigInfoHandlerFunc(func(params cfgApi.ConfigInfoParams, session *models.Principal) middleware.Responder {
 		config, err := getConfigResponse(session, params)
 		if err != nil {
-			return cfgApi.NewConfigInfoDefault(int(err.Code)).WithPayload(err)
+			return cfgApi.NewConfigInfoDefault(err.Code).WithPayload(err.APIError)
 		}
 		return cfgApi.NewConfigInfoOK().WithPayload(config)
 	})
@@ -52,7 +52,7 @@ func registerConfigHandlers(api *operations.ConsoleAPI) {
 	api.ConfigurationSetConfigHandler = cfgApi.SetConfigHandlerFunc(func(params cfgApi.SetConfigParams, session *models.Principal) middleware.Responder {
 		resp, err := setConfigResponse(session, params)
 		if err != nil {
-			return cfgApi.NewSetConfigDefault(int(err.Code)).WithPayload(err)
+			return cfgApi.NewSetConfigDefault(err.Code).WithPayload(err.APIError)
 		}
 		return cfgApi.NewSetConfigOK().WithPayload(resp)
 	})
@@ -60,7 +60,7 @@ func registerConfigHandlers(api *operations.ConsoleAPI) {
 	api.ConfigurationResetConfigHandler = cfgApi.ResetConfigHandlerFunc(func(params cfgApi.ResetConfigParams, session *models.Principal) middleware.Responder {
 		resp, err := resetConfigResponse(session, params)
 		if err != nil {
-			return cfgApi.NewResetConfigDefault(int(err.Code)).WithPayload(err)
+			return cfgApi.NewResetConfigDefault(err.Code).WithPayload(err.APIError)
 		}
 		return cfgApi.NewResetConfigOK().WithPayload(resp)
 	})
@@ -68,14 +68,14 @@ func registerConfigHandlers(api *operations.ConsoleAPI) {
 	api.ConfigurationExportConfigHandler = cfgApi.ExportConfigHandlerFunc(func(params cfgApi.ExportConfigParams, session *models.Principal) middleware.Responder {
 		resp, err := exportConfigResponse(session, params)
 		if err != nil {
-			return cfgApi.NewExportConfigDefault((int(err.Code))).WithPayload(err)
+			return cfgApi.NewExportConfigDefault(err.Code).WithPayload(err.APIError)
 		}
 		return cfgApi.NewExportConfigOK().WithPayload(resp)
 	})
 	api.ConfigurationPostConfigsImportHandler = cfgApi.PostConfigsImportHandlerFunc(func(params cfgApi.PostConfigsImportParams, session *models.Principal) middleware.Responder {
 		_, err := importConfigResponse(session, params)
 		if err != nil {
-			return cfgApi.NewPostConfigsImportDefault((int(err.Code))).WithPayload(err)
+			return cfgApi.NewPostConfigsImportDefault(err.Code).WithPayload(err.APIError)
 		}
 		return cfgApi.NewPostConfigsImportDefault(200)
 	})
@@ -101,7 +101,7 @@ func listConfig(client MinioAdmin) ([]*models.ConfigDescription, error) {
 }
 
 // getListConfigResponse performs listConfig() and serializes it to the handler's output
-func getListConfigResponse(session *models.Principal, params cfgApi.ListConfigParams) (*models.ListConfigResponse, *models.Error) {
+func getListConfigResponse(session *models.Principal, params cfgApi.ListConfigParams) (*models.ListConfigResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -166,7 +166,7 @@ func getConfig(ctx context.Context, client MinioAdmin, name string) ([]*models.C
 }
 
 // getConfigResponse performs getConfig() and serializes it to the handler's output
-func getConfigResponse(session *models.Principal, params cfgApi.ConfigInfoParams) ([]*models.Configuration, *models.Error) {
+func getConfigResponse(session *models.Principal, params cfgApi.ConfigInfoParams) ([]*models.Configuration, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -230,7 +230,7 @@ func buildConfig(configName *string, kvs []*models.ConfigurationKV) *string {
 }
 
 // setConfigResponse implements setConfig() to be used by handler
-func setConfigResponse(session *models.Principal, params cfgApi.SetConfigParams) (*models.SetConfigResponse, *models.Error) {
+func setConfigResponse(session *models.Principal, params cfgApi.SetConfigParams) (*models.SetConfigResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -256,7 +256,7 @@ func resetConfig(ctx context.Context, client MinioAdmin, configName *string) (er
 }
 
 // resetConfigResponse implements resetConfig() to be used by handler
-func resetConfigResponse(session *models.Principal, params cfgApi.ResetConfigParams) (*models.SetConfigResponse, *models.Error) {
+func resetConfigResponse(session *models.Principal, params cfgApi.ResetConfigParams) (*models.SetConfigResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -277,7 +277,7 @@ func resetConfigResponse(session *models.Principal, params cfgApi.ResetConfigPar
 	return &models.SetConfigResponse{Restart: true}, nil
 }
 
-func exportConfigResponse(session *models.Principal, params cfgApi.ExportConfigParams) (*models.ConfigExportResponse, *models.Error) {
+func exportConfigResponse(session *models.Principal, params cfgApi.ExportConfigParams) (*models.ConfigExportResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -296,7 +296,7 @@ func exportConfigResponse(session *models.Principal, params cfgApi.ExportConfigP
 	}, nil
 }
 
-func importConfigResponse(session *models.Principal, params cfgApi.PostConfigsImportParams) (*cfgApi.PostConfigsImportDefault, *models.Error) {
+func importConfigResponse(session *models.Principal, params cfgApi.PostConfigsImportParams) (*cfgApi.PostConfigsImportDefault, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
diff --git a/restapi/admin_groups.go b/restapi/admin_groups.go
index ccbbf5b34..8b5ab122c 100644
--- a/restapi/admin_groups.go
+++ b/restapi/admin_groups.go
@@ -35,7 +35,7 @@ func registerGroupsHandlers(api *operations.ConsoleAPI) {
 	api.GroupListGroupsHandler = groupApi.ListGroupsHandlerFunc(func(params groupApi.ListGroupsParams, session *models.Principal) middleware.Responder {
 		listGroupsResponse, err := getListGroupsResponse(session, params)
 		if err != nil {
-			return groupApi.NewListGroupsDefault(int(err.Code)).WithPayload(err)
+			return groupApi.NewListGroupsDefault(err.Code).WithPayload(err.APIError)
 		}
 		return groupApi.NewListGroupsOK().WithPayload(listGroupsResponse)
 	})
@@ -43,21 +43,21 @@ func registerGroupsHandlers(api *operations.ConsoleAPI) {
 	api.GroupGroupInfoHandler = groupApi.GroupInfoHandlerFunc(func(params groupApi.GroupInfoParams, session *models.Principal) middleware.Responder {
 		groupInfo, err := getGroupInfoResponse(session, params)
 		if err != nil {
-			return groupApi.NewGroupInfoDefault(int(err.Code)).WithPayload(err)
+			return groupApi.NewGroupInfoDefault(err.Code).WithPayload(err.APIError)
 		}
 		return groupApi.NewGroupInfoOK().WithPayload(groupInfo)
 	})
 	// Add Group
 	api.GroupAddGroupHandler = groupApi.AddGroupHandlerFunc(func(params groupApi.AddGroupParams, session *models.Principal) middleware.Responder {
 		if err := getAddGroupResponse(session, params); err != nil {
-			return groupApi.NewAddGroupDefault(int(err.Code)).WithPayload(err)
+			return groupApi.NewAddGroupDefault(err.Code).WithPayload(err.APIError)
 		}
 		return groupApi.NewAddGroupCreated()
 	})
 	// Remove Group
 	api.GroupRemoveGroupHandler = groupApi.RemoveGroupHandlerFunc(func(params groupApi.RemoveGroupParams, session *models.Principal) middleware.Responder {
 		if err := getRemoveGroupResponse(session, params); err != nil {
-			return groupApi.NewRemoveGroupDefault(int(err.Code)).WithPayload(err)
+			return groupApi.NewRemoveGroupDefault(err.Code).WithPayload(err.APIError)
 		}
 		return groupApi.NewRemoveGroupNoContent()
 	})
@@ -65,14 +65,14 @@ func registerGroupsHandlers(api *operations.ConsoleAPI) {
 	api.GroupUpdateGroupHandler = groupApi.UpdateGroupHandlerFunc(func(params groupApi.UpdateGroupParams, session *models.Principal) middleware.Responder {
 		groupUpdateResp, err := getUpdateGroupResponse(session, params)
 		if err != nil {
-			return groupApi.NewUpdateGroupDefault(int(err.Code)).WithPayload(err)
+			return groupApi.NewUpdateGroupDefault(err.Code).WithPayload(err.APIError)
 		}
 		return groupApi.NewUpdateGroupOK().WithPayload(groupUpdateResp)
 	})
 }
 
 // getListGroupsResponse performs listGroups() and serializes it to the handler's output
-func getListGroupsResponse(session *models.Principal, params groupApi.ListGroupsParams) (*models.ListGroupsResponse, *models.Error) {
+func getListGroupsResponse(session *models.Principal, params groupApi.ListGroupsParams) (*models.ListGroupsResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -107,7 +107,7 @@ func groupInfo(ctx context.Context, client MinioAdmin, group string) (*madmin.Gr
 }
 
 // getGroupInfoResponse performs groupInfo() and serializes it to the handler's output
-func getGroupInfoResponse(session *models.Principal, params groupApi.GroupInfoParams) (*models.Group, *models.Error) {
+func getGroupInfoResponse(session *models.Principal, params groupApi.GroupInfoParams) (*models.Group, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -153,7 +153,7 @@ func addGroup(ctx context.Context, client MinioAdmin, group string, members []st
 }
 
 // getAddGroupResponse performs addGroup() and serializes it to the handler's output
-func getAddGroupResponse(session *models.Principal, params groupApi.AddGroupParams) *models.Error {
+func getAddGroupResponse(session *models.Principal, params groupApi.AddGroupParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	// AddGroup request needed to proceed
@@ -198,7 +198,7 @@ func removeGroup(ctx context.Context, client MinioAdmin, group string) error {
 }
 
 // getRemoveGroupResponse performs removeGroup() and serializes it to the handler's output
-func getRemoveGroupResponse(session *models.Principal, params groupApi.RemoveGroupParams) *models.Error {
+func getRemoveGroupResponse(session *models.Principal, params groupApi.RemoveGroupParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	if params.Name == "" {
@@ -282,7 +282,7 @@ func setGroupStatus(ctx context.Context, client MinioAdmin, group, status string
 // getUpdateGroupResponse updates a group by adding or removing it's members depending on the request,
 // also sets the group's status if status in the request is different than the current one.
 // Then serializes the output to be used by the handler.
-func getUpdateGroupResponse(session *models.Principal, params groupApi.UpdateGroupParams) (*models.Group, *models.Error) {
+func getUpdateGroupResponse(session *models.Principal, params groupApi.UpdateGroupParams) (*models.Group, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	if params.Name == "" {
diff --git a/restapi/admin_idp.go b/restapi/admin_idp.go
index ceebf53b9..7eca86952 100644
--- a/restapi/admin_idp.go
+++ b/restapi/admin_idp.go
@@ -26,7 +26,7 @@ import (
 	"github.com/minio/console/models"
 	"github.com/minio/console/restapi/operations"
 	"github.com/minio/console/restapi/operations/idp"
-	madmin "github.com/minio/madmin-go/v3"
+	"github.com/minio/madmin-go/v3"
 )
 
 var errInvalidIDPType = fmt.Errorf("IDP type must be one of %v", madmin.ValidIDPConfigTypes)
@@ -35,48 +35,48 @@ func registerIDPHandlers(api *operations.ConsoleAPI) {
 	api.IdpCreateConfigurationHandler = idp.CreateConfigurationHandlerFunc(func(params idp.CreateConfigurationParams, session *models.Principal) middleware.Responder {
 		response, err := createIDPConfigurationResponse(session, params)
 		if err != nil {
-			return idp.NewCreateConfigurationDefault(int(err.Code)).WithPayload(err)
+			return idp.NewCreateConfigurationDefault(err.Code).WithPayload(err.APIError)
 		}
 		return idp.NewCreateConfigurationCreated().WithPayload(response)
 	})
 	api.IdpUpdateConfigurationHandler = idp.UpdateConfigurationHandlerFunc(func(params idp.UpdateConfigurationParams, session *models.Principal) middleware.Responder {
 		response, err := updateIDPConfigurationResponse(session, params)
 		if err != nil {
-			return idp.NewUpdateConfigurationDefault(int(err.Code)).WithPayload(err)
+			return idp.NewUpdateConfigurationDefault(err.Code).WithPayload(err.APIError)
 		}
 		return idp.NewUpdateConfigurationOK().WithPayload(response)
 	})
 	api.IdpListConfigurationsHandler = idp.ListConfigurationsHandlerFunc(func(params idp.ListConfigurationsParams, session *models.Principal) middleware.Responder {
 		response, err := listIDPConfigurationsResponse(session, params)
 		if err != nil {
-			return idp.NewListConfigurationsDefault(int(err.Code)).WithPayload(err)
+			return idp.NewListConfigurationsDefault(err.Code).WithPayload(err.APIError)
 		}
 		return idp.NewListConfigurationsOK().WithPayload(response)
 	})
 	api.IdpDeleteConfigurationHandler = idp.DeleteConfigurationHandlerFunc(func(params idp.DeleteConfigurationParams, session *models.Principal) middleware.Responder {
 		response, err := deleteIDPConfigurationResponse(session, params)
 		if err != nil {
-			return idp.NewDeleteConfigurationDefault(int(err.Code)).WithPayload(err)
+			return idp.NewDeleteConfigurationDefault(err.Code).WithPayload(err.APIError)
 		}
 		return idp.NewDeleteConfigurationOK().WithPayload(response)
 	})
 	api.IdpGetConfigurationHandler = idp.GetConfigurationHandlerFunc(func(params idp.GetConfigurationParams, session *models.Principal) middleware.Responder {
 		response, err := getIDPConfigurationsResponse(session, params)
 		if err != nil {
-			return idp.NewGetConfigurationDefault(int(err.Code)).WithPayload(err)
+			return idp.NewGetConfigurationDefault(err.Code).WithPayload(err.APIError)
 		}
 		return idp.NewGetConfigurationOK().WithPayload(response)
 	})
 	api.IdpGetLDAPEntitiesHandler = idp.GetLDAPEntitiesHandlerFunc(func(params idp.GetLDAPEntitiesParams, session *models.Principal) middleware.Responder {
 		response, err := getLDAPEntitiesResponse(session, params)
 		if err != nil {
-			return idp.NewGetLDAPEntitiesDefault(int(err.Code)).WithPayload(err)
+			return idp.NewGetLDAPEntitiesDefault(err.Code).WithPayload(err.APIError)
 		}
 		return idp.NewGetLDAPEntitiesOK().WithPayload(response)
 	})
 }
 
-func createIDPConfigurationResponse(session *models.Principal, params idp.CreateConfigurationParams) (*models.SetIDPResponse, *models.Error) {
+func createIDPConfigurationResponse(session *models.Principal, params idp.CreateConfigurationParams) (*models.SetIDPResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -90,7 +90,7 @@ func createIDPConfigurationResponse(session *models.Principal, params idp.Create
 	return &models.SetIDPResponse{Restart: restart}, nil
 }
 
-func updateIDPConfigurationResponse(session *models.Principal, params idp.UpdateConfigurationParams) (*models.SetIDPResponse, *models.Error) {
+func updateIDPConfigurationResponse(session *models.Principal, params idp.UpdateConfigurationParams) (*models.SetIDPResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -115,7 +115,7 @@ func createOrUpdateIDPConfig(ctx context.Context, idpType, name, input string, u
 	return restart, nil
 }
 
-func listIDPConfigurationsResponse(session *models.Principal, params idp.ListConfigurationsParams) (*models.IdpListConfigurationsResponse, *models.Error) {
+func listIDPConfigurationsResponse(session *models.Principal, params idp.ListConfigurationsParams) (*models.IdpListConfigurationsResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -151,7 +151,7 @@ func parseIDPConfigurations(configs []madmin.IDPListItem) (serverConfigs []*mode
 	return serverConfigs
 }
 
-func deleteIDPConfigurationResponse(session *models.Principal, params idp.DeleteConfigurationParams) (*models.SetIDPResponse, *models.Error) {
+func deleteIDPConfigurationResponse(session *models.Principal, params idp.DeleteConfigurationParams) (*models.SetIDPResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -176,7 +176,7 @@ func deleteIDPConfig(ctx context.Context, idpType, name string, client MinioAdmi
 	return restart, nil
 }
 
-func getIDPConfigurationsResponse(session *models.Principal, params idp.GetConfigurationParams) (*models.IdpServerConfiguration, *models.Error) {
+func getIDPConfigurationsResponse(session *models.Principal, params idp.GetConfigurationParams) (*models.IdpServerConfiguration, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -217,7 +217,7 @@ func parseIDPConfigurationsInfo(infoList []madmin.IDPCfgInfo) (results []*models
 	return results
 }
 
-func getLDAPEntitiesResponse(session *models.Principal, params idp.GetLDAPEntitiesParams) (*models.LdapEntities, *models.Error) {
+func getLDAPEntitiesResponse(session *models.Principal, params idp.GetLDAPEntitiesParams) (*models.LdapEntities, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
diff --git a/restapi/admin_info.go b/restapi/admin_info.go
index 19a1d1f87..3e579af0a 100644
--- a/restapi/admin_info.go
+++ b/restapi/admin_info.go
@@ -31,7 +31,6 @@ import (
 	"github.com/minio/console/pkg/utils"
 
 	"github.com/go-openapi/runtime/middleware"
-	"github.com/go-openapi/swag"
 	"github.com/minio/console/models"
 	"github.com/minio/console/restapi/operations"
 	systemApi "github.com/minio/console/restapi/operations/system"
@@ -42,7 +41,7 @@ func registerAdminInfoHandlers(api *operations.ConsoleAPI) {
 	api.SystemAdminInfoHandler = systemApi.AdminInfoHandlerFunc(func(params systemApi.AdminInfoParams, session *models.Principal) middleware.Responder {
 		infoResp, err := getAdminInfoResponse(session, params)
 		if err != nil {
-			return systemApi.NewAdminInfoDefault(int(err.Code)).WithPayload(err)
+			return systemApi.NewAdminInfoDefault(err.Code).WithPayload(err.APIError)
 		}
 		return systemApi.NewAdminInfoOK().WithPayload(infoResp)
 	})
@@ -50,7 +49,7 @@ func registerAdminInfoHandlers(api *operations.ConsoleAPI) {
 	api.SystemDashboardWidgetDetailsHandler = systemApi.DashboardWidgetDetailsHandlerFunc(func(params systemApi.DashboardWidgetDetailsParams, session *models.Principal) middleware.Responder {
 		infoResp, err := getAdminInfoWidgetResponse(params)
 		if err != nil {
-			return systemApi.NewDashboardWidgetDetailsDefault(int(err.Code)).WithPayload(err)
+			return systemApi.NewDashboardWidgetDetailsDefault(err.Code).WithPayload(err.APIError)
 		}
 		return systemApi.NewDashboardWidgetDetailsOK().WithPayload(infoResp)
 	})
@@ -876,7 +875,7 @@ type LabelResults struct {
 }
 
 // getAdminInfoResponse returns the response containing total buckets, objects and usage.
-func getAdminInfoResponse(session *models.Principal, params systemApi.AdminInfoParams) (*models.AdminInfoResponse, *models.Error) {
+func getAdminInfoResponse(session *models.Principal, params systemApi.AdminInfoParams) (*models.AdminInfoResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	prometheusURL := ""
@@ -1013,7 +1012,7 @@ func testPrometheusURL(ctx context.Context, url string) bool {
 	return response.StatusCode == http.StatusOK
 }
 
-func getAdminInfoWidgetResponse(params systemApi.DashboardWidgetDetailsParams) (*models.WidgetDetails, *models.Error) {
+func getAdminInfoWidgetResponse(params systemApi.DashboardWidgetDetailsParams) (*models.WidgetDetails, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	prometheusURL := getPrometheusURL()
@@ -1029,7 +1028,7 @@ func getAdminInfoWidgetResponse(params systemApi.DashboardWidgetDetailsParams) (
 	return getWidgetDetails(ctx, prometheusURL, selector, params.WidgetID, params.Step, params.Start, params.End)
 }
 
-func getWidgetDetails(ctx context.Context, prometheusURL string, selector string, widgetID int32, step *int32, start *int64, end *int64) (*models.WidgetDetails, *models.Error) {
+func getWidgetDetails(ctx context.Context, prometheusURL string, selector string, widgetID int32, step *int32, start *int64, end *int64) (*models.WidgetDetails, *CodedAPIError) {
 	// We test if prometheus URL is reachable. this is meant to avoid unuseful calls and application hang.
 	if !testPrometheusURL(ctx, prometheusURL) {
 		return nil, ErrorWithContext(ctx, errors.New("prometheus URL is unreachable"))
@@ -1173,5 +1172,5 @@ LabelsWaitLoop:
 		return &wdgtResult, nil
 	}
 
-	return nil, &models.Error{Code: 404, Message: swag.String("Widget not found")}
+	return nil, &CodedAPIError{Code: 404, APIError: &models.APIError{Message: "Widget not found"}}
 }
diff --git a/restapi/admin_inspect.go b/restapi/admin_inspect.go
index 06bbdc120..5a55948f8 100644
--- a/restapi/admin_inspect.go
+++ b/restapi/admin_inspect.go
@@ -45,14 +45,14 @@ func registerInspectHandler(api *operations.ConsoleAPI) {
 
 		k, r, err := getInspectResult(principal, &params)
 		if err != nil {
-			return inspectApi.NewInspectDefault(int(err.Code)).WithPayload(err)
+			return inspectApi.NewInspectDefault(err.Code).WithPayload(err.APIError)
 		}
 
 		return middleware.ResponderFunc(processInspectResponse(&params, k, r))
 	})
 }
 
-func getInspectResult(session *models.Principal, params *inspectApi.InspectParams) ([]byte, io.ReadCloser, *models.Error) {
+func getInspectResult(session *models.Principal, params *inspectApi.InspectParams) ([]byte, io.ReadCloser, *CodedAPIError) {
 	ctx := params.HTTPRequest.Context()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
 	if err != nil {
diff --git a/restapi/admin_kms.go b/restapi/admin_kms.go
index 0c6cc316c..d068fe32b 100644
--- a/restapi/admin_kms.go
+++ b/restapi/admin_kms.go
@@ -40,7 +40,7 @@ func registerKMSStatusHandlers(api *operations.ConsoleAPI) {
 	api.KmsKMSStatusHandler = kmsAPI.KMSStatusHandlerFunc(func(params kmsAPI.KMSStatusParams, session *models.Principal) middleware.Responder {
 		resp, err := GetKMSStatusResponse(session, params)
 		if err != nil {
-			return kmsAPI.NewKMSStatusDefault(int(err.Code)).WithPayload(err)
+			return kmsAPI.NewKMSStatusDefault(err.Code).WithPayload(err.APIError)
 		}
 		return kmsAPI.NewKMSStatusOK().WithPayload(resp)
 	})
@@ -48,7 +48,7 @@ func registerKMSStatusHandlers(api *operations.ConsoleAPI) {
 	api.KmsKMSMetricsHandler = kmsAPI.KMSMetricsHandlerFunc(func(params kmsAPI.KMSMetricsParams, session *models.Principal) middleware.Responder {
 		resp, err := GetKMSMetricsResponse(session, params)
 		if err != nil {
-			return kmsAPI.NewKMSMetricsDefault(int(err.Code)).WithPayload(err)
+			return kmsAPI.NewKMSMetricsDefault(err.Code).WithPayload(err.APIError)
 		}
 		return kmsAPI.NewKMSMetricsOK().WithPayload(resp)
 	})
@@ -56,7 +56,7 @@ func registerKMSStatusHandlers(api *operations.ConsoleAPI) {
 	api.KmsKMSAPIsHandler = kmsAPI.KMSAPIsHandlerFunc(func(params kmsAPI.KMSAPIsParams, session *models.Principal) middleware.Responder {
 		resp, err := GetKMSAPIsResponse(session, params)
 		if err != nil {
-			return kmsAPI.NewKMSAPIsDefault(int(err.Code)).WithPayload(err)
+			return kmsAPI.NewKMSAPIsDefault(err.Code).WithPayload(err.APIError)
 		}
 		return kmsAPI.NewKMSAPIsOK().WithPayload(resp)
 	})
@@ -64,13 +64,13 @@ func registerKMSStatusHandlers(api *operations.ConsoleAPI) {
 	api.KmsKMSVersionHandler = kmsAPI.KMSVersionHandlerFunc(func(params kmsAPI.KMSVersionParams, session *models.Principal) middleware.Responder {
 		resp, err := GetKMSVersionResponse(session, params)
 		if err != nil {
-			return kmsAPI.NewKMSVersionDefault(int(err.Code)).WithPayload(err)
+			return kmsAPI.NewKMSVersionDefault(err.Code).WithPayload(err.APIError)
 		}
 		return kmsAPI.NewKMSVersionOK().WithPayload(resp)
 	})
 }
 
-func GetKMSStatusResponse(session *models.Principal, params kmsAPI.KMSStatusParams) (*models.KmsStatusResponse, *models.Error) {
+func GetKMSStatusResponse(session *models.Principal, params kmsAPI.KMSStatusParams) (*models.KmsStatusResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -80,7 +80,7 @@ func GetKMSStatusResponse(session *models.Principal, params kmsAPI.KMSStatusPara
 	return kmsStatus(ctx, AdminClient{Client: mAdmin})
 }
 
-func kmsStatus(ctx context.Context, minioClient MinioAdmin) (*models.KmsStatusResponse, *models.Error) {
+func kmsStatus(ctx context.Context, minioClient MinioAdmin) (*models.KmsStatusResponse, *CodedAPIError) {
 	st, err := minioClient.kmsStatus(ctx)
 	if err != nil {
 		return nil, ErrorWithContext(ctx, err)
@@ -99,7 +99,7 @@ func parseStatusEndpoints(endpoints map[string]madmin.ItemState) (kmsEndpoints [
 	return kmsEndpoints
 }
 
-func GetKMSMetricsResponse(session *models.Principal, params kmsAPI.KMSMetricsParams) (*models.KmsMetricsResponse, *models.Error) {
+func GetKMSMetricsResponse(session *models.Principal, params kmsAPI.KMSMetricsParams) (*models.KmsMetricsResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -109,7 +109,7 @@ func GetKMSMetricsResponse(session *models.Principal, params kmsAPI.KMSMetricsPa
 	return kmsMetrics(ctx, AdminClient{Client: mAdmin})
 }
 
-func kmsMetrics(ctx context.Context, minioClient MinioAdmin) (*models.KmsMetricsResponse, *models.Error) {
+func kmsMetrics(ctx context.Context, minioClient MinioAdmin) (*models.KmsMetricsResponse, *CodedAPIError) {
 	metrics, err := minioClient.kmsMetrics(ctx)
 	if err != nil {
 		return nil, ErrorWithContext(ctx, err)
@@ -143,7 +143,7 @@ func parseHistogram(histogram map[int64]int64) (records []*models.KmsLatencyHist
 	return records
 }
 
-func GetKMSAPIsResponse(session *models.Principal, params kmsAPI.KMSAPIsParams) (*models.KmsAPIsResponse, *models.Error) {
+func GetKMSAPIsResponse(session *models.Principal, params kmsAPI.KMSAPIsParams) (*models.KmsAPIsResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -153,7 +153,7 @@ func GetKMSAPIsResponse(session *models.Principal, params kmsAPI.KMSAPIsParams)
 	return kmsAPIs(ctx, AdminClient{Client: mAdmin})
 }
 
-func kmsAPIs(ctx context.Context, minioClient MinioAdmin) (*models.KmsAPIsResponse, *models.Error) {
+func kmsAPIs(ctx context.Context, minioClient MinioAdmin) (*models.KmsAPIsResponse, *CodedAPIError) {
 	apis, err := minioClient.kmsAPIs(ctx)
 	if err != nil {
 		return nil, ErrorWithContext(ctx, err)
@@ -175,7 +175,7 @@ func parseApis(apis []madmin.KMSAPI) (data []*models.KmsAPI) {
 	return data
 }
 
-func GetKMSVersionResponse(session *models.Principal, params kmsAPI.KMSVersionParams) (*models.KmsVersionResponse, *models.Error) {
+func GetKMSVersionResponse(session *models.Principal, params kmsAPI.KMSVersionParams) (*models.KmsVersionResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -185,7 +185,7 @@ func GetKMSVersionResponse(session *models.Principal, params kmsAPI.KMSVersionPa
 	return kmsVersion(ctx, AdminClient{Client: mAdmin})
 }
 
-func kmsVersion(ctx context.Context, minioClient MinioAdmin) (*models.KmsVersionResponse, *models.Error) {
+func kmsVersion(ctx context.Context, minioClient MinioAdmin) (*models.KmsVersionResponse, *CodedAPIError) {
 	version, err := minioClient.kmsVersion(ctx)
 	if err != nil {
 		return nil, ErrorWithContext(ctx, err)
@@ -199,7 +199,7 @@ func registerKMSKeyHandlers(api *operations.ConsoleAPI) {
 	api.KmsKMSCreateKeyHandler = kmsAPI.KMSCreateKeyHandlerFunc(func(params kmsAPI.KMSCreateKeyParams, session *models.Principal) middleware.Responder {
 		err := GetKMSCreateKeyResponse(session, params)
 		if err != nil {
-			return kmsAPI.NewKMSCreateKeyDefault(int(err.Code)).WithPayload(err)
+			return kmsAPI.NewKMSCreateKeyDefault(err.Code).WithPayload(err.APIError)
 		}
 		return kmsAPI.NewKMSCreateKeyCreated()
 	})
@@ -207,7 +207,7 @@ func registerKMSKeyHandlers(api *operations.ConsoleAPI) {
 	api.KmsKMSImportKeyHandler = kmsAPI.KMSImportKeyHandlerFunc(func(params kmsAPI.KMSImportKeyParams, session *models.Principal) middleware.Responder {
 		err := GetKMSImportKeyResponse(session, params)
 		if err != nil {
-			return kmsAPI.NewKMSImportKeyDefault(int(err.Code)).WithPayload(err)
+			return kmsAPI.NewKMSImportKeyDefault(err.Code).WithPayload(err.APIError)
 		}
 		return kmsAPI.NewKMSImportKeyCreated()
 	})
@@ -215,7 +215,7 @@ func registerKMSKeyHandlers(api *operations.ConsoleAPI) {
 	api.KmsKMSListKeysHandler = kmsAPI.KMSListKeysHandlerFunc(func(params kmsAPI.KMSListKeysParams, session *models.Principal) middleware.Responder {
 		resp, err := GetKMSListKeysResponse(session, params)
 		if err != nil {
-			return kmsAPI.NewKMSListKeysDefault(int(err.Code)).WithPayload(err)
+			return kmsAPI.NewKMSListKeysDefault(err.Code).WithPayload(err.APIError)
 		}
 		return kmsAPI.NewKMSListKeysOK().WithPayload(resp)
 	})
@@ -223,7 +223,7 @@ func registerKMSKeyHandlers(api *operations.ConsoleAPI) {
 	api.KmsKMSKeyStatusHandler = kmsAPI.KMSKeyStatusHandlerFunc(func(params kmsAPI.KMSKeyStatusParams, session *models.Principal) middleware.Responder {
 		resp, err := GetKMSKeyStatusResponse(session, params)
 		if err != nil {
-			return kmsAPI.NewKMSKeyStatusDefault(int(err.Code)).WithPayload(err)
+			return kmsAPI.NewKMSKeyStatusDefault(err.Code).WithPayload(err.APIError)
 		}
 		return kmsAPI.NewKMSKeyStatusOK().WithPayload(resp)
 	})
@@ -231,13 +231,13 @@ func registerKMSKeyHandlers(api *operations.ConsoleAPI) {
 	api.KmsKMSDeleteKeyHandler = kmsAPI.KMSDeleteKeyHandlerFunc(func(params kmsAPI.KMSDeleteKeyParams, session *models.Principal) middleware.Responder {
 		err := GetKMSDeleteKeyResponse(session, params)
 		if err != nil {
-			return kmsAPI.NewKMSDeleteKeyDefault(int(err.Code)).WithPayload(err)
+			return kmsAPI.NewKMSDeleteKeyDefault(err.Code).WithPayload(err.APIError)
 		}
 		return kmsAPI.NewKMSDeleteKeyOK()
 	})
 }
 
-func GetKMSCreateKeyResponse(session *models.Principal, params kmsAPI.KMSCreateKeyParams) *models.Error {
+func GetKMSCreateKeyResponse(session *models.Principal, params kmsAPI.KMSCreateKeyParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -247,14 +247,14 @@ func GetKMSCreateKeyResponse(session *models.Principal, params kmsAPI.KMSCreateK
 	return createKey(ctx, *params.Body.Key, AdminClient{Client: mAdmin})
 }
 
-func createKey(ctx context.Context, key string, minioClient MinioAdmin) *models.Error {
+func createKey(ctx context.Context, key string, minioClient MinioAdmin) *CodedAPIError {
 	if err := minioClient.createKey(ctx, key); err != nil {
 		return ErrorWithContext(ctx, err)
 	}
 	return nil
 }
 
-func GetKMSImportKeyResponse(session *models.Principal, params kmsAPI.KMSImportKeyParams) *models.Error {
+func GetKMSImportKeyResponse(session *models.Principal, params kmsAPI.KMSImportKeyParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -268,14 +268,14 @@ func GetKMSImportKeyResponse(session *models.Principal, params kmsAPI.KMSImportK
 	return importKey(ctx, params.Name, bytes, AdminClient{Client: mAdmin})
 }
 
-func importKey(ctx context.Context, key string, bytes []byte, minioClient MinioAdmin) *models.Error {
+func importKey(ctx context.Context, key string, bytes []byte, minioClient MinioAdmin) *CodedAPIError {
 	if err := minioClient.importKey(ctx, key, bytes); err != nil {
 		return ErrorWithContext(ctx, err)
 	}
 	return nil
 }
 
-func GetKMSListKeysResponse(session *models.Principal, params kmsAPI.KMSListKeysParams) (*models.KmsListKeysResponse, *models.Error) {
+func GetKMSListKeysResponse(session *models.Principal, params kmsAPI.KMSListKeysParams) (*models.KmsListKeysResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -289,7 +289,7 @@ func GetKMSListKeysResponse(session *models.Principal, params kmsAPI.KMSListKeys
 	return listKeys(ctx, pattern, AdminClient{Client: mAdmin})
 }
 
-func listKeys(ctx context.Context, pattern string, minioClient MinioAdmin) (*models.KmsListKeysResponse, *models.Error) {
+func listKeys(ctx context.Context, pattern string, minioClient MinioAdmin) (*models.KmsListKeysResponse, *CodedAPIError) {
 	results, err := minioClient.listKeys(ctx, pattern)
 	if err != nil {
 		return nil, ErrorWithContext(ctx, err)
@@ -308,7 +308,7 @@ func parseKeys(results []madmin.KMSKeyInfo) (data []*models.KmsKeyInfo) {
 	return data
 }
 
-func GetKMSKeyStatusResponse(session *models.Principal, params kmsAPI.KMSKeyStatusParams) (*models.KmsKeyStatusResponse, *models.Error) {
+func GetKMSKeyStatusResponse(session *models.Principal, params kmsAPI.KMSKeyStatusParams) (*models.KmsKeyStatusResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -318,7 +318,7 @@ func GetKMSKeyStatusResponse(session *models.Principal, params kmsAPI.KMSKeyStat
 	return keyStatus(ctx, params.Name, AdminClient{Client: mAdmin})
 }
 
-func keyStatus(ctx context.Context, key string, minioClient MinioAdmin) (*models.KmsKeyStatusResponse, *models.Error) {
+func keyStatus(ctx context.Context, key string, minioClient MinioAdmin) (*models.KmsKeyStatusResponse, *CodedAPIError) {
 	ks, err := minioClient.keyStatus(ctx, key)
 	if err != nil {
 		return nil, ErrorWithContext(ctx, err)
@@ -330,7 +330,7 @@ func keyStatus(ctx context.Context, key string, minioClient MinioAdmin) (*models
 	}, nil
 }
 
-func GetKMSDeleteKeyResponse(session *models.Principal, params kmsAPI.KMSDeleteKeyParams) *models.Error {
+func GetKMSDeleteKeyResponse(session *models.Principal, params kmsAPI.KMSDeleteKeyParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -340,7 +340,7 @@ func GetKMSDeleteKeyResponse(session *models.Principal, params kmsAPI.KMSDeleteK
 	return deleteKey(ctx, params.Name, AdminClient{Client: mAdmin})
 }
 
-func deleteKey(ctx context.Context, key string, minioClient MinioAdmin) *models.Error {
+func deleteKey(ctx context.Context, key string, minioClient MinioAdmin) *CodedAPIError {
 	if err := minioClient.deleteKey(ctx, key); err != nil {
 		return ErrorWithContext(ctx, err)
 	}
@@ -351,7 +351,7 @@ func registerKMSPolicyHandlers(api *operations.ConsoleAPI) {
 	api.KmsKMSSetPolicyHandler = kmsAPI.KMSSetPolicyHandlerFunc(func(params kmsAPI.KMSSetPolicyParams, session *models.Principal) middleware.Responder {
 		err := GetKMSSetPolicyResponse(session, params)
 		if err != nil {
-			return kmsAPI.NewKMSSetPolicyDefault(int(err.Code)).WithPayload(err)
+			return kmsAPI.NewKMSSetPolicyDefault(err.Code).WithPayload(err.APIError)
 		}
 		return kmsAPI.NewKMSSetPolicyOK()
 	})
@@ -359,7 +359,7 @@ func registerKMSPolicyHandlers(api *operations.ConsoleAPI) {
 	api.KmsKMSAssignPolicyHandler = kmsAPI.KMSAssignPolicyHandlerFunc(func(params kmsAPI.KMSAssignPolicyParams, session *models.Principal) middleware.Responder {
 		err := GetKMSAssignPolicyResponse(session, params)
 		if err != nil {
-			return kmsAPI.NewKMSAssignPolicyDefault(int(err.Code)).WithPayload(err)
+			return kmsAPI.NewKMSAssignPolicyDefault(err.Code).WithPayload(err.APIError)
 		}
 		return kmsAPI.NewKMSAssignPolicyOK()
 	})
@@ -367,7 +367,7 @@ func registerKMSPolicyHandlers(api *operations.ConsoleAPI) {
 	api.KmsKMSDescribePolicyHandler = kmsAPI.KMSDescribePolicyHandlerFunc(func(params kmsAPI.KMSDescribePolicyParams, session *models.Principal) middleware.Responder {
 		resp, err := GetKMSDescribePolicyResponse(session, params)
 		if err != nil {
-			return kmsAPI.NewKMSDescribePolicyDefault(int(err.Code)).WithPayload(err)
+			return kmsAPI.NewKMSDescribePolicyDefault(err.Code).WithPayload(err.APIError)
 		}
 		return kmsAPI.NewKMSDescribePolicyOK().WithPayload(resp)
 	})
@@ -375,7 +375,7 @@ func registerKMSPolicyHandlers(api *operations.ConsoleAPI) {
 	api.KmsKMSGetPolicyHandler = kmsAPI.KMSGetPolicyHandlerFunc(func(params kmsAPI.KMSGetPolicyParams, session *models.Principal) middleware.Responder {
 		resp, err := GetKMSGetPolicyResponse(session, params)
 		if err != nil {
-			return kmsAPI.NewKMSGetPolicyDefault(int(err.Code)).WithPayload(err)
+			return kmsAPI.NewKMSGetPolicyDefault(err.Code).WithPayload(err.APIError)
 		}
 		return kmsAPI.NewKMSGetPolicyOK().WithPayload(resp)
 	})
@@ -383,7 +383,7 @@ func registerKMSPolicyHandlers(api *operations.ConsoleAPI) {
 	api.KmsKMSListPoliciesHandler = kmsAPI.KMSListPoliciesHandlerFunc(func(params kmsAPI.KMSListPoliciesParams, session *models.Principal) middleware.Responder {
 		resp, err := GetKMSListPoliciesResponse(session, params)
 		if err != nil {
-			return kmsAPI.NewKMSListPoliciesDefault(int(err.Code)).WithPayload(err)
+			return kmsAPI.NewKMSListPoliciesDefault(err.Code).WithPayload(err.APIError)
 		}
 		return kmsAPI.NewKMSListPoliciesOK().WithPayload(resp)
 	})
@@ -391,13 +391,13 @@ func registerKMSPolicyHandlers(api *operations.ConsoleAPI) {
 	api.KmsKMSDeletePolicyHandler = kmsAPI.KMSDeletePolicyHandlerFunc(func(params kmsAPI.KMSDeletePolicyParams, session *models.Principal) middleware.Responder {
 		err := GetKMSDeletePolicyResponse(session, params)
 		if err != nil {
-			return kmsAPI.NewKMSDeletePolicyDefault(int(err.Code)).WithPayload(err)
+			return kmsAPI.NewKMSDeletePolicyDefault(err.Code).WithPayload(err.APIError)
 		}
 		return kmsAPI.NewKMSDeletePolicyOK()
 	})
 }
 
-func GetKMSSetPolicyResponse(session *models.Principal, params kmsAPI.KMSSetPolicyParams) *models.Error {
+func GetKMSSetPolicyResponse(session *models.Principal, params kmsAPI.KMSSetPolicyParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -411,14 +411,14 @@ func GetKMSSetPolicyResponse(session *models.Principal, params kmsAPI.KMSSetPoli
 	return setPolicy(ctx, *params.Body.Policy, bytes, AdminClient{Client: mAdmin})
 }
 
-func setPolicy(ctx context.Context, policy string, content []byte, minioClient MinioAdmin) *models.Error {
+func setPolicy(ctx context.Context, policy string, content []byte, minioClient MinioAdmin) *CodedAPIError {
 	if err := minioClient.setKMSPolicy(ctx, policy, content); err != nil {
 		return ErrorWithContext(ctx, err)
 	}
 	return nil
 }
 
-func GetKMSAssignPolicyResponse(session *models.Principal, params kmsAPI.KMSAssignPolicyParams) *models.Error {
+func GetKMSAssignPolicyResponse(session *models.Principal, params kmsAPI.KMSAssignPolicyParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -432,14 +432,14 @@ func GetKMSAssignPolicyResponse(session *models.Principal, params kmsAPI.KMSAssi
 	return assignPolicy(ctx, params.Name, bytes, AdminClient{Client: mAdmin})
 }
 
-func assignPolicy(ctx context.Context, policy string, content []byte, minioClient MinioAdmin) *models.Error {
+func assignPolicy(ctx context.Context, policy string, content []byte, minioClient MinioAdmin) *CodedAPIError {
 	if err := minioClient.assignPolicy(ctx, policy, content); err != nil {
 		return ErrorWithContext(ctx, err)
 	}
 	return nil
 }
 
-func GetKMSDescribePolicyResponse(session *models.Principal, params kmsAPI.KMSDescribePolicyParams) (*models.KmsDescribePolicyResponse, *models.Error) {
+func GetKMSDescribePolicyResponse(session *models.Principal, params kmsAPI.KMSDescribePolicyParams) (*models.KmsDescribePolicyResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -449,7 +449,7 @@ func GetKMSDescribePolicyResponse(session *models.Principal, params kmsAPI.KMSDe
 	return describePolicy(ctx, params.Name, AdminClient{Client: mAdmin})
 }
 
-func describePolicy(ctx context.Context, policy string, minioClient MinioAdmin) (*models.KmsDescribePolicyResponse, *models.Error) {
+func describePolicy(ctx context.Context, policy string, minioClient MinioAdmin) (*models.KmsDescribePolicyResponse, *CodedAPIError) {
 	dp, err := minioClient.describePolicy(ctx, policy)
 	if err != nil {
 		return nil, ErrorWithContext(ctx, err)
@@ -461,7 +461,7 @@ func describePolicy(ctx context.Context, policy string, minioClient MinioAdmin)
 	}, nil
 }
 
-func GetKMSGetPolicyResponse(session *models.Principal, params kmsAPI.KMSGetPolicyParams) (*models.KmsGetPolicyResponse, *models.Error) {
+func GetKMSGetPolicyResponse(session *models.Principal, params kmsAPI.KMSGetPolicyParams) (*models.KmsGetPolicyResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -471,7 +471,7 @@ func GetKMSGetPolicyResponse(session *models.Principal, params kmsAPI.KMSGetPoli
 	return getPolicy(ctx, params.Name, AdminClient{Client: mAdmin})
 }
 
-func getPolicy(ctx context.Context, policy string, minioClient MinioAdmin) (*models.KmsGetPolicyResponse, *models.Error) {
+func getPolicy(ctx context.Context, policy string, minioClient MinioAdmin) (*models.KmsGetPolicyResponse, *CodedAPIError) {
 	p, err := minioClient.getKMSPolicy(ctx, policy)
 	if err != nil {
 		return nil, ErrorWithContext(ctx, err)
@@ -482,7 +482,7 @@ func getPolicy(ctx context.Context, policy string, minioClient MinioAdmin) (*mod
 	}, nil
 }
 
-func GetKMSListPoliciesResponse(session *models.Principal, params kmsAPI.KMSListPoliciesParams) (*models.KmsListPoliciesResponse, *models.Error) {
+func GetKMSListPoliciesResponse(session *models.Principal, params kmsAPI.KMSListPoliciesParams) (*models.KmsListPoliciesResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -496,7 +496,7 @@ func GetKMSListPoliciesResponse(session *models.Principal, params kmsAPI.KMSList
 	return listKMSPolicies(ctx, pattern, AdminClient{Client: mAdmin})
 }
 
-func listKMSPolicies(ctx context.Context, pattern string, minioClient MinioAdmin) (*models.KmsListPoliciesResponse, *models.Error) {
+func listKMSPolicies(ctx context.Context, pattern string, minioClient MinioAdmin) (*models.KmsListPoliciesResponse, *CodedAPIError) {
 	results, err := minioClient.listKMSPolicies(ctx, pattern)
 	if err != nil {
 		return nil, ErrorWithContext(ctx, err)
@@ -515,7 +515,7 @@ func parsePolicies(results []madmin.KMSPolicyInfo) (data []*models.KmsPolicyInfo
 	return data
 }
 
-func GetKMSDeletePolicyResponse(session *models.Principal, params kmsAPI.KMSDeletePolicyParams) *models.Error {
+func GetKMSDeletePolicyResponse(session *models.Principal, params kmsAPI.KMSDeletePolicyParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -525,7 +525,7 @@ func GetKMSDeletePolicyResponse(session *models.Principal, params kmsAPI.KMSDele
 	return deletePolicy(ctx, params.Name, AdminClient{Client: mAdmin})
 }
 
-func deletePolicy(ctx context.Context, policy string, minioClient MinioAdmin) *models.Error {
+func deletePolicy(ctx context.Context, policy string, minioClient MinioAdmin) *CodedAPIError {
 	if err := minioClient.deletePolicy(ctx, policy); err != nil {
 		return ErrorWithContext(ctx, err)
 	}
@@ -536,7 +536,7 @@ func registerKMSIdentityHandlers(api *operations.ConsoleAPI) {
 	api.KmsKMSDescribeIdentityHandler = kmsAPI.KMSDescribeIdentityHandlerFunc(func(params kmsAPI.KMSDescribeIdentityParams, session *models.Principal) middleware.Responder {
 		resp, err := GetKMSDescribeIdentityResponse(session, params)
 		if err != nil {
-			return kmsAPI.NewKMSDescribeIdentityDefault(int(err.Code)).WithPayload(err)
+			return kmsAPI.NewKMSDescribeIdentityDefault(err.Code).WithPayload(err.APIError)
 		}
 		return kmsAPI.NewKMSDescribeIdentityOK().WithPayload(resp)
 	})
@@ -544,7 +544,7 @@ func registerKMSIdentityHandlers(api *operations.ConsoleAPI) {
 	api.KmsKMSDescribeSelfIdentityHandler = kmsAPI.KMSDescribeSelfIdentityHandlerFunc(func(params kmsAPI.KMSDescribeSelfIdentityParams, session *models.Principal) middleware.Responder {
 		resp, err := GetKMSDescribeSelfIdentityResponse(session, params)
 		if err != nil {
-			return kmsAPI.NewKMSDescribeSelfIdentityDefault(int(err.Code)).WithPayload(err)
+			return kmsAPI.NewKMSDescribeSelfIdentityDefault(err.Code).WithPayload(err.APIError)
 		}
 		return kmsAPI.NewKMSDescribeSelfIdentityOK().WithPayload(resp)
 	})
@@ -552,20 +552,20 @@ func registerKMSIdentityHandlers(api *operations.ConsoleAPI) {
 	api.KmsKMSListIdentitiesHandler = kmsAPI.KMSListIdentitiesHandlerFunc(func(params kmsAPI.KMSListIdentitiesParams, session *models.Principal) middleware.Responder {
 		resp, err := GetKMSListIdentitiesResponse(session, params)
 		if err != nil {
-			return kmsAPI.NewKMSListIdentitiesDefault(int(err.Code)).WithPayload(err)
+			return kmsAPI.NewKMSListIdentitiesDefault(err.Code).WithPayload(err.APIError)
 		}
 		return kmsAPI.NewKMSListIdentitiesOK().WithPayload(resp)
 	})
 	api.KmsKMSDeleteIdentityHandler = kmsAPI.KMSDeleteIdentityHandlerFunc(func(params kmsAPI.KMSDeleteIdentityParams, session *models.Principal) middleware.Responder {
 		err := GetKMSDeleteIdentityResponse(session, params)
 		if err != nil {
-			return kmsAPI.NewKMSDeleteIdentityDefault(int(err.Code)).WithPayload(err)
+			return kmsAPI.NewKMSDeleteIdentityDefault(err.Code).WithPayload(err.APIError)
 		}
 		return kmsAPI.NewKMSDeleteIdentityOK()
 	})
 }
 
-func GetKMSDescribeIdentityResponse(session *models.Principal, params kmsAPI.KMSDescribeIdentityParams) (*models.KmsDescribeIdentityResponse, *models.Error) {
+func GetKMSDescribeIdentityResponse(session *models.Principal, params kmsAPI.KMSDescribeIdentityParams) (*models.KmsDescribeIdentityResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -575,7 +575,7 @@ func GetKMSDescribeIdentityResponse(session *models.Principal, params kmsAPI.KMS
 	return describeIdentity(ctx, params.Name, AdminClient{Client: mAdmin})
 }
 
-func describeIdentity(ctx context.Context, identity string, minioClient MinioAdmin) (*models.KmsDescribeIdentityResponse, *models.Error) {
+func describeIdentity(ctx context.Context, identity string, minioClient MinioAdmin) (*models.KmsDescribeIdentityResponse, *CodedAPIError) {
 	i, err := minioClient.describeIdentity(ctx, identity)
 	if err != nil {
 		return nil, ErrorWithContext(ctx, err)
@@ -589,7 +589,7 @@ func describeIdentity(ctx context.Context, identity string, minioClient MinioAdm
 	}, nil
 }
 
-func GetKMSDescribeSelfIdentityResponse(session *models.Principal, params kmsAPI.KMSDescribeSelfIdentityParams) (*models.KmsDescribeSelfIdentityResponse, *models.Error) {
+func GetKMSDescribeSelfIdentityResponse(session *models.Principal, params kmsAPI.KMSDescribeSelfIdentityParams) (*models.KmsDescribeSelfIdentityResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -599,7 +599,7 @@ func GetKMSDescribeSelfIdentityResponse(session *models.Principal, params kmsAPI
 	return describeSelfIdentity(ctx, AdminClient{Client: mAdmin})
 }
 
-func describeSelfIdentity(ctx context.Context, minioClient MinioAdmin) (*models.KmsDescribeSelfIdentityResponse, *models.Error) {
+func describeSelfIdentity(ctx context.Context, minioClient MinioAdmin) (*models.KmsDescribeSelfIdentityResponse, *CodedAPIError) {
 	i, err := minioClient.describeSelfIdentity(ctx)
 	if err != nil {
 		return nil, ErrorWithContext(ctx, err)
@@ -616,7 +616,7 @@ func describeSelfIdentity(ctx context.Context, minioClient MinioAdmin) (*models.
 	}, nil
 }
 
-func GetKMSListIdentitiesResponse(session *models.Principal, params kmsAPI.KMSListIdentitiesParams) (*models.KmsListIdentitiesResponse, *models.Error) {
+func GetKMSListIdentitiesResponse(session *models.Principal, params kmsAPI.KMSListIdentitiesParams) (*models.KmsListIdentitiesResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -630,7 +630,7 @@ func GetKMSListIdentitiesResponse(session *models.Principal, params kmsAPI.KMSLi
 	return listIdentities(ctx, pattern, AdminClient{Client: mAdmin})
 }
 
-func listIdentities(ctx context.Context, pattern string, minioClient MinioAdmin) (*models.KmsListIdentitiesResponse, *models.Error) {
+func listIdentities(ctx context.Context, pattern string, minioClient MinioAdmin) (*models.KmsListIdentitiesResponse, *CodedAPIError) {
 	results, err := minioClient.listIdentities(ctx, pattern)
 	if err != nil {
 		return nil, ErrorWithContext(ctx, err)
@@ -651,7 +651,7 @@ func parseIdentities(results []madmin.KMSIdentityInfo) (data []*models.KmsIdenti
 	return data
 }
 
-func GetKMSDeleteIdentityResponse(session *models.Principal, params kmsAPI.KMSDeleteIdentityParams) *models.Error {
+func GetKMSDeleteIdentityResponse(session *models.Principal, params kmsAPI.KMSDeleteIdentityParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -661,7 +661,7 @@ func GetKMSDeleteIdentityResponse(session *models.Principal, params kmsAPI.KMSDe
 	return deleteIdentity(ctx, params.Name, AdminClient{Client: mAdmin})
 }
 
-func deleteIdentity(ctx context.Context, identity string, minioClient MinioAdmin) *models.Error {
+func deleteIdentity(ctx context.Context, identity string, minioClient MinioAdmin) *CodedAPIError {
 	if err := minioClient.deleteIdentity(ctx, identity); err != nil {
 		return ErrorWithContext(ctx, err)
 	}
diff --git a/restapi/admin_nodes.go b/restapi/admin_nodes.go
index 7ee228753..ec509d947 100644
--- a/restapi/admin_nodes.go
+++ b/restapi/admin_nodes.go
@@ -29,14 +29,14 @@ func registerNodesHandler(api *operations.ConsoleAPI) {
 	api.SystemListNodesHandler = systemApi.ListNodesHandlerFunc(func(params systemApi.ListNodesParams, session *models.Principal) middleware.Responder {
 		listNodesResponse, err := getListNodesResponse(session, params)
 		if err != nil {
-			return systemApi.NewListNodesDefault(int(err.Code)).WithPayload(err)
+			return systemApi.NewListNodesDefault(err.Code).WithPayload(err.APIError)
 		}
 		return systemApi.NewListNodesOK().WithPayload(listNodesResponse)
 	})
 }
 
 // getListNodesResponse returns a list of available node endpoints .
-func getListNodesResponse(session *models.Principal, params systemApi.ListNodesParams) ([]string, *models.Error) {
+func getListNodesResponse(session *models.Principal, params systemApi.ListNodesParams) ([]string, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
diff --git a/restapi/admin_notification_endpoints.go b/restapi/admin_notification_endpoints.go
index 508aa3e5e..d41edb0bd 100644
--- a/restapi/admin_notification_endpoints.go
+++ b/restapi/admin_notification_endpoints.go
@@ -31,7 +31,7 @@ func registerAdminNotificationEndpointsHandlers(api *operations.ConsoleAPI) {
 	api.ConfigurationNotificationEndpointListHandler = configurationApi.NotificationEndpointListHandlerFunc(func(params configurationApi.NotificationEndpointListParams, session *models.Principal) middleware.Responder {
 		notifEndpoints, err := getNotificationEndpointsResponse(session, params)
 		if err != nil {
-			return configurationApi.NewNotificationEndpointListDefault(int(err.Code)).WithPayload(err)
+			return configurationApi.NewNotificationEndpointListDefault(err.Code).WithPayload(err.APIError)
 		}
 		return configurationApi.NewNotificationEndpointListOK().WithPayload(notifEndpoints)
 	})
@@ -39,7 +39,7 @@ func registerAdminNotificationEndpointsHandlers(api *operations.ConsoleAPI) {
 	api.ConfigurationAddNotificationEndpointHandler = configurationApi.AddNotificationEndpointHandlerFunc(func(params configurationApi.AddNotificationEndpointParams, session *models.Principal) middleware.Responder {
 		notifEndpoints, err := getAddNotificationEndpointResponse(session, params)
 		if err != nil {
-			return configurationApi.NewAddNotificationEndpointDefault(int(err.Code)).WithPayload(err)
+			return configurationApi.NewAddNotificationEndpointDefault(err.Code).WithPayload(err.APIError)
 		}
 		return configurationApi.NewAddNotificationEndpointCreated().WithPayload(notifEndpoints)
 	})
@@ -73,7 +73,7 @@ func getNotificationEndpoints(ctx context.Context, client MinioAdmin) (*models.N
 }
 
 // getNotificationEndpointsResponse returns a list of notification endpoints in the instance
-func getNotificationEndpointsResponse(session *models.Principal, params configurationApi.NotificationEndpointListParams) (*models.NotifEndpointResponse, *models.Error) {
+func getNotificationEndpointsResponse(session *models.Principal, params configurationApi.NotificationEndpointListParams) (*models.NotifEndpointResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -143,7 +143,7 @@ func addNotificationEndpoint(ctx context.Context, client MinioAdmin, params *con
 }
 
 // getNotificationEndpointsResponse returns a list of notification endpoints in the instance
-func getAddNotificationEndpointResponse(session *models.Principal, params configurationApi.AddNotificationEndpointParams) (*models.SetNotificationEndpointResponse, *models.Error) {
+func getAddNotificationEndpointResponse(session *models.Principal, params configurationApi.AddNotificationEndpointParams) (*models.SetNotificationEndpointResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
diff --git a/restapi/admin_policies.go b/restapi/admin_policies.go
index 6f7b09cfd..de5091465 100644
--- a/restapi/admin_policies.go
+++ b/restapi/admin_policies.go
@@ -42,7 +42,7 @@ func registersPoliciesHandler(api *operations.ConsoleAPI) {
 	api.PolicyListPoliciesHandler = policyApi.ListPoliciesHandlerFunc(func(params policyApi.ListPoliciesParams, session *models.Principal) middleware.Responder {
 		listPoliciesResponse, err := getListPoliciesResponse(session, params)
 		if err != nil {
-			return policyApi.NewListPoliciesDefault(int(err.Code)).WithPayload(err)
+			return policyApi.NewListPoliciesDefault(err.Code).WithPayload(err.APIError)
 		}
 		return policyApi.NewListPoliciesOK().WithPayload(listPoliciesResponse)
 	})
@@ -50,7 +50,7 @@ func registersPoliciesHandler(api *operations.ConsoleAPI) {
 	api.PolicyPolicyInfoHandler = policyApi.PolicyInfoHandlerFunc(func(params policyApi.PolicyInfoParams, session *models.Principal) middleware.Responder {
 		policyInfo, err := getPolicyInfoResponse(session, params)
 		if err != nil {
-			return policyApi.NewPolicyInfoDefault(int(err.Code)).WithPayload(err)
+			return policyApi.NewPolicyInfoDefault(err.Code).WithPayload(err.APIError)
 		}
 		return policyApi.NewPolicyInfoOK().WithPayload(policyInfo)
 	})
@@ -58,70 +58,70 @@ func registersPoliciesHandler(api *operations.ConsoleAPI) {
 	api.PolicyAddPolicyHandler = policyApi.AddPolicyHandlerFunc(func(params policyApi.AddPolicyParams, session *models.Principal) middleware.Responder {
 		policyResponse, err := getAddPolicyResponse(session, params)
 		if err != nil {
-			return policyApi.NewAddPolicyDefault(int(err.Code)).WithPayload(err)
+			return policyApi.NewAddPolicyDefault(err.Code).WithPayload(err.APIError)
 		}
 		return policyApi.NewAddPolicyCreated().WithPayload(policyResponse)
 	})
 	// Remove Policy
 	api.PolicyRemovePolicyHandler = policyApi.RemovePolicyHandlerFunc(func(params policyApi.RemovePolicyParams, session *models.Principal) middleware.Responder {
 		if err := getRemovePolicyResponse(session, params); err != nil {
-			return policyApi.NewRemovePolicyDefault(int(err.Code)).WithPayload(err)
+			return policyApi.NewRemovePolicyDefault(err.Code).WithPayload(err.APIError)
 		}
 		return policyApi.NewRemovePolicyNoContent()
 	})
 	// Set Policy
 	api.PolicySetPolicyHandler = policyApi.SetPolicyHandlerFunc(func(params policyApi.SetPolicyParams, session *models.Principal) middleware.Responder {
 		if err := getSetPolicyResponse(session, params); err != nil {
-			return policyApi.NewSetPolicyDefault(int(err.Code)).WithPayload(err)
+			return policyApi.NewSetPolicyDefault(err.Code).WithPayload(err.APIError)
 		}
 		return policyApi.NewSetPolicyNoContent()
 	})
 	// Set Policy Multiple User/Groups
 	api.PolicySetPolicyMultipleHandler = policyApi.SetPolicyMultipleHandlerFunc(func(params policyApi.SetPolicyMultipleParams, session *models.Principal) middleware.Responder {
 		if err := getSetPolicyMultipleResponse(session, params); err != nil {
-			return policyApi.NewSetPolicyMultipleDefault(int(err.Code)).WithPayload(err)
+			return policyApi.NewSetPolicyMultipleDefault(err.Code).WithPayload(err.APIError)
 		}
 		return policyApi.NewSetPolicyMultipleNoContent()
 	})
 	api.BucketListPoliciesWithBucketHandler = bucketApi.ListPoliciesWithBucketHandlerFunc(func(params bucketApi.ListPoliciesWithBucketParams, session *models.Principal) middleware.Responder {
 		policyResponse, err := getListPoliciesWithBucketResponse(session, params)
 		if err != nil {
-			return bucketApi.NewListPoliciesWithBucketDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewListPoliciesWithBucketDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewListPoliciesWithBucketOK().WithPayload(policyResponse)
 	})
 	api.BucketListAccessRulesWithBucketHandler = bucketApi.ListAccessRulesWithBucketHandlerFunc(func(params bucketApi.ListAccessRulesWithBucketParams, session *models.Principal) middleware.Responder {
 		policyResponse, err := getListAccessRulesWithBucketResponse(session, params)
 		if err != nil {
-			return bucketApi.NewListAccessRulesWithBucketDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewListAccessRulesWithBucketDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewListAccessRulesWithBucketOK().WithPayload(policyResponse)
 	})
 	api.BucketSetAccessRuleWithBucketHandler = bucketApi.SetAccessRuleWithBucketHandlerFunc(func(params bucketApi.SetAccessRuleWithBucketParams, session *models.Principal) middleware.Responder {
 		policyResponse, err := getSetAccessRuleWithBucketResponse(session, params)
 		if err != nil {
-			return bucketApi.NewSetAccessRuleWithBucketDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewSetAccessRuleWithBucketDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewSetAccessRuleWithBucketOK().WithPayload(policyResponse)
 	})
 	api.BucketDeleteAccessRuleWithBucketHandler = bucketApi.DeleteAccessRuleWithBucketHandlerFunc(func(params bucketApi.DeleteAccessRuleWithBucketParams, session *models.Principal) middleware.Responder {
 		policyResponse, err := getDeleteAccessRuleWithBucketResponse(session, params)
 		if err != nil {
-			return bucketApi.NewDeleteAccessRuleWithBucketDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewDeleteAccessRuleWithBucketDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewDeleteAccessRuleWithBucketOK().WithPayload(policyResponse)
 	})
 	api.PolicyListUsersForPolicyHandler = policyApi.ListUsersForPolicyHandlerFunc(func(params policyApi.ListUsersForPolicyParams, session *models.Principal) middleware.Responder {
 		policyUsersResponse, err := getListUsersForPolicyResponse(session, params)
 		if err != nil {
-			return policyApi.NewListUsersForPolicyDefault(int(err.Code)).WithPayload(err)
+			return policyApi.NewListUsersForPolicyDefault(err.Code).WithPayload(err.APIError)
 		}
 		return policyApi.NewListUsersForPolicyOK().WithPayload(policyUsersResponse)
 	})
 	api.PolicyListGroupsForPolicyHandler = policyApi.ListGroupsForPolicyHandlerFunc(func(params policyApi.ListGroupsForPolicyParams, session *models.Principal) middleware.Responder {
 		policyGroupsResponse, err := getListGroupsForPolicyResponse(session, params)
 		if err != nil {
-			return policyApi.NewListGroupsForPolicyDefault(int(err.Code)).WithPayload(err)
+			return policyApi.NewListGroupsForPolicyDefault(err.Code).WithPayload(err.APIError)
 		}
 		return policyApi.NewListGroupsForPolicyOK().WithPayload(policyGroupsResponse)
 	})
@@ -129,7 +129,7 @@ func registersPoliciesHandler(api *operations.ConsoleAPI) {
 	api.PolicyGetUserPolicyHandler = policyApi.GetUserPolicyHandlerFunc(func(params policyApi.GetUserPolicyParams, session *models.Principal) middleware.Responder {
 		userPolicyResponse, err := getUserPolicyResponse(params.HTTPRequest.Context(), session)
 		if err != nil {
-			return policyApi.NewGetUserPolicyDefault(int(err.Code)).WithPayload(err)
+			return policyApi.NewGetUserPolicyDefault(err.Code).WithPayload(err.APIError)
 		}
 		return policyApi.NewGetUserPolicyOK().WithPayload(userPolicyResponse)
 	})
@@ -137,13 +137,13 @@ func registersPoliciesHandler(api *operations.ConsoleAPI) {
 	api.PolicyGetSAUserPolicyHandler = policyApi.GetSAUserPolicyHandlerFunc(func(params policyApi.GetSAUserPolicyParams, session *models.Principal) middleware.Responder {
 		userPolicyResponse, err := getSAUserPolicyResponse(session, params)
 		if err != nil {
-			return policyApi.NewGetSAUserPolicyDefault(int(err.Code)).WithPayload(err)
+			return policyApi.NewGetSAUserPolicyDefault(err.Code).WithPayload(err.APIError)
 		}
 		return policyApi.NewGetSAUserPolicyOK().WithPayload(userPolicyResponse)
 	})
 }
 
-func getListAccessRulesWithBucketResponse(session *models.Principal, params bucketApi.ListAccessRulesWithBucketParams) (*models.ListAccessRulesResponse, *models.Error) {
+func getListAccessRulesWithBucketResponse(session *models.Principal, params bucketApi.ListAccessRulesWithBucketParams) (*models.ListAccessRulesResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	bucket := params.Bucket
@@ -159,7 +159,7 @@ func getListAccessRulesWithBucketResponse(session *models.Principal, params buck
 	return &models.ListAccessRulesResponse{AccessRules: accessRuleList}, nil
 }
 
-func getSetAccessRuleWithBucketResponse(session *models.Principal, params bucketApi.SetAccessRuleWithBucketParams) (bool, *models.Error) {
+func getSetAccessRuleWithBucketResponse(session *models.Principal, params bucketApi.SetAccessRuleWithBucketParams) (bool, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	prefixAccess := params.Prefixaccess
@@ -179,7 +179,7 @@ func getSetAccessRuleWithBucketResponse(session *models.Principal, params bucket
 	return true, nil
 }
 
-func getDeleteAccessRuleWithBucketResponse(session *models.Principal, params bucketApi.DeleteAccessRuleWithBucketParams) (bool, *models.Error) {
+func getDeleteAccessRuleWithBucketResponse(session *models.Principal, params bucketApi.DeleteAccessRuleWithBucketParams) (bool, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	bucket := params.Bucket
@@ -195,7 +195,7 @@ func getDeleteAccessRuleWithBucketResponse(session *models.Principal, params buc
 	return true, nil
 }
 
-func getListPoliciesWithBucketResponse(session *models.Principal, params bucketApi.ListPoliciesWithBucketParams) (*models.ListPoliciesResponse, *models.Error) {
+func getListPoliciesWithBucketResponse(session *models.Principal, params bucketApi.ListPoliciesWithBucketParams) (*models.ListPoliciesResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -281,7 +281,7 @@ func listPolicies(ctx context.Context, client MinioAdmin) ([]*models.Policy, err
 }
 
 // getListPoliciesResponse performs listPolicies() and serializes it to the handler's output
-func getListPoliciesResponse(session *models.Principal, params policyApi.ListPoliciesParams) (*models.ListPoliciesResponse, *models.Error) {
+func getListPoliciesResponse(session *models.Principal, params policyApi.ListPoliciesParams) (*models.ListPoliciesResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -305,7 +305,7 @@ func getListPoliciesResponse(session *models.Principal, params policyApi.ListPol
 }
 
 // getListUsersForPoliciesResponse performs lists users affected by a given policy.
-func getListUsersForPolicyResponse(session *models.Principal, params policyApi.ListUsersForPolicyParams) ([]string, *models.Error) {
+func getListUsersForPolicyResponse(session *models.Principal, params policyApi.ListUsersForPolicyParams) ([]string, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	policy, err := utils.DecodeBase64(params.Policy)
@@ -350,7 +350,7 @@ func getListUsersForPolicyResponse(session *models.Principal, params policyApi.L
 	return filteredUsers, nil
 }
 
-func getUserPolicyResponse(ctx context.Context, session *models.Principal) (string, *models.Error) {
+func getUserPolicyResponse(ctx context.Context, session *models.Principal) (string, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 	// serialize output
@@ -379,7 +379,7 @@ func getUserPolicyResponse(ctx context.Context, session *models.Principal) (stri
 	return string(rawPolicy), nil
 }
 
-func getSAUserPolicyResponse(session *models.Principal, params policyApi.GetSAUserPolicyParams) (*models.AUserPolicyResponse, *models.Error) {
+func getSAUserPolicyResponse(session *models.Principal, params policyApi.GetSAUserPolicyParams) (*models.AUserPolicyResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	// serialize output
@@ -458,7 +458,7 @@ func getSAUserPolicyResponse(session *models.Principal, params policyApi.GetSAUs
 	return getUserPoliciesResponse, nil
 }
 
-func getListGroupsForPolicyResponse(session *models.Principal, params policyApi.ListGroupsForPolicyParams) ([]string, *models.Error) {
+func getListGroupsForPolicyResponse(session *models.Principal, params policyApi.ListGroupsForPolicyParams) ([]string, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -518,7 +518,7 @@ func removePolicy(ctx context.Context, client MinioAdmin, name string) error {
 }
 
 // getRemovePolicyResponse() performs removePolicy() and serializes it to the handler's output
-func getRemovePolicyResponse(session *models.Principal, params policyApi.RemovePolicyParams) *models.Error {
+func getRemovePolicyResponse(session *models.Principal, params policyApi.RemovePolicyParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	if params.Name == "" {
@@ -562,7 +562,7 @@ func addPolicy(ctx context.Context, client MinioAdmin, name, policy string) (*mo
 }
 
 // getAddPolicyResponse performs addPolicy() and serializes it to the handler's output
-func getAddPolicyResponse(session *models.Principal, params policyApi.AddPolicyParams) (*models.Policy, *models.Error) {
+func getAddPolicyResponse(session *models.Principal, params policyApi.AddPolicyParams) (*models.Policy, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	if params.Body == nil {
@@ -613,7 +613,7 @@ func getPolicyStatements(ctx context.Context, client MinioAdmin, name string) ([
 }
 
 // getPolicyInfoResponse performs policyInfo() and serializes it to the handler's output
-func getPolicyInfoResponse(session *models.Principal, params policyApi.PolicyInfoParams) (*models.Policy, *models.Error) {
+func getPolicyInfoResponse(session *models.Principal, params policyApi.PolicyInfoParams) (*models.Policy, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -644,7 +644,7 @@ func SetPolicy(ctx context.Context, client MinioAdmin, name, entityName string,
 }
 
 // getSetPolicyResponse() performs SetPolicy() and serializes it to the handler's output
-func getSetPolicyResponse(session *models.Principal, params policyApi.SetPolicyParams) *models.Error {
+func getSetPolicyResponse(session *models.Principal, params policyApi.SetPolicyParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	// Removing this section
@@ -662,7 +662,7 @@ func getSetPolicyResponse(session *models.Principal, params policyApi.SetPolicyP
 	return nil
 }
 
-func getSetPolicyMultipleResponse(session *models.Principal, params policyApi.SetPolicyMultipleParams) *models.Error {
+func getSetPolicyMultipleResponse(session *models.Principal, params policyApi.SetPolicyMultipleParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
diff --git a/restapi/admin_releases.go b/restapi/admin_releases.go
index 427cc6b3a..e71f89eee 100644
--- a/restapi/admin_releases.go
+++ b/restapi/admin_releases.go
@@ -42,13 +42,13 @@ func registerReleasesHandlers(api *operations.ConsoleAPI) {
 	api.ReleaseListReleasesHandler = release.ListReleasesHandlerFunc(func(params release.ListReleasesParams, session *models.Principal) middleware.Responder {
 		resp, err := GetReleaseListResponse(session, params)
 		if err != nil {
-			return release.NewListReleasesDefault(int(err.Code)).WithPayload(err)
+			return release.NewListReleasesDefault(err.Code).WithPayload(err.APIError)
 		}
 		return release.NewListReleasesOK().WithPayload(resp)
 	})
 }
 
-func GetReleaseListResponse(_ *models.Principal, params release.ListReleasesParams) (*models.ReleaseListResponse, *models.Error) {
+func GetReleaseListResponse(_ *models.Principal, params release.ListReleasesParams) (*models.ReleaseListResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	repo := params.Repo
@@ -68,7 +68,7 @@ func GetReleaseListResponse(_ *models.Principal, params release.ListReleasesPara
 	return releaseList(ctx, repo, currentRelease, search, filter)
 }
 
-func releaseList(ctx context.Context, repo, currentRelease, search, filter string) (*models.ReleaseListResponse, *models.Error) {
+func releaseList(ctx context.Context, repo, currentRelease, search, filter string) (*models.ReleaseListResponse, *CodedAPIError) {
 	serviceURL := getReleaseServiceURL()
 	clientIP := utils.ClientIPFromContext(ctx)
 	releases, err := getReleases(serviceURL, repo, currentRelease, search, filter, clientIP)
diff --git a/restapi/admin_remote_buckets.go b/restapi/admin_remote_buckets.go
index f70c40cff..da8e66809 100644
--- a/restapi/admin_remote_buckets.go
+++ b/restapi/admin_remote_buckets.go
@@ -47,7 +47,7 @@ func registerAdminBucketRemoteHandlers(api *operations.ConsoleAPI) {
 	api.BucketListRemoteBucketsHandler = bucketApi.ListRemoteBucketsHandlerFunc(func(params bucketApi.ListRemoteBucketsParams, session *models.Principal) middleware.Responder {
 		listResp, err := getListRemoteBucketsResponse(session, params)
 		if err != nil {
-			return bucketApi.NewListRemoteBucketsDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewListRemoteBucketsDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewListRemoteBucketsOK().WithPayload(listResp)
 	})
@@ -56,7 +56,7 @@ func registerAdminBucketRemoteHandlers(api *operations.ConsoleAPI) {
 	api.BucketRemoteBucketDetailsHandler = bucketApi.RemoteBucketDetailsHandlerFunc(func(params bucketApi.RemoteBucketDetailsParams, session *models.Principal) middleware.Responder {
 		response, err := getRemoteBucketDetailsResponse(session, params)
 		if err != nil {
-			return bucketApi.NewRemoteBucketDetailsDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewRemoteBucketDetailsDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewRemoteBucketDetailsOK().WithPayload(response)
 	})
@@ -65,7 +65,7 @@ func registerAdminBucketRemoteHandlers(api *operations.ConsoleAPI) {
 	api.BucketDeleteRemoteBucketHandler = bucketApi.DeleteRemoteBucketHandlerFunc(func(params bucketApi.DeleteRemoteBucketParams, session *models.Principal) middleware.Responder {
 		err := getDeleteRemoteBucketResponse(session, params)
 		if err != nil {
-			return bucketApi.NewDeleteRemoteBucketDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewDeleteRemoteBucketDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewDeleteRemoteBucketNoContent()
 	})
@@ -74,7 +74,7 @@ func registerAdminBucketRemoteHandlers(api *operations.ConsoleAPI) {
 	api.BucketAddRemoteBucketHandler = bucketApi.AddRemoteBucketHandlerFunc(func(params bucketApi.AddRemoteBucketParams, session *models.Principal) middleware.Responder {
 		err := getAddRemoteBucketResponse(session, params)
 		if err != nil {
-			return bucketApi.NewAddRemoteBucketDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewAddRemoteBucketDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewAddRemoteBucketCreated()
 	})
@@ -83,7 +83,7 @@ func registerAdminBucketRemoteHandlers(api *operations.ConsoleAPI) {
 	api.BucketSetMultiBucketReplicationHandler = bucketApi.SetMultiBucketReplicationHandlerFunc(func(params bucketApi.SetMultiBucketReplicationParams, session *models.Principal) middleware.Responder {
 		response, err := setMultiBucketReplicationResponse(session, params)
 		if err != nil {
-			return bucketApi.NewSetMultiBucketReplicationDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewSetMultiBucketReplicationDefault(err.Code).WithPayload(err.APIError)
 		}
 
 		return bucketApi.NewSetMultiBucketReplicationOK().WithPayload(response)
@@ -93,7 +93,7 @@ func registerAdminBucketRemoteHandlers(api *operations.ConsoleAPI) {
 	api.BucketListExternalBucketsHandler = bucketApi.ListExternalBucketsHandlerFunc(func(params bucketApi.ListExternalBucketsParams, session *models.Principal) middleware.Responder {
 		response, err := listExternalBucketsResponse(params)
 		if err != nil {
-			return bucketApi.NewListExternalBucketsDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewListExternalBucketsDefault(err.Code).WithPayload(err.APIError)
 		}
 
 		return bucketApi.NewListExternalBucketsOK().WithPayload(response)
@@ -103,7 +103,7 @@ func registerAdminBucketRemoteHandlers(api *operations.ConsoleAPI) {
 	api.BucketDeleteBucketReplicationRuleHandler = bucketApi.DeleteBucketReplicationRuleHandlerFunc(func(params bucketApi.DeleteBucketReplicationRuleParams, session *models.Principal) middleware.Responder {
 		err := deleteReplicationRuleResponse(session, params)
 		if err != nil {
-			return bucketApi.NewDeleteBucketReplicationRuleDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewDeleteBucketReplicationRuleDefault(err.Code).WithPayload(err.APIError)
 		}
 
 		return bucketApi.NewDeleteBucketReplicationRuleNoContent()
@@ -113,13 +113,13 @@ func registerAdminBucketRemoteHandlers(api *operations.ConsoleAPI) {
 	api.BucketDeleteAllReplicationRulesHandler = bucketApi.DeleteAllReplicationRulesHandlerFunc(func(params bucketApi.DeleteAllReplicationRulesParams, session *models.Principal) middleware.Responder {
 		err := deleteBucketReplicationRulesResponse(session, params)
 		if err != nil {
-			if err.Code == 500 && *err.DetailedMessage == "The remote target does not exist" {
+			if err.Code == 500 && err.APIError.DetailedMessage == "The remote target does not exist" {
 				// We should ignore this MinIO error when deleting all replication rules
 				return bucketApi.NewDeleteAllReplicationRulesNoContent() // This will return 204 as per swagger spec
 			}
 			// If there is a different error, then we should handle it
 			// This will return a generic error with err.Code (likely a 500 or 404) and its *err.DetailedMessage
-			return bucketApi.NewDeleteAllReplicationRulesDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewDeleteAllReplicationRulesDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewDeleteAllReplicationRulesNoContent()
 	})
@@ -128,7 +128,7 @@ func registerAdminBucketRemoteHandlers(api *operations.ConsoleAPI) {
 	api.BucketDeleteSelectedReplicationRulesHandler = bucketApi.DeleteSelectedReplicationRulesHandlerFunc(func(params bucketApi.DeleteSelectedReplicationRulesParams, session *models.Principal) middleware.Responder {
 		err := deleteSelectedReplicationRulesResponse(session, params)
 		if err != nil {
-			return bucketApi.NewDeleteSelectedReplicationRulesDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewDeleteSelectedReplicationRulesDefault(err.Code).WithPayload(err.APIError)
 		}
 
 		return bucketApi.NewDeleteSelectedReplicationRulesNoContent()
@@ -138,13 +138,13 @@ func registerAdminBucketRemoteHandlers(api *operations.ConsoleAPI) {
 	api.BucketUpdateMultiBucketReplicationHandler = bucketApi.UpdateMultiBucketReplicationHandlerFunc(func(params bucketApi.UpdateMultiBucketReplicationParams, session *models.Principal) middleware.Responder {
 		err := updateBucketReplicationResponse(session, params)
 		if err != nil {
-			return bucketApi.NewUpdateMultiBucketReplicationDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewUpdateMultiBucketReplicationDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewUpdateMultiBucketReplicationCreated()
 	})
 }
 
-func getListRemoteBucketsResponse(session *models.Principal, params bucketApi.ListRemoteBucketsParams) (*models.ListRemoteBucketsResponse, *models.Error) {
+func getListRemoteBucketsResponse(session *models.Principal, params bucketApi.ListRemoteBucketsParams) (*models.ListRemoteBucketsResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -155,7 +155,7 @@ func getListRemoteBucketsResponse(session *models.Principal, params bucketApi.Li
 	return listRemoteBuckets(ctx, adminClient)
 }
 
-func getRemoteBucketDetailsResponse(session *models.Principal, params bucketApi.RemoteBucketDetailsParams) (*models.RemoteBucket, *models.Error) {
+func getRemoteBucketDetailsResponse(session *models.Principal, params bucketApi.RemoteBucketDetailsParams) (*models.RemoteBucket, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -166,7 +166,7 @@ func getRemoteBucketDetailsResponse(session *models.Principal, params bucketApi.
 	return getRemoteBucket(ctx, adminClient, params.Name)
 }
 
-func getDeleteRemoteBucketResponse(session *models.Principal, params bucketApi.DeleteRemoteBucketParams) *models.Error {
+func getDeleteRemoteBucketResponse(session *models.Principal, params bucketApi.DeleteRemoteBucketParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -181,7 +181,7 @@ func getDeleteRemoteBucketResponse(session *models.Principal, params bucketApi.D
 	return nil
 }
 
-func getAddRemoteBucketResponse(session *models.Principal, params bucketApi.AddRemoteBucketParams) *models.Error {
+func getAddRemoteBucketResponse(session *models.Principal, params bucketApi.AddRemoteBucketParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -196,7 +196,7 @@ func getAddRemoteBucketResponse(session *models.Principal, params bucketApi.AddR
 	return nil
 }
 
-func listRemoteBuckets(ctx context.Context, client MinioAdmin) (*models.ListRemoteBucketsResponse, *models.Error) {
+func listRemoteBuckets(ctx context.Context, client MinioAdmin) (*models.ListRemoteBucketsResponse, *CodedAPIError) {
 	var remoteBuckets []*models.RemoteBucket
 	buckets, err := client.listRemoteBuckets(ctx, "", "")
 	if err != nil {
@@ -228,7 +228,7 @@ func listRemoteBuckets(ctx context.Context, client MinioAdmin) (*models.ListRemo
 	}, nil
 }
 
-func getRemoteBucket(ctx context.Context, client MinioAdmin, name string) (*models.RemoteBucket, *models.Error) {
+func getRemoteBucket(ctx context.Context, client MinioAdmin, name string) (*models.RemoteBucket, *CodedAPIError) {
 	remoteBucket, err := client.getRemoteBucket(ctx, name, "")
 	if err != nil {
 		return nil, ErrorWithContext(ctx, fmt.Errorf("error getting remote bucket details: %v", err))
@@ -502,7 +502,7 @@ func setMultiBucketReplication(ctx context.Context, session *models.Principal, c
 	return resultsList
 }
 
-func setMultiBucketReplicationResponse(session *models.Principal, params bucketApi.SetMultiBucketReplicationParams) (*models.MultiBucketResponseState, *models.Error) {
+func setMultiBucketReplicationResponse(session *models.Principal, params bucketApi.SetMultiBucketReplicationParams) (*models.MultiBucketResponseState, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -545,7 +545,7 @@ func setMultiBucketReplicationResponse(session *models.Principal, params bucketA
 	return &resultsParsed, nil
 }
 
-func listExternalBucketsResponse(params bucketApi.ListExternalBucketsParams) (*models.ListBucketsResponse, *models.Error) {
+func listExternalBucketsResponse(params bucketApi.ListExternalBucketsParams) (*models.ListBucketsResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	remoteAdmin, err := newAdminFromCreds(*params.Body.AccessKey, *params.Body.SecretKey, *params.Body.TargetURL, *params.Body.UseTLS)
@@ -555,7 +555,7 @@ func listExternalBucketsResponse(params bucketApi.ListExternalBucketsParams) (*m
 	return listExternalBuckets(ctx, AdminClient{Client: remoteAdmin})
 }
 
-func listExternalBuckets(ctx context.Context, client MinioAdmin) (*models.ListBucketsResponse, *models.Error) {
+func listExternalBuckets(ctx context.Context, client MinioAdmin) (*models.ListBucketsResponse, *CodedAPIError) {
 	buckets, err := getAccountBuckets(ctx, client)
 	if err != nil {
 		return nil, ErrorWithContext(ctx, err)
@@ -733,7 +733,7 @@ func deleteSelectedReplicationRules(ctx context.Context, session *models.Princip
 	return nil
 }
 
-func deleteReplicationRuleResponse(session *models.Principal, params bucketApi.DeleteBucketReplicationRuleParams) *models.Error {
+func deleteReplicationRuleResponse(session *models.Principal, params bucketApi.DeleteBucketReplicationRuleParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	ctx = context.WithValue(ctx, utils.ContextClientIP, getClientIP(params.HTTPRequest))
@@ -744,7 +744,7 @@ func deleteReplicationRuleResponse(session *models.Principal, params bucketApi.D
 	return nil
 }
 
-func deleteBucketReplicationRulesResponse(session *models.Principal, params bucketApi.DeleteAllReplicationRulesParams) *models.Error {
+func deleteBucketReplicationRulesResponse(session *models.Principal, params bucketApi.DeleteAllReplicationRulesParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	ctx = context.WithValue(ctx, utils.ContextClientIP, getClientIP(params.HTTPRequest))
@@ -755,7 +755,7 @@ func deleteBucketReplicationRulesResponse(session *models.Principal, params buck
 	return nil
 }
 
-func deleteSelectedReplicationRulesResponse(session *models.Principal, params bucketApi.DeleteSelectedReplicationRulesParams) *models.Error {
+func deleteSelectedReplicationRulesResponse(session *models.Principal, params bucketApi.DeleteSelectedReplicationRulesParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -768,7 +768,7 @@ func deleteSelectedReplicationRulesResponse(session *models.Principal, params bu
 	return nil
 }
 
-func updateBucketReplicationResponse(session *models.Principal, params bucketApi.UpdateMultiBucketReplicationParams) *models.Error {
+func updateBucketReplicationResponse(session *models.Principal, params bucketApi.UpdateMultiBucketReplicationParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
diff --git a/restapi/admin_replication_status.go b/restapi/admin_replication_status.go
index eeedb014e..72721a175 100644
--- a/restapi/admin_replication_status.go
+++ b/restapi/admin_replication_status.go
@@ -30,13 +30,13 @@ func registerSiteReplicationStatusHandler(api *operations.ConsoleAPI) {
 	api.SiteReplicationGetSiteReplicationStatusHandler = siteRepApi.GetSiteReplicationStatusHandlerFunc(func(params siteRepApi.GetSiteReplicationStatusParams, session *models.Principal) middleware.Responder {
 		rInfo, err := getSRStatusResponse(session, params)
 		if err != nil {
-			return siteRepApi.NewGetSiteReplicationStatusDefault(int(err.Code)).WithPayload(err)
+			return siteRepApi.NewGetSiteReplicationStatusDefault(err.Code).WithPayload(err.APIError)
 		}
 		return siteRepApi.NewGetSiteReplicationStatusOK().WithPayload(rInfo)
 	})
 }
 
-func getSRStatusResponse(session *models.Principal, params siteRepApi.GetSiteReplicationStatusParams) (*models.SiteReplicationStatusResponse, *models.Error) {
+func getSRStatusResponse(session *models.Principal, params siteRepApi.GetSiteReplicationStatusParams) (*models.SiteReplicationStatusResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
diff --git a/restapi/admin_service.go b/restapi/admin_service.go
index 76e01366b..25e878dac 100644
--- a/restapi/admin_service.go
+++ b/restapi/admin_service.go
@@ -31,7 +31,7 @@ func registerServiceHandlers(api *operations.ConsoleAPI) {
 	// Restart Service
 	api.ServiceRestartServiceHandler = svcApi.RestartServiceHandlerFunc(func(params svcApi.RestartServiceParams, session *models.Principal) middleware.Responder {
 		if err := getRestartServiceResponse(session, params); err != nil {
-			return svcApi.NewRestartServiceDefault(int(err.Code)).WithPayload(err)
+			return svcApi.NewRestartServiceDefault(err.Code).WithPayload(err.APIError)
 		}
 		return svcApi.NewRestartServiceNoContent()
 	})
@@ -59,7 +59,7 @@ func serviceRestart(ctx context.Context, client MinioAdmin) error {
 }
 
 // getRestartServiceResponse performs serviceRestart()
-func getRestartServiceResponse(session *models.Principal, params svcApi.RestartServiceParams) *models.Error {
+func getRestartServiceResponse(session *models.Principal, params svcApi.RestartServiceParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
diff --git a/restapi/admin_site_replication.go b/restapi/admin_site_replication.go
index 2672434b2..4e7ec97cf 100644
--- a/restapi/admin_site_replication.go
+++ b/restapi/admin_site_replication.go
@@ -30,7 +30,7 @@ func registerSiteReplicationHandler(api *operations.ConsoleAPI) {
 	api.SiteReplicationGetSiteReplicationInfoHandler = siteRepApi.GetSiteReplicationInfoHandlerFunc(func(params siteRepApi.GetSiteReplicationInfoParams, session *models.Principal) middleware.Responder {
 		rInfo, err := getSRInfoResponse(session, params)
 		if err != nil {
-			return siteRepApi.NewGetSiteReplicationInfoDefault(int(err.Code)).WithPayload(err)
+			return siteRepApi.NewGetSiteReplicationInfoDefault(err.Code).WithPayload(err.APIError)
 		}
 		return siteRepApi.NewGetSiteReplicationInfoOK().WithPayload(rInfo)
 	})
@@ -38,7 +38,7 @@ func registerSiteReplicationHandler(api *operations.ConsoleAPI) {
 	api.SiteReplicationSiteReplicationInfoAddHandler = siteRepApi.SiteReplicationInfoAddHandlerFunc(func(params siteRepApi.SiteReplicationInfoAddParams, session *models.Principal) middleware.Responder {
 		eInfo, err := getSRAddResponse(session, params)
 		if err != nil {
-			return siteRepApi.NewSiteReplicationInfoAddDefault(int(err.Code)).WithPayload(err)
+			return siteRepApi.NewSiteReplicationInfoAddDefault(err.Code).WithPayload(err.APIError)
 		}
 		return siteRepApi.NewSiteReplicationInfoAddOK().WithPayload(eInfo)
 	})
@@ -46,7 +46,7 @@ func registerSiteReplicationHandler(api *operations.ConsoleAPI) {
 	api.SiteReplicationSiteReplicationRemoveHandler = siteRepApi.SiteReplicationRemoveHandlerFunc(func(params siteRepApi.SiteReplicationRemoveParams, session *models.Principal) middleware.Responder {
 		remRes, err := getSRRemoveResponse(session, params)
 		if err != nil {
-			return siteRepApi.NewSiteReplicationRemoveDefault(int(err.Code)).WithPayload(err)
+			return siteRepApi.NewSiteReplicationRemoveDefault(err.Code).WithPayload(err.APIError)
 		}
 		return siteRepApi.NewSiteReplicationRemoveNoContent().WithPayload(remRes)
 	})
@@ -54,13 +54,13 @@ func registerSiteReplicationHandler(api *operations.ConsoleAPI) {
 	api.SiteReplicationSiteReplicationEditHandler = siteRepApi.SiteReplicationEditHandlerFunc(func(params siteRepApi.SiteReplicationEditParams, session *models.Principal) middleware.Responder {
 		eInfo, err := getSREditResponse(session, params)
 		if err != nil {
-			return siteRepApi.NewSiteReplicationRemoveDefault(int(err.Code)).WithPayload(err)
+			return siteRepApi.NewSiteReplicationRemoveDefault(err.Code).WithPayload(err.APIError)
 		}
 		return siteRepApi.NewSiteReplicationEditOK().WithPayload(eInfo)
 	})
 }
 
-func getSRInfoResponse(session *models.Principal, params siteRepApi.GetSiteReplicationInfoParams) (*models.SiteReplicationInfoResponse, *models.Error) {
+func getSRInfoResponse(session *models.Principal, params siteRepApi.GetSiteReplicationInfoParams) (*models.SiteReplicationInfoResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -76,7 +76,7 @@ func getSRInfoResponse(session *models.Principal, params siteRepApi.GetSiteRepli
 	return res, nil
 }
 
-func getSRAddResponse(session *models.Principal, params siteRepApi.SiteReplicationInfoAddParams) (*models.SiteReplicationAddResponse, *models.Error) {
+func getSRAddResponse(session *models.Principal, params siteRepApi.SiteReplicationInfoAddParams) (*models.SiteReplicationAddResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -92,7 +92,7 @@ func getSRAddResponse(session *models.Principal, params siteRepApi.SiteReplicati
 	return res, nil
 }
 
-func getSREditResponse(session *models.Principal, params siteRepApi.SiteReplicationEditParams) (*models.PeerSiteEditResponse, *models.Error) {
+func getSREditResponse(session *models.Principal, params siteRepApi.SiteReplicationEditParams) (*models.PeerSiteEditResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -107,7 +107,7 @@ func getSREditResponse(session *models.Principal, params siteRepApi.SiteReplicat
 	return eRes, nil
 }
 
-func getSRRemoveResponse(session *models.Principal, params siteRepApi.SiteReplicationRemoveParams) (*models.PeerSiteRemoveResponse, *models.Error) {
+func getSRRemoveResponse(session *models.Principal, params siteRepApi.SiteReplicationRemoveParams) (*models.PeerSiteRemoveResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
diff --git a/restapi/admin_subnet.go b/restapi/admin_subnet.go
index fa691875f..eaee33825 100644
--- a/restapi/admin_subnet.go
+++ b/restapi/admin_subnet.go
@@ -42,7 +42,7 @@ func registerSubnetHandlers(api *operations.ConsoleAPI) {
 	api.SubnetSubnetLoginHandler = subnetApi.SubnetLoginHandlerFunc(func(params subnetApi.SubnetLoginParams, session *models.Principal) middleware.Responder {
 		resp, err := GetSubnetLoginResponse(session, params)
 		if err != nil {
-			return subnetApi.NewSubnetLoginDefault(int(err.Code)).WithPayload(err)
+			return subnetApi.NewSubnetLoginDefault(err.Code).WithPayload(err.APIError)
 		}
 		return subnetApi.NewSubnetLoginOK().WithPayload(resp)
 	})
@@ -50,7 +50,7 @@ func registerSubnetHandlers(api *operations.ConsoleAPI) {
 	api.SubnetSubnetLoginMFAHandler = subnetApi.SubnetLoginMFAHandlerFunc(func(params subnetApi.SubnetLoginMFAParams, session *models.Principal) middleware.Responder {
 		resp, err := GetSubnetLoginWithMFAResponse(session, params)
 		if err != nil {
-			return subnetApi.NewSubnetLoginMFADefault(int(err.Code)).WithPayload(err)
+			return subnetApi.NewSubnetLoginMFADefault(err.Code).WithPayload(err.APIError)
 		}
 		return subnetApi.NewSubnetLoginMFAOK().WithPayload(resp)
 	})
@@ -58,7 +58,7 @@ func registerSubnetHandlers(api *operations.ConsoleAPI) {
 	api.SubnetSubnetRegisterHandler = subnetApi.SubnetRegisterHandlerFunc(func(params subnetApi.SubnetRegisterParams, session *models.Principal) middleware.Responder {
 		err := GetSubnetRegisterResponse(session, params)
 		if err != nil {
-			return subnetApi.NewSubnetRegisterDefault(int(err.Code)).WithPayload(err)
+			return subnetApi.NewSubnetRegisterDefault(err.Code).WithPayload(err.APIError)
 		}
 		return subnetApi.NewSubnetRegisterOK()
 	})
@@ -66,7 +66,7 @@ func registerSubnetHandlers(api *operations.ConsoleAPI) {
 	api.SubnetSubnetInfoHandler = subnetApi.SubnetInfoHandlerFunc(func(params subnetApi.SubnetInfoParams, session *models.Principal) middleware.Responder {
 		resp, err := GetSubnetInfoResponse(session, params)
 		if err != nil {
-			return subnetApi.NewSubnetInfoDefault(int(err.Code)).WithPayload(err)
+			return subnetApi.NewSubnetInfoDefault(err.Code).WithPayload(err.APIError)
 		}
 		return subnetApi.NewSubnetInfoOK().WithPayload(resp)
 	})
@@ -74,7 +74,7 @@ func registerSubnetHandlers(api *operations.ConsoleAPI) {
 	api.SubnetSubnetRegTokenHandler = subnetApi.SubnetRegTokenHandlerFunc(func(params subnetApi.SubnetRegTokenParams, session *models.Principal) middleware.Responder {
 		resp, err := GetSubnetRegTokenResponse(session, params)
 		if err != nil {
-			return subnetApi.NewSubnetRegTokenDefault(int(err.Code)).WithPayload(err)
+			return subnetApi.NewSubnetRegTokenDefault(err.Code).WithPayload(err.APIError)
 		}
 		return subnetApi.NewSubnetRegTokenOK().WithPayload(resp)
 	})
@@ -82,7 +82,7 @@ func registerSubnetHandlers(api *operations.ConsoleAPI) {
 	api.SubnetSubnetAPIKeyHandler = subnetApi.SubnetAPIKeyHandlerFunc(func(params subnetApi.SubnetAPIKeyParams, session *models.Principal) middleware.Responder {
 		resp, err := GetSubnetAPIKeyResponse(session, params)
 		if err != nil {
-			return subnetApi.NewSubnetAPIKeyDefault(int(err.Code)).WithPayload(err)
+			return subnetApi.NewSubnetAPIKeyDefault(err.Code).WithPayload(err.APIError)
 		}
 		return subnetApi.NewSubnetAPIKeyOK().WithPayload(resp)
 	})
@@ -130,7 +130,7 @@ func SubnetLogin(client xhttp.ClientI, username, password string) (string, strin
 	return "", "", errors.New("something went wrong")
 }
 
-func GetSubnetLoginResponse(session *models.Principal, params subnetApi.SubnetLoginParams) (*models.SubnetLoginResponse, *models.Error) {
+func GetSubnetLoginResponse(session *models.Principal, params subnetApi.SubnetLoginParams) (*models.SubnetLoginResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -140,7 +140,7 @@ func GetSubnetLoginResponse(session *models.Principal, params subnetApi.SubnetLo
 	return subnetLoginResponse(ctx, AdminClient{Client: mAdmin}, params)
 }
 
-func subnetLoginResponse(ctx context.Context, minioClient MinioAdmin, params subnetApi.SubnetLoginParams) (*models.SubnetLoginResponse, *models.Error) {
+func subnetLoginResponse(ctx context.Context, minioClient MinioAdmin, params subnetApi.SubnetLoginParams) (*models.SubnetLoginResponse, *CodedAPIError) {
 	subnetHTTPClient, err := GetSubnetHTTPClient(ctx, minioClient)
 	if err != nil {
 		return nil, ErrorWithContext(ctx, err)
@@ -223,7 +223,7 @@ func GetSubnetHTTPClient(ctx context.Context, minioClient MinioAdmin) (*xhttp.Cl
 	return clientI, nil
 }
 
-func GetSubnetLoginWithMFAResponse(session *models.Principal, params subnetApi.SubnetLoginMFAParams) (*models.SubnetLoginResponse, *models.Error) {
+func GetSubnetLoginWithMFAResponse(session *models.Principal, params subnetApi.SubnetLoginMFAParams) (*models.SubnetLoginResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -234,7 +234,7 @@ func GetSubnetLoginWithMFAResponse(session *models.Principal, params subnetApi.S
 	return subnetLoginWithMFAResponse(ctx, minioClient, params)
 }
 
-func subnetLoginWithMFAResponse(ctx context.Context, minioClient MinioAdmin, params subnetApi.SubnetLoginMFAParams) (*models.SubnetLoginResponse, *models.Error) {
+func subnetLoginWithMFAResponse(ctx context.Context, minioClient MinioAdmin, params subnetApi.SubnetLoginMFAParams) (*models.SubnetLoginResponse, *CodedAPIError) {
 	subnetHTTPClient, err := GetSubnetHTTPClient(ctx, minioClient)
 	if err != nil {
 		return nil, ErrorWithContext(ctx, err)
@@ -292,7 +292,7 @@ func GetSubnetRegister(ctx context.Context, minioClient MinioAdmin, httpClient x
 	return nil
 }
 
-func GetSubnetRegisterResponse(session *models.Principal, params subnetApi.SubnetRegisterParams) *models.Error {
+func GetSubnetRegisterResponse(session *models.Principal, params subnetApi.SubnetRegisterParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -303,7 +303,7 @@ func GetSubnetRegisterResponse(session *models.Principal, params subnetApi.Subne
 	return subnetRegisterResponse(ctx, adminClient, params)
 }
 
-func subnetRegisterResponse(ctx context.Context, minioClient MinioAdmin, params subnetApi.SubnetRegisterParams) *models.Error {
+func subnetRegisterResponse(ctx context.Context, minioClient MinioAdmin, params subnetApi.SubnetRegisterParams) *CodedAPIError {
 	subnetHTTPClient, err := GetSubnetHTTPClient(ctx, minioClient)
 	if err != nil {
 		return ErrorWithContext(ctx, err)
@@ -317,7 +317,7 @@ func subnetRegisterResponse(ctx context.Context, minioClient MinioAdmin, params
 
 var ErrSubnetLicenseNotFound = errors.New("license not found")
 
-func GetSubnetInfoResponse(session *models.Principal, params subnetApi.SubnetInfoParams) (*models.License, *models.Error) {
+func GetSubnetInfoResponse(session *models.Principal, params subnetApi.SubnetInfoParams) (*models.License, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	clientIP := utils.ClientIPFromContext(ctx)
@@ -384,7 +384,7 @@ func GetSubnetRegToken(ctx context.Context, minioClient MinioAdmin) (string, err
 	return regToken, nil
 }
 
-func GetSubnetRegTokenResponse(session *models.Principal, params subnetApi.SubnetRegTokenParams) (*models.SubnetRegTokenResponse, *models.Error) {
+func GetSubnetRegTokenResponse(session *models.Principal, params subnetApi.SubnetRegTokenParams) (*models.SubnetRegTokenResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -395,7 +395,7 @@ func GetSubnetRegTokenResponse(session *models.Principal, params subnetApi.Subne
 	return subnetRegTokenResponse(ctx, adminClient)
 }
 
-func subnetRegTokenResponse(ctx context.Context, minioClient MinioAdmin) (*models.SubnetRegTokenResponse, *models.Error) {
+func subnetRegTokenResponse(ctx context.Context, minioClient MinioAdmin) (*models.SubnetRegTokenResponse, *CodedAPIError) {
 	token, err := GetSubnetRegToken(ctx, minioClient)
 	if err != nil {
 		return nil, ErrorWithContext(ctx, err)
@@ -405,7 +405,7 @@ func subnetRegTokenResponse(ctx context.Context, minioClient MinioAdmin) (*model
 	}, nil
 }
 
-func GetSubnetAPIKeyResponse(session *models.Principal, params subnetApi.SubnetAPIKeyParams) (*models.APIKey, *models.Error) {
+func GetSubnetAPIKeyResponse(session *models.Principal, params subnetApi.SubnetAPIKeyParams) (*models.APIKey, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -416,7 +416,7 @@ func GetSubnetAPIKeyResponse(session *models.Principal, params subnetApi.SubnetA
 	return subnetAPIKeyResponse(ctx, adminClient, params)
 }
 
-func subnetAPIKeyResponse(ctx context.Context, minioClient MinioAdmin, params subnetApi.SubnetAPIKeyParams) (*models.APIKey, *models.Error) {
+func subnetAPIKeyResponse(ctx context.Context, minioClient MinioAdmin, params subnetApi.SubnetAPIKeyParams) (*models.APIKey, *CodedAPIError) {
 	subnetHTTPClient, err := GetSubnetHTTPClient(ctx, minioClient)
 	if err != nil {
 		return nil, ErrorWithContext(ctx, err)
diff --git a/restapi/admin_tiers.go b/restapi/admin_tiers.go
index f5ad9bd30..a04a691e1 100644
--- a/restapi/admin_tiers.go
+++ b/restapi/admin_tiers.go
@@ -34,7 +34,7 @@ func registerAdminTiersHandlers(api *operations.ConsoleAPI) {
 	api.TieringTiersListHandler = tieringApi.TiersListHandlerFunc(func(params tieringApi.TiersListParams, session *models.Principal) middleware.Responder {
 		tierList, err := getTiersResponse(session, params)
 		if err != nil {
-			return tieringApi.NewTiersListDefault(int(err.Code)).WithPayload(err)
+			return tieringApi.NewTiersListDefault(err.Code).WithPayload(err.APIError)
 		}
 		return tieringApi.NewTiersListOK().WithPayload(tierList)
 	})
@@ -42,7 +42,7 @@ func registerAdminTiersHandlers(api *operations.ConsoleAPI) {
 	api.TieringAddTierHandler = tieringApi.AddTierHandlerFunc(func(params tieringApi.AddTierParams, session *models.Principal) middleware.Responder {
 		err := getAddTierResponse(session, params)
 		if err != nil {
-			return tieringApi.NewAddTierDefault(int(err.Code)).WithPayload(err)
+			return tieringApi.NewAddTierDefault(err.Code).WithPayload(err.APIError)
 		}
 		return tieringApi.NewAddTierCreated()
 	})
@@ -50,7 +50,7 @@ func registerAdminTiersHandlers(api *operations.ConsoleAPI) {
 	api.TieringGetTierHandler = tieringApi.GetTierHandlerFunc(func(params tieringApi.GetTierParams, session *models.Principal) middleware.Responder {
 		notifEndpoints, err := getGetTierResponse(session, params)
 		if err != nil {
-			return tieringApi.NewGetTierDefault(int(err.Code)).WithPayload(err)
+			return tieringApi.NewGetTierDefault(err.Code).WithPayload(err.APIError)
 		}
 		return tieringApi.NewGetTierOK().WithPayload(notifEndpoints)
 	})
@@ -58,7 +58,7 @@ func registerAdminTiersHandlers(api *operations.ConsoleAPI) {
 	api.TieringEditTierCredentialsHandler = tieringApi.EditTierCredentialsHandlerFunc(func(params tieringApi.EditTierCredentialsParams, session *models.Principal) middleware.Responder {
 		err := getEditTierCredentialsResponse(session, params)
 		if err != nil {
-			return tieringApi.NewEditTierCredentialsDefault(int(err.Code)).WithPayload(err)
+			return tieringApi.NewEditTierCredentialsDefault(err.Code).WithPayload(err.APIError)
 		}
 		return tieringApi.NewEditTierCredentialsOK()
 	})
@@ -174,7 +174,7 @@ func getTiers(ctx context.Context, client MinioAdmin) (*models.TierListResponse,
 }
 
 // getTiersResponse returns a response with a list of tiers
-func getTiersResponse(session *models.Principal, params tieringApi.TiersListParams) (*models.TierListResponse, *models.Error) {
+func getTiersResponse(session *models.Principal, params tieringApi.TiersListParams) (*models.TierListResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -276,7 +276,7 @@ func addTier(ctx context.Context, client MinioAdmin, params *tieringApi.AddTierP
 }
 
 // getAddTierResponse returns the response of admin tier
-func getAddTierResponse(session *models.Principal, params tieringApi.AddTierParams) *models.Error {
+func getAddTierResponse(session *models.Principal, params tieringApi.AddTierParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -358,7 +358,7 @@ func getTier(ctx context.Context, client MinioAdmin, params *tieringApi.GetTierP
 }
 
 // getGetTierResponse returns a tier
-func getGetTierResponse(session *models.Principal, params tieringApi.GetTierParams) (*models.Tier, *models.Error) {
+func getGetTierResponse(session *models.Principal, params tieringApi.GetTierParams) (*models.Tier, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -392,7 +392,7 @@ func editTierCredentials(ctx context.Context, client MinioAdmin, params *tiering
 }
 
 // getEditTierCredentialsResponse returns the result of editing credentials for a tier
-func getEditTierCredentialsResponse(session *models.Principal, params tieringApi.EditTierCredentialsParams) *models.Error {
+func getEditTierCredentialsResponse(session *models.Principal, params tieringApi.EditTierCredentialsParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
diff --git a/restapi/admin_users.go b/restapi/admin_users.go
index 71f1438f0..a7126f9d0 100644
--- a/restapi/admin_users.go
+++ b/restapi/admin_users.go
@@ -24,8 +24,6 @@ import (
 
 	"github.com/minio/console/pkg/utils"
 
-	"github.com/go-openapi/swag"
-
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/minio/console/models"
@@ -49,7 +47,7 @@ func registerUsersHandlers(api *operations.ConsoleAPI) {
 	api.UserListUsersHandler = userApi.ListUsersHandlerFunc(func(params userApi.ListUsersParams, session *models.Principal) middleware.Responder {
 		listUsersResponse, err := getListUsersResponse(session, params)
 		if err != nil {
-			return userApi.NewListUsersDefault(int(err.Code)).WithPayload(err)
+			return userApi.NewListUsersDefault(err.Code).WithPayload(err.APIError)
 		}
 		return userApi.NewListUsersOK().WithPayload(listUsersResponse)
 	})
@@ -57,7 +55,7 @@ func registerUsersHandlers(api *operations.ConsoleAPI) {
 	api.UserAddUserHandler = userApi.AddUserHandlerFunc(func(params userApi.AddUserParams, session *models.Principal) middleware.Responder {
 		userResponse, err := getUserAddResponse(session, params)
 		if err != nil {
-			return userApi.NewAddUserDefault(int(err.Code)).WithPayload(err)
+			return userApi.NewAddUserDefault(err.Code).WithPayload(err.APIError)
 		}
 		return userApi.NewAddUserCreated().WithPayload(userResponse)
 	})
@@ -65,7 +63,7 @@ func registerUsersHandlers(api *operations.ConsoleAPI) {
 	api.UserRemoveUserHandler = userApi.RemoveUserHandlerFunc(func(params userApi.RemoveUserParams, session *models.Principal) middleware.Responder {
 		err := getRemoveUserResponse(session, params)
 		if err != nil {
-			return userApi.NewRemoveUserDefault(int(err.Code)).WithPayload(err)
+			return userApi.NewRemoveUserDefault(err.Code).WithPayload(err.APIError)
 		}
 		return userApi.NewRemoveUserNoContent()
 	})
@@ -73,7 +71,7 @@ func registerUsersHandlers(api *operations.ConsoleAPI) {
 	api.UserUpdateUserGroupsHandler = userApi.UpdateUserGroupsHandlerFunc(func(params userApi.UpdateUserGroupsParams, session *models.Principal) middleware.Responder {
 		userUpdateResponse, err := getUpdateUserGroupsResponse(session, params)
 		if err != nil {
-			return userApi.NewUpdateUserGroupsDefault(int(err.Code)).WithPayload(err)
+			return userApi.NewUpdateUserGroupsDefault(err.Code).WithPayload(err.APIError)
 		}
 
 		return userApi.NewUpdateUserGroupsOK().WithPayload(userUpdateResponse)
@@ -82,7 +80,7 @@ func registerUsersHandlers(api *operations.ConsoleAPI) {
 	api.UserGetUserInfoHandler = userApi.GetUserInfoHandlerFunc(func(params userApi.GetUserInfoParams, session *models.Principal) middleware.Responder {
 		userInfoResponse, err := getUserInfoResponse(session, params)
 		if err != nil {
-			return userApi.NewGetUserInfoDefault(int(err.Code)).WithPayload(err)
+			return userApi.NewGetUserInfoDefault(err.Code).WithPayload(err.APIError)
 		}
 
 		return userApi.NewGetUserInfoOK().WithPayload(userInfoResponse)
@@ -91,7 +89,7 @@ func registerUsersHandlers(api *operations.ConsoleAPI) {
 	api.UserUpdateUserInfoHandler = userApi.UpdateUserInfoHandlerFunc(func(params userApi.UpdateUserInfoParams, session *models.Principal) middleware.Responder {
 		userUpdateResponse, err := getUpdateUserResponse(session, params)
 		if err != nil {
-			return userApi.NewUpdateUserInfoDefault(int(err.Code)).WithPayload(err)
+			return userApi.NewUpdateUserInfoDefault(err.Code).WithPayload(err.APIError)
 		}
 
 		return userApi.NewUpdateUserInfoOK().WithPayload(userUpdateResponse)
@@ -100,7 +98,7 @@ func registerUsersHandlers(api *operations.ConsoleAPI) {
 	api.UserBulkUpdateUsersGroupsHandler = userApi.BulkUpdateUsersGroupsHandlerFunc(func(params userApi.BulkUpdateUsersGroupsParams, session *models.Principal) middleware.Responder {
 		err := getAddUsersListToGroupsResponse(session, params)
 		if err != nil {
-			return userApi.NewBulkUpdateUsersGroupsDefault(int(err.Code)).WithPayload(err)
+			return userApi.NewBulkUpdateUsersGroupsDefault(err.Code).WithPayload(err.APIError)
 		}
 
 		return userApi.NewBulkUpdateUsersGroupsOK()
@@ -108,7 +106,7 @@ func registerUsersHandlers(api *operations.ConsoleAPI) {
 	api.BucketListUsersWithAccessToBucketHandler = bucketApi.ListUsersWithAccessToBucketHandlerFunc(func(params bucketApi.ListUsersWithAccessToBucketParams, session *models.Principal) middleware.Responder {
 		response, err := getListUsersWithAccessToBucketResponse(session, params)
 		if err != nil {
-			return bucketApi.NewListUsersWithAccessToBucketDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewListUsersWithAccessToBucketDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewListUsersWithAccessToBucketOK().WithPayload(response)
 	})
@@ -116,7 +114,7 @@ func registerUsersHandlers(api *operations.ConsoleAPI) {
 	api.AccountChangeUserPasswordHandler = accountApi.ChangeUserPasswordHandlerFunc(func(params accountApi.ChangeUserPasswordParams, session *models.Principal) middleware.Responder {
 		err := getChangeUserPasswordResponse(session, params)
 		if err != nil {
-			return accountApi.NewChangeUserPasswordDefault(int(err.Code)).WithPayload(err)
+			return accountApi.NewChangeUserPasswordDefault(err.Code).WithPayload(err.APIError)
 		}
 		return accountApi.NewChangeUserPasswordCreated()
 	})
@@ -124,7 +122,7 @@ func registerUsersHandlers(api *operations.ConsoleAPI) {
 	api.UserCheckUserServiceAccountsHandler = userApi.CheckUserServiceAccountsHandlerFunc(func(params userApi.CheckUserServiceAccountsParams, session *models.Principal) middleware.Responder {
 		userSAList, err := getCheckUserSAResponse(session, params)
 		if err != nil {
-			return userApi.NewCheckUserServiceAccountsDefault(int(err.Code)).WithPayload(err)
+			return userApi.NewCheckUserServiceAccountsDefault(err.Code).WithPayload(err.APIError)
 		}
 		return userApi.NewCheckUserServiceAccountsOK().WithPayload(userSAList)
 	})
@@ -154,7 +152,7 @@ func listUsers(ctx context.Context, client MinioAdmin) ([]*models.User, error) {
 }
 
 // getListUsersResponse performs listUsers() and serializes it to the handler's output
-func getListUsersResponse(session *models.Principal, params userApi.ListUsersParams) (*models.ListUsersResponse, *models.Error) {
+func getListUsersResponse(session *models.Principal, params userApi.ListUsersParams) (*models.ListUsersResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -215,7 +213,7 @@ func addUser(ctx context.Context, client MinioAdmin, accessKey, secretKey *strin
 	return userRet, nil
 }
 
-func getUserAddResponse(session *models.Principal, params userApi.AddUserParams) (*models.User, *models.Error) {
+func getUserAddResponse(session *models.Principal, params userApi.AddUserParams) (*models.User, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -252,7 +250,7 @@ func removeUser(ctx context.Context, client MinioAdmin, accessKey string) error
 	return client.removeUser(ctx, accessKey)
 }
 
-func getRemoveUserResponse(session *models.Principal, params userApi.RemoveUserParams) *models.Error {
+func getRemoveUserResponse(session *models.Principal, params userApi.RemoveUserParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -284,7 +282,7 @@ func getUserInfo(ctx context.Context, client MinioAdmin, accessKey string) (*mad
 	return &userInfo, nil
 }
 
-func getUserInfoResponse(session *models.Principal, params userApi.GetUserInfoParams) (*models.User, *models.Error) {
+func getUserInfoResponse(session *models.Principal, params userApi.GetUserInfoParams) (*models.User, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -306,9 +304,9 @@ func getUserInfoResponse(session *models.Principal, params userApi.GetUserInfoPa
 	if err != nil {
 		// User doesn't exist, return 404
 		if madmin.ToErrorResponse(err).Code == "XMinioAdminNoSuchUser" {
-			var errorCode int32 = 404
+			errorCode := 404
 			errorMessage := "User doesn't exist"
-			return nil, &models.Error{Code: errorCode, Message: swag.String(errorMessage), DetailedMessage: swag.String(err.Error())}
+			return nil, &CodedAPIError{Code: errorCode, APIError: &models.APIError{Message: errorMessage, DetailedMessage: err.Error()}}
 		}
 		return nil, ErrorWithContext(ctx, err)
 	}
@@ -435,7 +433,7 @@ func updateUserGroups(ctx context.Context, client MinioAdmin, user string, group
 	return userReturn, nil
 }
 
-func getUpdateUserGroupsResponse(session *models.Principal, params userApi.UpdateUserGroupsParams) (*models.User, *models.Error) {
+func getUpdateUserGroupsResponse(session *models.Principal, params userApi.UpdateUserGroupsParams) (*models.User, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -476,7 +474,7 @@ func setUserStatus(ctx context.Context, client MinioAdmin, user string, status s
 	return client.setUserStatus(ctx, user, setStatus)
 }
 
-func getUpdateUserResponse(session *models.Principal, params userApi.UpdateUserInfoParams) (*models.User, *models.Error) {
+func getUpdateUserResponse(session *models.Principal, params userApi.UpdateUserInfoParams) (*models.User, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -550,7 +548,7 @@ func addUsersListToGroups(ctx context.Context, client MinioAdmin, usersToUpdate
 	return nil
 }
 
-func getAddUsersListToGroupsResponse(session *models.Principal, params userApi.BulkUpdateUsersGroupsParams) *models.Error {
+func getAddUsersListToGroupsResponse(session *models.Principal, params userApi.BulkUpdateUsersGroupsParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -573,7 +571,7 @@ func getAddUsersListToGroupsResponse(session *models.Principal, params userApi.B
 	return nil
 }
 
-func getListUsersWithAccessToBucketResponse(session *models.Principal, params bucketApi.ListUsersWithAccessToBucketParams) ([]string, *models.Error) {
+func getListUsersWithAccessToBucketResponse(session *models.Principal, params bucketApi.ListUsersWithAccessToBucketParams) ([]string, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -684,7 +682,7 @@ func changeUserPassword(ctx context.Context, client MinioAdmin, selectedUser str
 }
 
 // getChangeUserPasswordResponse will change the password of selctedUser to newSecretKey
-func getChangeUserPasswordResponse(session *models.Principal, params accountApi.ChangeUserPasswordParams) *models.Error {
+func getChangeUserPasswordResponse(session *models.Principal, params accountApi.ChangeUserPasswordParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -706,7 +704,7 @@ func getChangeUserPasswordResponse(session *models.Principal, params accountApi.
 	return nil
 }
 
-func getCheckUserSAResponse(session *models.Principal, params userApi.CheckUserServiceAccountsParams) (*models.UserServiceAccountSummary, *models.Error) {
+func getCheckUserSAResponse(session *models.Principal, params userApi.CheckUserServiceAccountsParams) (*models.UserServiceAccountSummary, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
diff --git a/restapi/embedded_spec.go b/restapi/embedded_spec.go
index b95ddc552..444f43cf4 100644
--- a/restapi/embedded_spec.go
+++ b/restapi/embedded_spec.go
@@ -76,7 +76,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -106,7 +106,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -129,7 +129,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -160,7 +160,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -208,7 +208,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -253,7 +253,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -276,7 +276,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -307,7 +307,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -330,7 +330,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -361,7 +361,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -392,7 +392,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -423,7 +423,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -488,7 +488,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -511,7 +511,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -539,7 +539,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -582,7 +582,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -630,7 +630,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -673,7 +673,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -719,7 +719,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -762,7 +762,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -799,7 +799,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -836,7 +836,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -859,7 +859,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -890,7 +890,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -923,7 +923,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -956,7 +956,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -984,7 +984,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1033,7 +1033,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1069,7 +1069,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1097,7 +1097,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1133,7 +1133,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1164,7 +1164,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1207,7 +1207,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1241,7 +1241,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1283,7 +1283,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1314,7 +1314,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1348,7 +1348,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1390,7 +1390,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1422,7 +1422,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1453,7 +1453,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1518,7 +1518,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1575,7 +1575,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1640,7 +1640,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1693,7 +1693,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1741,7 +1741,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1778,7 +1778,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1818,7 +1818,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1866,7 +1866,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1904,7 +1904,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -1952,7 +1952,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2000,7 +2000,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2043,7 +2043,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2074,7 +2074,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2111,7 +2111,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2151,7 +2151,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2183,7 +2183,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2214,7 +2214,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2248,7 +2248,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2290,7 +2290,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2326,7 +2326,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2357,7 +2357,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2391,7 +2391,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2422,7 +2422,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2448,7 +2448,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2479,7 +2479,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2516,7 +2516,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2555,7 +2555,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2579,7 +2579,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2616,7 +2616,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2639,7 +2639,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2669,7 +2669,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2703,7 +2703,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2740,7 +2740,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2771,7 +2771,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2802,7 +2802,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2839,7 +2839,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2865,7 +2865,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2902,7 +2902,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2930,7 +2930,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -2962,7 +2962,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3000,7 +3000,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3039,7 +3039,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3084,7 +3084,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3121,7 +3121,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3144,7 +3144,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3167,7 +3167,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3198,7 +3198,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3227,7 +3227,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3259,7 +3259,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3290,7 +3290,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3318,7 +3318,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3350,7 +3350,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3377,7 +3377,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3414,7 +3414,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3437,7 +3437,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3468,7 +3468,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3496,7 +3496,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3528,7 +3528,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3555,7 +3555,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3592,7 +3592,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3624,7 +3624,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3647,7 +3647,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3670,7 +3670,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3703,7 +3703,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3736,7 +3736,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3760,7 +3760,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3789,7 +3789,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3820,7 +3820,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3850,7 +3850,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3914,7 +3914,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3940,7 +3940,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -3977,7 +3977,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4008,7 +4008,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4042,7 +4042,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4076,7 +4076,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4107,7 +4107,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4133,7 +4133,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4166,7 +4166,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4192,7 +4192,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4242,7 +4242,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4265,7 +4265,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4293,7 +4293,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4324,7 +4324,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4358,7 +4358,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4391,7 +4391,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4428,7 +4428,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4459,7 +4459,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4492,7 +4492,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4520,7 +4520,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4551,7 +4551,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4585,7 +4585,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4605,7 +4605,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4628,7 +4628,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4658,7 +4658,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4688,7 +4688,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4719,7 +4719,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4742,7 +4742,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4775,7 +4775,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4808,7 +4808,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4838,7 +4838,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4861,7 +4861,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4884,7 +4884,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4912,7 +4912,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4935,7 +4935,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -4966,7 +4966,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -5003,7 +5003,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -5029,7 +5029,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -5068,7 +5068,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -5099,7 +5099,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -5138,7 +5138,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -5169,7 +5169,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -5206,7 +5206,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -5243,7 +5243,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -5274,7 +5274,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -5304,7 +5304,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -5340,7 +5340,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -5348,6 +5348,17 @@ func init() {
     }
   },
   "definitions": {
+    "ApiError": {
+      "type": "object",
+      "properties": {
+        "detailedMessage": {
+          "type": "string"
+        },
+        "message": {
+          "type": "string"
+        }
+      }
+    },
     "BackendProperties": {
       "type": "object",
       "properties": {
@@ -6230,25 +6241,6 @@ func init() {
         }
       }
     },
-    "error": {
-      "type": "object",
-      "required": [
-        "message",
-        "detailedMessage"
-      ],
-      "properties": {
-        "code": {
-          "type": "integer",
-          "format": "int32"
-        },
-        "detailedMessage": {
-          "type": "string"
-        },
-        "message": {
-          "type": "string"
-        }
-      }
-    },
     "expirationResponse": {
       "type": "object",
       "properties": {
@@ -9160,7 +9152,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9190,7 +9182,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9213,7 +9205,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9244,7 +9236,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9292,7 +9284,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9337,7 +9329,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9360,7 +9352,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9391,7 +9383,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9414,7 +9406,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9445,7 +9437,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9476,7 +9468,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9507,7 +9499,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9572,7 +9564,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9595,7 +9587,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9623,7 +9615,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9666,7 +9658,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9714,7 +9706,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9757,7 +9749,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9803,7 +9795,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9846,7 +9838,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9883,7 +9875,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9920,7 +9912,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9943,7 +9935,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -9974,7 +9966,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10007,7 +9999,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10040,7 +10032,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10068,7 +10060,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10117,7 +10109,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10153,7 +10145,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10181,7 +10173,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10217,7 +10209,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10248,7 +10240,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10291,7 +10283,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10325,7 +10317,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10367,7 +10359,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10398,7 +10390,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10432,7 +10424,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10474,7 +10466,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10506,7 +10498,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10537,7 +10529,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10602,7 +10594,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10659,7 +10651,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10724,7 +10716,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10777,7 +10769,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10825,7 +10817,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10862,7 +10854,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10902,7 +10894,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10950,7 +10942,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -10988,7 +10980,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11036,7 +11028,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11084,7 +11076,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11127,7 +11119,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11158,7 +11150,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11195,7 +11187,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11235,7 +11227,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11267,7 +11259,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11298,7 +11290,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11332,7 +11324,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11374,7 +11366,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11410,7 +11402,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11441,7 +11433,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11475,7 +11467,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11506,7 +11498,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11532,7 +11524,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11563,7 +11555,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11600,7 +11592,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11639,7 +11631,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11663,7 +11655,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11700,7 +11692,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11723,7 +11715,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11753,7 +11745,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11787,7 +11779,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11824,7 +11816,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11855,7 +11847,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11886,7 +11878,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11923,7 +11915,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11949,7 +11941,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -11986,7 +11978,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12014,7 +12006,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12046,7 +12038,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12084,7 +12076,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12123,7 +12115,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12168,7 +12160,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12205,7 +12197,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12228,7 +12220,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12251,7 +12243,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12282,7 +12274,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12311,7 +12303,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12343,7 +12335,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12374,7 +12366,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12402,7 +12394,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12434,7 +12426,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12461,7 +12453,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12498,7 +12490,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12521,7 +12513,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12552,7 +12544,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12580,7 +12572,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12612,7 +12604,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12639,7 +12631,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12676,7 +12668,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12708,7 +12700,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12731,7 +12723,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12754,7 +12746,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12787,7 +12779,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12820,7 +12812,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12844,7 +12836,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12873,7 +12865,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12904,7 +12896,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12934,7 +12926,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -12998,7 +12990,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13024,7 +13016,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13061,7 +13053,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13092,7 +13084,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13126,7 +13118,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13160,7 +13152,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13191,7 +13183,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13217,7 +13209,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13250,7 +13242,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13276,7 +13268,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13326,7 +13318,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13349,7 +13341,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13377,7 +13369,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13408,7 +13400,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13442,7 +13434,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13475,7 +13467,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13512,7 +13504,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13543,7 +13535,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13576,7 +13568,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13604,7 +13596,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13635,7 +13627,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13669,7 +13661,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13689,7 +13681,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13712,7 +13704,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13742,7 +13734,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13772,7 +13764,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13803,7 +13795,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13826,7 +13818,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13859,7 +13851,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13892,7 +13884,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13922,7 +13914,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13945,7 +13937,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13968,7 +13960,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -13996,7 +13988,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -14019,7 +14011,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -14050,7 +14042,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -14087,7 +14079,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -14113,7 +14105,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -14152,7 +14144,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -14183,7 +14175,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -14222,7 +14214,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -14253,7 +14245,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -14290,7 +14282,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -14327,7 +14319,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -14358,7 +14350,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -14388,7 +14380,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -14424,7 +14416,7 @@ func init() {
           "default": {
             "description": "Generic error response.",
             "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/ApiError"
             }
           }
         }
@@ -14432,6 +14424,17 @@ func init() {
     }
   },
   "definitions": {
+    "ApiError": {
+      "type": "object",
+      "properties": {
+        "detailedMessage": {
+          "type": "string"
+        },
+        "message": {
+          "type": "string"
+        }
+      }
+    },
     "BackendProperties": {
       "type": "object",
       "properties": {
@@ -15463,25 +15466,6 @@ func init() {
         }
       }
     },
-    "error": {
-      "type": "object",
-      "required": [
-        "message",
-        "detailedMessage"
-      ],
-      "properties": {
-        "code": {
-          "type": "integer",
-          "format": "int32"
-        },
-        "detailedMessage": {
-          "type": "string"
-        },
-        "message": {
-          "type": "string"
-        }
-      }
-    },
     "expirationResponse": {
       "type": "object",
       "properties": {
diff --git a/restapi/errors.go b/restapi/errors.go
index 524cc2b1a..bef6a1d78 100644
--- a/restapi/errors.go
+++ b/restapi/errors.go
@@ -21,10 +21,10 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/go-openapi/swag"
+	"github.com/minio/minio-go/v7"
+
 	"github.com/minio/console/models"
 	"github.com/minio/madmin-go/v3"
-	"github.com/minio/minio-go/v7"
 )
 
 var (
@@ -75,9 +75,14 @@ var (
 	ErrHealthReportFail                 = errors.New("failure to generate Health report")
 )
 
+type CodedAPIError struct {
+	Code     int
+	APIError *models.APIError
+}
+
 // ErrorWithContext :
-func ErrorWithContext(ctx context.Context, err ...interface{}) *models.Error {
-	errorCode := int32(500)
+func ErrorWithContext(ctx context.Context, err ...interface{}) *CodedAPIError {
+	errorCode := 500
 	errorMessage := ErrDefault.Error()
 	var err1 error
 	var exists bool
@@ -241,6 +246,7 @@ func ErrorWithContext(ctx context.Context, err ...interface{}) *models.Error {
 				errorCode = 400
 				errorMessage = "Bucket already exists"
 			}
+
 			LogError("ErrorWithContext:%v", err...)
 			LogIf(ctx, err1, err...)
 		}
@@ -251,11 +257,11 @@ func ErrorWithContext(ctx context.Context, err ...interface{}) *models.Error {
 			}
 		}
 	}
-	return &models.Error{Code: errorCode, Message: swag.String(errorMessage), DetailedMessage: swag.String(err1.Error())}
+	return &CodedAPIError{Code: errorCode, APIError: &models.APIError{Message: errorMessage, DetailedMessage: err1.Error()}}
 }
 
 // Error receives an errors object and parse it against k8sErrors, returns the right errors code paired with a generic errors message
-func Error(err ...interface{}) *models.Error {
+func Error(err ...interface{}) *CodedAPIError {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	return ErrorWithContext(ctx, err...)
diff --git a/restapi/errors_test.go b/restapi/errors_test.go
index a664b357f..e6f6ad23f 100644
--- a/restapi/errors_test.go
+++ b/restapi/errors_test.go
@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/go-openapi/swag"
 	"github.com/minio/console/models"
 	"github.com/stretchr/testify/assert"
 )
@@ -34,7 +33,7 @@ func TestError(t *testing.T) {
 	type testError struct {
 		name string
 		args args
-		want *models.Error
+		want *CodedAPIError
 	}
 
 	var tests []testError
@@ -91,7 +90,10 @@ func TestError(t *testing.T) {
 			args: args{
 				err: []interface{}{e.err},
 			},
-			want: &models.Error{Code: int32(e.code), Message: swag.String(e.err.Error()), DetailedMessage: swag.String(e.err.Error())},
+			want: &CodedAPIError{
+				Code:     e.code,
+				APIError: &models.APIError{Message: e.err.Error(), DetailedMessage: e.err.Error()},
+			},
 		})
 	}
 	tests = append(tests,
@@ -100,13 +102,16 @@ func TestError(t *testing.T) {
 			args: args{
 				err: []interface{}{ErrDefault, ErrInvalidLogin},
 			},
-			want: &models.Error{Code: int32(401), Message: swag.String(ErrDefault.Error()), DetailedMessage: swag.String(ErrDefault.Error())},
+			want: &CodedAPIError{
+				Code:     int(401),
+				APIError: &models.APIError{Message: ErrDefault.Error(), DetailedMessage: ErrDefault.Error()},
+			},
 		})
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got := Error(tt.args.err...)
 			assert.Equalf(t, tt.want.Code, got.Code, "Error(%v) Got (%v)", tt.want.Code, got.Code)
-			assert.Equalf(t, *tt.want.DetailedMessage, *got.DetailedMessage, "Error(%s) Got (%s)", *tt.want.DetailedMessage, *got.DetailedMessage)
+			assert.Equalf(t, tt.want.APIError.DetailedMessage, got.APIError.DetailedMessage, "Error(%s) Got (%s)", tt.want.APIError.DetailedMessage, got.APIError.DetailedMessage)
 		})
 	}
 }
@@ -119,7 +124,7 @@ func TestErrorWithContext(t *testing.T) {
 	tests := []struct {
 		name string
 		args args
-		want *models.Error
+		want *CodedAPIError
 	}{
 		{
 			name: "default error",
@@ -127,7 +132,9 @@ func TestErrorWithContext(t *testing.T) {
 				ctx: context.Background(),
 				err: []interface{}{ErrDefault},
 			},
-			want: &models.Error{Code: 500, Message: swag.String(ErrDefault.Error()), DetailedMessage: swag.String(ErrDefault.Error())},
+			want: &CodedAPIError{
+				Code: 500, APIError: &models.APIError{Message: ErrDefault.Error(), DetailedMessage: ErrDefault.Error()},
+			},
 		},
 	}
 	for _, tt := range tests {
diff --git a/restapi/operations/account/account_change_password_responses.go b/restapi/operations/account/account_change_password_responses.go
index 4684dbaac..91104da67 100644
--- a/restapi/operations/account/account_change_password_responses.go
+++ b/restapi/operations/account/account_change_password_responses.go
@@ -66,7 +66,7 @@ type AccountChangePasswordDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewAccountChangePasswordDefault creates AccountChangePasswordDefault with default headers values
@@ -92,13 +92,13 @@ func (o *AccountChangePasswordDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the account change password default response
-func (o *AccountChangePasswordDefault) WithPayload(payload *models.Error) *AccountChangePasswordDefault {
+func (o *AccountChangePasswordDefault) WithPayload(payload *models.APIError) *AccountChangePasswordDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the account change password default response
-func (o *AccountChangePasswordDefault) SetPayload(payload *models.Error) {
+func (o *AccountChangePasswordDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/account/change_user_password_responses.go b/restapi/operations/account/change_user_password_responses.go
index 6846b1e0c..d40b33bed 100644
--- a/restapi/operations/account/change_user_password_responses.go
+++ b/restapi/operations/account/change_user_password_responses.go
@@ -66,7 +66,7 @@ type ChangeUserPasswordDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewChangeUserPasswordDefault creates ChangeUserPasswordDefault with default headers values
@@ -92,13 +92,13 @@ func (o *ChangeUserPasswordDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the change user password default response
-func (o *ChangeUserPasswordDefault) WithPayload(payload *models.Error) *ChangeUserPasswordDefault {
+func (o *ChangeUserPasswordDefault) WithPayload(payload *models.APIError) *ChangeUserPasswordDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the change user password default response
-func (o *ChangeUserPasswordDefault) SetPayload(payload *models.Error) {
+func (o *ChangeUserPasswordDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/auth/login_detail_responses.go b/restapi/operations/auth/login_detail_responses.go
index bf7a2a354..8b3429dcb 100644
--- a/restapi/operations/auth/login_detail_responses.go
+++ b/restapi/operations/auth/login_detail_responses.go
@@ -86,7 +86,7 @@ type LoginDetailDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewLoginDetailDefault creates LoginDetailDefault with default headers values
@@ -112,13 +112,13 @@ func (o *LoginDetailDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the login detail default response
-func (o *LoginDetailDefault) WithPayload(payload *models.Error) *LoginDetailDefault {
+func (o *LoginDetailDefault) WithPayload(payload *models.APIError) *LoginDetailDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the login detail default response
-func (o *LoginDetailDefault) SetPayload(payload *models.Error) {
+func (o *LoginDetailDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/auth/login_oauth2_auth_responses.go b/restapi/operations/auth/login_oauth2_auth_responses.go
index a0817f141..1781e63fc 100644
--- a/restapi/operations/auth/login_oauth2_auth_responses.go
+++ b/restapi/operations/auth/login_oauth2_auth_responses.go
@@ -66,7 +66,7 @@ type LoginOauth2AuthDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewLoginOauth2AuthDefault creates LoginOauth2AuthDefault with default headers values
@@ -92,13 +92,13 @@ func (o *LoginOauth2AuthDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the login oauth2 auth default response
-func (o *LoginOauth2AuthDefault) WithPayload(payload *models.Error) *LoginOauth2AuthDefault {
+func (o *LoginOauth2AuthDefault) WithPayload(payload *models.APIError) *LoginOauth2AuthDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the login oauth2 auth default response
-func (o *LoginOauth2AuthDefault) SetPayload(payload *models.Error) {
+func (o *LoginOauth2AuthDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/auth/login_responses.go b/restapi/operations/auth/login_responses.go
index 87e43647a..11d2da7e1 100644
--- a/restapi/operations/auth/login_responses.go
+++ b/restapi/operations/auth/login_responses.go
@@ -66,7 +66,7 @@ type LoginDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewLoginDefault creates LoginDefault with default headers values
@@ -92,13 +92,13 @@ func (o *LoginDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the login default response
-func (o *LoginDefault) WithPayload(payload *models.Error) *LoginDefault {
+func (o *LoginDefault) WithPayload(payload *models.APIError) *LoginDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the login default response
-func (o *LoginDefault) SetPayload(payload *models.Error) {
+func (o *LoginDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/auth/logout_responses.go b/restapi/operations/auth/logout_responses.go
index a4c4cdd9b..03b8945f5 100644
--- a/restapi/operations/auth/logout_responses.go
+++ b/restapi/operations/auth/logout_responses.go
@@ -66,7 +66,7 @@ type LogoutDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewLogoutDefault creates LogoutDefault with default headers values
@@ -92,13 +92,13 @@ func (o *LogoutDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the logout default response
-func (o *LogoutDefault) WithPayload(payload *models.Error) *LogoutDefault {
+func (o *LogoutDefault) WithPayload(payload *models.APIError) *LogoutDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the logout default response
-func (o *LogoutDefault) SetPayload(payload *models.Error) {
+func (o *LogoutDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/auth/session_check_responses.go b/restapi/operations/auth/session_check_responses.go
index 221e06a7e..5dfc96802 100644
--- a/restapi/operations/auth/session_check_responses.go
+++ b/restapi/operations/auth/session_check_responses.go
@@ -86,7 +86,7 @@ type SessionCheckDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewSessionCheckDefault creates SessionCheckDefault with default headers values
@@ -112,13 +112,13 @@ func (o *SessionCheckDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the session check default response
-func (o *SessionCheckDefault) WithPayload(payload *models.Error) *SessionCheckDefault {
+func (o *SessionCheckDefault) WithPayload(payload *models.APIError) *SessionCheckDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the session check default response
-func (o *SessionCheckDefault) SetPayload(payload *models.Error) {
+func (o *SessionCheckDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/add_bucket_lifecycle_responses.go b/restapi/operations/bucket/add_bucket_lifecycle_responses.go
index a95028841..764266c94 100644
--- a/restapi/operations/bucket/add_bucket_lifecycle_responses.go
+++ b/restapi/operations/bucket/add_bucket_lifecycle_responses.go
@@ -66,7 +66,7 @@ type AddBucketLifecycleDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewAddBucketLifecycleDefault creates AddBucketLifecycleDefault with default headers values
@@ -92,13 +92,13 @@ func (o *AddBucketLifecycleDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the add bucket lifecycle default response
-func (o *AddBucketLifecycleDefault) WithPayload(payload *models.Error) *AddBucketLifecycleDefault {
+func (o *AddBucketLifecycleDefault) WithPayload(payload *models.APIError) *AddBucketLifecycleDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the add bucket lifecycle default response
-func (o *AddBucketLifecycleDefault) SetPayload(payload *models.Error) {
+func (o *AddBucketLifecycleDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/add_multi_bucket_lifecycle_responses.go b/restapi/operations/bucket/add_multi_bucket_lifecycle_responses.go
index 7b90401c1..9bde2518d 100644
--- a/restapi/operations/bucket/add_multi_bucket_lifecycle_responses.go
+++ b/restapi/operations/bucket/add_multi_bucket_lifecycle_responses.go
@@ -86,7 +86,7 @@ type AddMultiBucketLifecycleDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewAddMultiBucketLifecycleDefault creates AddMultiBucketLifecycleDefault with default headers values
@@ -112,13 +112,13 @@ func (o *AddMultiBucketLifecycleDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the add multi bucket lifecycle default response
-func (o *AddMultiBucketLifecycleDefault) WithPayload(payload *models.Error) *AddMultiBucketLifecycleDefault {
+func (o *AddMultiBucketLifecycleDefault) WithPayload(payload *models.APIError) *AddMultiBucketLifecycleDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the add multi bucket lifecycle default response
-func (o *AddMultiBucketLifecycleDefault) SetPayload(payload *models.Error) {
+func (o *AddMultiBucketLifecycleDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/add_remote_bucket_responses.go b/restapi/operations/bucket/add_remote_bucket_responses.go
index 5d20a5dd1..625eaa182 100644
--- a/restapi/operations/bucket/add_remote_bucket_responses.go
+++ b/restapi/operations/bucket/add_remote_bucket_responses.go
@@ -66,7 +66,7 @@ type AddRemoteBucketDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewAddRemoteBucketDefault creates AddRemoteBucketDefault with default headers values
@@ -92,13 +92,13 @@ func (o *AddRemoteBucketDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the add remote bucket default response
-func (o *AddRemoteBucketDefault) WithPayload(payload *models.Error) *AddRemoteBucketDefault {
+func (o *AddRemoteBucketDefault) WithPayload(payload *models.APIError) *AddRemoteBucketDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the add remote bucket default response
-func (o *AddRemoteBucketDefault) SetPayload(payload *models.Error) {
+func (o *AddRemoteBucketDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/bucket_info_responses.go b/restapi/operations/bucket/bucket_info_responses.go
index e519e450b..42fffde97 100644
--- a/restapi/operations/bucket/bucket_info_responses.go
+++ b/restapi/operations/bucket/bucket_info_responses.go
@@ -86,7 +86,7 @@ type BucketInfoDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewBucketInfoDefault creates BucketInfoDefault with default headers values
@@ -112,13 +112,13 @@ func (o *BucketInfoDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the bucket info default response
-func (o *BucketInfoDefault) WithPayload(payload *models.Error) *BucketInfoDefault {
+func (o *BucketInfoDefault) WithPayload(payload *models.APIError) *BucketInfoDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the bucket info default response
-func (o *BucketInfoDefault) SetPayload(payload *models.Error) {
+func (o *BucketInfoDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/bucket_set_policy_responses.go b/restapi/operations/bucket/bucket_set_policy_responses.go
index 74c7fdd17..2ad0c673b 100644
--- a/restapi/operations/bucket/bucket_set_policy_responses.go
+++ b/restapi/operations/bucket/bucket_set_policy_responses.go
@@ -86,7 +86,7 @@ type BucketSetPolicyDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewBucketSetPolicyDefault creates BucketSetPolicyDefault with default headers values
@@ -112,13 +112,13 @@ func (o *BucketSetPolicyDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the bucket set policy default response
-func (o *BucketSetPolicyDefault) WithPayload(payload *models.Error) *BucketSetPolicyDefault {
+func (o *BucketSetPolicyDefault) WithPayload(payload *models.APIError) *BucketSetPolicyDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the bucket set policy default response
-func (o *BucketSetPolicyDefault) SetPayload(payload *models.Error) {
+func (o *BucketSetPolicyDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/create_bucket_event_responses.go b/restapi/operations/bucket/create_bucket_event_responses.go
index 8923ec608..c8bda7cd4 100644
--- a/restapi/operations/bucket/create_bucket_event_responses.go
+++ b/restapi/operations/bucket/create_bucket_event_responses.go
@@ -66,7 +66,7 @@ type CreateBucketEventDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewCreateBucketEventDefault creates CreateBucketEventDefault with default headers values
@@ -92,13 +92,13 @@ func (o *CreateBucketEventDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the create bucket event default response
-func (o *CreateBucketEventDefault) WithPayload(payload *models.Error) *CreateBucketEventDefault {
+func (o *CreateBucketEventDefault) WithPayload(payload *models.APIError) *CreateBucketEventDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the create bucket event default response
-func (o *CreateBucketEventDefault) SetPayload(payload *models.Error) {
+func (o *CreateBucketEventDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/delete_access_rule_with_bucket_responses.go b/restapi/operations/bucket/delete_access_rule_with_bucket_responses.go
index aa5459c60..317222954 100644
--- a/restapi/operations/bucket/delete_access_rule_with_bucket_responses.go
+++ b/restapi/operations/bucket/delete_access_rule_with_bucket_responses.go
@@ -84,7 +84,7 @@ type DeleteAccessRuleWithBucketDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewDeleteAccessRuleWithBucketDefault creates DeleteAccessRuleWithBucketDefault with default headers values
@@ -110,13 +110,13 @@ func (o *DeleteAccessRuleWithBucketDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the delete access rule with bucket default response
-func (o *DeleteAccessRuleWithBucketDefault) WithPayload(payload *models.Error) *DeleteAccessRuleWithBucketDefault {
+func (o *DeleteAccessRuleWithBucketDefault) WithPayload(payload *models.APIError) *DeleteAccessRuleWithBucketDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the delete access rule with bucket default response
-func (o *DeleteAccessRuleWithBucketDefault) SetPayload(payload *models.Error) {
+func (o *DeleteAccessRuleWithBucketDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/delete_all_replication_rules_responses.go b/restapi/operations/bucket/delete_all_replication_rules_responses.go
index 693005b87..b890fef48 100644
--- a/restapi/operations/bucket/delete_all_replication_rules_responses.go
+++ b/restapi/operations/bucket/delete_all_replication_rules_responses.go
@@ -66,7 +66,7 @@ type DeleteAllReplicationRulesDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewDeleteAllReplicationRulesDefault creates DeleteAllReplicationRulesDefault with default headers values
@@ -92,13 +92,13 @@ func (o *DeleteAllReplicationRulesDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the delete all replication rules default response
-func (o *DeleteAllReplicationRulesDefault) WithPayload(payload *models.Error) *DeleteAllReplicationRulesDefault {
+func (o *DeleteAllReplicationRulesDefault) WithPayload(payload *models.APIError) *DeleteAllReplicationRulesDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the delete all replication rules default response
-func (o *DeleteAllReplicationRulesDefault) SetPayload(payload *models.Error) {
+func (o *DeleteAllReplicationRulesDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/delete_bucket_event_responses.go b/restapi/operations/bucket/delete_bucket_event_responses.go
index 51d0e6dab..9809dbfd7 100644
--- a/restapi/operations/bucket/delete_bucket_event_responses.go
+++ b/restapi/operations/bucket/delete_bucket_event_responses.go
@@ -66,7 +66,7 @@ type DeleteBucketEventDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewDeleteBucketEventDefault creates DeleteBucketEventDefault with default headers values
@@ -92,13 +92,13 @@ func (o *DeleteBucketEventDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the delete bucket event default response
-func (o *DeleteBucketEventDefault) WithPayload(payload *models.Error) *DeleteBucketEventDefault {
+func (o *DeleteBucketEventDefault) WithPayload(payload *models.APIError) *DeleteBucketEventDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the delete bucket event default response
-func (o *DeleteBucketEventDefault) SetPayload(payload *models.Error) {
+func (o *DeleteBucketEventDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/delete_bucket_lifecycle_rule_responses.go b/restapi/operations/bucket/delete_bucket_lifecycle_rule_responses.go
index b412d6a95..b289f7739 100644
--- a/restapi/operations/bucket/delete_bucket_lifecycle_rule_responses.go
+++ b/restapi/operations/bucket/delete_bucket_lifecycle_rule_responses.go
@@ -66,7 +66,7 @@ type DeleteBucketLifecycleRuleDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewDeleteBucketLifecycleRuleDefault creates DeleteBucketLifecycleRuleDefault with default headers values
@@ -92,13 +92,13 @@ func (o *DeleteBucketLifecycleRuleDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the delete bucket lifecycle rule default response
-func (o *DeleteBucketLifecycleRuleDefault) WithPayload(payload *models.Error) *DeleteBucketLifecycleRuleDefault {
+func (o *DeleteBucketLifecycleRuleDefault) WithPayload(payload *models.APIError) *DeleteBucketLifecycleRuleDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the delete bucket lifecycle rule default response
-func (o *DeleteBucketLifecycleRuleDefault) SetPayload(payload *models.Error) {
+func (o *DeleteBucketLifecycleRuleDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/delete_bucket_replication_rule_responses.go b/restapi/operations/bucket/delete_bucket_replication_rule_responses.go
index a61c03f8a..9c56027c0 100644
--- a/restapi/operations/bucket/delete_bucket_replication_rule_responses.go
+++ b/restapi/operations/bucket/delete_bucket_replication_rule_responses.go
@@ -66,7 +66,7 @@ type DeleteBucketReplicationRuleDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewDeleteBucketReplicationRuleDefault creates DeleteBucketReplicationRuleDefault with default headers values
@@ -92,13 +92,13 @@ func (o *DeleteBucketReplicationRuleDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the delete bucket replication rule default response
-func (o *DeleteBucketReplicationRuleDefault) WithPayload(payload *models.Error) *DeleteBucketReplicationRuleDefault {
+func (o *DeleteBucketReplicationRuleDefault) WithPayload(payload *models.APIError) *DeleteBucketReplicationRuleDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the delete bucket replication rule default response
-func (o *DeleteBucketReplicationRuleDefault) SetPayload(payload *models.Error) {
+func (o *DeleteBucketReplicationRuleDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/delete_bucket_responses.go b/restapi/operations/bucket/delete_bucket_responses.go
index 085d56351..27fb28545 100644
--- a/restapi/operations/bucket/delete_bucket_responses.go
+++ b/restapi/operations/bucket/delete_bucket_responses.go
@@ -66,7 +66,7 @@ type DeleteBucketDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewDeleteBucketDefault creates DeleteBucketDefault with default headers values
@@ -92,13 +92,13 @@ func (o *DeleteBucketDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the delete bucket default response
-func (o *DeleteBucketDefault) WithPayload(payload *models.Error) *DeleteBucketDefault {
+func (o *DeleteBucketDefault) WithPayload(payload *models.APIError) *DeleteBucketDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the delete bucket default response
-func (o *DeleteBucketDefault) SetPayload(payload *models.Error) {
+func (o *DeleteBucketDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/delete_remote_bucket_responses.go b/restapi/operations/bucket/delete_remote_bucket_responses.go
index d2ae46846..0dcd6ff26 100644
--- a/restapi/operations/bucket/delete_remote_bucket_responses.go
+++ b/restapi/operations/bucket/delete_remote_bucket_responses.go
@@ -66,7 +66,7 @@ type DeleteRemoteBucketDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewDeleteRemoteBucketDefault creates DeleteRemoteBucketDefault with default headers values
@@ -92,13 +92,13 @@ func (o *DeleteRemoteBucketDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the delete remote bucket default response
-func (o *DeleteRemoteBucketDefault) WithPayload(payload *models.Error) *DeleteRemoteBucketDefault {
+func (o *DeleteRemoteBucketDefault) WithPayload(payload *models.APIError) *DeleteRemoteBucketDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the delete remote bucket default response
-func (o *DeleteRemoteBucketDefault) SetPayload(payload *models.Error) {
+func (o *DeleteRemoteBucketDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/delete_selected_replication_rules_responses.go b/restapi/operations/bucket/delete_selected_replication_rules_responses.go
index 9a0a29b17..83de0aaa5 100644
--- a/restapi/operations/bucket/delete_selected_replication_rules_responses.go
+++ b/restapi/operations/bucket/delete_selected_replication_rules_responses.go
@@ -66,7 +66,7 @@ type DeleteSelectedReplicationRulesDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewDeleteSelectedReplicationRulesDefault creates DeleteSelectedReplicationRulesDefault with default headers values
@@ -92,13 +92,13 @@ func (o *DeleteSelectedReplicationRulesDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the delete selected replication rules default response
-func (o *DeleteSelectedReplicationRulesDefault) WithPayload(payload *models.Error) *DeleteSelectedReplicationRulesDefault {
+func (o *DeleteSelectedReplicationRulesDefault) WithPayload(payload *models.APIError) *DeleteSelectedReplicationRulesDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the delete selected replication rules default response
-func (o *DeleteSelectedReplicationRulesDefault) SetPayload(payload *models.Error) {
+func (o *DeleteSelectedReplicationRulesDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/disable_bucket_encryption_responses.go b/restapi/operations/bucket/disable_bucket_encryption_responses.go
index e819c91a7..b03982414 100644
--- a/restapi/operations/bucket/disable_bucket_encryption_responses.go
+++ b/restapi/operations/bucket/disable_bucket_encryption_responses.go
@@ -66,7 +66,7 @@ type DisableBucketEncryptionDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewDisableBucketEncryptionDefault creates DisableBucketEncryptionDefault with default headers values
@@ -92,13 +92,13 @@ func (o *DisableBucketEncryptionDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the disable bucket encryption default response
-func (o *DisableBucketEncryptionDefault) WithPayload(payload *models.Error) *DisableBucketEncryptionDefault {
+func (o *DisableBucketEncryptionDefault) WithPayload(payload *models.APIError) *DisableBucketEncryptionDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the disable bucket encryption default response
-func (o *DisableBucketEncryptionDefault) SetPayload(payload *models.Error) {
+func (o *DisableBucketEncryptionDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/enable_bucket_encryption_responses.go b/restapi/operations/bucket/enable_bucket_encryption_responses.go
index 9f48c5fcf..78307e52d 100644
--- a/restapi/operations/bucket/enable_bucket_encryption_responses.go
+++ b/restapi/operations/bucket/enable_bucket_encryption_responses.go
@@ -66,7 +66,7 @@ type EnableBucketEncryptionDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewEnableBucketEncryptionDefault creates EnableBucketEncryptionDefault with default headers values
@@ -92,13 +92,13 @@ func (o *EnableBucketEncryptionDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the enable bucket encryption default response
-func (o *EnableBucketEncryptionDefault) WithPayload(payload *models.Error) *EnableBucketEncryptionDefault {
+func (o *EnableBucketEncryptionDefault) WithPayload(payload *models.APIError) *EnableBucketEncryptionDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the enable bucket encryption default response
-func (o *EnableBucketEncryptionDefault) SetPayload(payload *models.Error) {
+func (o *EnableBucketEncryptionDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/get_bucket_encryption_info_responses.go b/restapi/operations/bucket/get_bucket_encryption_info_responses.go
index 03b3ab45f..b8ebb9c92 100644
--- a/restapi/operations/bucket/get_bucket_encryption_info_responses.go
+++ b/restapi/operations/bucket/get_bucket_encryption_info_responses.go
@@ -86,7 +86,7 @@ type GetBucketEncryptionInfoDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewGetBucketEncryptionInfoDefault creates GetBucketEncryptionInfoDefault with default headers values
@@ -112,13 +112,13 @@ func (o *GetBucketEncryptionInfoDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the get bucket encryption info default response
-func (o *GetBucketEncryptionInfoDefault) WithPayload(payload *models.Error) *GetBucketEncryptionInfoDefault {
+func (o *GetBucketEncryptionInfoDefault) WithPayload(payload *models.APIError) *GetBucketEncryptionInfoDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the get bucket encryption info default response
-func (o *GetBucketEncryptionInfoDefault) SetPayload(payload *models.Error) {
+func (o *GetBucketEncryptionInfoDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/get_bucket_lifecycle_responses.go b/restapi/operations/bucket/get_bucket_lifecycle_responses.go
index 37f92dba7..dea7d5eff 100644
--- a/restapi/operations/bucket/get_bucket_lifecycle_responses.go
+++ b/restapi/operations/bucket/get_bucket_lifecycle_responses.go
@@ -86,7 +86,7 @@ type GetBucketLifecycleDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewGetBucketLifecycleDefault creates GetBucketLifecycleDefault with default headers values
@@ -112,13 +112,13 @@ func (o *GetBucketLifecycleDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the get bucket lifecycle default response
-func (o *GetBucketLifecycleDefault) WithPayload(payload *models.Error) *GetBucketLifecycleDefault {
+func (o *GetBucketLifecycleDefault) WithPayload(payload *models.APIError) *GetBucketLifecycleDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the get bucket lifecycle default response
-func (o *GetBucketLifecycleDefault) SetPayload(payload *models.Error) {
+func (o *GetBucketLifecycleDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/get_bucket_object_locking_status_responses.go b/restapi/operations/bucket/get_bucket_object_locking_status_responses.go
index 82c437dab..ff2b391e8 100644
--- a/restapi/operations/bucket/get_bucket_object_locking_status_responses.go
+++ b/restapi/operations/bucket/get_bucket_object_locking_status_responses.go
@@ -86,7 +86,7 @@ type GetBucketObjectLockingStatusDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewGetBucketObjectLockingStatusDefault creates GetBucketObjectLockingStatusDefault with default headers values
@@ -112,13 +112,13 @@ func (o *GetBucketObjectLockingStatusDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the get bucket object locking status default response
-func (o *GetBucketObjectLockingStatusDefault) WithPayload(payload *models.Error) *GetBucketObjectLockingStatusDefault {
+func (o *GetBucketObjectLockingStatusDefault) WithPayload(payload *models.APIError) *GetBucketObjectLockingStatusDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the get bucket object locking status default response
-func (o *GetBucketObjectLockingStatusDefault) SetPayload(payload *models.Error) {
+func (o *GetBucketObjectLockingStatusDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/get_bucket_quota_responses.go b/restapi/operations/bucket/get_bucket_quota_responses.go
index 710e7cb32..d037462f4 100644
--- a/restapi/operations/bucket/get_bucket_quota_responses.go
+++ b/restapi/operations/bucket/get_bucket_quota_responses.go
@@ -86,7 +86,7 @@ type GetBucketQuotaDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewGetBucketQuotaDefault creates GetBucketQuotaDefault with default headers values
@@ -112,13 +112,13 @@ func (o *GetBucketQuotaDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the get bucket quota default response
-func (o *GetBucketQuotaDefault) WithPayload(payload *models.Error) *GetBucketQuotaDefault {
+func (o *GetBucketQuotaDefault) WithPayload(payload *models.APIError) *GetBucketQuotaDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the get bucket quota default response
-func (o *GetBucketQuotaDefault) SetPayload(payload *models.Error) {
+func (o *GetBucketQuotaDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/get_bucket_replication_responses.go b/restapi/operations/bucket/get_bucket_replication_responses.go
index 981e60524..430cc0062 100644
--- a/restapi/operations/bucket/get_bucket_replication_responses.go
+++ b/restapi/operations/bucket/get_bucket_replication_responses.go
@@ -86,7 +86,7 @@ type GetBucketReplicationDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewGetBucketReplicationDefault creates GetBucketReplicationDefault with default headers values
@@ -112,13 +112,13 @@ func (o *GetBucketReplicationDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the get bucket replication default response
-func (o *GetBucketReplicationDefault) WithPayload(payload *models.Error) *GetBucketReplicationDefault {
+func (o *GetBucketReplicationDefault) WithPayload(payload *models.APIError) *GetBucketReplicationDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the get bucket replication default response
-func (o *GetBucketReplicationDefault) SetPayload(payload *models.Error) {
+func (o *GetBucketReplicationDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/get_bucket_replication_rule_responses.go b/restapi/operations/bucket/get_bucket_replication_rule_responses.go
index 0e078ecf5..0e1a9c3db 100644
--- a/restapi/operations/bucket/get_bucket_replication_rule_responses.go
+++ b/restapi/operations/bucket/get_bucket_replication_rule_responses.go
@@ -86,7 +86,7 @@ type GetBucketReplicationRuleDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewGetBucketReplicationRuleDefault creates GetBucketReplicationRuleDefault with default headers values
@@ -112,13 +112,13 @@ func (o *GetBucketReplicationRuleDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the get bucket replication rule default response
-func (o *GetBucketReplicationRuleDefault) WithPayload(payload *models.Error) *GetBucketReplicationRuleDefault {
+func (o *GetBucketReplicationRuleDefault) WithPayload(payload *models.APIError) *GetBucketReplicationRuleDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the get bucket replication rule default response
-func (o *GetBucketReplicationRuleDefault) SetPayload(payload *models.Error) {
+func (o *GetBucketReplicationRuleDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/get_bucket_retention_config_responses.go b/restapi/operations/bucket/get_bucket_retention_config_responses.go
index f2788d8f6..a089656b1 100644
--- a/restapi/operations/bucket/get_bucket_retention_config_responses.go
+++ b/restapi/operations/bucket/get_bucket_retention_config_responses.go
@@ -86,7 +86,7 @@ type GetBucketRetentionConfigDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewGetBucketRetentionConfigDefault creates GetBucketRetentionConfigDefault with default headers values
@@ -112,13 +112,13 @@ func (o *GetBucketRetentionConfigDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the get bucket retention config default response
-func (o *GetBucketRetentionConfigDefault) WithPayload(payload *models.Error) *GetBucketRetentionConfigDefault {
+func (o *GetBucketRetentionConfigDefault) WithPayload(payload *models.APIError) *GetBucketRetentionConfigDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the get bucket retention config default response
-func (o *GetBucketRetentionConfigDefault) SetPayload(payload *models.Error) {
+func (o *GetBucketRetentionConfigDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/get_bucket_rewind_responses.go b/restapi/operations/bucket/get_bucket_rewind_responses.go
index 81a8357d6..fba50b6db 100644
--- a/restapi/operations/bucket/get_bucket_rewind_responses.go
+++ b/restapi/operations/bucket/get_bucket_rewind_responses.go
@@ -86,7 +86,7 @@ type GetBucketRewindDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewGetBucketRewindDefault creates GetBucketRewindDefault with default headers values
@@ -112,13 +112,13 @@ func (o *GetBucketRewindDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the get bucket rewind default response
-func (o *GetBucketRewindDefault) WithPayload(payload *models.Error) *GetBucketRewindDefault {
+func (o *GetBucketRewindDefault) WithPayload(payload *models.APIError) *GetBucketRewindDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the get bucket rewind default response
-func (o *GetBucketRewindDefault) SetPayload(payload *models.Error) {
+func (o *GetBucketRewindDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/get_bucket_versioning_responses.go b/restapi/operations/bucket/get_bucket_versioning_responses.go
index 48aa15442..626498f48 100644
--- a/restapi/operations/bucket/get_bucket_versioning_responses.go
+++ b/restapi/operations/bucket/get_bucket_versioning_responses.go
@@ -86,7 +86,7 @@ type GetBucketVersioningDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewGetBucketVersioningDefault creates GetBucketVersioningDefault with default headers values
@@ -112,13 +112,13 @@ func (o *GetBucketVersioningDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the get bucket versioning default response
-func (o *GetBucketVersioningDefault) WithPayload(payload *models.Error) *GetBucketVersioningDefault {
+func (o *GetBucketVersioningDefault) WithPayload(payload *models.APIError) *GetBucketVersioningDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the get bucket versioning default response
-func (o *GetBucketVersioningDefault) SetPayload(payload *models.Error) {
+func (o *GetBucketVersioningDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/list_access_rules_with_bucket_responses.go b/restapi/operations/bucket/list_access_rules_with_bucket_responses.go
index 06f27af92..113ca15c7 100644
--- a/restapi/operations/bucket/list_access_rules_with_bucket_responses.go
+++ b/restapi/operations/bucket/list_access_rules_with_bucket_responses.go
@@ -86,7 +86,7 @@ type ListAccessRulesWithBucketDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewListAccessRulesWithBucketDefault creates ListAccessRulesWithBucketDefault with default headers values
@@ -112,13 +112,13 @@ func (o *ListAccessRulesWithBucketDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the list access rules with bucket default response
-func (o *ListAccessRulesWithBucketDefault) WithPayload(payload *models.Error) *ListAccessRulesWithBucketDefault {
+func (o *ListAccessRulesWithBucketDefault) WithPayload(payload *models.APIError) *ListAccessRulesWithBucketDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the list access rules with bucket default response
-func (o *ListAccessRulesWithBucketDefault) SetPayload(payload *models.Error) {
+func (o *ListAccessRulesWithBucketDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/list_bucket_events_responses.go b/restapi/operations/bucket/list_bucket_events_responses.go
index aafc80452..b5ea29145 100644
--- a/restapi/operations/bucket/list_bucket_events_responses.go
+++ b/restapi/operations/bucket/list_bucket_events_responses.go
@@ -86,7 +86,7 @@ type ListBucketEventsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewListBucketEventsDefault creates ListBucketEventsDefault with default headers values
@@ -112,13 +112,13 @@ func (o *ListBucketEventsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the list bucket events default response
-func (o *ListBucketEventsDefault) WithPayload(payload *models.Error) *ListBucketEventsDefault {
+func (o *ListBucketEventsDefault) WithPayload(payload *models.APIError) *ListBucketEventsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the list bucket events default response
-func (o *ListBucketEventsDefault) SetPayload(payload *models.Error) {
+func (o *ListBucketEventsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/list_buckets_responses.go b/restapi/operations/bucket/list_buckets_responses.go
index d7d00bfe7..184e8a13b 100644
--- a/restapi/operations/bucket/list_buckets_responses.go
+++ b/restapi/operations/bucket/list_buckets_responses.go
@@ -86,7 +86,7 @@ type ListBucketsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewListBucketsDefault creates ListBucketsDefault with default headers values
@@ -112,13 +112,13 @@ func (o *ListBucketsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the list buckets default response
-func (o *ListBucketsDefault) WithPayload(payload *models.Error) *ListBucketsDefault {
+func (o *ListBucketsDefault) WithPayload(payload *models.APIError) *ListBucketsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the list buckets default response
-func (o *ListBucketsDefault) SetPayload(payload *models.Error) {
+func (o *ListBucketsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/list_external_buckets_responses.go b/restapi/operations/bucket/list_external_buckets_responses.go
index 0445dc0e7..af77d4dca 100644
--- a/restapi/operations/bucket/list_external_buckets_responses.go
+++ b/restapi/operations/bucket/list_external_buckets_responses.go
@@ -86,7 +86,7 @@ type ListExternalBucketsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewListExternalBucketsDefault creates ListExternalBucketsDefault with default headers values
@@ -112,13 +112,13 @@ func (o *ListExternalBucketsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the list external buckets default response
-func (o *ListExternalBucketsDefault) WithPayload(payload *models.Error) *ListExternalBucketsDefault {
+func (o *ListExternalBucketsDefault) WithPayload(payload *models.APIError) *ListExternalBucketsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the list external buckets default response
-func (o *ListExternalBucketsDefault) SetPayload(payload *models.Error) {
+func (o *ListExternalBucketsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/list_policies_with_bucket_responses.go b/restapi/operations/bucket/list_policies_with_bucket_responses.go
index 687348b28..4618104d4 100644
--- a/restapi/operations/bucket/list_policies_with_bucket_responses.go
+++ b/restapi/operations/bucket/list_policies_with_bucket_responses.go
@@ -86,7 +86,7 @@ type ListPoliciesWithBucketDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewListPoliciesWithBucketDefault creates ListPoliciesWithBucketDefault with default headers values
@@ -112,13 +112,13 @@ func (o *ListPoliciesWithBucketDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the list policies with bucket default response
-func (o *ListPoliciesWithBucketDefault) WithPayload(payload *models.Error) *ListPoliciesWithBucketDefault {
+func (o *ListPoliciesWithBucketDefault) WithPayload(payload *models.APIError) *ListPoliciesWithBucketDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the list policies with bucket default response
-func (o *ListPoliciesWithBucketDefault) SetPayload(payload *models.Error) {
+func (o *ListPoliciesWithBucketDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/list_remote_buckets_responses.go b/restapi/operations/bucket/list_remote_buckets_responses.go
index a0ae717e2..72b867390 100644
--- a/restapi/operations/bucket/list_remote_buckets_responses.go
+++ b/restapi/operations/bucket/list_remote_buckets_responses.go
@@ -86,7 +86,7 @@ type ListRemoteBucketsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewListRemoteBucketsDefault creates ListRemoteBucketsDefault with default headers values
@@ -112,13 +112,13 @@ func (o *ListRemoteBucketsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the list remote buckets default response
-func (o *ListRemoteBucketsDefault) WithPayload(payload *models.Error) *ListRemoteBucketsDefault {
+func (o *ListRemoteBucketsDefault) WithPayload(payload *models.APIError) *ListRemoteBucketsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the list remote buckets default response
-func (o *ListRemoteBucketsDefault) SetPayload(payload *models.Error) {
+func (o *ListRemoteBucketsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/list_users_with_access_to_bucket_responses.go b/restapi/operations/bucket/list_users_with_access_to_bucket_responses.go
index c45552226..96dacd0ff 100644
--- a/restapi/operations/bucket/list_users_with_access_to_bucket_responses.go
+++ b/restapi/operations/bucket/list_users_with_access_to_bucket_responses.go
@@ -89,7 +89,7 @@ type ListUsersWithAccessToBucketDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewListUsersWithAccessToBucketDefault creates ListUsersWithAccessToBucketDefault with default headers values
@@ -115,13 +115,13 @@ func (o *ListUsersWithAccessToBucketDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the list users with access to bucket default response
-func (o *ListUsersWithAccessToBucketDefault) WithPayload(payload *models.Error) *ListUsersWithAccessToBucketDefault {
+func (o *ListUsersWithAccessToBucketDefault) WithPayload(payload *models.APIError) *ListUsersWithAccessToBucketDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the list users with access to bucket default response
-func (o *ListUsersWithAccessToBucketDefault) SetPayload(payload *models.Error) {
+func (o *ListUsersWithAccessToBucketDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/make_bucket_responses.go b/restapi/operations/bucket/make_bucket_responses.go
index ac5235453..47af23c79 100644
--- a/restapi/operations/bucket/make_bucket_responses.go
+++ b/restapi/operations/bucket/make_bucket_responses.go
@@ -86,7 +86,7 @@ type MakeBucketDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewMakeBucketDefault creates MakeBucketDefault with default headers values
@@ -112,13 +112,13 @@ func (o *MakeBucketDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the make bucket default response
-func (o *MakeBucketDefault) WithPayload(payload *models.Error) *MakeBucketDefault {
+func (o *MakeBucketDefault) WithPayload(payload *models.APIError) *MakeBucketDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the make bucket default response
-func (o *MakeBucketDefault) SetPayload(payload *models.Error) {
+func (o *MakeBucketDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/put_bucket_tags_responses.go b/restapi/operations/bucket/put_bucket_tags_responses.go
index 1a1096a40..3cc7fee0b 100644
--- a/restapi/operations/bucket/put_bucket_tags_responses.go
+++ b/restapi/operations/bucket/put_bucket_tags_responses.go
@@ -66,7 +66,7 @@ type PutBucketTagsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewPutBucketTagsDefault creates PutBucketTagsDefault with default headers values
@@ -92,13 +92,13 @@ func (o *PutBucketTagsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the put bucket tags default response
-func (o *PutBucketTagsDefault) WithPayload(payload *models.Error) *PutBucketTagsDefault {
+func (o *PutBucketTagsDefault) WithPayload(payload *models.APIError) *PutBucketTagsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the put bucket tags default response
-func (o *PutBucketTagsDefault) SetPayload(payload *models.Error) {
+func (o *PutBucketTagsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/remote_bucket_details_responses.go b/restapi/operations/bucket/remote_bucket_details_responses.go
index 6615db3e7..f77794eb1 100644
--- a/restapi/operations/bucket/remote_bucket_details_responses.go
+++ b/restapi/operations/bucket/remote_bucket_details_responses.go
@@ -86,7 +86,7 @@ type RemoteBucketDetailsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewRemoteBucketDetailsDefault creates RemoteBucketDetailsDefault with default headers values
@@ -112,13 +112,13 @@ func (o *RemoteBucketDetailsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the remote bucket details default response
-func (o *RemoteBucketDetailsDefault) WithPayload(payload *models.Error) *RemoteBucketDetailsDefault {
+func (o *RemoteBucketDetailsDefault) WithPayload(payload *models.APIError) *RemoteBucketDetailsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the remote bucket details default response
-func (o *RemoteBucketDetailsDefault) SetPayload(payload *models.Error) {
+func (o *RemoteBucketDetailsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/set_access_rule_with_bucket_responses.go b/restapi/operations/bucket/set_access_rule_with_bucket_responses.go
index 73307dbce..817ed1e10 100644
--- a/restapi/operations/bucket/set_access_rule_with_bucket_responses.go
+++ b/restapi/operations/bucket/set_access_rule_with_bucket_responses.go
@@ -84,7 +84,7 @@ type SetAccessRuleWithBucketDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewSetAccessRuleWithBucketDefault creates SetAccessRuleWithBucketDefault with default headers values
@@ -110,13 +110,13 @@ func (o *SetAccessRuleWithBucketDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the set access rule with bucket default response
-func (o *SetAccessRuleWithBucketDefault) WithPayload(payload *models.Error) *SetAccessRuleWithBucketDefault {
+func (o *SetAccessRuleWithBucketDefault) WithPayload(payload *models.APIError) *SetAccessRuleWithBucketDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the set access rule with bucket default response
-func (o *SetAccessRuleWithBucketDefault) SetPayload(payload *models.Error) {
+func (o *SetAccessRuleWithBucketDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/set_bucket_quota_responses.go b/restapi/operations/bucket/set_bucket_quota_responses.go
index 8415e00f8..cf1e03d94 100644
--- a/restapi/operations/bucket/set_bucket_quota_responses.go
+++ b/restapi/operations/bucket/set_bucket_quota_responses.go
@@ -86,7 +86,7 @@ type SetBucketQuotaDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewSetBucketQuotaDefault creates SetBucketQuotaDefault with default headers values
@@ -112,13 +112,13 @@ func (o *SetBucketQuotaDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the set bucket quota default response
-func (o *SetBucketQuotaDefault) WithPayload(payload *models.Error) *SetBucketQuotaDefault {
+func (o *SetBucketQuotaDefault) WithPayload(payload *models.APIError) *SetBucketQuotaDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the set bucket quota default response
-func (o *SetBucketQuotaDefault) SetPayload(payload *models.Error) {
+func (o *SetBucketQuotaDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/set_bucket_retention_config_responses.go b/restapi/operations/bucket/set_bucket_retention_config_responses.go
index 00af1d5ab..7fffdc563 100644
--- a/restapi/operations/bucket/set_bucket_retention_config_responses.go
+++ b/restapi/operations/bucket/set_bucket_retention_config_responses.go
@@ -66,7 +66,7 @@ type SetBucketRetentionConfigDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewSetBucketRetentionConfigDefault creates SetBucketRetentionConfigDefault with default headers values
@@ -92,13 +92,13 @@ func (o *SetBucketRetentionConfigDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the set bucket retention config default response
-func (o *SetBucketRetentionConfigDefault) WithPayload(payload *models.Error) *SetBucketRetentionConfigDefault {
+func (o *SetBucketRetentionConfigDefault) WithPayload(payload *models.APIError) *SetBucketRetentionConfigDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the set bucket retention config default response
-func (o *SetBucketRetentionConfigDefault) SetPayload(payload *models.Error) {
+func (o *SetBucketRetentionConfigDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/set_bucket_versioning_responses.go b/restapi/operations/bucket/set_bucket_versioning_responses.go
index 827ba2f77..b2c8ec0f9 100644
--- a/restapi/operations/bucket/set_bucket_versioning_responses.go
+++ b/restapi/operations/bucket/set_bucket_versioning_responses.go
@@ -66,7 +66,7 @@ type SetBucketVersioningDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewSetBucketVersioningDefault creates SetBucketVersioningDefault with default headers values
@@ -92,13 +92,13 @@ func (o *SetBucketVersioningDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the set bucket versioning default response
-func (o *SetBucketVersioningDefault) WithPayload(payload *models.Error) *SetBucketVersioningDefault {
+func (o *SetBucketVersioningDefault) WithPayload(payload *models.APIError) *SetBucketVersioningDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the set bucket versioning default response
-func (o *SetBucketVersioningDefault) SetPayload(payload *models.Error) {
+func (o *SetBucketVersioningDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/set_multi_bucket_replication_responses.go b/restapi/operations/bucket/set_multi_bucket_replication_responses.go
index 3030bcaa7..f5b358a62 100644
--- a/restapi/operations/bucket/set_multi_bucket_replication_responses.go
+++ b/restapi/operations/bucket/set_multi_bucket_replication_responses.go
@@ -86,7 +86,7 @@ type SetMultiBucketReplicationDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewSetMultiBucketReplicationDefault creates SetMultiBucketReplicationDefault with default headers values
@@ -112,13 +112,13 @@ func (o *SetMultiBucketReplicationDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the set multi bucket replication default response
-func (o *SetMultiBucketReplicationDefault) WithPayload(payload *models.Error) *SetMultiBucketReplicationDefault {
+func (o *SetMultiBucketReplicationDefault) WithPayload(payload *models.APIError) *SetMultiBucketReplicationDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the set multi bucket replication default response
-func (o *SetMultiBucketReplicationDefault) SetPayload(payload *models.Error) {
+func (o *SetMultiBucketReplicationDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/update_bucket_lifecycle_responses.go b/restapi/operations/bucket/update_bucket_lifecycle_responses.go
index fbd7aafb6..8cf05dfe3 100644
--- a/restapi/operations/bucket/update_bucket_lifecycle_responses.go
+++ b/restapi/operations/bucket/update_bucket_lifecycle_responses.go
@@ -66,7 +66,7 @@ type UpdateBucketLifecycleDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewUpdateBucketLifecycleDefault creates UpdateBucketLifecycleDefault with default headers values
@@ -92,13 +92,13 @@ func (o *UpdateBucketLifecycleDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the update bucket lifecycle default response
-func (o *UpdateBucketLifecycleDefault) WithPayload(payload *models.Error) *UpdateBucketLifecycleDefault {
+func (o *UpdateBucketLifecycleDefault) WithPayload(payload *models.APIError) *UpdateBucketLifecycleDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the update bucket lifecycle default response
-func (o *UpdateBucketLifecycleDefault) SetPayload(payload *models.Error) {
+func (o *UpdateBucketLifecycleDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/bucket/update_multi_bucket_replication_responses.go b/restapi/operations/bucket/update_multi_bucket_replication_responses.go
index b73d923f6..eed8e363f 100644
--- a/restapi/operations/bucket/update_multi_bucket_replication_responses.go
+++ b/restapi/operations/bucket/update_multi_bucket_replication_responses.go
@@ -66,7 +66,7 @@ type UpdateMultiBucketReplicationDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewUpdateMultiBucketReplicationDefault creates UpdateMultiBucketReplicationDefault with default headers values
@@ -92,13 +92,13 @@ func (o *UpdateMultiBucketReplicationDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the update multi bucket replication default response
-func (o *UpdateMultiBucketReplicationDefault) WithPayload(payload *models.Error) *UpdateMultiBucketReplicationDefault {
+func (o *UpdateMultiBucketReplicationDefault) WithPayload(payload *models.APIError) *UpdateMultiBucketReplicationDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the update multi bucket replication default response
-func (o *UpdateMultiBucketReplicationDefault) SetPayload(payload *models.Error) {
+func (o *UpdateMultiBucketReplicationDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/configuration/add_notification_endpoint_responses.go b/restapi/operations/configuration/add_notification_endpoint_responses.go
index 31245b1c8..7af150099 100644
--- a/restapi/operations/configuration/add_notification_endpoint_responses.go
+++ b/restapi/operations/configuration/add_notification_endpoint_responses.go
@@ -86,7 +86,7 @@ type AddNotificationEndpointDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewAddNotificationEndpointDefault creates AddNotificationEndpointDefault with default headers values
@@ -112,13 +112,13 @@ func (o *AddNotificationEndpointDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the add notification endpoint default response
-func (o *AddNotificationEndpointDefault) WithPayload(payload *models.Error) *AddNotificationEndpointDefault {
+func (o *AddNotificationEndpointDefault) WithPayload(payload *models.APIError) *AddNotificationEndpointDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the add notification endpoint default response
-func (o *AddNotificationEndpointDefault) SetPayload(payload *models.Error) {
+func (o *AddNotificationEndpointDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/configuration/config_info_responses.go b/restapi/operations/configuration/config_info_responses.go
index 8fb5cf490..7cbd93ac5 100644
--- a/restapi/operations/configuration/config_info_responses.go
+++ b/restapi/operations/configuration/config_info_responses.go
@@ -89,7 +89,7 @@ type ConfigInfoDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewConfigInfoDefault creates ConfigInfoDefault with default headers values
@@ -115,13 +115,13 @@ func (o *ConfigInfoDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the config info default response
-func (o *ConfigInfoDefault) WithPayload(payload *models.Error) *ConfigInfoDefault {
+func (o *ConfigInfoDefault) WithPayload(payload *models.APIError) *ConfigInfoDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the config info default response
-func (o *ConfigInfoDefault) SetPayload(payload *models.Error) {
+func (o *ConfigInfoDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/configuration/export_config_responses.go b/restapi/operations/configuration/export_config_responses.go
index 5651bd448..c24448f56 100644
--- a/restapi/operations/configuration/export_config_responses.go
+++ b/restapi/operations/configuration/export_config_responses.go
@@ -86,7 +86,7 @@ type ExportConfigDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewExportConfigDefault creates ExportConfigDefault with default headers values
@@ -112,13 +112,13 @@ func (o *ExportConfigDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the export config default response
-func (o *ExportConfigDefault) WithPayload(payload *models.Error) *ExportConfigDefault {
+func (o *ExportConfigDefault) WithPayload(payload *models.APIError) *ExportConfigDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the export config default response
-func (o *ExportConfigDefault) SetPayload(payload *models.Error) {
+func (o *ExportConfigDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/configuration/list_config_responses.go b/restapi/operations/configuration/list_config_responses.go
index 371302832..d0419a149 100644
--- a/restapi/operations/configuration/list_config_responses.go
+++ b/restapi/operations/configuration/list_config_responses.go
@@ -86,7 +86,7 @@ type ListConfigDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewListConfigDefault creates ListConfigDefault with default headers values
@@ -112,13 +112,13 @@ func (o *ListConfigDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the list config default response
-func (o *ListConfigDefault) WithPayload(payload *models.Error) *ListConfigDefault {
+func (o *ListConfigDefault) WithPayload(payload *models.APIError) *ListConfigDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the list config default response
-func (o *ListConfigDefault) SetPayload(payload *models.Error) {
+func (o *ListConfigDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/configuration/notification_endpoint_list_responses.go b/restapi/operations/configuration/notification_endpoint_list_responses.go
index 6bef66bec..a2513dea5 100644
--- a/restapi/operations/configuration/notification_endpoint_list_responses.go
+++ b/restapi/operations/configuration/notification_endpoint_list_responses.go
@@ -86,7 +86,7 @@ type NotificationEndpointListDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewNotificationEndpointListDefault creates NotificationEndpointListDefault with default headers values
@@ -112,13 +112,13 @@ func (o *NotificationEndpointListDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the notification endpoint list default response
-func (o *NotificationEndpointListDefault) WithPayload(payload *models.Error) *NotificationEndpointListDefault {
+func (o *NotificationEndpointListDefault) WithPayload(payload *models.APIError) *NotificationEndpointListDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the notification endpoint list default response
-func (o *NotificationEndpointListDefault) SetPayload(payload *models.Error) {
+func (o *NotificationEndpointListDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/configuration/post_configs_import_responses.go b/restapi/operations/configuration/post_configs_import_responses.go
index 682995124..1329a658c 100644
--- a/restapi/operations/configuration/post_configs_import_responses.go
+++ b/restapi/operations/configuration/post_configs_import_responses.go
@@ -66,7 +66,7 @@ type PostConfigsImportDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewPostConfigsImportDefault creates PostConfigsImportDefault with default headers values
@@ -92,13 +92,13 @@ func (o *PostConfigsImportDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the post configs import default response
-func (o *PostConfigsImportDefault) WithPayload(payload *models.Error) *PostConfigsImportDefault {
+func (o *PostConfigsImportDefault) WithPayload(payload *models.APIError) *PostConfigsImportDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the post configs import default response
-func (o *PostConfigsImportDefault) SetPayload(payload *models.Error) {
+func (o *PostConfigsImportDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/configuration/reset_config_responses.go b/restapi/operations/configuration/reset_config_responses.go
index aabc58628..d4976f49a 100644
--- a/restapi/operations/configuration/reset_config_responses.go
+++ b/restapi/operations/configuration/reset_config_responses.go
@@ -86,7 +86,7 @@ type ResetConfigDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewResetConfigDefault creates ResetConfigDefault with default headers values
@@ -112,13 +112,13 @@ func (o *ResetConfigDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the reset config default response
-func (o *ResetConfigDefault) WithPayload(payload *models.Error) *ResetConfigDefault {
+func (o *ResetConfigDefault) WithPayload(payload *models.APIError) *ResetConfigDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the reset config default response
-func (o *ResetConfigDefault) SetPayload(payload *models.Error) {
+func (o *ResetConfigDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/configuration/set_config_responses.go b/restapi/operations/configuration/set_config_responses.go
index 92ca4b067..a823dc2fe 100644
--- a/restapi/operations/configuration/set_config_responses.go
+++ b/restapi/operations/configuration/set_config_responses.go
@@ -86,7 +86,7 @@ type SetConfigDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewSetConfigDefault creates SetConfigDefault with default headers values
@@ -112,13 +112,13 @@ func (o *SetConfigDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the set config default response
-func (o *SetConfigDefault) WithPayload(payload *models.Error) *SetConfigDefault {
+func (o *SetConfigDefault) WithPayload(payload *models.APIError) *SetConfigDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the set config default response
-func (o *SetConfigDefault) SetPayload(payload *models.Error) {
+func (o *SetConfigDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/group/add_group_responses.go b/restapi/operations/group/add_group_responses.go
index fdd83e498..b68b7b3cb 100644
--- a/restapi/operations/group/add_group_responses.go
+++ b/restapi/operations/group/add_group_responses.go
@@ -66,7 +66,7 @@ type AddGroupDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewAddGroupDefault creates AddGroupDefault with default headers values
@@ -92,13 +92,13 @@ func (o *AddGroupDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the add group default response
-func (o *AddGroupDefault) WithPayload(payload *models.Error) *AddGroupDefault {
+func (o *AddGroupDefault) WithPayload(payload *models.APIError) *AddGroupDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the add group default response
-func (o *AddGroupDefault) SetPayload(payload *models.Error) {
+func (o *AddGroupDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/group/group_info_responses.go b/restapi/operations/group/group_info_responses.go
index f41089b38..4eb2ce67c 100644
--- a/restapi/operations/group/group_info_responses.go
+++ b/restapi/operations/group/group_info_responses.go
@@ -86,7 +86,7 @@ type GroupInfoDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewGroupInfoDefault creates GroupInfoDefault with default headers values
@@ -112,13 +112,13 @@ func (o *GroupInfoDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the group info default response
-func (o *GroupInfoDefault) WithPayload(payload *models.Error) *GroupInfoDefault {
+func (o *GroupInfoDefault) WithPayload(payload *models.APIError) *GroupInfoDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the group info default response
-func (o *GroupInfoDefault) SetPayload(payload *models.Error) {
+func (o *GroupInfoDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/group/list_groups_responses.go b/restapi/operations/group/list_groups_responses.go
index eaaa13241..871bb770a 100644
--- a/restapi/operations/group/list_groups_responses.go
+++ b/restapi/operations/group/list_groups_responses.go
@@ -86,7 +86,7 @@ type ListGroupsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewListGroupsDefault creates ListGroupsDefault with default headers values
@@ -112,13 +112,13 @@ func (o *ListGroupsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the list groups default response
-func (o *ListGroupsDefault) WithPayload(payload *models.Error) *ListGroupsDefault {
+func (o *ListGroupsDefault) WithPayload(payload *models.APIError) *ListGroupsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the list groups default response
-func (o *ListGroupsDefault) SetPayload(payload *models.Error) {
+func (o *ListGroupsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/group/remove_group_responses.go b/restapi/operations/group/remove_group_responses.go
index 75189c428..7bb82d8a3 100644
--- a/restapi/operations/group/remove_group_responses.go
+++ b/restapi/operations/group/remove_group_responses.go
@@ -66,7 +66,7 @@ type RemoveGroupDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewRemoveGroupDefault creates RemoveGroupDefault with default headers values
@@ -92,13 +92,13 @@ func (o *RemoveGroupDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the remove group default response
-func (o *RemoveGroupDefault) WithPayload(payload *models.Error) *RemoveGroupDefault {
+func (o *RemoveGroupDefault) WithPayload(payload *models.APIError) *RemoveGroupDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the remove group default response
-func (o *RemoveGroupDefault) SetPayload(payload *models.Error) {
+func (o *RemoveGroupDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/group/update_group_responses.go b/restapi/operations/group/update_group_responses.go
index d231f5f87..bfa38a101 100644
--- a/restapi/operations/group/update_group_responses.go
+++ b/restapi/operations/group/update_group_responses.go
@@ -86,7 +86,7 @@ type UpdateGroupDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewUpdateGroupDefault creates UpdateGroupDefault with default headers values
@@ -112,13 +112,13 @@ func (o *UpdateGroupDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the update group default response
-func (o *UpdateGroupDefault) WithPayload(payload *models.Error) *UpdateGroupDefault {
+func (o *UpdateGroupDefault) WithPayload(payload *models.APIError) *UpdateGroupDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the update group default response
-func (o *UpdateGroupDefault) SetPayload(payload *models.Error) {
+func (o *UpdateGroupDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/idp/create_configuration_responses.go b/restapi/operations/idp/create_configuration_responses.go
index ca1261659..9a28b534a 100644
--- a/restapi/operations/idp/create_configuration_responses.go
+++ b/restapi/operations/idp/create_configuration_responses.go
@@ -86,7 +86,7 @@ type CreateConfigurationDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewCreateConfigurationDefault creates CreateConfigurationDefault with default headers values
@@ -112,13 +112,13 @@ func (o *CreateConfigurationDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the create configuration default response
-func (o *CreateConfigurationDefault) WithPayload(payload *models.Error) *CreateConfigurationDefault {
+func (o *CreateConfigurationDefault) WithPayload(payload *models.APIError) *CreateConfigurationDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the create configuration default response
-func (o *CreateConfigurationDefault) SetPayload(payload *models.Error) {
+func (o *CreateConfigurationDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/idp/delete_configuration_responses.go b/restapi/operations/idp/delete_configuration_responses.go
index 6dcefac80..8d72e0e32 100644
--- a/restapi/operations/idp/delete_configuration_responses.go
+++ b/restapi/operations/idp/delete_configuration_responses.go
@@ -86,7 +86,7 @@ type DeleteConfigurationDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewDeleteConfigurationDefault creates DeleteConfigurationDefault with default headers values
@@ -112,13 +112,13 @@ func (o *DeleteConfigurationDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the delete configuration default response
-func (o *DeleteConfigurationDefault) WithPayload(payload *models.Error) *DeleteConfigurationDefault {
+func (o *DeleteConfigurationDefault) WithPayload(payload *models.APIError) *DeleteConfigurationDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the delete configuration default response
-func (o *DeleteConfigurationDefault) SetPayload(payload *models.Error) {
+func (o *DeleteConfigurationDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/idp/get_configuration_responses.go b/restapi/operations/idp/get_configuration_responses.go
index f8450307e..8e07dcb51 100644
--- a/restapi/operations/idp/get_configuration_responses.go
+++ b/restapi/operations/idp/get_configuration_responses.go
@@ -86,7 +86,7 @@ type GetConfigurationDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewGetConfigurationDefault creates GetConfigurationDefault with default headers values
@@ -112,13 +112,13 @@ func (o *GetConfigurationDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the get configuration default response
-func (o *GetConfigurationDefault) WithPayload(payload *models.Error) *GetConfigurationDefault {
+func (o *GetConfigurationDefault) WithPayload(payload *models.APIError) *GetConfigurationDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the get configuration default response
-func (o *GetConfigurationDefault) SetPayload(payload *models.Error) {
+func (o *GetConfigurationDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/idp/get_l_d_a_p_entities_responses.go b/restapi/operations/idp/get_l_d_a_p_entities_responses.go
index 9e47c64aa..dcfed987d 100644
--- a/restapi/operations/idp/get_l_d_a_p_entities_responses.go
+++ b/restapi/operations/idp/get_l_d_a_p_entities_responses.go
@@ -86,7 +86,7 @@ type GetLDAPEntitiesDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewGetLDAPEntitiesDefault creates GetLDAPEntitiesDefault with default headers values
@@ -112,13 +112,13 @@ func (o *GetLDAPEntitiesDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the get l d a p entities default response
-func (o *GetLDAPEntitiesDefault) WithPayload(payload *models.Error) *GetLDAPEntitiesDefault {
+func (o *GetLDAPEntitiesDefault) WithPayload(payload *models.APIError) *GetLDAPEntitiesDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the get l d a p entities default response
-func (o *GetLDAPEntitiesDefault) SetPayload(payload *models.Error) {
+func (o *GetLDAPEntitiesDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/idp/list_configurations_responses.go b/restapi/operations/idp/list_configurations_responses.go
index 7f29a290a..2ed1ab42f 100644
--- a/restapi/operations/idp/list_configurations_responses.go
+++ b/restapi/operations/idp/list_configurations_responses.go
@@ -86,7 +86,7 @@ type ListConfigurationsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewListConfigurationsDefault creates ListConfigurationsDefault with default headers values
@@ -112,13 +112,13 @@ func (o *ListConfigurationsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the list configurations default response
-func (o *ListConfigurationsDefault) WithPayload(payload *models.Error) *ListConfigurationsDefault {
+func (o *ListConfigurationsDefault) WithPayload(payload *models.APIError) *ListConfigurationsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the list configurations default response
-func (o *ListConfigurationsDefault) SetPayload(payload *models.Error) {
+func (o *ListConfigurationsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/idp/update_configuration_responses.go b/restapi/operations/idp/update_configuration_responses.go
index 6a8844595..92bd1025b 100644
--- a/restapi/operations/idp/update_configuration_responses.go
+++ b/restapi/operations/idp/update_configuration_responses.go
@@ -86,7 +86,7 @@ type UpdateConfigurationDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewUpdateConfigurationDefault creates UpdateConfigurationDefault with default headers values
@@ -112,13 +112,13 @@ func (o *UpdateConfigurationDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the update configuration default response
-func (o *UpdateConfigurationDefault) WithPayload(payload *models.Error) *UpdateConfigurationDefault {
+func (o *UpdateConfigurationDefault) WithPayload(payload *models.APIError) *UpdateConfigurationDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the update configuration default response
-func (o *UpdateConfigurationDefault) SetPayload(payload *models.Error) {
+func (o *UpdateConfigurationDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/inspect/inspect_responses.go b/restapi/operations/inspect/inspect_responses.go
index 3c59dbbec..6e5d23a7d 100644
--- a/restapi/operations/inspect/inspect_responses.go
+++ b/restapi/operations/inspect/inspect_responses.go
@@ -85,7 +85,7 @@ type InspectDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewInspectDefault creates InspectDefault with default headers values
@@ -111,13 +111,13 @@ func (o *InspectDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the inspect default response
-func (o *InspectDefault) WithPayload(payload *models.Error) *InspectDefault {
+func (o *InspectDefault) WithPayload(payload *models.APIError) *InspectDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the inspect default response
-func (o *InspectDefault) SetPayload(payload *models.Error) {
+func (o *InspectDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/k_m_s/k_m_s_a_p_is_responses.go b/restapi/operations/k_m_s/k_m_s_a_p_is_responses.go
index c978d2882..af13ba750 100644
--- a/restapi/operations/k_m_s/k_m_s_a_p_is_responses.go
+++ b/restapi/operations/k_m_s/k_m_s_a_p_is_responses.go
@@ -86,7 +86,7 @@ type KMSAPIsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewKMSAPIsDefault creates KMSAPIsDefault with default headers values
@@ -112,13 +112,13 @@ func (o *KMSAPIsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the k m s a p is default response
-func (o *KMSAPIsDefault) WithPayload(payload *models.Error) *KMSAPIsDefault {
+func (o *KMSAPIsDefault) WithPayload(payload *models.APIError) *KMSAPIsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the k m s a p is default response
-func (o *KMSAPIsDefault) SetPayload(payload *models.Error) {
+func (o *KMSAPIsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/k_m_s/k_m_s_assign_policy_responses.go b/restapi/operations/k_m_s/k_m_s_assign_policy_responses.go
index 2630c423c..d48e26bb4 100644
--- a/restapi/operations/k_m_s/k_m_s_assign_policy_responses.go
+++ b/restapi/operations/k_m_s/k_m_s_assign_policy_responses.go
@@ -66,7 +66,7 @@ type KMSAssignPolicyDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewKMSAssignPolicyDefault creates KMSAssignPolicyDefault with default headers values
@@ -92,13 +92,13 @@ func (o *KMSAssignPolicyDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the k m s assign policy default response
-func (o *KMSAssignPolicyDefault) WithPayload(payload *models.Error) *KMSAssignPolicyDefault {
+func (o *KMSAssignPolicyDefault) WithPayload(payload *models.APIError) *KMSAssignPolicyDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the k m s assign policy default response
-func (o *KMSAssignPolicyDefault) SetPayload(payload *models.Error) {
+func (o *KMSAssignPolicyDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/k_m_s/k_m_s_create_key_responses.go b/restapi/operations/k_m_s/k_m_s_create_key_responses.go
index 37a603fce..2746b4c0b 100644
--- a/restapi/operations/k_m_s/k_m_s_create_key_responses.go
+++ b/restapi/operations/k_m_s/k_m_s_create_key_responses.go
@@ -66,7 +66,7 @@ type KMSCreateKeyDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewKMSCreateKeyDefault creates KMSCreateKeyDefault with default headers values
@@ -92,13 +92,13 @@ func (o *KMSCreateKeyDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the k m s create key default response
-func (o *KMSCreateKeyDefault) WithPayload(payload *models.Error) *KMSCreateKeyDefault {
+func (o *KMSCreateKeyDefault) WithPayload(payload *models.APIError) *KMSCreateKeyDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the k m s create key default response
-func (o *KMSCreateKeyDefault) SetPayload(payload *models.Error) {
+func (o *KMSCreateKeyDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/k_m_s/k_m_s_delete_identity_responses.go b/restapi/operations/k_m_s/k_m_s_delete_identity_responses.go
index 319dce5b9..3dcf91343 100644
--- a/restapi/operations/k_m_s/k_m_s_delete_identity_responses.go
+++ b/restapi/operations/k_m_s/k_m_s_delete_identity_responses.go
@@ -66,7 +66,7 @@ type KMSDeleteIdentityDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewKMSDeleteIdentityDefault creates KMSDeleteIdentityDefault with default headers values
@@ -92,13 +92,13 @@ func (o *KMSDeleteIdentityDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the k m s delete identity default response
-func (o *KMSDeleteIdentityDefault) WithPayload(payload *models.Error) *KMSDeleteIdentityDefault {
+func (o *KMSDeleteIdentityDefault) WithPayload(payload *models.APIError) *KMSDeleteIdentityDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the k m s delete identity default response
-func (o *KMSDeleteIdentityDefault) SetPayload(payload *models.Error) {
+func (o *KMSDeleteIdentityDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/k_m_s/k_m_s_delete_key_responses.go b/restapi/operations/k_m_s/k_m_s_delete_key_responses.go
index 0a1bc5bdc..c67a41dff 100644
--- a/restapi/operations/k_m_s/k_m_s_delete_key_responses.go
+++ b/restapi/operations/k_m_s/k_m_s_delete_key_responses.go
@@ -66,7 +66,7 @@ type KMSDeleteKeyDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewKMSDeleteKeyDefault creates KMSDeleteKeyDefault with default headers values
@@ -92,13 +92,13 @@ func (o *KMSDeleteKeyDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the k m s delete key default response
-func (o *KMSDeleteKeyDefault) WithPayload(payload *models.Error) *KMSDeleteKeyDefault {
+func (o *KMSDeleteKeyDefault) WithPayload(payload *models.APIError) *KMSDeleteKeyDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the k m s delete key default response
-func (o *KMSDeleteKeyDefault) SetPayload(payload *models.Error) {
+func (o *KMSDeleteKeyDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/k_m_s/k_m_s_delete_policy_responses.go b/restapi/operations/k_m_s/k_m_s_delete_policy_responses.go
index e01ed05a5..73597a875 100644
--- a/restapi/operations/k_m_s/k_m_s_delete_policy_responses.go
+++ b/restapi/operations/k_m_s/k_m_s_delete_policy_responses.go
@@ -66,7 +66,7 @@ type KMSDeletePolicyDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewKMSDeletePolicyDefault creates KMSDeletePolicyDefault with default headers values
@@ -92,13 +92,13 @@ func (o *KMSDeletePolicyDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the k m s delete policy default response
-func (o *KMSDeletePolicyDefault) WithPayload(payload *models.Error) *KMSDeletePolicyDefault {
+func (o *KMSDeletePolicyDefault) WithPayload(payload *models.APIError) *KMSDeletePolicyDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the k m s delete policy default response
-func (o *KMSDeletePolicyDefault) SetPayload(payload *models.Error) {
+func (o *KMSDeletePolicyDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/k_m_s/k_m_s_describe_identity_responses.go b/restapi/operations/k_m_s/k_m_s_describe_identity_responses.go
index f8ed5f1fb..9a529fc21 100644
--- a/restapi/operations/k_m_s/k_m_s_describe_identity_responses.go
+++ b/restapi/operations/k_m_s/k_m_s_describe_identity_responses.go
@@ -86,7 +86,7 @@ type KMSDescribeIdentityDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewKMSDescribeIdentityDefault creates KMSDescribeIdentityDefault with default headers values
@@ -112,13 +112,13 @@ func (o *KMSDescribeIdentityDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the k m s describe identity default response
-func (o *KMSDescribeIdentityDefault) WithPayload(payload *models.Error) *KMSDescribeIdentityDefault {
+func (o *KMSDescribeIdentityDefault) WithPayload(payload *models.APIError) *KMSDescribeIdentityDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the k m s describe identity default response
-func (o *KMSDescribeIdentityDefault) SetPayload(payload *models.Error) {
+func (o *KMSDescribeIdentityDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/k_m_s/k_m_s_describe_policy_responses.go b/restapi/operations/k_m_s/k_m_s_describe_policy_responses.go
index 37390340e..176e798ad 100644
--- a/restapi/operations/k_m_s/k_m_s_describe_policy_responses.go
+++ b/restapi/operations/k_m_s/k_m_s_describe_policy_responses.go
@@ -86,7 +86,7 @@ type KMSDescribePolicyDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewKMSDescribePolicyDefault creates KMSDescribePolicyDefault with default headers values
@@ -112,13 +112,13 @@ func (o *KMSDescribePolicyDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the k m s describe policy default response
-func (o *KMSDescribePolicyDefault) WithPayload(payload *models.Error) *KMSDescribePolicyDefault {
+func (o *KMSDescribePolicyDefault) WithPayload(payload *models.APIError) *KMSDescribePolicyDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the k m s describe policy default response
-func (o *KMSDescribePolicyDefault) SetPayload(payload *models.Error) {
+func (o *KMSDescribePolicyDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/k_m_s/k_m_s_describe_self_identity_responses.go b/restapi/operations/k_m_s/k_m_s_describe_self_identity_responses.go
index 3711e21e8..d639a0a24 100644
--- a/restapi/operations/k_m_s/k_m_s_describe_self_identity_responses.go
+++ b/restapi/operations/k_m_s/k_m_s_describe_self_identity_responses.go
@@ -86,7 +86,7 @@ type KMSDescribeSelfIdentityDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewKMSDescribeSelfIdentityDefault creates KMSDescribeSelfIdentityDefault with default headers values
@@ -112,13 +112,13 @@ func (o *KMSDescribeSelfIdentityDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the k m s describe self identity default response
-func (o *KMSDescribeSelfIdentityDefault) WithPayload(payload *models.Error) *KMSDescribeSelfIdentityDefault {
+func (o *KMSDescribeSelfIdentityDefault) WithPayload(payload *models.APIError) *KMSDescribeSelfIdentityDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the k m s describe self identity default response
-func (o *KMSDescribeSelfIdentityDefault) SetPayload(payload *models.Error) {
+func (o *KMSDescribeSelfIdentityDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/k_m_s/k_m_s_get_policy_responses.go b/restapi/operations/k_m_s/k_m_s_get_policy_responses.go
index 5c958e6ac..328db1c3a 100644
--- a/restapi/operations/k_m_s/k_m_s_get_policy_responses.go
+++ b/restapi/operations/k_m_s/k_m_s_get_policy_responses.go
@@ -86,7 +86,7 @@ type KMSGetPolicyDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewKMSGetPolicyDefault creates KMSGetPolicyDefault with default headers values
@@ -112,13 +112,13 @@ func (o *KMSGetPolicyDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the k m s get policy default response
-func (o *KMSGetPolicyDefault) WithPayload(payload *models.Error) *KMSGetPolicyDefault {
+func (o *KMSGetPolicyDefault) WithPayload(payload *models.APIError) *KMSGetPolicyDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the k m s get policy default response
-func (o *KMSGetPolicyDefault) SetPayload(payload *models.Error) {
+func (o *KMSGetPolicyDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/k_m_s/k_m_s_import_key_responses.go b/restapi/operations/k_m_s/k_m_s_import_key_responses.go
index 7839e6c56..b092567a9 100644
--- a/restapi/operations/k_m_s/k_m_s_import_key_responses.go
+++ b/restapi/operations/k_m_s/k_m_s_import_key_responses.go
@@ -66,7 +66,7 @@ type KMSImportKeyDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewKMSImportKeyDefault creates KMSImportKeyDefault with default headers values
@@ -92,13 +92,13 @@ func (o *KMSImportKeyDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the k m s import key default response
-func (o *KMSImportKeyDefault) WithPayload(payload *models.Error) *KMSImportKeyDefault {
+func (o *KMSImportKeyDefault) WithPayload(payload *models.APIError) *KMSImportKeyDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the k m s import key default response
-func (o *KMSImportKeyDefault) SetPayload(payload *models.Error) {
+func (o *KMSImportKeyDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/k_m_s/k_m_s_key_status_responses.go b/restapi/operations/k_m_s/k_m_s_key_status_responses.go
index 0bb3c58e8..643865f2e 100644
--- a/restapi/operations/k_m_s/k_m_s_key_status_responses.go
+++ b/restapi/operations/k_m_s/k_m_s_key_status_responses.go
@@ -86,7 +86,7 @@ type KMSKeyStatusDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewKMSKeyStatusDefault creates KMSKeyStatusDefault with default headers values
@@ -112,13 +112,13 @@ func (o *KMSKeyStatusDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the k m s key status default response
-func (o *KMSKeyStatusDefault) WithPayload(payload *models.Error) *KMSKeyStatusDefault {
+func (o *KMSKeyStatusDefault) WithPayload(payload *models.APIError) *KMSKeyStatusDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the k m s key status default response
-func (o *KMSKeyStatusDefault) SetPayload(payload *models.Error) {
+func (o *KMSKeyStatusDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/k_m_s/k_m_s_list_identities_responses.go b/restapi/operations/k_m_s/k_m_s_list_identities_responses.go
index f0e714fe0..72c484b21 100644
--- a/restapi/operations/k_m_s/k_m_s_list_identities_responses.go
+++ b/restapi/operations/k_m_s/k_m_s_list_identities_responses.go
@@ -86,7 +86,7 @@ type KMSListIdentitiesDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewKMSListIdentitiesDefault creates KMSListIdentitiesDefault with default headers values
@@ -112,13 +112,13 @@ func (o *KMSListIdentitiesDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the k m s list identities default response
-func (o *KMSListIdentitiesDefault) WithPayload(payload *models.Error) *KMSListIdentitiesDefault {
+func (o *KMSListIdentitiesDefault) WithPayload(payload *models.APIError) *KMSListIdentitiesDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the k m s list identities default response
-func (o *KMSListIdentitiesDefault) SetPayload(payload *models.Error) {
+func (o *KMSListIdentitiesDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/k_m_s/k_m_s_list_keys_responses.go b/restapi/operations/k_m_s/k_m_s_list_keys_responses.go
index 7903107a9..1ede4f053 100644
--- a/restapi/operations/k_m_s/k_m_s_list_keys_responses.go
+++ b/restapi/operations/k_m_s/k_m_s_list_keys_responses.go
@@ -86,7 +86,7 @@ type KMSListKeysDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewKMSListKeysDefault creates KMSListKeysDefault with default headers values
@@ -112,13 +112,13 @@ func (o *KMSListKeysDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the k m s list keys default response
-func (o *KMSListKeysDefault) WithPayload(payload *models.Error) *KMSListKeysDefault {
+func (o *KMSListKeysDefault) WithPayload(payload *models.APIError) *KMSListKeysDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the k m s list keys default response
-func (o *KMSListKeysDefault) SetPayload(payload *models.Error) {
+func (o *KMSListKeysDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/k_m_s/k_m_s_list_policies_responses.go b/restapi/operations/k_m_s/k_m_s_list_policies_responses.go
index 8f3907fa4..62ad82e03 100644
--- a/restapi/operations/k_m_s/k_m_s_list_policies_responses.go
+++ b/restapi/operations/k_m_s/k_m_s_list_policies_responses.go
@@ -86,7 +86,7 @@ type KMSListPoliciesDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewKMSListPoliciesDefault creates KMSListPoliciesDefault with default headers values
@@ -112,13 +112,13 @@ func (o *KMSListPoliciesDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the k m s list policies default response
-func (o *KMSListPoliciesDefault) WithPayload(payload *models.Error) *KMSListPoliciesDefault {
+func (o *KMSListPoliciesDefault) WithPayload(payload *models.APIError) *KMSListPoliciesDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the k m s list policies default response
-func (o *KMSListPoliciesDefault) SetPayload(payload *models.Error) {
+func (o *KMSListPoliciesDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/k_m_s/k_m_s_metrics_responses.go b/restapi/operations/k_m_s/k_m_s_metrics_responses.go
index b13c3b265..ae8b4d7ea 100644
--- a/restapi/operations/k_m_s/k_m_s_metrics_responses.go
+++ b/restapi/operations/k_m_s/k_m_s_metrics_responses.go
@@ -86,7 +86,7 @@ type KMSMetricsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewKMSMetricsDefault creates KMSMetricsDefault with default headers values
@@ -112,13 +112,13 @@ func (o *KMSMetricsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the k m s metrics default response
-func (o *KMSMetricsDefault) WithPayload(payload *models.Error) *KMSMetricsDefault {
+func (o *KMSMetricsDefault) WithPayload(payload *models.APIError) *KMSMetricsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the k m s metrics default response
-func (o *KMSMetricsDefault) SetPayload(payload *models.Error) {
+func (o *KMSMetricsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/k_m_s/k_m_s_set_policy_responses.go b/restapi/operations/k_m_s/k_m_s_set_policy_responses.go
index bf89750ec..c9c744f89 100644
--- a/restapi/operations/k_m_s/k_m_s_set_policy_responses.go
+++ b/restapi/operations/k_m_s/k_m_s_set_policy_responses.go
@@ -66,7 +66,7 @@ type KMSSetPolicyDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewKMSSetPolicyDefault creates KMSSetPolicyDefault with default headers values
@@ -92,13 +92,13 @@ func (o *KMSSetPolicyDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the k m s set policy default response
-func (o *KMSSetPolicyDefault) WithPayload(payload *models.Error) *KMSSetPolicyDefault {
+func (o *KMSSetPolicyDefault) WithPayload(payload *models.APIError) *KMSSetPolicyDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the k m s set policy default response
-func (o *KMSSetPolicyDefault) SetPayload(payload *models.Error) {
+func (o *KMSSetPolicyDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/k_m_s/k_m_s_status_responses.go b/restapi/operations/k_m_s/k_m_s_status_responses.go
index 0fb5afb27..62e9da03e 100644
--- a/restapi/operations/k_m_s/k_m_s_status_responses.go
+++ b/restapi/operations/k_m_s/k_m_s_status_responses.go
@@ -86,7 +86,7 @@ type KMSStatusDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewKMSStatusDefault creates KMSStatusDefault with default headers values
@@ -112,13 +112,13 @@ func (o *KMSStatusDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the k m s status default response
-func (o *KMSStatusDefault) WithPayload(payload *models.Error) *KMSStatusDefault {
+func (o *KMSStatusDefault) WithPayload(payload *models.APIError) *KMSStatusDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the k m s status default response
-func (o *KMSStatusDefault) SetPayload(payload *models.Error) {
+func (o *KMSStatusDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/k_m_s/k_m_s_version_responses.go b/restapi/operations/k_m_s/k_m_s_version_responses.go
index 0d1355b5f..4c2c273eb 100644
--- a/restapi/operations/k_m_s/k_m_s_version_responses.go
+++ b/restapi/operations/k_m_s/k_m_s_version_responses.go
@@ -86,7 +86,7 @@ type KMSVersionDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewKMSVersionDefault creates KMSVersionDefault with default headers values
@@ -112,13 +112,13 @@ func (o *KMSVersionDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the k m s version default response
-func (o *KMSVersionDefault) WithPayload(payload *models.Error) *KMSVersionDefault {
+func (o *KMSVersionDefault) WithPayload(payload *models.APIError) *KMSVersionDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the k m s version default response
-func (o *KMSVersionDefault) SetPayload(payload *models.Error) {
+func (o *KMSVersionDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/logging/log_search_responses.go b/restapi/operations/logging/log_search_responses.go
index 2b25ca140..f2927f960 100644
--- a/restapi/operations/logging/log_search_responses.go
+++ b/restapi/operations/logging/log_search_responses.go
@@ -86,7 +86,7 @@ type LogSearchDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewLogSearchDefault creates LogSearchDefault with default headers values
@@ -112,13 +112,13 @@ func (o *LogSearchDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the log search default response
-func (o *LogSearchDefault) WithPayload(payload *models.Error) *LogSearchDefault {
+func (o *LogSearchDefault) WithPayload(payload *models.APIError) *LogSearchDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the log search default response
-func (o *LogSearchDefault) SetPayload(payload *models.Error) {
+func (o *LogSearchDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/object/delete_multiple_objects_responses.go b/restapi/operations/object/delete_multiple_objects_responses.go
index 936815e8d..0a88ec8cb 100644
--- a/restapi/operations/object/delete_multiple_objects_responses.go
+++ b/restapi/operations/object/delete_multiple_objects_responses.go
@@ -66,7 +66,7 @@ type DeleteMultipleObjectsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewDeleteMultipleObjectsDefault creates DeleteMultipleObjectsDefault with default headers values
@@ -92,13 +92,13 @@ func (o *DeleteMultipleObjectsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the delete multiple objects default response
-func (o *DeleteMultipleObjectsDefault) WithPayload(payload *models.Error) *DeleteMultipleObjectsDefault {
+func (o *DeleteMultipleObjectsDefault) WithPayload(payload *models.APIError) *DeleteMultipleObjectsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the delete multiple objects default response
-func (o *DeleteMultipleObjectsDefault) SetPayload(payload *models.Error) {
+func (o *DeleteMultipleObjectsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/object/delete_object_responses.go b/restapi/operations/object/delete_object_responses.go
index d13157cb0..d393f9e31 100644
--- a/restapi/operations/object/delete_object_responses.go
+++ b/restapi/operations/object/delete_object_responses.go
@@ -66,7 +66,7 @@ type DeleteObjectDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewDeleteObjectDefault creates DeleteObjectDefault with default headers values
@@ -92,13 +92,13 @@ func (o *DeleteObjectDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the delete object default response
-func (o *DeleteObjectDefault) WithPayload(payload *models.Error) *DeleteObjectDefault {
+func (o *DeleteObjectDefault) WithPayload(payload *models.APIError) *DeleteObjectDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the delete object default response
-func (o *DeleteObjectDefault) SetPayload(payload *models.Error) {
+func (o *DeleteObjectDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/object/delete_object_retention_responses.go b/restapi/operations/object/delete_object_retention_responses.go
index 218ef6c2a..36107cf26 100644
--- a/restapi/operations/object/delete_object_retention_responses.go
+++ b/restapi/operations/object/delete_object_retention_responses.go
@@ -66,7 +66,7 @@ type DeleteObjectRetentionDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewDeleteObjectRetentionDefault creates DeleteObjectRetentionDefault with default headers values
@@ -92,13 +92,13 @@ func (o *DeleteObjectRetentionDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the delete object retention default response
-func (o *DeleteObjectRetentionDefault) WithPayload(payload *models.Error) *DeleteObjectRetentionDefault {
+func (o *DeleteObjectRetentionDefault) WithPayload(payload *models.APIError) *DeleteObjectRetentionDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the delete object retention default response
-func (o *DeleteObjectRetentionDefault) SetPayload(payload *models.Error) {
+func (o *DeleteObjectRetentionDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/object/download_multiple_objects_responses.go b/restapi/operations/object/download_multiple_objects_responses.go
index eeeff812b..1017fce35 100644
--- a/restapi/operations/object/download_multiple_objects_responses.go
+++ b/restapi/operations/object/download_multiple_objects_responses.go
@@ -85,7 +85,7 @@ type DownloadMultipleObjectsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewDownloadMultipleObjectsDefault creates DownloadMultipleObjectsDefault with default headers values
@@ -111,13 +111,13 @@ func (o *DownloadMultipleObjectsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the download multiple objects default response
-func (o *DownloadMultipleObjectsDefault) WithPayload(payload *models.Error) *DownloadMultipleObjectsDefault {
+func (o *DownloadMultipleObjectsDefault) WithPayload(payload *models.APIError) *DownloadMultipleObjectsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the download multiple objects default response
-func (o *DownloadMultipleObjectsDefault) SetPayload(payload *models.Error) {
+func (o *DownloadMultipleObjectsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/object/download_object_responses.go b/restapi/operations/object/download_object_responses.go
index 7dfd29727..24bbe4c41 100644
--- a/restapi/operations/object/download_object_responses.go
+++ b/restapi/operations/object/download_object_responses.go
@@ -85,7 +85,7 @@ type DownloadObjectDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewDownloadObjectDefault creates DownloadObjectDefault with default headers values
@@ -111,13 +111,13 @@ func (o *DownloadObjectDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the download object default response
-func (o *DownloadObjectDefault) WithPayload(payload *models.Error) *DownloadObjectDefault {
+func (o *DownloadObjectDefault) WithPayload(payload *models.APIError) *DownloadObjectDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the download object default response
-func (o *DownloadObjectDefault) SetPayload(payload *models.Error) {
+func (o *DownloadObjectDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/object/get_object_metadata_responses.go b/restapi/operations/object/get_object_metadata_responses.go
index d7b69e275..5c2c9d038 100644
--- a/restapi/operations/object/get_object_metadata_responses.go
+++ b/restapi/operations/object/get_object_metadata_responses.go
@@ -86,7 +86,7 @@ type GetObjectMetadataDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewGetObjectMetadataDefault creates GetObjectMetadataDefault with default headers values
@@ -112,13 +112,13 @@ func (o *GetObjectMetadataDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the get object metadata default response
-func (o *GetObjectMetadataDefault) WithPayload(payload *models.Error) *GetObjectMetadataDefault {
+func (o *GetObjectMetadataDefault) WithPayload(payload *models.APIError) *GetObjectMetadataDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the get object metadata default response
-func (o *GetObjectMetadataDefault) SetPayload(payload *models.Error) {
+func (o *GetObjectMetadataDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/object/list_objects_responses.go b/restapi/operations/object/list_objects_responses.go
index 0b7ec68b3..a08934e1b 100644
--- a/restapi/operations/object/list_objects_responses.go
+++ b/restapi/operations/object/list_objects_responses.go
@@ -86,7 +86,7 @@ type ListObjectsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewListObjectsDefault creates ListObjectsDefault with default headers values
@@ -112,13 +112,13 @@ func (o *ListObjectsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the list objects default response
-func (o *ListObjectsDefault) WithPayload(payload *models.Error) *ListObjectsDefault {
+func (o *ListObjectsDefault) WithPayload(payload *models.APIError) *ListObjectsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the list objects default response
-func (o *ListObjectsDefault) SetPayload(payload *models.Error) {
+func (o *ListObjectsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/object/post_buckets_bucket_name_objects_upload_responses.go b/restapi/operations/object/post_buckets_bucket_name_objects_upload_responses.go
index 3f9d80f3b..b95c79be8 100644
--- a/restapi/operations/object/post_buckets_bucket_name_objects_upload_responses.go
+++ b/restapi/operations/object/post_buckets_bucket_name_objects_upload_responses.go
@@ -66,7 +66,7 @@ type PostBucketsBucketNameObjectsUploadDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewPostBucketsBucketNameObjectsUploadDefault creates PostBucketsBucketNameObjectsUploadDefault with default headers values
@@ -92,13 +92,13 @@ func (o *PostBucketsBucketNameObjectsUploadDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the post buckets bucket name objects upload default response
-func (o *PostBucketsBucketNameObjectsUploadDefault) WithPayload(payload *models.Error) *PostBucketsBucketNameObjectsUploadDefault {
+func (o *PostBucketsBucketNameObjectsUploadDefault) WithPayload(payload *models.APIError) *PostBucketsBucketNameObjectsUploadDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the post buckets bucket name objects upload default response
-func (o *PostBucketsBucketNameObjectsUploadDefault) SetPayload(payload *models.Error) {
+func (o *PostBucketsBucketNameObjectsUploadDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/object/put_object_legal_hold_responses.go b/restapi/operations/object/put_object_legal_hold_responses.go
index 525018757..06cadc0ed 100644
--- a/restapi/operations/object/put_object_legal_hold_responses.go
+++ b/restapi/operations/object/put_object_legal_hold_responses.go
@@ -66,7 +66,7 @@ type PutObjectLegalHoldDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewPutObjectLegalHoldDefault creates PutObjectLegalHoldDefault with default headers values
@@ -92,13 +92,13 @@ func (o *PutObjectLegalHoldDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the put object legal hold default response
-func (o *PutObjectLegalHoldDefault) WithPayload(payload *models.Error) *PutObjectLegalHoldDefault {
+func (o *PutObjectLegalHoldDefault) WithPayload(payload *models.APIError) *PutObjectLegalHoldDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the put object legal hold default response
-func (o *PutObjectLegalHoldDefault) SetPayload(payload *models.Error) {
+func (o *PutObjectLegalHoldDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/object/put_object_restore_responses.go b/restapi/operations/object/put_object_restore_responses.go
index 76ecf1b6f..ee6e605cc 100644
--- a/restapi/operations/object/put_object_restore_responses.go
+++ b/restapi/operations/object/put_object_restore_responses.go
@@ -66,7 +66,7 @@ type PutObjectRestoreDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewPutObjectRestoreDefault creates PutObjectRestoreDefault with default headers values
@@ -92,13 +92,13 @@ func (o *PutObjectRestoreDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the put object restore default response
-func (o *PutObjectRestoreDefault) WithPayload(payload *models.Error) *PutObjectRestoreDefault {
+func (o *PutObjectRestoreDefault) WithPayload(payload *models.APIError) *PutObjectRestoreDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the put object restore default response
-func (o *PutObjectRestoreDefault) SetPayload(payload *models.Error) {
+func (o *PutObjectRestoreDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/object/put_object_retention_responses.go b/restapi/operations/object/put_object_retention_responses.go
index 5c9f8908e..04be190f9 100644
--- a/restapi/operations/object/put_object_retention_responses.go
+++ b/restapi/operations/object/put_object_retention_responses.go
@@ -66,7 +66,7 @@ type PutObjectRetentionDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewPutObjectRetentionDefault creates PutObjectRetentionDefault with default headers values
@@ -92,13 +92,13 @@ func (o *PutObjectRetentionDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the put object retention default response
-func (o *PutObjectRetentionDefault) WithPayload(payload *models.Error) *PutObjectRetentionDefault {
+func (o *PutObjectRetentionDefault) WithPayload(payload *models.APIError) *PutObjectRetentionDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the put object retention default response
-func (o *PutObjectRetentionDefault) SetPayload(payload *models.Error) {
+func (o *PutObjectRetentionDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/object/put_object_tags_responses.go b/restapi/operations/object/put_object_tags_responses.go
index 4db66c8a1..6d6a7cfb5 100644
--- a/restapi/operations/object/put_object_tags_responses.go
+++ b/restapi/operations/object/put_object_tags_responses.go
@@ -66,7 +66,7 @@ type PutObjectTagsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewPutObjectTagsDefault creates PutObjectTagsDefault with default headers values
@@ -92,13 +92,13 @@ func (o *PutObjectTagsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the put object tags default response
-func (o *PutObjectTagsDefault) WithPayload(payload *models.Error) *PutObjectTagsDefault {
+func (o *PutObjectTagsDefault) WithPayload(payload *models.APIError) *PutObjectTagsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the put object tags default response
-func (o *PutObjectTagsDefault) SetPayload(payload *models.Error) {
+func (o *PutObjectTagsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/object/share_object_responses.go b/restapi/operations/object/share_object_responses.go
index 23511b47a..df27c172a 100644
--- a/restapi/operations/object/share_object_responses.go
+++ b/restapi/operations/object/share_object_responses.go
@@ -84,7 +84,7 @@ type ShareObjectDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewShareObjectDefault creates ShareObjectDefault with default headers values
@@ -110,13 +110,13 @@ func (o *ShareObjectDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the share object default response
-func (o *ShareObjectDefault) WithPayload(payload *models.Error) *ShareObjectDefault {
+func (o *ShareObjectDefault) WithPayload(payload *models.APIError) *ShareObjectDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the share object default response
-func (o *ShareObjectDefault) SetPayload(payload *models.Error) {
+func (o *ShareObjectDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/policy/add_policy_responses.go b/restapi/operations/policy/add_policy_responses.go
index 56e659f0c..5c064c3c5 100644
--- a/restapi/operations/policy/add_policy_responses.go
+++ b/restapi/operations/policy/add_policy_responses.go
@@ -86,7 +86,7 @@ type AddPolicyDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewAddPolicyDefault creates AddPolicyDefault with default headers values
@@ -112,13 +112,13 @@ func (o *AddPolicyDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the add policy default response
-func (o *AddPolicyDefault) WithPayload(payload *models.Error) *AddPolicyDefault {
+func (o *AddPolicyDefault) WithPayload(payload *models.APIError) *AddPolicyDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the add policy default response
-func (o *AddPolicyDefault) SetPayload(payload *models.Error) {
+func (o *AddPolicyDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/policy/get_s_a_user_policy_responses.go b/restapi/operations/policy/get_s_a_user_policy_responses.go
index a67ed7878..a5d0247f3 100644
--- a/restapi/operations/policy/get_s_a_user_policy_responses.go
+++ b/restapi/operations/policy/get_s_a_user_policy_responses.go
@@ -86,7 +86,7 @@ type GetSAUserPolicyDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewGetSAUserPolicyDefault creates GetSAUserPolicyDefault with default headers values
@@ -112,13 +112,13 @@ func (o *GetSAUserPolicyDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the get s a user policy default response
-func (o *GetSAUserPolicyDefault) WithPayload(payload *models.Error) *GetSAUserPolicyDefault {
+func (o *GetSAUserPolicyDefault) WithPayload(payload *models.APIError) *GetSAUserPolicyDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the get s a user policy default response
-func (o *GetSAUserPolicyDefault) SetPayload(payload *models.Error) {
+func (o *GetSAUserPolicyDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/policy/get_user_policy_responses.go b/restapi/operations/policy/get_user_policy_responses.go
index 71105b9fe..fe8754b20 100644
--- a/restapi/operations/policy/get_user_policy_responses.go
+++ b/restapi/operations/policy/get_user_policy_responses.go
@@ -84,7 +84,7 @@ type GetUserPolicyDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewGetUserPolicyDefault creates GetUserPolicyDefault with default headers values
@@ -110,13 +110,13 @@ func (o *GetUserPolicyDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the get user policy default response
-func (o *GetUserPolicyDefault) WithPayload(payload *models.Error) *GetUserPolicyDefault {
+func (o *GetUserPolicyDefault) WithPayload(payload *models.APIError) *GetUserPolicyDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the get user policy default response
-func (o *GetUserPolicyDefault) SetPayload(payload *models.Error) {
+func (o *GetUserPolicyDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/policy/list_groups_for_policy_responses.go b/restapi/operations/policy/list_groups_for_policy_responses.go
index f9b35b4b2..23b2cd7c8 100644
--- a/restapi/operations/policy/list_groups_for_policy_responses.go
+++ b/restapi/operations/policy/list_groups_for_policy_responses.go
@@ -89,7 +89,7 @@ type ListGroupsForPolicyDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewListGroupsForPolicyDefault creates ListGroupsForPolicyDefault with default headers values
@@ -115,13 +115,13 @@ func (o *ListGroupsForPolicyDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the list groups for policy default response
-func (o *ListGroupsForPolicyDefault) WithPayload(payload *models.Error) *ListGroupsForPolicyDefault {
+func (o *ListGroupsForPolicyDefault) WithPayload(payload *models.APIError) *ListGroupsForPolicyDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the list groups for policy default response
-func (o *ListGroupsForPolicyDefault) SetPayload(payload *models.Error) {
+func (o *ListGroupsForPolicyDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/policy/list_policies_responses.go b/restapi/operations/policy/list_policies_responses.go
index 7ea6c0ad7..92da85ab3 100644
--- a/restapi/operations/policy/list_policies_responses.go
+++ b/restapi/operations/policy/list_policies_responses.go
@@ -86,7 +86,7 @@ type ListPoliciesDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewListPoliciesDefault creates ListPoliciesDefault with default headers values
@@ -112,13 +112,13 @@ func (o *ListPoliciesDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the list policies default response
-func (o *ListPoliciesDefault) WithPayload(payload *models.Error) *ListPoliciesDefault {
+func (o *ListPoliciesDefault) WithPayload(payload *models.APIError) *ListPoliciesDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the list policies default response
-func (o *ListPoliciesDefault) SetPayload(payload *models.Error) {
+func (o *ListPoliciesDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/policy/list_users_for_policy_responses.go b/restapi/operations/policy/list_users_for_policy_responses.go
index 83739f89f..877f9a6ee 100644
--- a/restapi/operations/policy/list_users_for_policy_responses.go
+++ b/restapi/operations/policy/list_users_for_policy_responses.go
@@ -89,7 +89,7 @@ type ListUsersForPolicyDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewListUsersForPolicyDefault creates ListUsersForPolicyDefault with default headers values
@@ -115,13 +115,13 @@ func (o *ListUsersForPolicyDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the list users for policy default response
-func (o *ListUsersForPolicyDefault) WithPayload(payload *models.Error) *ListUsersForPolicyDefault {
+func (o *ListUsersForPolicyDefault) WithPayload(payload *models.APIError) *ListUsersForPolicyDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the list users for policy default response
-func (o *ListUsersForPolicyDefault) SetPayload(payload *models.Error) {
+func (o *ListUsersForPolicyDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/policy/policy_info_responses.go b/restapi/operations/policy/policy_info_responses.go
index 1a32518ba..35e822550 100644
--- a/restapi/operations/policy/policy_info_responses.go
+++ b/restapi/operations/policy/policy_info_responses.go
@@ -86,7 +86,7 @@ type PolicyInfoDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewPolicyInfoDefault creates PolicyInfoDefault with default headers values
@@ -112,13 +112,13 @@ func (o *PolicyInfoDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the policy info default response
-func (o *PolicyInfoDefault) WithPayload(payload *models.Error) *PolicyInfoDefault {
+func (o *PolicyInfoDefault) WithPayload(payload *models.APIError) *PolicyInfoDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the policy info default response
-func (o *PolicyInfoDefault) SetPayload(payload *models.Error) {
+func (o *PolicyInfoDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/policy/remove_policy_responses.go b/restapi/operations/policy/remove_policy_responses.go
index 5ad530121..b3147e907 100644
--- a/restapi/operations/policy/remove_policy_responses.go
+++ b/restapi/operations/policy/remove_policy_responses.go
@@ -66,7 +66,7 @@ type RemovePolicyDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewRemovePolicyDefault creates RemovePolicyDefault with default headers values
@@ -92,13 +92,13 @@ func (o *RemovePolicyDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the remove policy default response
-func (o *RemovePolicyDefault) WithPayload(payload *models.Error) *RemovePolicyDefault {
+func (o *RemovePolicyDefault) WithPayload(payload *models.APIError) *RemovePolicyDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the remove policy default response
-func (o *RemovePolicyDefault) SetPayload(payload *models.Error) {
+func (o *RemovePolicyDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/policy/set_policy_multiple_responses.go b/restapi/operations/policy/set_policy_multiple_responses.go
index dfd83549c..e09701e86 100644
--- a/restapi/operations/policy/set_policy_multiple_responses.go
+++ b/restapi/operations/policy/set_policy_multiple_responses.go
@@ -66,7 +66,7 @@ type SetPolicyMultipleDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewSetPolicyMultipleDefault creates SetPolicyMultipleDefault with default headers values
@@ -92,13 +92,13 @@ func (o *SetPolicyMultipleDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the set policy multiple default response
-func (o *SetPolicyMultipleDefault) WithPayload(payload *models.Error) *SetPolicyMultipleDefault {
+func (o *SetPolicyMultipleDefault) WithPayload(payload *models.APIError) *SetPolicyMultipleDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the set policy multiple default response
-func (o *SetPolicyMultipleDefault) SetPayload(payload *models.Error) {
+func (o *SetPolicyMultipleDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/policy/set_policy_responses.go b/restapi/operations/policy/set_policy_responses.go
index 4c7f8a2c4..3235b9429 100644
--- a/restapi/operations/policy/set_policy_responses.go
+++ b/restapi/operations/policy/set_policy_responses.go
@@ -66,7 +66,7 @@ type SetPolicyDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewSetPolicyDefault creates SetPolicyDefault with default headers values
@@ -92,13 +92,13 @@ func (o *SetPolicyDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the set policy default response
-func (o *SetPolicyDefault) WithPayload(payload *models.Error) *SetPolicyDefault {
+func (o *SetPolicyDefault) WithPayload(payload *models.APIError) *SetPolicyDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the set policy default response
-func (o *SetPolicyDefault) SetPayload(payload *models.Error) {
+func (o *SetPolicyDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/profile/profiling_start_responses.go b/restapi/operations/profile/profiling_start_responses.go
index 1132d1263..cecb78b58 100644
--- a/restapi/operations/profile/profiling_start_responses.go
+++ b/restapi/operations/profile/profiling_start_responses.go
@@ -86,7 +86,7 @@ type ProfilingStartDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewProfilingStartDefault creates ProfilingStartDefault with default headers values
@@ -112,13 +112,13 @@ func (o *ProfilingStartDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the profiling start default response
-func (o *ProfilingStartDefault) WithPayload(payload *models.Error) *ProfilingStartDefault {
+func (o *ProfilingStartDefault) WithPayload(payload *models.APIError) *ProfilingStartDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the profiling start default response
-func (o *ProfilingStartDefault) SetPayload(payload *models.Error) {
+func (o *ProfilingStartDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/profile/profiling_stop_responses.go b/restapi/operations/profile/profiling_stop_responses.go
index f1ac660a0..831000019 100644
--- a/restapi/operations/profile/profiling_stop_responses.go
+++ b/restapi/operations/profile/profiling_stop_responses.go
@@ -85,7 +85,7 @@ type ProfilingStopDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewProfilingStopDefault creates ProfilingStopDefault with default headers values
@@ -111,13 +111,13 @@ func (o *ProfilingStopDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the profiling stop default response
-func (o *ProfilingStopDefault) WithPayload(payload *models.Error) *ProfilingStopDefault {
+func (o *ProfilingStopDefault) WithPayload(payload *models.APIError) *ProfilingStopDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the profiling stop default response
-func (o *ProfilingStopDefault) SetPayload(payload *models.Error) {
+func (o *ProfilingStopDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/release/list_releases_responses.go b/restapi/operations/release/list_releases_responses.go
index 27276f38e..101c78559 100644
--- a/restapi/operations/release/list_releases_responses.go
+++ b/restapi/operations/release/list_releases_responses.go
@@ -86,7 +86,7 @@ type ListReleasesDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewListReleasesDefault creates ListReleasesDefault with default headers values
@@ -112,13 +112,13 @@ func (o *ListReleasesDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the list releases default response
-func (o *ListReleasesDefault) WithPayload(payload *models.Error) *ListReleasesDefault {
+func (o *ListReleasesDefault) WithPayload(payload *models.APIError) *ListReleasesDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the list releases default response
-func (o *ListReleasesDefault) SetPayload(payload *models.Error) {
+func (o *ListReleasesDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/service/restart_service_responses.go b/restapi/operations/service/restart_service_responses.go
index bfb310d72..0de46508d 100644
--- a/restapi/operations/service/restart_service_responses.go
+++ b/restapi/operations/service/restart_service_responses.go
@@ -66,7 +66,7 @@ type RestartServiceDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewRestartServiceDefault creates RestartServiceDefault with default headers values
@@ -92,13 +92,13 @@ func (o *RestartServiceDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the restart service default response
-func (o *RestartServiceDefault) WithPayload(payload *models.Error) *RestartServiceDefault {
+func (o *RestartServiceDefault) WithPayload(payload *models.APIError) *RestartServiceDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the restart service default response
-func (o *RestartServiceDefault) SetPayload(payload *models.Error) {
+func (o *RestartServiceDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/service_account/create_service_account_creds_responses.go b/restapi/operations/service_account/create_service_account_creds_responses.go
index b63bfe086..417b188a2 100644
--- a/restapi/operations/service_account/create_service_account_creds_responses.go
+++ b/restapi/operations/service_account/create_service_account_creds_responses.go
@@ -86,7 +86,7 @@ type CreateServiceAccountCredsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewCreateServiceAccountCredsDefault creates CreateServiceAccountCredsDefault with default headers values
@@ -112,13 +112,13 @@ func (o *CreateServiceAccountCredsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the create service account creds default response
-func (o *CreateServiceAccountCredsDefault) WithPayload(payload *models.Error) *CreateServiceAccountCredsDefault {
+func (o *CreateServiceAccountCredsDefault) WithPayload(payload *models.APIError) *CreateServiceAccountCredsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the create service account creds default response
-func (o *CreateServiceAccountCredsDefault) SetPayload(payload *models.Error) {
+func (o *CreateServiceAccountCredsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/service_account/create_service_account_responses.go b/restapi/operations/service_account/create_service_account_responses.go
index 4d64f4ed4..38e12ce18 100644
--- a/restapi/operations/service_account/create_service_account_responses.go
+++ b/restapi/operations/service_account/create_service_account_responses.go
@@ -86,7 +86,7 @@ type CreateServiceAccountDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewCreateServiceAccountDefault creates CreateServiceAccountDefault with default headers values
@@ -112,13 +112,13 @@ func (o *CreateServiceAccountDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the create service account default response
-func (o *CreateServiceAccountDefault) WithPayload(payload *models.Error) *CreateServiceAccountDefault {
+func (o *CreateServiceAccountDefault) WithPayload(payload *models.APIError) *CreateServiceAccountDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the create service account default response
-func (o *CreateServiceAccountDefault) SetPayload(payload *models.Error) {
+func (o *CreateServiceAccountDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/service_account/delete_multiple_service_accounts_responses.go b/restapi/operations/service_account/delete_multiple_service_accounts_responses.go
index dc26f79bf..fe9b01d72 100644
--- a/restapi/operations/service_account/delete_multiple_service_accounts_responses.go
+++ b/restapi/operations/service_account/delete_multiple_service_accounts_responses.go
@@ -66,7 +66,7 @@ type DeleteMultipleServiceAccountsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewDeleteMultipleServiceAccountsDefault creates DeleteMultipleServiceAccountsDefault with default headers values
@@ -92,13 +92,13 @@ func (o *DeleteMultipleServiceAccountsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the delete multiple service accounts default response
-func (o *DeleteMultipleServiceAccountsDefault) WithPayload(payload *models.Error) *DeleteMultipleServiceAccountsDefault {
+func (o *DeleteMultipleServiceAccountsDefault) WithPayload(payload *models.APIError) *DeleteMultipleServiceAccountsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the delete multiple service accounts default response
-func (o *DeleteMultipleServiceAccountsDefault) SetPayload(payload *models.Error) {
+func (o *DeleteMultipleServiceAccountsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/service_account/delete_service_account_responses.go b/restapi/operations/service_account/delete_service_account_responses.go
index 2b80ee895..a4f8968c2 100644
--- a/restapi/operations/service_account/delete_service_account_responses.go
+++ b/restapi/operations/service_account/delete_service_account_responses.go
@@ -66,7 +66,7 @@ type DeleteServiceAccountDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewDeleteServiceAccountDefault creates DeleteServiceAccountDefault with default headers values
@@ -92,13 +92,13 @@ func (o *DeleteServiceAccountDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the delete service account default response
-func (o *DeleteServiceAccountDefault) WithPayload(payload *models.Error) *DeleteServiceAccountDefault {
+func (o *DeleteServiceAccountDefault) WithPayload(payload *models.APIError) *DeleteServiceAccountDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the delete service account default response
-func (o *DeleteServiceAccountDefault) SetPayload(payload *models.Error) {
+func (o *DeleteServiceAccountDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/service_account/get_service_account_policy_responses.go b/restapi/operations/service_account/get_service_account_policy_responses.go
index 60398db5a..595aa30c7 100644
--- a/restapi/operations/service_account/get_service_account_policy_responses.go
+++ b/restapi/operations/service_account/get_service_account_policy_responses.go
@@ -84,7 +84,7 @@ type GetServiceAccountPolicyDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewGetServiceAccountPolicyDefault creates GetServiceAccountPolicyDefault with default headers values
@@ -110,13 +110,13 @@ func (o *GetServiceAccountPolicyDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the get service account policy default response
-func (o *GetServiceAccountPolicyDefault) WithPayload(payload *models.Error) *GetServiceAccountPolicyDefault {
+func (o *GetServiceAccountPolicyDefault) WithPayload(payload *models.APIError) *GetServiceAccountPolicyDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the get service account policy default response
-func (o *GetServiceAccountPolicyDefault) SetPayload(payload *models.Error) {
+func (o *GetServiceAccountPolicyDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/service_account/list_user_service_accounts_responses.go b/restapi/operations/service_account/list_user_service_accounts_responses.go
index 98a04c1b3..70fba458c 100644
--- a/restapi/operations/service_account/list_user_service_accounts_responses.go
+++ b/restapi/operations/service_account/list_user_service_accounts_responses.go
@@ -89,7 +89,7 @@ type ListUserServiceAccountsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewListUserServiceAccountsDefault creates ListUserServiceAccountsDefault with default headers values
@@ -115,13 +115,13 @@ func (o *ListUserServiceAccountsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the list user service accounts default response
-func (o *ListUserServiceAccountsDefault) WithPayload(payload *models.Error) *ListUserServiceAccountsDefault {
+func (o *ListUserServiceAccountsDefault) WithPayload(payload *models.APIError) *ListUserServiceAccountsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the list user service accounts default response
-func (o *ListUserServiceAccountsDefault) SetPayload(payload *models.Error) {
+func (o *ListUserServiceAccountsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/service_account/set_service_account_policy_responses.go b/restapi/operations/service_account/set_service_account_policy_responses.go
index 9e2eb74a2..0c751248a 100644
--- a/restapi/operations/service_account/set_service_account_policy_responses.go
+++ b/restapi/operations/service_account/set_service_account_policy_responses.go
@@ -66,7 +66,7 @@ type SetServiceAccountPolicyDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewSetServiceAccountPolicyDefault creates SetServiceAccountPolicyDefault with default headers values
@@ -92,13 +92,13 @@ func (o *SetServiceAccountPolicyDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the set service account policy default response
-func (o *SetServiceAccountPolicyDefault) WithPayload(payload *models.Error) *SetServiceAccountPolicyDefault {
+func (o *SetServiceAccountPolicyDefault) WithPayload(payload *models.APIError) *SetServiceAccountPolicyDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the set service account policy default response
-func (o *SetServiceAccountPolicyDefault) SetPayload(payload *models.Error) {
+func (o *SetServiceAccountPolicyDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/site_replication/get_site_replication_info_responses.go b/restapi/operations/site_replication/get_site_replication_info_responses.go
index 9e0ddf742..5ad5999c6 100644
--- a/restapi/operations/site_replication/get_site_replication_info_responses.go
+++ b/restapi/operations/site_replication/get_site_replication_info_responses.go
@@ -86,7 +86,7 @@ type GetSiteReplicationInfoDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewGetSiteReplicationInfoDefault creates GetSiteReplicationInfoDefault with default headers values
@@ -112,13 +112,13 @@ func (o *GetSiteReplicationInfoDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the get site replication info default response
-func (o *GetSiteReplicationInfoDefault) WithPayload(payload *models.Error) *GetSiteReplicationInfoDefault {
+func (o *GetSiteReplicationInfoDefault) WithPayload(payload *models.APIError) *GetSiteReplicationInfoDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the get site replication info default response
-func (o *GetSiteReplicationInfoDefault) SetPayload(payload *models.Error) {
+func (o *GetSiteReplicationInfoDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/site_replication/get_site_replication_status_responses.go b/restapi/operations/site_replication/get_site_replication_status_responses.go
index 43a76ae7a..a5ca56e15 100644
--- a/restapi/operations/site_replication/get_site_replication_status_responses.go
+++ b/restapi/operations/site_replication/get_site_replication_status_responses.go
@@ -86,7 +86,7 @@ type GetSiteReplicationStatusDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewGetSiteReplicationStatusDefault creates GetSiteReplicationStatusDefault with default headers values
@@ -112,13 +112,13 @@ func (o *GetSiteReplicationStatusDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the get site replication status default response
-func (o *GetSiteReplicationStatusDefault) WithPayload(payload *models.Error) *GetSiteReplicationStatusDefault {
+func (o *GetSiteReplicationStatusDefault) WithPayload(payload *models.APIError) *GetSiteReplicationStatusDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the get site replication status default response
-func (o *GetSiteReplicationStatusDefault) SetPayload(payload *models.Error) {
+func (o *GetSiteReplicationStatusDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/site_replication/site_replication_edit_responses.go b/restapi/operations/site_replication/site_replication_edit_responses.go
index f85690ed8..c938e012d 100644
--- a/restapi/operations/site_replication/site_replication_edit_responses.go
+++ b/restapi/operations/site_replication/site_replication_edit_responses.go
@@ -86,7 +86,7 @@ type SiteReplicationEditDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewSiteReplicationEditDefault creates SiteReplicationEditDefault with default headers values
@@ -112,13 +112,13 @@ func (o *SiteReplicationEditDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the site replication edit default response
-func (o *SiteReplicationEditDefault) WithPayload(payload *models.Error) *SiteReplicationEditDefault {
+func (o *SiteReplicationEditDefault) WithPayload(payload *models.APIError) *SiteReplicationEditDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the site replication edit default response
-func (o *SiteReplicationEditDefault) SetPayload(payload *models.Error) {
+func (o *SiteReplicationEditDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/site_replication/site_replication_info_add_responses.go b/restapi/operations/site_replication/site_replication_info_add_responses.go
index e6cf9309f..735951017 100644
--- a/restapi/operations/site_replication/site_replication_info_add_responses.go
+++ b/restapi/operations/site_replication/site_replication_info_add_responses.go
@@ -86,7 +86,7 @@ type SiteReplicationInfoAddDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewSiteReplicationInfoAddDefault creates SiteReplicationInfoAddDefault with default headers values
@@ -112,13 +112,13 @@ func (o *SiteReplicationInfoAddDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the site replication info add default response
-func (o *SiteReplicationInfoAddDefault) WithPayload(payload *models.Error) *SiteReplicationInfoAddDefault {
+func (o *SiteReplicationInfoAddDefault) WithPayload(payload *models.APIError) *SiteReplicationInfoAddDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the site replication info add default response
-func (o *SiteReplicationInfoAddDefault) SetPayload(payload *models.Error) {
+func (o *SiteReplicationInfoAddDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/site_replication/site_replication_remove_responses.go b/restapi/operations/site_replication/site_replication_remove_responses.go
index 4e0388e3e..b986ec935 100644
--- a/restapi/operations/site_replication/site_replication_remove_responses.go
+++ b/restapi/operations/site_replication/site_replication_remove_responses.go
@@ -86,7 +86,7 @@ type SiteReplicationRemoveDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewSiteReplicationRemoveDefault creates SiteReplicationRemoveDefault with default headers values
@@ -112,13 +112,13 @@ func (o *SiteReplicationRemoveDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the site replication remove default response
-func (o *SiteReplicationRemoveDefault) WithPayload(payload *models.Error) *SiteReplicationRemoveDefault {
+func (o *SiteReplicationRemoveDefault) WithPayload(payload *models.APIError) *SiteReplicationRemoveDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the site replication remove default response
-func (o *SiteReplicationRemoveDefault) SetPayload(payload *models.Error) {
+func (o *SiteReplicationRemoveDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/subnet/subnet_api_key_responses.go b/restapi/operations/subnet/subnet_api_key_responses.go
index 2e49d782c..f26310066 100644
--- a/restapi/operations/subnet/subnet_api_key_responses.go
+++ b/restapi/operations/subnet/subnet_api_key_responses.go
@@ -86,7 +86,7 @@ type SubnetAPIKeyDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewSubnetAPIKeyDefault creates SubnetAPIKeyDefault with default headers values
@@ -112,13 +112,13 @@ func (o *SubnetAPIKeyDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the subnet Api key default response
-func (o *SubnetAPIKeyDefault) WithPayload(payload *models.Error) *SubnetAPIKeyDefault {
+func (o *SubnetAPIKeyDefault) WithPayload(payload *models.APIError) *SubnetAPIKeyDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the subnet Api key default response
-func (o *SubnetAPIKeyDefault) SetPayload(payload *models.Error) {
+func (o *SubnetAPIKeyDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/subnet/subnet_info_responses.go b/restapi/operations/subnet/subnet_info_responses.go
index 708bc6224..a063e586e 100644
--- a/restapi/operations/subnet/subnet_info_responses.go
+++ b/restapi/operations/subnet/subnet_info_responses.go
@@ -86,7 +86,7 @@ type SubnetInfoDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewSubnetInfoDefault creates SubnetInfoDefault with default headers values
@@ -112,13 +112,13 @@ func (o *SubnetInfoDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the subnet info default response
-func (o *SubnetInfoDefault) WithPayload(payload *models.Error) *SubnetInfoDefault {
+func (o *SubnetInfoDefault) WithPayload(payload *models.APIError) *SubnetInfoDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the subnet info default response
-func (o *SubnetInfoDefault) SetPayload(payload *models.Error) {
+func (o *SubnetInfoDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/subnet/subnet_login_m_f_a_responses.go b/restapi/operations/subnet/subnet_login_m_f_a_responses.go
index daf68d6ff..cd2aca9ce 100644
--- a/restapi/operations/subnet/subnet_login_m_f_a_responses.go
+++ b/restapi/operations/subnet/subnet_login_m_f_a_responses.go
@@ -86,7 +86,7 @@ type SubnetLoginMFADefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewSubnetLoginMFADefault creates SubnetLoginMFADefault with default headers values
@@ -112,13 +112,13 @@ func (o *SubnetLoginMFADefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the subnet login m f a default response
-func (o *SubnetLoginMFADefault) WithPayload(payload *models.Error) *SubnetLoginMFADefault {
+func (o *SubnetLoginMFADefault) WithPayload(payload *models.APIError) *SubnetLoginMFADefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the subnet login m f a default response
-func (o *SubnetLoginMFADefault) SetPayload(payload *models.Error) {
+func (o *SubnetLoginMFADefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/subnet/subnet_login_responses.go b/restapi/operations/subnet/subnet_login_responses.go
index f3377ad7f..889ca69e4 100644
--- a/restapi/operations/subnet/subnet_login_responses.go
+++ b/restapi/operations/subnet/subnet_login_responses.go
@@ -86,7 +86,7 @@ type SubnetLoginDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewSubnetLoginDefault creates SubnetLoginDefault with default headers values
@@ -112,13 +112,13 @@ func (o *SubnetLoginDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the subnet login default response
-func (o *SubnetLoginDefault) WithPayload(payload *models.Error) *SubnetLoginDefault {
+func (o *SubnetLoginDefault) WithPayload(payload *models.APIError) *SubnetLoginDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the subnet login default response
-func (o *SubnetLoginDefault) SetPayload(payload *models.Error) {
+func (o *SubnetLoginDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/subnet/subnet_reg_token_responses.go b/restapi/operations/subnet/subnet_reg_token_responses.go
index 318eeda6f..36eb9b62f 100644
--- a/restapi/operations/subnet/subnet_reg_token_responses.go
+++ b/restapi/operations/subnet/subnet_reg_token_responses.go
@@ -86,7 +86,7 @@ type SubnetRegTokenDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewSubnetRegTokenDefault creates SubnetRegTokenDefault with default headers values
@@ -112,13 +112,13 @@ func (o *SubnetRegTokenDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the subnet reg token default response
-func (o *SubnetRegTokenDefault) WithPayload(payload *models.Error) *SubnetRegTokenDefault {
+func (o *SubnetRegTokenDefault) WithPayload(payload *models.APIError) *SubnetRegTokenDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the subnet reg token default response
-func (o *SubnetRegTokenDefault) SetPayload(payload *models.Error) {
+func (o *SubnetRegTokenDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/subnet/subnet_register_responses.go b/restapi/operations/subnet/subnet_register_responses.go
index 2ea33a0ed..78de6f8fd 100644
--- a/restapi/operations/subnet/subnet_register_responses.go
+++ b/restapi/operations/subnet/subnet_register_responses.go
@@ -66,7 +66,7 @@ type SubnetRegisterDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewSubnetRegisterDefault creates SubnetRegisterDefault with default headers values
@@ -92,13 +92,13 @@ func (o *SubnetRegisterDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the subnet register default response
-func (o *SubnetRegisterDefault) WithPayload(payload *models.Error) *SubnetRegisterDefault {
+func (o *SubnetRegisterDefault) WithPayload(payload *models.APIError) *SubnetRegisterDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the subnet register default response
-func (o *SubnetRegisterDefault) SetPayload(payload *models.Error) {
+func (o *SubnetRegisterDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/support/get_call_home_option_value_responses.go b/restapi/operations/support/get_call_home_option_value_responses.go
index 5d0c5f8a7..22bc6dc9f 100644
--- a/restapi/operations/support/get_call_home_option_value_responses.go
+++ b/restapi/operations/support/get_call_home_option_value_responses.go
@@ -86,7 +86,7 @@ type GetCallHomeOptionValueDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewGetCallHomeOptionValueDefault creates GetCallHomeOptionValueDefault with default headers values
@@ -112,13 +112,13 @@ func (o *GetCallHomeOptionValueDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the get call home option value default response
-func (o *GetCallHomeOptionValueDefault) WithPayload(payload *models.Error) *GetCallHomeOptionValueDefault {
+func (o *GetCallHomeOptionValueDefault) WithPayload(payload *models.APIError) *GetCallHomeOptionValueDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the get call home option value default response
-func (o *GetCallHomeOptionValueDefault) SetPayload(payload *models.Error) {
+func (o *GetCallHomeOptionValueDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/support/set_call_home_status_responses.go b/restapi/operations/support/set_call_home_status_responses.go
index 69937f16a..830463225 100644
--- a/restapi/operations/support/set_call_home_status_responses.go
+++ b/restapi/operations/support/set_call_home_status_responses.go
@@ -66,7 +66,7 @@ type SetCallHomeStatusDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewSetCallHomeStatusDefault creates SetCallHomeStatusDefault with default headers values
@@ -92,13 +92,13 @@ func (o *SetCallHomeStatusDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the set call home status default response
-func (o *SetCallHomeStatusDefault) WithPayload(payload *models.Error) *SetCallHomeStatusDefault {
+func (o *SetCallHomeStatusDefault) WithPayload(payload *models.APIError) *SetCallHomeStatusDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the set call home status default response
-func (o *SetCallHomeStatusDefault) SetPayload(payload *models.Error) {
+func (o *SetCallHomeStatusDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/system/admin_info_responses.go b/restapi/operations/system/admin_info_responses.go
index 0f1321e6d..0eede5e82 100644
--- a/restapi/operations/system/admin_info_responses.go
+++ b/restapi/operations/system/admin_info_responses.go
@@ -86,7 +86,7 @@ type AdminInfoDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewAdminInfoDefault creates AdminInfoDefault with default headers values
@@ -112,13 +112,13 @@ func (o *AdminInfoDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the admin info default response
-func (o *AdminInfoDefault) WithPayload(payload *models.Error) *AdminInfoDefault {
+func (o *AdminInfoDefault) WithPayload(payload *models.APIError) *AdminInfoDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the admin info default response
-func (o *AdminInfoDefault) SetPayload(payload *models.Error) {
+func (o *AdminInfoDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/system/arn_list_responses.go b/restapi/operations/system/arn_list_responses.go
index c281e997f..bb8198214 100644
--- a/restapi/operations/system/arn_list_responses.go
+++ b/restapi/operations/system/arn_list_responses.go
@@ -86,7 +86,7 @@ type ArnListDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewArnListDefault creates ArnListDefault with default headers values
@@ -112,13 +112,13 @@ func (o *ArnListDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the arn list default response
-func (o *ArnListDefault) WithPayload(payload *models.Error) *ArnListDefault {
+func (o *ArnListDefault) WithPayload(payload *models.APIError) *ArnListDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the arn list default response
-func (o *ArnListDefault) SetPayload(payload *models.Error) {
+func (o *ArnListDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/system/check_min_i_o_version_responses.go b/restapi/operations/system/check_min_i_o_version_responses.go
index 6cd789dcc..eb9ba65c4 100644
--- a/restapi/operations/system/check_min_i_o_version_responses.go
+++ b/restapi/operations/system/check_min_i_o_version_responses.go
@@ -86,7 +86,7 @@ type CheckMinIOVersionDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewCheckMinIOVersionDefault creates CheckMinIOVersionDefault with default headers values
@@ -112,13 +112,13 @@ func (o *CheckMinIOVersionDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the check min i o version default response
-func (o *CheckMinIOVersionDefault) WithPayload(payload *models.Error) *CheckMinIOVersionDefault {
+func (o *CheckMinIOVersionDefault) WithPayload(payload *models.APIError) *CheckMinIOVersionDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the check min i o version default response
-func (o *CheckMinIOVersionDefault) SetPayload(payload *models.Error) {
+func (o *CheckMinIOVersionDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/system/dashboard_widget_details_responses.go b/restapi/operations/system/dashboard_widget_details_responses.go
index 0324f6552..35e95d092 100644
--- a/restapi/operations/system/dashboard_widget_details_responses.go
+++ b/restapi/operations/system/dashboard_widget_details_responses.go
@@ -86,7 +86,7 @@ type DashboardWidgetDetailsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewDashboardWidgetDetailsDefault creates DashboardWidgetDetailsDefault with default headers values
@@ -112,13 +112,13 @@ func (o *DashboardWidgetDetailsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the dashboard widget details default response
-func (o *DashboardWidgetDetailsDefault) WithPayload(payload *models.Error) *DashboardWidgetDetailsDefault {
+func (o *DashboardWidgetDetailsDefault) WithPayload(payload *models.APIError) *DashboardWidgetDetailsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the dashboard widget details default response
-func (o *DashboardWidgetDetailsDefault) SetPayload(payload *models.Error) {
+func (o *DashboardWidgetDetailsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/system/list_nodes_responses.go b/restapi/operations/system/list_nodes_responses.go
index 6f9f49188..8246bbeef 100644
--- a/restapi/operations/system/list_nodes_responses.go
+++ b/restapi/operations/system/list_nodes_responses.go
@@ -89,7 +89,7 @@ type ListNodesDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewListNodesDefault creates ListNodesDefault with default headers values
@@ -115,13 +115,13 @@ func (o *ListNodesDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the list nodes default response
-func (o *ListNodesDefault) WithPayload(payload *models.Error) *ListNodesDefault {
+func (o *ListNodesDefault) WithPayload(payload *models.APIError) *ListNodesDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the list nodes default response
-func (o *ListNodesDefault) SetPayload(payload *models.Error) {
+func (o *ListNodesDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/tiering/add_tier_responses.go b/restapi/operations/tiering/add_tier_responses.go
index 55de08710..56ba3107f 100644
--- a/restapi/operations/tiering/add_tier_responses.go
+++ b/restapi/operations/tiering/add_tier_responses.go
@@ -66,7 +66,7 @@ type AddTierDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewAddTierDefault creates AddTierDefault with default headers values
@@ -92,13 +92,13 @@ func (o *AddTierDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the add tier default response
-func (o *AddTierDefault) WithPayload(payload *models.Error) *AddTierDefault {
+func (o *AddTierDefault) WithPayload(payload *models.APIError) *AddTierDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the add tier default response
-func (o *AddTierDefault) SetPayload(payload *models.Error) {
+func (o *AddTierDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/tiering/edit_tier_credentials_responses.go b/restapi/operations/tiering/edit_tier_credentials_responses.go
index f59759e96..36d0543df 100644
--- a/restapi/operations/tiering/edit_tier_credentials_responses.go
+++ b/restapi/operations/tiering/edit_tier_credentials_responses.go
@@ -66,7 +66,7 @@ type EditTierCredentialsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewEditTierCredentialsDefault creates EditTierCredentialsDefault with default headers values
@@ -92,13 +92,13 @@ func (o *EditTierCredentialsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the edit tier credentials default response
-func (o *EditTierCredentialsDefault) WithPayload(payload *models.Error) *EditTierCredentialsDefault {
+func (o *EditTierCredentialsDefault) WithPayload(payload *models.APIError) *EditTierCredentialsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the edit tier credentials default response
-func (o *EditTierCredentialsDefault) SetPayload(payload *models.Error) {
+func (o *EditTierCredentialsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/tiering/get_tier_responses.go b/restapi/operations/tiering/get_tier_responses.go
index b1292bbf5..821bcd82c 100644
--- a/restapi/operations/tiering/get_tier_responses.go
+++ b/restapi/operations/tiering/get_tier_responses.go
@@ -86,7 +86,7 @@ type GetTierDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewGetTierDefault creates GetTierDefault with default headers values
@@ -112,13 +112,13 @@ func (o *GetTierDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the get tier default response
-func (o *GetTierDefault) WithPayload(payload *models.Error) *GetTierDefault {
+func (o *GetTierDefault) WithPayload(payload *models.APIError) *GetTierDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the get tier default response
-func (o *GetTierDefault) SetPayload(payload *models.Error) {
+func (o *GetTierDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/tiering/tiers_list_responses.go b/restapi/operations/tiering/tiers_list_responses.go
index 6c537f29c..c9af04737 100644
--- a/restapi/operations/tiering/tiers_list_responses.go
+++ b/restapi/operations/tiering/tiers_list_responses.go
@@ -86,7 +86,7 @@ type TiersListDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewTiersListDefault creates TiersListDefault with default headers values
@@ -112,13 +112,13 @@ func (o *TiersListDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the tiers list default response
-func (o *TiersListDefault) WithPayload(payload *models.Error) *TiersListDefault {
+func (o *TiersListDefault) WithPayload(payload *models.APIError) *TiersListDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the tiers list default response
-func (o *TiersListDefault) SetPayload(payload *models.Error) {
+func (o *TiersListDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/user/add_user_responses.go b/restapi/operations/user/add_user_responses.go
index 0399b66b4..186444752 100644
--- a/restapi/operations/user/add_user_responses.go
+++ b/restapi/operations/user/add_user_responses.go
@@ -86,7 +86,7 @@ type AddUserDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewAddUserDefault creates AddUserDefault with default headers values
@@ -112,13 +112,13 @@ func (o *AddUserDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the add user default response
-func (o *AddUserDefault) WithPayload(payload *models.Error) *AddUserDefault {
+func (o *AddUserDefault) WithPayload(payload *models.APIError) *AddUserDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the add user default response
-func (o *AddUserDefault) SetPayload(payload *models.Error) {
+func (o *AddUserDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/user/bulk_update_users_groups_responses.go b/restapi/operations/user/bulk_update_users_groups_responses.go
index 676a57a06..43e844f86 100644
--- a/restapi/operations/user/bulk_update_users_groups_responses.go
+++ b/restapi/operations/user/bulk_update_users_groups_responses.go
@@ -66,7 +66,7 @@ type BulkUpdateUsersGroupsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewBulkUpdateUsersGroupsDefault creates BulkUpdateUsersGroupsDefault with default headers values
@@ -92,13 +92,13 @@ func (o *BulkUpdateUsersGroupsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the bulk update users groups default response
-func (o *BulkUpdateUsersGroupsDefault) WithPayload(payload *models.Error) *BulkUpdateUsersGroupsDefault {
+func (o *BulkUpdateUsersGroupsDefault) WithPayload(payload *models.APIError) *BulkUpdateUsersGroupsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the bulk update users groups default response
-func (o *BulkUpdateUsersGroupsDefault) SetPayload(payload *models.Error) {
+func (o *BulkUpdateUsersGroupsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/user/check_user_service_accounts_responses.go b/restapi/operations/user/check_user_service_accounts_responses.go
index 41974af74..cf3fe2cf4 100644
--- a/restapi/operations/user/check_user_service_accounts_responses.go
+++ b/restapi/operations/user/check_user_service_accounts_responses.go
@@ -86,7 +86,7 @@ type CheckUserServiceAccountsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewCheckUserServiceAccountsDefault creates CheckUserServiceAccountsDefault with default headers values
@@ -112,13 +112,13 @@ func (o *CheckUserServiceAccountsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the check user service accounts default response
-func (o *CheckUserServiceAccountsDefault) WithPayload(payload *models.Error) *CheckUserServiceAccountsDefault {
+func (o *CheckUserServiceAccountsDefault) WithPayload(payload *models.APIError) *CheckUserServiceAccountsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the check user service accounts default response
-func (o *CheckUserServiceAccountsDefault) SetPayload(payload *models.Error) {
+func (o *CheckUserServiceAccountsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/user/create_a_user_service_account_responses.go b/restapi/operations/user/create_a_user_service_account_responses.go
index 9df36dc91..3f54779e9 100644
--- a/restapi/operations/user/create_a_user_service_account_responses.go
+++ b/restapi/operations/user/create_a_user_service_account_responses.go
@@ -86,7 +86,7 @@ type CreateAUserServiceAccountDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewCreateAUserServiceAccountDefault creates CreateAUserServiceAccountDefault with default headers values
@@ -112,13 +112,13 @@ func (o *CreateAUserServiceAccountDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the create a user service account default response
-func (o *CreateAUserServiceAccountDefault) WithPayload(payload *models.Error) *CreateAUserServiceAccountDefault {
+func (o *CreateAUserServiceAccountDefault) WithPayload(payload *models.APIError) *CreateAUserServiceAccountDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the create a user service account default response
-func (o *CreateAUserServiceAccountDefault) SetPayload(payload *models.Error) {
+func (o *CreateAUserServiceAccountDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/user/create_service_account_credentials_responses.go b/restapi/operations/user/create_service_account_credentials_responses.go
index a0cbf16bd..1007c6ff0 100644
--- a/restapi/operations/user/create_service_account_credentials_responses.go
+++ b/restapi/operations/user/create_service_account_credentials_responses.go
@@ -86,7 +86,7 @@ type CreateServiceAccountCredentialsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewCreateServiceAccountCredentialsDefault creates CreateServiceAccountCredentialsDefault with default headers values
@@ -112,13 +112,13 @@ func (o *CreateServiceAccountCredentialsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the create service account credentials default response
-func (o *CreateServiceAccountCredentialsDefault) WithPayload(payload *models.Error) *CreateServiceAccountCredentialsDefault {
+func (o *CreateServiceAccountCredentialsDefault) WithPayload(payload *models.APIError) *CreateServiceAccountCredentialsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the create service account credentials default response
-func (o *CreateServiceAccountCredentialsDefault) SetPayload(payload *models.Error) {
+func (o *CreateServiceAccountCredentialsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/user/get_user_info_responses.go b/restapi/operations/user/get_user_info_responses.go
index 8833cb0f0..8f3a18cff 100644
--- a/restapi/operations/user/get_user_info_responses.go
+++ b/restapi/operations/user/get_user_info_responses.go
@@ -86,7 +86,7 @@ type GetUserInfoDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewGetUserInfoDefault creates GetUserInfoDefault with default headers values
@@ -112,13 +112,13 @@ func (o *GetUserInfoDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the get user info default response
-func (o *GetUserInfoDefault) WithPayload(payload *models.Error) *GetUserInfoDefault {
+func (o *GetUserInfoDefault) WithPayload(payload *models.APIError) *GetUserInfoDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the get user info default response
-func (o *GetUserInfoDefault) SetPayload(payload *models.Error) {
+func (o *GetUserInfoDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/user/list_a_user_service_accounts_responses.go b/restapi/operations/user/list_a_user_service_accounts_responses.go
index 7bcc0e42b..0d3956999 100644
--- a/restapi/operations/user/list_a_user_service_accounts_responses.go
+++ b/restapi/operations/user/list_a_user_service_accounts_responses.go
@@ -89,7 +89,7 @@ type ListAUserServiceAccountsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewListAUserServiceAccountsDefault creates ListAUserServiceAccountsDefault with default headers values
@@ -115,13 +115,13 @@ func (o *ListAUserServiceAccountsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the list a user service accounts default response
-func (o *ListAUserServiceAccountsDefault) WithPayload(payload *models.Error) *ListAUserServiceAccountsDefault {
+func (o *ListAUserServiceAccountsDefault) WithPayload(payload *models.APIError) *ListAUserServiceAccountsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the list a user service accounts default response
-func (o *ListAUserServiceAccountsDefault) SetPayload(payload *models.Error) {
+func (o *ListAUserServiceAccountsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/user/list_users_responses.go b/restapi/operations/user/list_users_responses.go
index 7ef400bf8..2950b66d1 100644
--- a/restapi/operations/user/list_users_responses.go
+++ b/restapi/operations/user/list_users_responses.go
@@ -86,7 +86,7 @@ type ListUsersDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewListUsersDefault creates ListUsersDefault with default headers values
@@ -112,13 +112,13 @@ func (o *ListUsersDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the list users default response
-func (o *ListUsersDefault) WithPayload(payload *models.Error) *ListUsersDefault {
+func (o *ListUsersDefault) WithPayload(payload *models.APIError) *ListUsersDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the list users default response
-func (o *ListUsersDefault) SetPayload(payload *models.Error) {
+func (o *ListUsersDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/user/remove_user_responses.go b/restapi/operations/user/remove_user_responses.go
index 15d153512..258ee44c2 100644
--- a/restapi/operations/user/remove_user_responses.go
+++ b/restapi/operations/user/remove_user_responses.go
@@ -66,7 +66,7 @@ type RemoveUserDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewRemoveUserDefault creates RemoveUserDefault with default headers values
@@ -92,13 +92,13 @@ func (o *RemoveUserDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the remove user default response
-func (o *RemoveUserDefault) WithPayload(payload *models.Error) *RemoveUserDefault {
+func (o *RemoveUserDefault) WithPayload(payload *models.APIError) *RemoveUserDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the remove user default response
-func (o *RemoveUserDefault) SetPayload(payload *models.Error) {
+func (o *RemoveUserDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/user/update_user_groups_responses.go b/restapi/operations/user/update_user_groups_responses.go
index 5be158da9..abcb4b991 100644
--- a/restapi/operations/user/update_user_groups_responses.go
+++ b/restapi/operations/user/update_user_groups_responses.go
@@ -86,7 +86,7 @@ type UpdateUserGroupsDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewUpdateUserGroupsDefault creates UpdateUserGroupsDefault with default headers values
@@ -112,13 +112,13 @@ func (o *UpdateUserGroupsDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the update user groups default response
-func (o *UpdateUserGroupsDefault) WithPayload(payload *models.Error) *UpdateUserGroupsDefault {
+func (o *UpdateUserGroupsDefault) WithPayload(payload *models.APIError) *UpdateUserGroupsDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the update user groups default response
-func (o *UpdateUserGroupsDefault) SetPayload(payload *models.Error) {
+func (o *UpdateUserGroupsDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/operations/user/update_user_info_responses.go b/restapi/operations/user/update_user_info_responses.go
index 73b852564..3fc8092f8 100644
--- a/restapi/operations/user/update_user_info_responses.go
+++ b/restapi/operations/user/update_user_info_responses.go
@@ -86,7 +86,7 @@ type UpdateUserInfoDefault struct {
 	/*
 	  In: Body
 	*/
-	Payload *models.Error `json:"body,omitempty"`
+	Payload *models.APIError `json:"body,omitempty"`
 }
 
 // NewUpdateUserInfoDefault creates UpdateUserInfoDefault with default headers values
@@ -112,13 +112,13 @@ func (o *UpdateUserInfoDefault) SetStatusCode(code int) {
 }
 
 // WithPayload adds the payload to the update user info default response
-func (o *UpdateUserInfoDefault) WithPayload(payload *models.Error) *UpdateUserInfoDefault {
+func (o *UpdateUserInfoDefault) WithPayload(payload *models.APIError) *UpdateUserInfoDefault {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the update user info default response
-func (o *UpdateUserInfoDefault) SetPayload(payload *models.Error) {
+func (o *UpdateUserInfoDefault) SetPayload(payload *models.APIError) {
 	o.Payload = payload
 }
 
diff --git a/restapi/service_accounts_handlers.go b/restapi/service_accounts_handlers.go
index 254fa242a..46446bf8c 100644
--- a/restapi/service_accounts_handlers.go
+++ b/restapi/service_accounts_handlers.go
@@ -39,7 +39,7 @@ func registerServiceAccountsHandlers(api *operations.ConsoleAPI) {
 	api.ServiceAccountCreateServiceAccountHandler = saApi.CreateServiceAccountHandlerFunc(func(params saApi.CreateServiceAccountParams, session *models.Principal) middleware.Responder {
 		creds, err := getCreateServiceAccountResponse(session, params)
 		if err != nil {
-			return saApi.NewCreateServiceAccountDefault(int(err.Code)).WithPayload(err)
+			return saApi.NewCreateServiceAccountDefault(err.Code).WithPayload(err.APIError)
 		}
 		return saApi.NewCreateServiceAccountCreated().WithPayload(creds)
 	})
@@ -47,7 +47,7 @@ func registerServiceAccountsHandlers(api *operations.ConsoleAPI) {
 	api.UserCreateAUserServiceAccountHandler = userApi.CreateAUserServiceAccountHandlerFunc(func(params userApi.CreateAUserServiceAccountParams, session *models.Principal) middleware.Responder {
 		creds, err := getCreateAUserServiceAccountResponse(session, params)
 		if err != nil {
-			return saApi.NewCreateServiceAccountDefault(int(err.Code)).WithPayload(err)
+			return saApi.NewCreateServiceAccountDefault(err.Code).WithPayload(err.APIError)
 		}
 		return userApi.NewCreateAUserServiceAccountCreated().WithPayload(creds)
 	})
@@ -55,14 +55,14 @@ func registerServiceAccountsHandlers(api *operations.ConsoleAPI) {
 	api.UserCreateServiceAccountCredentialsHandler = userApi.CreateServiceAccountCredentialsHandlerFunc(func(params userApi.CreateServiceAccountCredentialsParams, session *models.Principal) middleware.Responder {
 		creds, err := getCreateAUserServiceAccountCredsResponse(session, params)
 		if err != nil {
-			return saApi.NewCreateServiceAccountDefault(int(err.Code)).WithPayload(err)
+			return saApi.NewCreateServiceAccountDefault(err.Code).WithPayload(err.APIError)
 		}
 		return userApi.NewCreateServiceAccountCredentialsCreated().WithPayload(creds)
 	})
 	api.ServiceAccountCreateServiceAccountCredsHandler = saApi.CreateServiceAccountCredsHandlerFunc(func(params saApi.CreateServiceAccountCredsParams, session *models.Principal) middleware.Responder {
 		creds, err := getCreateServiceAccountCredsResponse(session, params)
 		if err != nil {
-			return saApi.NewCreateServiceAccountDefault(int(err.Code)).WithPayload(err)
+			return saApi.NewCreateServiceAccountDefault(err.Code).WithPayload(err.APIError)
 		}
 		return userApi.NewCreateServiceAccountCredentialsCreated().WithPayload(creds)
 	})
@@ -72,7 +72,7 @@ func registerServiceAccountsHandlers(api *operations.ConsoleAPI) {
 		defer cancel()
 		serviceAccounts, err := getUserServiceAccountsResponse(ctx, session, "")
 		if err != nil {
-			return saApi.NewListUserServiceAccountsDefault(int(err.Code)).WithPayload(err)
+			return saApi.NewListUserServiceAccountsDefault(err.Code).WithPayload(err.APIError)
 		}
 		return saApi.NewListUserServiceAccountsOK().WithPayload(serviceAccounts)
 	})
@@ -80,7 +80,7 @@ func registerServiceAccountsHandlers(api *operations.ConsoleAPI) {
 	// Delete a User's service account
 	api.ServiceAccountDeleteServiceAccountHandler = saApi.DeleteServiceAccountHandlerFunc(func(params saApi.DeleteServiceAccountParams, session *models.Principal) middleware.Responder {
 		if err := getDeleteServiceAccountResponse(session, params); err != nil {
-			return saApi.NewDeleteServiceAccountDefault(int(err.Code)).WithPayload(err)
+			return saApi.NewDeleteServiceAccountDefault(err.Code).WithPayload(err.APIError)
 		}
 		return saApi.NewDeleteServiceAccountNoContent()
 	})
@@ -91,7 +91,7 @@ func registerServiceAccountsHandlers(api *operations.ConsoleAPI) {
 		defer cancel()
 		serviceAccounts, err := getUserServiceAccountsResponse(ctx, session, params.Name)
 		if err != nil {
-			return saApi.NewListUserServiceAccountsDefault(int(err.Code)).WithPayload(err)
+			return saApi.NewListUserServiceAccountsDefault(err.Code).WithPayload(err.APIError)
 		}
 		return saApi.NewListUserServiceAccountsOK().WithPayload(serviceAccounts)
 	})
@@ -99,7 +99,7 @@ func registerServiceAccountsHandlers(api *operations.ConsoleAPI) {
 	api.ServiceAccountGetServiceAccountPolicyHandler = saApi.GetServiceAccountPolicyHandlerFunc(func(params saApi.GetServiceAccountPolicyParams, session *models.Principal) middleware.Responder {
 		serviceAccounts, err := getServiceAccountPolicyResponse(session, params)
 		if err != nil {
-			return saApi.NewGetServiceAccountPolicyDefault(int(err.Code)).WithPayload(err)
+			return saApi.NewGetServiceAccountPolicyDefault(err.Code).WithPayload(err.APIError)
 		}
 		return saApi.NewGetServiceAccountPolicyOK().WithPayload(serviceAccounts)
 	})
@@ -107,7 +107,7 @@ func registerServiceAccountsHandlers(api *operations.ConsoleAPI) {
 	api.ServiceAccountSetServiceAccountPolicyHandler = saApi.SetServiceAccountPolicyHandlerFunc(func(params saApi.SetServiceAccountPolicyParams, session *models.Principal) middleware.Responder {
 		err := getSetServiceAccountPolicyResponse(session, params)
 		if err != nil {
-			return saApi.NewSetServiceAccountPolicyDefault(int(err.Code)).WithPayload(err)
+			return saApi.NewSetServiceAccountPolicyDefault(err.Code).WithPayload(err.APIError)
 		}
 		return saApi.NewSetServiceAccountPolicyOK()
 	})
@@ -115,7 +115,7 @@ func registerServiceAccountsHandlers(api *operations.ConsoleAPI) {
 	// Delete multiple service accounts
 	api.ServiceAccountDeleteMultipleServiceAccountsHandler = saApi.DeleteMultipleServiceAccountsHandlerFunc(func(params saApi.DeleteMultipleServiceAccountsParams, session *models.Principal) middleware.Responder {
 		if err := getDeleteMultipleServiceAccountsResponse(session, params); err != nil {
-			return saApi.NewDeleteMultipleServiceAccountsDefault(int(err.Code)).WithPayload(err)
+			return saApi.NewDeleteMultipleServiceAccountsDefault(err.Code).WithPayload(err.APIError)
 		}
 		return saApi.NewDeleteMultipleServiceAccountsNoContent()
 	})
@@ -162,7 +162,7 @@ func createServiceAccountCreds(ctx context.Context, userClient MinioAdmin, polic
 // getCreateServiceAccountResponse creates a service account with the defined policy for the user that
 // is requesting, it first gets the credentials of the user and creates a client which is going to
 // make the call to create the Service Account
-func getCreateServiceAccountResponse(session *models.Principal, params saApi.CreateServiceAccountParams) (*models.ServiceAccountCreds, *models.Error) {
+func getCreateServiceAccountResponse(session *models.Principal, params saApi.CreateServiceAccountParams) (*models.ServiceAccountCreds, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -223,7 +223,7 @@ func createAUserServiceAccountCreds(ctx context.Context, userClient MinioAdmin,
 // getCreateServiceAccountResponse creates a service account with the defined policy for the user that
 // is requesting it ,it first gets the credentials of the user and creates a client which is going to
 // make the call to create the Service Account
-func getCreateAUserServiceAccountResponse(session *models.Principal, params userApi.CreateAUserServiceAccountParams) (*models.ServiceAccountCreds, *models.Error) {
+func getCreateAUserServiceAccountResponse(session *models.Principal, params userApi.CreateAUserServiceAccountParams) (*models.ServiceAccountCreds, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -247,7 +247,7 @@ func getCreateAUserServiceAccountResponse(session *models.Principal, params user
 
 // getCreateServiceAccountCredsResponse creates a service account with the defined policy for the user that
 // is requesting it, and with the credentials provided
-func getCreateAUserServiceAccountCredsResponse(session *models.Principal, params userApi.CreateServiceAccountCredentialsParams) (*models.ServiceAccountCreds, *models.Error) {
+func getCreateAUserServiceAccountCredsResponse(session *models.Principal, params userApi.CreateServiceAccountCredentialsParams) (*models.ServiceAccountCreds, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -282,7 +282,7 @@ func getCreateAUserServiceAccountCredsResponse(session *models.Principal, params
 	return saCreds, nil
 }
 
-func getCreateServiceAccountCredsResponse(session *models.Principal, params saApi.CreateServiceAccountCredsParams) (*models.ServiceAccountCreds, *models.Error) {
+func getCreateServiceAccountCredsResponse(session *models.Principal, params saApi.CreateServiceAccountCredsParams) (*models.ServiceAccountCreds, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	serviceAccount := params.Body
@@ -347,7 +347,7 @@ func getUserServiceAccounts(ctx context.Context, userClient MinioAdmin, user str
 
 // getUserServiceAccountsResponse authenticates the user and calls
 // getUserServiceAccounts to list the user's service accounts
-func getUserServiceAccountsResponse(ctx context.Context, session *models.Principal, user string) (models.ServiceAccounts, *models.Error) {
+func getUserServiceAccountsResponse(ctx context.Context, session *models.Principal, user string) (models.ServiceAccounts, *CodedAPIError) {
 	userAdmin, err := NewMinioAdminClient(ctx, session)
 	if err != nil {
 		return nil, ErrorWithContext(ctx, err)
@@ -372,7 +372,7 @@ func deleteServiceAccount(ctx context.Context, userClient MinioAdmin, accessKey
 }
 
 // getDeleteServiceAccountResponse authenticates the user and calls deleteServiceAccount
-func getDeleteServiceAccountResponse(session *models.Principal, params saApi.DeleteServiceAccountParams) *models.Error {
+func getDeleteServiceAccountResponse(session *models.Principal, params saApi.DeleteServiceAccountParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	accessKey, err := utils.DecodeBase64(params.AccessKey)
@@ -408,7 +408,7 @@ func getServiceAccountPolicy(ctx context.Context, userClient MinioAdmin, accessK
 
 // getServiceAccountPolicyResponse authenticates the user and calls
 // getServiceAccountPolicy to get the policy for a service account
-func getServiceAccountPolicyResponse(session *models.Principal, params saApi.GetServiceAccountPolicyParams) (string, *models.Error) {
+func getServiceAccountPolicyResponse(session *models.Principal, params saApi.GetServiceAccountPolicyParams) (string, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	accessKey, err := utils.DecodeBase64(params.AccessKey)
@@ -438,7 +438,7 @@ func setServiceAccountPolicy(ctx context.Context, userClient MinioAdmin, accessK
 
 // getSetServiceAccountPolicyResponse authenticates the user and calls
 // getSetServiceAccountPolicy to set the policy for a service account
-func getSetServiceAccountPolicyResponse(session *models.Principal, params saApi.SetServiceAccountPolicyParams) *models.Error {
+func getSetServiceAccountPolicyResponse(session *models.Principal, params saApi.SetServiceAccountPolicyParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	accessKey, err := utils.DecodeBase64(params.AccessKey)
@@ -462,7 +462,7 @@ func getSetServiceAccountPolicyResponse(session *models.Principal, params saApi.
 }
 
 // getDeleteMultipleServiceAccountsResponse authenticates the user and calls deleteServiceAccount for each account listed in selectedSAs
-func getDeleteMultipleServiceAccountsResponse(session *models.Principal, params saApi.DeleteMultipleServiceAccountsParams) *models.Error {
+func getDeleteMultipleServiceAccountsResponse(session *models.Principal, params saApi.DeleteMultipleServiceAccountsParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	selectedSAs := params.SelectedSA
diff --git a/restapi/user_account.go b/restapi/user_account.go
index 944ba1777..bb7febaa9 100644
--- a/restapi/user_account.go
+++ b/restapi/user_account.go
@@ -36,7 +36,7 @@ func registerAccountHandlers(api *operations.ConsoleAPI) {
 	api.AccountAccountChangePasswordHandler = accountApi.AccountChangePasswordHandlerFunc(func(params accountApi.AccountChangePasswordParams, session *models.Principal) middleware.Responder {
 		changePasswordResponse, err := getChangePasswordResponse(session, params)
 		if err != nil {
-			return accountApi.NewAccountChangePasswordDefault(int(err.Code)).WithPayload(err)
+			return accountApi.NewAccountChangePasswordDefault(err.Code).WithPayload(err.APIError)
 		}
 		// Custom response writer to update the session cookies
 		return middleware.ResponderFunc(func(w http.ResponseWriter, p runtime.Producer) {
@@ -54,7 +54,7 @@ func changePassword(ctx context.Context, client MinioAdmin, session *models.Prin
 
 // getChangePasswordResponse will validate user knows what is the current password (avoid account hijacking), update user account password
 // and authenticate the user generating a new session token/cookie
-func getChangePasswordResponse(session *models.Principal, params accountApi.AccountChangePasswordParams) (*models.LoginResponse, *models.Error) {
+func getChangePasswordResponse(session *models.Principal, params accountApi.AccountChangePasswordParams) (*models.LoginResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	clientIP := getClientIP(params.HTTPRequest)
diff --git a/restapi/user_account_test.go b/restapi/user_account_test.go
index 370a1919c..c37e0ddc5 100644
--- a/restapi/user_account_test.go
+++ b/restapi/user_account_test.go
@@ -45,7 +45,7 @@ func Test_getChangePasswordResponse(t *testing.T) {
 	expected := (*models.LoginResponse)(nil)
 	assert.Equal(expected, loginResponse)
 	expectedError := "error please check your current password" // errChangePassword
-	assert.Equal(expectedError, *actualError.DetailedMessage)
+	assert.Equal(expectedError, actualError.APIError.DetailedMessage)
 }
 
 func Test_changePassword(t *testing.T) {
diff --git a/restapi/user_bucket_quota.go b/restapi/user_bucket_quota.go
index e3ed6ff02..bcddd0859 100644
--- a/restapi/user_bucket_quota.go
+++ b/restapi/user_bucket_quota.go
@@ -35,7 +35,7 @@ func registerBucketQuotaHandlers(api *operations.ConsoleAPI) {
 	api.BucketSetBucketQuotaHandler = bucektApi.SetBucketQuotaHandlerFunc(func(params bucektApi.SetBucketQuotaParams, session *models.Principal) middleware.Responder {
 		err := setBucketQuotaResponse(session, params)
 		if err != nil {
-			return bucektApi.NewSetBucketQuotaDefault(int(err.Code)).WithPayload(err)
+			return bucektApi.NewSetBucketQuotaDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucektApi.NewSetBucketQuotaOK()
 	})
@@ -44,13 +44,13 @@ func registerBucketQuotaHandlers(api *operations.ConsoleAPI) {
 	api.BucketGetBucketQuotaHandler = bucektApi.GetBucketQuotaHandlerFunc(func(params bucektApi.GetBucketQuotaParams, session *models.Principal) middleware.Responder {
 		resp, err := getBucketQuotaResponse(session, params)
 		if err != nil {
-			return bucektApi.NewGetBucketQuotaDefault(int(err.Code)).WithPayload(err)
+			return bucektApi.NewGetBucketQuotaDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucektApi.NewGetBucketQuotaOK().WithPayload(resp)
 	})
 }
 
-func setBucketQuotaResponse(session *models.Principal, params bucektApi.SetBucketQuotaParams) *models.Error {
+func setBucketQuotaResponse(session *models.Principal, params bucektApi.SetBucketQuotaParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
@@ -92,7 +92,7 @@ func setBucketQuota(ctx context.Context, ac *AdminClient, bucket *string, bucket
 	return nil
 }
 
-func getBucketQuotaResponse(session *models.Principal, params bucektApi.GetBucketQuotaParams) (*models.BucketQuota, *models.Error) {
+func getBucketQuotaResponse(session *models.Principal, params bucektApi.GetBucketQuotaParams) (*models.BucketQuota, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mAdmin, err := NewMinioAdminClient(params.HTTPRequest.Context(), session)
diff --git a/restapi/user_buckets.go b/restapi/user_buckets.go
index 2e6de1c6b..6052f7326 100644
--- a/restapi/user_buckets.go
+++ b/restapi/user_buckets.go
@@ -25,9 +25,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/madmin-go/v3"
 	"github.com/minio/minio-go/v7"
 
+	"github.com/minio/madmin-go/v3"
 	"github.com/minio/mc/cmd"
 	"github.com/minio/mc/pkg/probe"
 	"github.com/minio/minio-go/v7/pkg/sse"
@@ -48,7 +48,7 @@ func registerBucketsHandlers(api *operations.ConsoleAPI) {
 	api.BucketListBucketsHandler = bucketApi.ListBucketsHandlerFunc(func(params bucketApi.ListBucketsParams, session *models.Principal) middleware.Responder {
 		listBucketsResponse, err := getListBucketsResponse(session, params)
 		if err != nil {
-			return bucketApi.NewListBucketsDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewListBucketsDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewListBucketsOK().WithPayload(listBucketsResponse)
 	})
@@ -56,14 +56,14 @@ func registerBucketsHandlers(api *operations.ConsoleAPI) {
 	api.BucketMakeBucketHandler = bucketApi.MakeBucketHandlerFunc(func(params bucketApi.MakeBucketParams, session *models.Principal) middleware.Responder {
 		makeBucketResponse, err := getMakeBucketResponse(session, params)
 		if err != nil {
-			return bucketApi.NewMakeBucketDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewMakeBucketDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewMakeBucketOK().WithPayload(makeBucketResponse)
 	})
 	// delete bucket
 	api.BucketDeleteBucketHandler = bucketApi.DeleteBucketHandlerFunc(func(params bucketApi.DeleteBucketParams, session *models.Principal) middleware.Responder {
 		if err := getDeleteBucketResponse(session, params); err != nil {
-			return bucketApi.NewMakeBucketDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewMakeBucketDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewDeleteBucketNoContent()
 	})
@@ -71,7 +71,7 @@ func registerBucketsHandlers(api *operations.ConsoleAPI) {
 	api.BucketBucketInfoHandler = bucketApi.BucketInfoHandlerFunc(func(params bucketApi.BucketInfoParams, session *models.Principal) middleware.Responder {
 		bucketInfoResp, err := getBucketInfoResponse(session, params)
 		if err != nil {
-			return bucketApi.NewBucketInfoDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewBucketInfoDefault(err.Code).WithPayload(err.APIError)
 		}
 
 		return bucketApi.NewBucketInfoOK().WithPayload(bucketInfoResp)
@@ -80,7 +80,7 @@ func registerBucketsHandlers(api *operations.ConsoleAPI) {
 	api.BucketBucketSetPolicyHandler = bucketApi.BucketSetPolicyHandlerFunc(func(params bucketApi.BucketSetPolicyParams, session *models.Principal) middleware.Responder {
 		bucketSetPolicyResp, err := getBucketSetPolicyResponse(session, params)
 		if err != nil {
-			return bucketApi.NewBucketSetPolicyDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewBucketSetPolicyDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewBucketSetPolicyOK().WithPayload(bucketSetPolicyResp)
 	})
@@ -88,7 +88,7 @@ func registerBucketsHandlers(api *operations.ConsoleAPI) {
 	api.BucketPutBucketTagsHandler = bucketApi.PutBucketTagsHandlerFunc(func(params bucketApi.PutBucketTagsParams, session *models.Principal) middleware.Responder {
 		err := getPutBucketTagsResponse(session, params)
 		if err != nil {
-			return bucketApi.NewPutBucketTagsDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewPutBucketTagsDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewPutBucketTagsOK()
 	})
@@ -96,7 +96,7 @@ func registerBucketsHandlers(api *operations.ConsoleAPI) {
 	api.BucketGetBucketVersioningHandler = bucketApi.GetBucketVersioningHandlerFunc(func(params bucketApi.GetBucketVersioningParams, session *models.Principal) middleware.Responder {
 		getBucketVersioning, err := getBucketVersionedResponse(session, params)
 		if err != nil {
-			return bucketApi.NewGetBucketVersioningDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewGetBucketVersioningDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewGetBucketVersioningOK().WithPayload(getBucketVersioning)
 	})
@@ -104,7 +104,7 @@ func registerBucketsHandlers(api *operations.ConsoleAPI) {
 	api.BucketSetBucketVersioningHandler = bucketApi.SetBucketVersioningHandlerFunc(func(params bucketApi.SetBucketVersioningParams, session *models.Principal) middleware.Responder {
 		err := setBucketVersioningResponse(session, params)
 		if err != nil {
-			return bucketApi.NewSetBucketVersioningDefault(500).WithPayload(err)
+			return bucketApi.NewSetBucketVersioningDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewSetBucketVersioningCreated()
 	})
@@ -112,7 +112,7 @@ func registerBucketsHandlers(api *operations.ConsoleAPI) {
 	api.BucketGetBucketReplicationHandler = bucketApi.GetBucketReplicationHandlerFunc(func(params bucketApi.GetBucketReplicationParams, session *models.Principal) middleware.Responder {
 		getBucketReplication, err := getBucketReplicationResponse(session, params)
 		if err != nil {
-			return bucketApi.NewGetBucketReplicationDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewGetBucketReplicationDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewGetBucketReplicationOK().WithPayload(getBucketReplication)
 	})
@@ -120,7 +120,7 @@ func registerBucketsHandlers(api *operations.ConsoleAPI) {
 	api.BucketGetBucketReplicationRuleHandler = bucketApi.GetBucketReplicationRuleHandlerFunc(func(params bucketApi.GetBucketReplicationRuleParams, session *models.Principal) middleware.Responder {
 		getBucketReplicationRule, err := getBucketReplicationRuleResponse(session, params)
 		if err != nil {
-			return bucketApi.NewGetBucketReplicationRuleDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewGetBucketReplicationRuleDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewGetBucketReplicationRuleOK().WithPayload(getBucketReplicationRule)
 	})
@@ -128,14 +128,14 @@ func registerBucketsHandlers(api *operations.ConsoleAPI) {
 	// enable bucket encryption
 	api.BucketEnableBucketEncryptionHandler = bucketApi.EnableBucketEncryptionHandlerFunc(func(params bucketApi.EnableBucketEncryptionParams, session *models.Principal) middleware.Responder {
 		if err := enableBucketEncryptionResponse(session, params); err != nil {
-			return bucketApi.NewEnableBucketEncryptionDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewEnableBucketEncryptionDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewEnableBucketEncryptionOK()
 	})
 	// disable bucket encryption
 	api.BucketDisableBucketEncryptionHandler = bucketApi.DisableBucketEncryptionHandlerFunc(func(params bucketApi.DisableBucketEncryptionParams, session *models.Principal) middleware.Responder {
 		if err := disableBucketEncryptionResponse(session, params); err != nil {
-			return bucketApi.NewDisableBucketEncryptionDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewDisableBucketEncryptionDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewDisableBucketEncryptionOK()
 	})
@@ -143,14 +143,14 @@ func registerBucketsHandlers(api *operations.ConsoleAPI) {
 	api.BucketGetBucketEncryptionInfoHandler = bucketApi.GetBucketEncryptionInfoHandlerFunc(func(params bucketApi.GetBucketEncryptionInfoParams, session *models.Principal) middleware.Responder {
 		response, err := getBucketEncryptionInfoResponse(session, params)
 		if err != nil {
-			return bucketApi.NewGetBucketEncryptionInfoDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewGetBucketEncryptionInfoDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewGetBucketEncryptionInfoOK().WithPayload(response)
 	})
 	// set bucket retention config
 	api.BucketSetBucketRetentionConfigHandler = bucketApi.SetBucketRetentionConfigHandlerFunc(func(params bucketApi.SetBucketRetentionConfigParams, session *models.Principal) middleware.Responder {
 		if err := getSetBucketRetentionConfigResponse(session, params); err != nil {
-			return bucketApi.NewSetBucketRetentionConfigDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewSetBucketRetentionConfigDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewSetBucketRetentionConfigOK()
 	})
@@ -158,7 +158,7 @@ func registerBucketsHandlers(api *operations.ConsoleAPI) {
 	api.BucketGetBucketRetentionConfigHandler = bucketApi.GetBucketRetentionConfigHandlerFunc(func(params bucketApi.GetBucketRetentionConfigParams, session *models.Principal) middleware.Responder {
 		response, err := getBucketRetentionConfigResponse(session, params)
 		if err != nil {
-			return bucketApi.NewGetBucketRetentionConfigDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewGetBucketRetentionConfigDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewGetBucketRetentionConfigOK().WithPayload(response)
 	})
@@ -166,7 +166,7 @@ func registerBucketsHandlers(api *operations.ConsoleAPI) {
 	api.BucketGetBucketObjectLockingStatusHandler = bucketApi.GetBucketObjectLockingStatusHandlerFunc(func(params bucketApi.GetBucketObjectLockingStatusParams, session *models.Principal) middleware.Responder {
 		getBucketObjectLockingStatus, err := getBucketObjectLockingResponse(session, params)
 		if err != nil {
-			return bucketApi.NewGetBucketObjectLockingStatusDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewGetBucketObjectLockingStatusDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewGetBucketObjectLockingStatusOK().WithPayload(getBucketObjectLockingStatus)
 	})
@@ -174,7 +174,7 @@ func registerBucketsHandlers(api *operations.ConsoleAPI) {
 	api.BucketGetBucketRewindHandler = bucketApi.GetBucketRewindHandlerFunc(func(params bucketApi.GetBucketRewindParams, session *models.Principal) middleware.Responder {
 		getBucketRewind, err := getBucketRewindResponse(session, params)
 		if err != nil {
-			return bucketApi.NewGetBucketRewindDefault(500).WithPayload(err)
+			return bucketApi.NewGetBucketRewindDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewGetBucketRewindOK().WithPayload(getBucketRewind)
 	})
@@ -197,7 +197,7 @@ func doSetVersioning(ctx context.Context, client MCClient, state VersionState, e
 	return nil
 }
 
-func setBucketVersioningResponse(session *models.Principal, params bucketApi.SetBucketVersioningParams) *models.Error {
+func setBucketVersioningResponse(session *models.Principal, params bucketApi.SetBucketVersioningParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -230,7 +230,7 @@ func setBucketVersioningResponse(session *models.Principal, params bucketApi.Set
 	return nil
 }
 
-func getBucketReplicationResponse(session *models.Principal, params bucketApi.GetBucketReplicationParams) (*models.BucketReplicationResponse, *models.Error) {
+func getBucketReplicationResponse(session *models.Principal, params bucketApi.GetBucketReplicationParams) (*models.BucketReplicationResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -280,7 +280,7 @@ func getBucketReplicationResponse(session *models.Principal, params bucketApi.Ge
 	return bucketRResponse, nil
 }
 
-func getBucketReplicationRuleResponse(session *models.Principal, params bucketApi.GetBucketReplicationRuleParams) (*models.BucketReplicationRule, *models.Error) {
+func getBucketReplicationRuleResponse(session *models.Principal, params bucketApi.GetBucketReplicationRuleParams) (*models.BucketReplicationRule, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -347,7 +347,7 @@ func getBucketReplicationRuleResponse(session *models.Principal, params bucketAp
 	return returnRule, nil
 }
 
-func getBucketVersionedResponse(session *models.Principal, params bucketApi.GetBucketVersioningParams) (*models.BucketVersioningResponse, *models.Error) {
+func getBucketVersionedResponse(session *models.Principal, params bucketApi.GetBucketVersioningParams) (*models.BucketVersioningResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -428,7 +428,7 @@ func getAccountBuckets(ctx context.Context, client MinioAdmin) ([]*models.Bucket
 }
 
 // getListBucketsResponse performs listBuckets() and serializes it to the handler's output
-func getListBucketsResponse(session *models.Principal, params bucketApi.ListBucketsParams) (*models.ListBucketsResponse, *models.Error) {
+func getListBucketsResponse(session *models.Principal, params bucketApi.ListBucketsParams) (*models.ListBucketsResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -459,7 +459,7 @@ func makeBucket(ctx context.Context, client MinioClient, bucketName string, obje
 }
 
 // getMakeBucketResponse performs makeBucket() to create a bucket with its access policy
-func getMakeBucketResponse(session *models.Principal, params bucketApi.MakeBucketParams) (*models.MakeBucketsResponse, *models.Error) {
+func getMakeBucketResponse(session *models.Principal, params bucketApi.MakeBucketParams) (*models.MakeBucketsResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	// bucket request needed to proceed
@@ -584,7 +584,7 @@ func setBucketAccessPolicy(ctx context.Context, client MinioClient, bucketName s
 
 // getBucketSetPolicyResponse calls setBucketAccessPolicy() to set a access policy to a bucket
 // and returns the serialized output.
-func getBucketSetPolicyResponse(session *models.Principal, params bucketApi.BucketSetPolicyParams) (*models.Bucket, *models.Error) {
+func getBucketSetPolicyResponse(session *models.Principal, params bucketApi.BucketSetPolicyParams) (*models.Bucket, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -618,7 +618,7 @@ func getBucketSetPolicyResponse(session *models.Principal, params bucketApi.Buck
 }
 
 // putBucketTags sets tags for a bucket
-func getPutBucketTagsResponse(session *models.Principal, params bucketApi.PutBucketTagsParams) *models.Error {
+func getPutBucketTagsResponse(session *models.Principal, params bucketApi.PutBucketTagsParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -652,7 +652,7 @@ func removeBucket(client MinioClient, bucketName string) error {
 }
 
 // getDeleteBucketResponse performs removeBucket() to delete a bucket
-func getDeleteBucketResponse(session *models.Principal, params bucketApi.DeleteBucketParams) *models.Error {
+func getDeleteBucketResponse(session *models.Principal, params bucketApi.DeleteBucketParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	if params.Name == "" {
@@ -736,7 +736,7 @@ func getBucketInfo(ctx context.Context, client MinioClient, adminClient MinioAdm
 }
 
 // getBucketInfoResponse calls getBucketInfo() to get the bucket's info
-func getBucketInfoResponse(session *models.Principal, params bucketApi.BucketInfoParams) (*models.Bucket, *models.Error) {
+func getBucketInfoResponse(session *models.Principal, params bucketApi.BucketInfoParams) (*models.Bucket, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mClient, err := newMinioClient(session, getClientIP(params.HTTPRequest))
@@ -801,7 +801,7 @@ func enableBucketEncryption(ctx context.Context, client MinioClient, bucketName
 }
 
 // enableBucketEncryptionResponse calls enableBucketEncryption() to create new encryption configuration for provided bucket name
-func enableBucketEncryptionResponse(session *models.Principal, params bucketApi.EnableBucketEncryptionParams) *models.Error {
+func enableBucketEncryptionResponse(session *models.Principal, params bucketApi.EnableBucketEncryptionParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mClient, err := newMinioClient(session, getClientIP(params.HTTPRequest))
@@ -823,7 +823,7 @@ func disableBucketEncryption(ctx context.Context, client MinioClient, bucketName
 }
 
 // disableBucketEncryptionResponse calls disableBucketEncryption()
-func disableBucketEncryptionResponse(session *models.Principal, params bucketApi.DisableBucketEncryptionParams) *models.Error {
+func disableBucketEncryptionResponse(session *models.Principal, params bucketApi.DisableBucketEncryptionParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mClient, err := newMinioClient(session, getClientIP(params.HTTPRequest))
@@ -850,7 +850,7 @@ func getBucketEncryptionInfo(ctx context.Context, client MinioClient, bucketName
 	return &models.BucketEncryptionInfo{Algorithm: bucketInfo.Rules[0].Apply.SSEAlgorithm, KmsMasterKeyID: bucketInfo.Rules[0].Apply.KmsMasterKeyID}, nil
 }
 
-func getBucketEncryptionInfoResponse(session *models.Principal, params bucketApi.GetBucketEncryptionInfoParams) (*models.BucketEncryptionInfo, *models.Error) {
+func getBucketEncryptionInfoResponse(session *models.Principal, params bucketApi.GetBucketEncryptionInfoParams) (*models.BucketEncryptionInfo, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mClient, err := newMinioClient(session, getClientIP(params.HTTPRequest))
@@ -897,7 +897,7 @@ func setBucketRetentionConfig(ctx context.Context, client MinioClient, bucketNam
 	return client.setObjectLockConfig(ctx, bucketName, &retentionMode, &retentionValidity, &retentionUnit)
 }
 
-func getSetBucketRetentionConfigResponse(session *models.Principal, params bucketApi.SetBucketRetentionConfigParams) *models.Error {
+func getSetBucketRetentionConfigResponse(session *models.Principal, params bucketApi.SetBucketRetentionConfigParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mClient, err := newMinioClient(session, getClientIP(params.HTTPRequest))
@@ -969,7 +969,7 @@ func getBucketRetentionConfig(ctx context.Context, client MinioClient, bucketNam
 	return config, nil
 }
 
-func getBucketRetentionConfigResponse(session *models.Principal, params bucketApi.GetBucketRetentionConfigParams) (*models.GetBucketRetentionConfig, *models.Error) {
+func getBucketRetentionConfigResponse(session *models.Principal, params bucketApi.GetBucketRetentionConfigParams) (*models.GetBucketRetentionConfig, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	bucketName := params.BucketName
@@ -989,7 +989,7 @@ func getBucketRetentionConfigResponse(session *models.Principal, params bucketAp
 	return config, nil
 }
 
-func getBucketObjectLockingResponse(session *models.Principal, params bucketApi.GetBucketObjectLockingStatusParams) (*models.BucketObLockingResponse, *models.Error) {
+func getBucketObjectLockingResponse(session *models.Principal, params bucketApi.GetBucketObjectLockingStatusParams) (*models.BucketObLockingResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	bucketName := params.BucketName
@@ -1018,7 +1018,7 @@ func getBucketObjectLockingResponse(session *models.Principal, params bucketApi.
 	}, nil
 }
 
-func getBucketRewindResponse(session *models.Principal, params bucketApi.GetBucketRewindParams) (*models.RewindResponse, *models.Error) {
+func getBucketRewindResponse(session *models.Principal, params bucketApi.GetBucketRewindParams) (*models.RewindResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	prefix := ""
diff --git a/restapi/user_buckets_events.go b/restapi/user_buckets_events.go
index 0b26d140e..f9c78b719 100644
--- a/restapi/user_buckets_events.go
+++ b/restapi/user_buckets_events.go
@@ -33,21 +33,21 @@ func registerBucketEventsHandlers(api *operations.ConsoleAPI) {
 	api.BucketListBucketEventsHandler = bucketApi.ListBucketEventsHandlerFunc(func(params bucketApi.ListBucketEventsParams, session *models.Principal) middleware.Responder {
 		listBucketEventsResponse, err := getListBucketEventsResponse(session, params)
 		if err != nil {
-			return bucketApi.NewListBucketEventsDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewListBucketEventsDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewListBucketEventsOK().WithPayload(listBucketEventsResponse)
 	})
 	// create bucket event
 	api.BucketCreateBucketEventHandler = bucketApi.CreateBucketEventHandlerFunc(func(params bucketApi.CreateBucketEventParams, session *models.Principal) middleware.Responder {
 		if err := getCreateBucketEventsResponse(session, params); err != nil {
-			return bucketApi.NewCreateBucketEventDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewCreateBucketEventDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewCreateBucketEventCreated()
 	})
 	// delete bucket event
 	api.BucketDeleteBucketEventHandler = bucketApi.DeleteBucketEventHandlerFunc(func(params bucketApi.DeleteBucketEventParams, session *models.Principal) middleware.Responder {
 		if err := getDeleteBucketEventsResponse(session, params); err != nil {
-			return bucketApi.NewDeleteBucketEventDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewDeleteBucketEventDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewDeleteBucketEventNoContent()
 	})
@@ -136,7 +136,7 @@ func listBucketEvents(client MinioClient, bucketName string) ([]*models.Notifica
 }
 
 // getListBucketsResponse performs listBucketEvents() and serializes it to the handler's output
-func getListBucketEventsResponse(session *models.Principal, params bucketApi.ListBucketEventsParams) (*models.ListBucketEventsResponse, *models.Error) {
+func getListBucketEventsResponse(session *models.Principal, params bucketApi.ListBucketEventsParams) (*models.ListBucketEventsResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mClient, err := newMinioClient(session, getClientIP(params.HTTPRequest))
@@ -189,7 +189,7 @@ func createBucketEvent(ctx context.Context, client MCClient, arn string, notific
 }
 
 // getCreateBucketEventsResponse calls createBucketEvent to add a bucket event notification
-func getCreateBucketEventsResponse(session *models.Principal, params bucketApi.CreateBucketEventParams) *models.Error {
+func getCreateBucketEventsResponse(session *models.Principal, params bucketApi.CreateBucketEventParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	bucketName := params.BucketName
@@ -227,7 +227,7 @@ func joinNotificationEvents(events []models.NotificationEventType) string {
 }
 
 // getDeleteBucketEventsResponse calls deleteBucketEventNotification() to delete a bucket event notification
-func getDeleteBucketEventsResponse(session *models.Principal, params bucketApi.DeleteBucketEventParams) *models.Error {
+func getDeleteBucketEventsResponse(session *models.Principal, params bucketApi.DeleteBucketEventParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	bucketName := params.BucketName
diff --git a/restapi/user_buckets_lifecycle.go b/restapi/user_buckets_lifecycle.go
index 33cdd4601..66f399efc 100644
--- a/restapi/user_buckets_lifecycle.go
+++ b/restapi/user_buckets_lifecycle.go
@@ -24,11 +24,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/minio/minio-go/v7"
+
 	"github.com/rs/xid"
 
 	"github.com/minio/mc/cmd/ilm"
 
-	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/lifecycle"
 
 	"github.com/go-openapi/runtime/middleware"
@@ -46,21 +47,21 @@ func registerBucketsLifecycleHandlers(api *operations.ConsoleAPI) {
 	api.BucketGetBucketLifecycleHandler = bucketApi.GetBucketLifecycleHandlerFunc(func(params bucketApi.GetBucketLifecycleParams, session *models.Principal) middleware.Responder {
 		listBucketLifecycleResponse, err := getBucketLifecycleResponse(session, params)
 		if err != nil {
-			return bucketApi.NewGetBucketLifecycleDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewGetBucketLifecycleDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewGetBucketLifecycleOK().WithPayload(listBucketLifecycleResponse)
 	})
 	api.BucketAddBucketLifecycleHandler = bucketApi.AddBucketLifecycleHandlerFunc(func(params bucketApi.AddBucketLifecycleParams, session *models.Principal) middleware.Responder {
 		err := getAddBucketLifecycleResponse(session, params)
 		if err != nil {
-			return bucketApi.NewAddBucketLifecycleDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewAddBucketLifecycleDefault(err.Code).WithPayload(err.APIError)
 		}
 		return bucketApi.NewAddBucketLifecycleCreated()
 	})
 	api.BucketUpdateBucketLifecycleHandler = bucketApi.UpdateBucketLifecycleHandlerFunc(func(params bucketApi.UpdateBucketLifecycleParams, session *models.Principal) middleware.Responder {
 		err := getEditBucketLifecycleRule(session, params)
 		if err != nil {
-			return bucketApi.NewUpdateBucketLifecycleDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewUpdateBucketLifecycleDefault(err.Code).WithPayload(err.APIError)
 		}
 
 		return bucketApi.NewUpdateBucketLifecycleOK()
@@ -68,7 +69,7 @@ func registerBucketsLifecycleHandlers(api *operations.ConsoleAPI) {
 	api.BucketDeleteBucketLifecycleRuleHandler = bucketApi.DeleteBucketLifecycleRuleHandlerFunc(func(params bucketApi.DeleteBucketLifecycleRuleParams, session *models.Principal) middleware.Responder {
 		err := getDeleteBucketLifecycleRule(session, params)
 		if err != nil {
-			return bucketApi.NewDeleteBucketLifecycleRuleDefault(int(err.Code)).WithPayload(err)
+			return bucketApi.NewDeleteBucketLifecycleRuleDefault(err.Code).WithPayload(err.APIError)
 		}
 
 		return bucketApi.NewDeleteBucketLifecycleRuleNoContent()
@@ -76,7 +77,7 @@ func registerBucketsLifecycleHandlers(api *operations.ConsoleAPI) {
 	api.BucketAddMultiBucketLifecycleHandler = bucketApi.AddMultiBucketLifecycleHandlerFunc(func(params bucketApi.AddMultiBucketLifecycleParams, session *models.Principal) middleware.Responder {
 		multiBucketResponse, err := getAddMultiBucketLifecycleResponse(session, params)
 		if err != nil {
-			bucketApi.NewAddMultiBucketLifecycleDefault(int(err.Code)).WithPayload(err)
+			bucketApi.NewAddMultiBucketLifecycleDefault(err.Code).WithPayload(err.APIError)
 		}
 
 		return bucketApi.NewAddMultiBucketLifecycleOK().WithPayload(multiBucketResponse)
@@ -139,7 +140,7 @@ func getBucketLifecycle(ctx context.Context, client MinioClient, bucketName stri
 }
 
 // getBucketLifecycleResponse performs getBucketLifecycle() and serializes it to the handler's output
-func getBucketLifecycleResponse(session *models.Principal, params bucketApi.GetBucketLifecycleParams) (*models.BucketLifecycleResponse, *models.Error) {
+func getBucketLifecycleResponse(session *models.Principal, params bucketApi.GetBucketLifecycleParams) (*models.BucketLifecycleResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mClient, err := newMinioClient(session, getClientIP(params.HTTPRequest))
@@ -242,7 +243,7 @@ func addBucketLifecycle(ctx context.Context, client MinioClient, params bucketAp
 }
 
 // getAddBucketLifecycleResponse returns the response of adding a bucket lifecycle response
-func getAddBucketLifecycleResponse(session *models.Principal, params bucketApi.AddBucketLifecycleParams) *models.Error {
+func getAddBucketLifecycleResponse(session *models.Principal, params bucketApi.AddBucketLifecycleParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mClient, err := newMinioClient(session, getClientIP(params.HTTPRequest))
@@ -355,7 +356,7 @@ func editBucketLifecycle(ctx context.Context, client MinioClient, params bucketA
 }
 
 // getEditBucketLifecycleRule returns the response of bucket lifecycle tier edit
-func getEditBucketLifecycleRule(session *models.Principal, params bucketApi.UpdateBucketLifecycleParams) *models.Error {
+func getEditBucketLifecycleRule(session *models.Principal, params bucketApi.UpdateBucketLifecycleParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mClient, err := newMinioClient(session, getClientIP(params.HTTPRequest))
@@ -409,7 +410,7 @@ func deleteBucketLifecycle(ctx context.Context, client MinioClient, params bucke
 }
 
 // getDeleteBucketLifecycleRule returns the response of bucket lifecycle tier delete
-func getDeleteBucketLifecycleRule(session *models.Principal, params bucketApi.DeleteBucketLifecycleRuleParams) *models.Error {
+func getDeleteBucketLifecycleRule(session *models.Principal, params bucketApi.DeleteBucketLifecycleRuleParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mClient, err := newMinioClient(session, getClientIP(params.HTTPRequest))
@@ -495,7 +496,7 @@ func addMultiBucketLifecycle(ctx context.Context, client MinioClient, params buc
 }
 
 // getAddMultiBucketLifecycleResponse returns the response of multibucket lifecycle assignment
-func getAddMultiBucketLifecycleResponse(session *models.Principal, params bucketApi.AddMultiBucketLifecycleParams) (*models.MultiLifecycleResult, *models.Error) {
+func getAddMultiBucketLifecycleResponse(session *models.Principal, params bucketApi.AddMultiBucketLifecycleParams) (*models.MultiLifecycleResult, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	mClient, err := newMinioClient(session, getClientIP(params.HTTPRequest))
diff --git a/restapi/user_log_search.go b/restapi/user_log_search.go
index 7690640ce..a5bd20ece 100644
--- a/restapi/user_log_search.go
+++ b/restapi/user_log_search.go
@@ -23,7 +23,6 @@ import (
 	"net/http"
 
 	"github.com/go-openapi/runtime/middleware"
-	"github.com/go-openapi/swag"
 	"github.com/minio/console/models"
 	"github.com/minio/console/restapi/operations"
 	logApi "github.com/minio/console/restapi/operations/logging"
@@ -35,14 +34,14 @@ func registerLogSearchHandlers(api *operations.ConsoleAPI) {
 	api.LoggingLogSearchHandler = logApi.LogSearchHandlerFunc(func(params logApi.LogSearchParams, session *models.Principal) middleware.Responder {
 		searchResp, err := getLogSearchResponse(session, params)
 		if err != nil {
-			return logApi.NewLogSearchDefault(int(err.Code)).WithPayload(err)
+			return logApi.NewLogSearchDefault(err.Code).WithPayload(err.APIError)
 		}
 		return logApi.NewLogSearchOK().WithPayload(searchResp)
 	})
 }
 
 // getLogSearchResponse performs a query to Log Search if Enabled
-func getLogSearchResponse(session *models.Principal, params logApi.LogSearchParams) (*models.LogSearchResponse, *models.Error) {
+func getLogSearchResponse(session *models.Principal, params logApi.LogSearchParams) (*models.LogSearchResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	sessionResp, err := getSessionResponse(ctx, session)
@@ -60,10 +59,12 @@ func getLogSearchResponse(session *models.Principal, params logApi.LogSearchPara
 	}
 
 	if !allowedToQueryLogSearchAPI {
-		return nil, &models.Error{
-			Code:            int32(403),
-			Message:         swag.String("Forbidden"),
-			DetailedMessage: swag.String("The Log Search API not available."),
+		return nil, &CodedAPIError{
+			Code: 403,
+			APIError: &models.APIError{
+				Message:         "Forbidden",
+				DetailedMessage: "The Log Search API not available.",
+			},
 		}
 	}
 
diff --git a/restapi/user_login.go b/restapi/user_login.go
index 5594b880c..d79d7ba15 100644
--- a/restapi/user_login.go
+++ b/restapi/user_login.go
@@ -43,7 +43,7 @@ func registerLoginHandlers(api *operations.ConsoleAPI) {
 	api.AuthLoginDetailHandler = authApi.LoginDetailHandlerFunc(func(params authApi.LoginDetailParams) middleware.Responder {
 		loginDetails, err := getLoginDetailsResponse(params, GlobalMinIOConfig.OpenIDProviders)
 		if err != nil {
-			return authApi.NewLoginDetailDefault(int(err.Code)).WithPayload(err)
+			return authApi.NewLoginDetailDefault(err.Code).WithPayload(err.APIError)
 		}
 		return authApi.NewLoginDetailOK().WithPayload(loginDetails)
 	})
@@ -51,7 +51,7 @@ func registerLoginHandlers(api *operations.ConsoleAPI) {
 	api.AuthLoginHandler = authApi.LoginHandlerFunc(func(params authApi.LoginParams) middleware.Responder {
 		loginResponse, err := getLoginResponse(params)
 		if err != nil {
-			return authApi.NewLoginDefault(int(err.Code)).WithPayload(err)
+			return authApi.NewLoginDefault(err.Code).WithPayload(err.APIError)
 		}
 		// Custom response writer to set the session cookies
 		return middleware.ResponderFunc(func(w http.ResponseWriter, p runtime.Producer) {
@@ -64,7 +64,7 @@ func registerLoginHandlers(api *operations.ConsoleAPI) {
 	api.AuthLoginOauth2AuthHandler = authApi.LoginOauth2AuthHandlerFunc(func(params authApi.LoginOauth2AuthParams) middleware.Responder {
 		loginResponse, err := getLoginOauth2AuthResponse(params, GlobalMinIOConfig.OpenIDProviders)
 		if err != nil {
-			return authApi.NewLoginOauth2AuthDefault(int(err.Code)).WithPayload(err)
+			return authApi.NewLoginOauth2AuthDefault(err.Code).WithPayload(err.APIError)
 		}
 		// Custom response writer to set the session cookies
 		return middleware.ResponderFunc(func(w http.ResponseWriter, p runtime.Producer) {
@@ -123,7 +123,7 @@ func getConsoleCredentials(accessKey, secretKey, clientIP string) (*ConsoleCrede
 }
 
 // getLoginResponse performs login() and serializes it to the handler's output
-func getLoginResponse(params authApi.LoginParams) (*models.LoginResponse, *models.Error) {
+func getLoginResponse(params authApi.LoginParams) (*models.LoginResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	lr := params.Body
@@ -177,7 +177,7 @@ func isKubernetes() bool {
 }
 
 // getLoginDetailsResponse returns information regarding the Console authentication mechanism.
-func getLoginDetailsResponse(params authApi.LoginDetailParams, openIDProviders oauth2.OpenIDPCfg) (*models.LoginDetails, *models.Error) {
+func getLoginDetailsResponse(params authApi.LoginDetailParams, openIDProviders oauth2.OpenIDPCfg) (*models.LoginDetails, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	loginStrategy := models.LoginDetailsLoginStrategyForm
@@ -242,7 +242,7 @@ func verifyUserAgainstIDP(ctx context.Context, provider auth.IdentityProviderI,
 	return userCredentials, nil
 }
 
-func getLoginOauth2AuthResponse(params authApi.LoginOauth2AuthParams, openIDProviders oauth2.OpenIDPCfg) (*models.LoginResponse, *models.Error) {
+func getLoginOauth2AuthResponse(params authApi.LoginOauth2AuthParams, openIDProviders oauth2.OpenIDPCfg) (*models.LoginResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	r := params.HTTPRequest
diff --git a/restapi/user_logout.go b/restapi/user_logout.go
index ee0d06bd7..3b25dbae4 100644
--- a/restapi/user_logout.go
+++ b/restapi/user_logout.go
@@ -37,7 +37,7 @@ func registerLogoutHandlers(api *operations.ConsoleAPI) {
 	api.AuthLogoutHandler = authApi.LogoutHandlerFunc(func(params authApi.LogoutParams, session *models.Principal) middleware.Responder {
 		err := getLogoutResponse(session, params)
 		if err != nil {
-			return authApi.NewLogoutDefault(int(err.Code)).WithPayload(err)
+			return authApi.NewLogoutDefault(err.Code).WithPayload(err.APIError)
 		}
 		// Custom response writer to expire the session cookies
 		return middleware.ResponderFunc(func(w http.ResponseWriter, p runtime.Producer) {
@@ -66,7 +66,7 @@ func logout(credentials ConsoleCredentialsI) {
 }
 
 // getLogoutResponse performs logout() and returns nil or errors
-func getLogoutResponse(session *models.Principal, params authApi.LogoutParams) *models.Error {
+func getLogoutResponse(session *models.Principal, params authApi.LogoutParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	state := params.Body.State
diff --git a/restapi/user_objects.go b/restapi/user_objects.go
index 14125496e..60d0c5d62 100644
--- a/restapi/user_objects.go
+++ b/restapi/user_objects.go
@@ -31,6 +31,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/minio/minio-go/v7"
+
 	"github.com/minio/console/pkg/utils"
 
 	"github.com/go-openapi/runtime"
@@ -41,7 +43,6 @@ import (
 	objectApi "github.com/minio/console/restapi/operations/object"
 	mc "github.com/minio/mc/cmd"
 	"github.com/minio/mc/pkg/probe"
-	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/tags"
 	"github.com/minio/pkg/mimedb"
 )
@@ -57,21 +58,21 @@ func registerObjectsHandlers(api *operations.ConsoleAPI) {
 	api.ObjectListObjectsHandler = objectApi.ListObjectsHandlerFunc(func(params objectApi.ListObjectsParams, session *models.Principal) middleware.Responder {
 		resp, err := getListObjectsResponse(session, params)
 		if err != nil {
-			return objectApi.NewListObjectsDefault(int(err.Code)).WithPayload(err)
+			return objectApi.NewListObjectsDefault(err.Code).WithPayload(err.APIError)
 		}
 		return objectApi.NewListObjectsOK().WithPayload(resp)
 	})
 	// delete object
 	api.ObjectDeleteObjectHandler = objectApi.DeleteObjectHandlerFunc(func(params objectApi.DeleteObjectParams, session *models.Principal) middleware.Responder {
 		if err := getDeleteObjectResponse(session, params); err != nil {
-			return objectApi.NewDeleteObjectDefault(int(err.Code)).WithPayload(err)
+			return objectApi.NewDeleteObjectDefault(err.Code).WithPayload(err.APIError)
 		}
 		return objectApi.NewDeleteObjectOK()
 	})
 	// delete multiple objects
 	api.ObjectDeleteMultipleObjectsHandler = objectApi.DeleteMultipleObjectsHandlerFunc(func(params objectApi.DeleteMultipleObjectsParams, session *models.Principal) middleware.Responder {
 		if err := getDeleteMultiplePathsResponse(session, params); err != nil {
-			return objectApi.NewDeleteMultipleObjectsDefault(int(err.Code)).WithPayload(err)
+			return objectApi.NewDeleteMultipleObjectsDefault(err.Code).WithPayload(err.APIError)
 		}
 		return objectApi.NewDeleteMultipleObjectsOK()
 	})
@@ -84,7 +85,8 @@ func registerObjectsHandlers(api *operations.ConsoleAPI) {
 			encodedPrefix := SanitizeEncodedPrefix(params.Prefix)
 			decodedPrefix, err := base64.StdEncoding.DecodeString(encodedPrefix)
 			if err != nil {
-				return objectApi.NewDownloadObjectDefault(400).WithPayload(ErrorWithContext(ctx, err))
+				apiErr := ErrorWithContext(ctx, err)
+				return objectApi.NewDownloadObjectDefault(400).WithPayload(apiErr.APIError)
 			}
 			prefix = string(decodedPrefix)
 		}
@@ -94,7 +96,7 @@ func registerObjectsHandlers(api *operations.ConsoleAPI) {
 			isFolder = true
 		}
 		var resp middleware.Responder
-		var err *models.Error
+		var err *CodedAPIError
 
 		if isFolder {
 			resp, err = getDownloadFolderResponse(session, params)
@@ -103,7 +105,7 @@ func registerObjectsHandlers(api *operations.ConsoleAPI) {
 		}
 
 		if err != nil {
-			return objectApi.NewDownloadObjectDefault(int(err.Code)).WithPayload(err)
+			return objectApi.NewDownloadObjectDefault(err.Code).WithPayload(err.APIError)
 		}
 		return resp
 	})
@@ -111,13 +113,14 @@ func registerObjectsHandlers(api *operations.ConsoleAPI) {
 	api.ObjectDownloadMultipleObjectsHandler = objectApi.DownloadMultipleObjectsHandlerFunc(func(params objectApi.DownloadMultipleObjectsParams, session *models.Principal) middleware.Responder {
 		ctx := params.HTTPRequest.Context()
 		if len(params.ObjectList) < 1 {
-			return objectApi.NewDownloadMultipleObjectsDefault(400).WithPayload(ErrorWithContext(ctx, errors.New("could not download, since object list is empty")))
+			errCode := ErrorWithContext(ctx, errors.New("could not download, since object list is empty"))
+			return objectApi.NewDownloadMultipleObjectsDefault(errCode.Code).WithPayload(errCode.APIError)
 		}
 		var resp middleware.Responder
-		var err *models.Error
+		var err *CodedAPIError
 		resp, err = getMultipleFilesDownloadResponse(session, params)
 		if err != nil {
-			return objectApi.NewDownloadMultipleObjectsDefault(int(err.Code)).WithPayload(err)
+			return objectApi.NewDownloadMultipleObjectsDefault(err.Code).WithPayload(err.APIError)
 		}
 		return resp
 	})
@@ -125,10 +128,10 @@ func registerObjectsHandlers(api *operations.ConsoleAPI) {
 	// upload object
 	api.ObjectPostBucketsBucketNameObjectsUploadHandler = objectApi.PostBucketsBucketNameObjectsUploadHandlerFunc(func(params objectApi.PostBucketsBucketNameObjectsUploadParams, session *models.Principal) middleware.Responder {
 		if err := getUploadObjectResponse(session, params); err != nil {
-			if strings.Contains(*err.DetailedMessage, "413") {
-				return objectApi.NewPostBucketsBucketNameObjectsUploadDefault(413).WithPayload(err)
+			if strings.Contains(err.APIError.DetailedMessage, "413") {
+				return objectApi.NewPostBucketsBucketNameObjectsUploadDefault(413).WithPayload(err.APIError)
 			}
-			return objectApi.NewPostBucketsBucketNameObjectsUploadDefault(int(err.Code)).WithPayload(err)
+			return objectApi.NewPostBucketsBucketNameObjectsUploadDefault(err.Code).WithPayload(err.APIError)
 		}
 		return objectApi.NewPostBucketsBucketNameObjectsUploadOK()
 	})
@@ -136,42 +139,42 @@ func registerObjectsHandlers(api *operations.ConsoleAPI) {
 	api.ObjectShareObjectHandler = objectApi.ShareObjectHandlerFunc(func(params objectApi.ShareObjectParams, session *models.Principal) middleware.Responder {
 		resp, err := getShareObjectResponse(session, params)
 		if err != nil {
-			return objectApi.NewShareObjectDefault(int(err.Code)).WithPayload(err)
+			return objectApi.NewShareObjectDefault(err.Code).WithPayload(err.APIError)
 		}
 		return objectApi.NewShareObjectOK().WithPayload(*resp)
 	})
 	// set object legalhold status
 	api.ObjectPutObjectLegalHoldHandler = objectApi.PutObjectLegalHoldHandlerFunc(func(params objectApi.PutObjectLegalHoldParams, session *models.Principal) middleware.Responder {
 		if err := getSetObjectLegalHoldResponse(session, params); err != nil {
-			return objectApi.NewPutObjectLegalHoldDefault(int(err.Code)).WithPayload(err)
+			return objectApi.NewPutObjectLegalHoldDefault(err.Code).WithPayload(err.APIError)
 		}
 		return objectApi.NewPutObjectLegalHoldOK()
 	})
 	// set object retention
 	api.ObjectPutObjectRetentionHandler = objectApi.PutObjectRetentionHandlerFunc(func(params objectApi.PutObjectRetentionParams, session *models.Principal) middleware.Responder {
 		if err := getSetObjectRetentionResponse(session, params); err != nil {
-			return objectApi.NewPutObjectRetentionDefault(int(err.Code)).WithPayload(err)
+			return objectApi.NewPutObjectRetentionDefault(err.Code).WithPayload(err.APIError)
 		}
 		return objectApi.NewPutObjectRetentionOK()
 	})
 	// delete object retention
 	api.ObjectDeleteObjectRetentionHandler = objectApi.DeleteObjectRetentionHandlerFunc(func(params objectApi.DeleteObjectRetentionParams, session *models.Principal) middleware.Responder {
 		if err := deleteObjectRetentionResponse(session, params); err != nil {
-			return objectApi.NewDeleteObjectRetentionDefault(int(err.Code)).WithPayload(err)
+			return objectApi.NewDeleteObjectRetentionDefault(err.Code).WithPayload(err.APIError)
 		}
 		return objectApi.NewDeleteObjectRetentionOK()
 	})
 	// set tags in object
 	api.ObjectPutObjectTagsHandler = objectApi.PutObjectTagsHandlerFunc(func(params objectApi.PutObjectTagsParams, session *models.Principal) middleware.Responder {
 		if err := getPutObjectTagsResponse(session, params); err != nil {
-			return objectApi.NewPutObjectTagsDefault(int(err.Code)).WithPayload(err)
+			return objectApi.NewPutObjectTagsDefault(err.Code).WithPayload(err.APIError)
 		}
 		return objectApi.NewPutObjectTagsOK()
 	})
 	// Restore file version
 	api.ObjectPutObjectRestoreHandler = objectApi.PutObjectRestoreHandlerFunc(func(params objectApi.PutObjectRestoreParams, session *models.Principal) middleware.Responder {
 		if err := getPutObjectRestoreResponse(session, params); err != nil {
-			return objectApi.NewPutObjectRestoreDefault(int(err.Code)).WithPayload(err)
+			return objectApi.NewPutObjectRestoreDefault(err.Code).WithPayload(err.APIError)
 		}
 		return objectApi.NewPutObjectRestoreOK()
 	})
@@ -179,14 +182,14 @@ func registerObjectsHandlers(api *operations.ConsoleAPI) {
 	api.ObjectGetObjectMetadataHandler = objectApi.GetObjectMetadataHandlerFunc(func(params objectApi.GetObjectMetadataParams, session *models.Principal) middleware.Responder {
 		resp, err := getObjectMetadataResponse(session, params)
 		if err != nil {
-			return objectApi.NewGetObjectMetadataDefault(int(err.Code)).WithPayload(err)
+			return objectApi.NewGetObjectMetadataDefault(err.Code).WithPayload(err.APIError)
 		}
 		return objectApi.NewGetObjectMetadataOK().WithPayload(resp)
 	})
 }
 
 // getListObjectsResponse returns a list of objects
-func getListObjectsResponse(session *models.Principal, params objectApi.ListObjectsParams) (*models.ListObjectsResponse, *models.Error) {
+func getListObjectsResponse(session *models.Principal, params objectApi.ListObjectsParams) (*models.ListObjectsResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	var prefix string
@@ -412,7 +415,7 @@ func parseRange(s string, size int64) ([]httpRange, error) {
 	return ranges, nil
 }
 
-func getDownloadObjectResponse(session *models.Principal, params objectApi.DownloadObjectParams) (middleware.Responder, *models.Error) {
+func getDownloadObjectResponse(session *models.Principal, params objectApi.DownloadObjectParams) (middleware.Responder, *CodedAPIError) {
 	ctx := params.HTTPRequest.Context()
 	var prefix string
 	mClient, err := newMinioClient(session, getClientIP(params.HTTPRequest))
@@ -528,7 +531,7 @@ func getDownloadObjectResponse(session *models.Principal, params objectApi.Downl
 	}), nil
 }
 
-func getDownloadFolderResponse(session *models.Principal, params objectApi.DownloadObjectParams) (middleware.Responder, *models.Error) {
+func getDownloadFolderResponse(session *models.Principal, params objectApi.DownloadObjectParams) (middleware.Responder, *CodedAPIError) {
 	ctx := params.HTTPRequest.Context()
 	var prefix string
 	mClient, err := newMinioClient(session, getClientIP(params.HTTPRequest))
@@ -635,7 +638,7 @@ func getDownloadFolderResponse(session *models.Principal, params objectApi.Downl
 	}), nil
 }
 
-func getMultipleFilesDownloadResponse(session *models.Principal, params objectApi.DownloadMultipleObjectsParams) (middleware.Responder, *models.Error) {
+func getMultipleFilesDownloadResponse(session *models.Principal, params objectApi.DownloadMultipleObjectsParams) (middleware.Responder, *CodedAPIError) {
 	ctx := params.HTTPRequest.Context()
 	mClient, err := newMinioClient(session, getClientIP(params.HTTPRequest))
 	if err != nil {
@@ -758,7 +761,7 @@ func getMultipleFilesDownloadResponse(session *models.Principal, params objectAp
 }
 
 // getDeleteObjectResponse returns whether there was an error on deletion of object
-func getDeleteObjectResponse(session *models.Principal, params objectApi.DeleteObjectParams) *models.Error {
+func getDeleteObjectResponse(session *models.Principal, params objectApi.DeleteObjectParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	var prefix string
@@ -811,7 +814,7 @@ func getDeleteObjectResponse(session *models.Principal, params objectApi.DeleteO
 }
 
 // getDeleteMultiplePathsResponse returns whether there was an error on deletion of any object
-func getDeleteMultiplePathsResponse(session *models.Principal, params objectApi.DeleteMultipleObjectsParams) *models.Error {
+func getDeleteMultiplePathsResponse(session *models.Principal, params objectApi.DeleteMultipleObjectsParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	var version string
@@ -965,7 +968,7 @@ func deleteNonCurrentVersions(ctx context.Context, client MCClient, isBypass boo
 	return nil
 }
 
-func getUploadObjectResponse(session *models.Principal, params objectApi.PostBucketsBucketNameObjectsUploadParams) *models.Error {
+func getUploadObjectResponse(session *models.Principal, params objectApi.PostBucketsBucketNameObjectsUploadParams) *CodedAPIError {
 	ctx := params.HTTPRequest.Context()
 	mClient, err := newMinioClient(session, getClientIP(params.HTTPRequest))
 	if err != nil {
@@ -1032,7 +1035,7 @@ func uploadFiles(ctx context.Context, client MinioClient, params objectApi.PostB
 }
 
 // getShareObjectResponse returns a share object url
-func getShareObjectResponse(session *models.Principal, params objectApi.ShareObjectParams) (*string, *models.Error) {
+func getShareObjectResponse(session *models.Principal, params objectApi.ShareObjectParams) (*string, *CodedAPIError) {
 	ctx := params.HTTPRequest.Context()
 	clientIP := utils.ClientIPFromContext(ctx)
 	var prefix string
@@ -1079,7 +1082,7 @@ func getShareObjectURL(ctx context.Context, client MCClient, versionID string, d
 	return &objURL, nil
 }
 
-func getSetObjectLegalHoldResponse(session *models.Principal, params objectApi.PutObjectLegalHoldParams) *models.Error {
+func getSetObjectLegalHoldResponse(session *models.Principal, params objectApi.PutObjectLegalHoldParams) *CodedAPIError {
 	ctx := params.HTTPRequest.Context()
 	mClient, err := newMinioClient(session, getClientIP(params.HTTPRequest))
 	if err != nil {
@@ -1114,7 +1117,7 @@ func setObjectLegalHold(ctx context.Context, client MinioClient, bucketName, pre
 	return client.putObjectLegalHold(ctx, bucketName, prefix, minio.PutObjectLegalHoldOptions{VersionID: versionID, Status: &lstatus})
 }
 
-func getSetObjectRetentionResponse(session *models.Principal, params objectApi.PutObjectRetentionParams) *models.Error {
+func getSetObjectRetentionResponse(session *models.Principal, params objectApi.PutObjectRetentionParams) *CodedAPIError {
 	ctx := params.HTTPRequest.Context()
 	mClient, err := newMinioClient(session, getClientIP(params.HTTPRequest))
 	if err != nil {
@@ -1166,7 +1169,7 @@ func setObjectRetention(ctx context.Context, client MinioClient, bucketName, ver
 	return client.putObjectRetention(ctx, bucketName, prefix, opts)
 }
 
-func deleteObjectRetentionResponse(session *models.Principal, params objectApi.DeleteObjectRetentionParams) *models.Error {
+func deleteObjectRetentionResponse(session *models.Principal, params objectApi.DeleteObjectRetentionParams) *CodedAPIError {
 	ctx := params.HTTPRequest.Context()
 	mClient, err := newMinioClient(session, getClientIP(params.HTTPRequest))
 	if err != nil {
@@ -1200,7 +1203,7 @@ func deleteObjectRetention(ctx context.Context, client MinioClient, bucketName,
 	return client.putObjectRetention(ctx, bucketName, prefix, opts)
 }
 
-func getPutObjectTagsResponse(session *models.Principal, params objectApi.PutObjectTagsParams) *models.Error {
+func getPutObjectTagsResponse(session *models.Principal, params objectApi.PutObjectTagsParams) *CodedAPIError {
 	ctx := params.HTTPRequest.Context()
 	mClient, err := newMinioClient(session, getClientIP(params.HTTPRequest))
 	if err != nil {
@@ -1237,7 +1240,7 @@ func putObjectTags(ctx context.Context, client MinioClient, bucketName, prefix,
 }
 
 // Restore Object Version
-func getPutObjectRestoreResponse(session *models.Principal, params objectApi.PutObjectRestoreParams) *models.Error {
+func getPutObjectRestoreResponse(session *models.Principal, params objectApi.PutObjectRestoreParams) *CodedAPIError {
 	ctx := params.HTTPRequest.Context()
 	mClient, err := newMinioClient(session, getClientIP(params.HTTPRequest))
 	if err != nil {
@@ -1292,7 +1295,7 @@ func restoreObject(ctx context.Context, client MinioClient, bucketName, prefix,
 }
 
 // Metadata Response from minio-go API
-func getObjectMetadataResponse(session *models.Principal, params objectApi.GetObjectMetadataParams) (*models.Metadata, *models.Error) {
+func getObjectMetadataResponse(session *models.Principal, params objectApi.GetObjectMetadataParams) (*models.Metadata, *CodedAPIError) {
 	ctx := params.HTTPRequest.Context()
 	mClient, err := newMinioClient(session, getClientIP(params.HTTPRequest))
 	if err != nil {
diff --git a/restapi/user_objects_test.go b/restapi/user_objects_test.go
index d31cdd8c0..cda213fad 100644
--- a/restapi/user_objects_test.go
+++ b/restapi/user_objects_test.go
@@ -1455,7 +1455,7 @@ func Test_getMultipleFilesDownloadResponse(t *testing.T) {
 		name  string
 		args  args
 		want  middleware.Responder
-		want1 *models.Error
+		want1 *CodedAPIError
 	}{
 		{
 			name: "test no objects sent for download",
diff --git a/restapi/user_session.go b/restapi/user_session.go
index 4a94c7a38..21c770887 100644
--- a/restapi/user_session.go
+++ b/restapi/user_session.go
@@ -48,7 +48,7 @@ func registerSessionHandlers(api *operations.ConsoleAPI) {
 	api.AuthSessionCheckHandler = authApi.SessionCheckHandlerFunc(func(params authApi.SessionCheckParams, session *models.Principal) middleware.Responder {
 		sessionResp, err := getSessionResponse(params.HTTPRequest.Context(), session)
 		if err != nil {
-			return authApi.NewSessionCheckDefault(int(err.Code)).WithPayload(err)
+			return authApi.NewSessionCheckDefault(err.Code).WithPayload(err.APIError)
 		}
 		return authApi.NewSessionCheckOK().WithPayload(sessionResp)
 	})
@@ -70,7 +70,7 @@ func getClaimsFromToken(sessionToken string) (map[string]interface{}, error) {
 }
 
 // getSessionResponse parse the token of the current session and returns a list of allowed actions to render in the UI
-func getSessionResponse(ctx context.Context, session *models.Principal) (*models.SessionResponse, *models.Error) {
+func getSessionResponse(ctx context.Context, session *models.Principal) (*models.SessionResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 
diff --git a/restapi/user_support.go b/restapi/user_support.go
index b88c85c85..c64f7887d 100644
--- a/restapi/user_support.go
+++ b/restapi/user_support.go
@@ -38,7 +38,7 @@ func registerSupportHandlers(api *operations.ConsoleAPI) {
 	api.SupportGetCallHomeOptionValueHandler = support.GetCallHomeOptionValueHandlerFunc(func(params support.GetCallHomeOptionValueParams, session *models.Principal) middleware.Responder {
 		callhomeResp, err := getCallHomeOptionResponse(session, params)
 		if err != nil {
-			return support.NewGetCallHomeOptionValueDefault(int(err.Code)).WithPayload(err)
+			return support.NewGetCallHomeOptionValueDefault(err.Code).WithPayload(err.APIError)
 		}
 
 		return support.NewGetCallHomeOptionValueOK().WithPayload(callhomeResp)
@@ -47,7 +47,7 @@ func registerSupportHandlers(api *operations.ConsoleAPI) {
 	api.SupportSetCallHomeStatusHandler = support.SetCallHomeStatusHandlerFunc(func(params support.SetCallHomeStatusParams, session *models.Principal) middleware.Responder {
 		err := editCallHomeOptionResponse(session, params)
 		if err != nil {
-			return support.NewSetCallHomeStatusDefault(int(err.Code)).WithPayload(err)
+			return support.NewSetCallHomeStatusDefault(err.Code).WithPayload(err.APIError)
 		}
 
 		return support.NewSetCallHomeStatusNoContent()
@@ -55,7 +55,7 @@ func registerSupportHandlers(api *operations.ConsoleAPI) {
 }
 
 // getCallHomeOptionResponse returns the selected option value
-func getCallHomeOptionResponse(session *models.Principal, params support.GetCallHomeOptionValueParams) (*models.CallHomeGetResponse, *models.Error) {
+func getCallHomeOptionResponse(session *models.Principal, params support.GetCallHomeOptionValueParams) (*models.CallHomeGetResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -129,7 +129,7 @@ func getCallHomeRule(ctx context.Context, client MinioAdmin) (*models.CallHomeGe
 }
 
 // editCallHomeOptionResponse returns if there was an error setting the option
-func editCallHomeOptionResponse(session *models.Principal, params support.SetCallHomeStatusParams) *models.Error {
+func editCallHomeOptionResponse(session *models.Principal, params support.SetCallHomeStatusParams) *CodedAPIError {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
diff --git a/restapi/user_version.go b/restapi/user_version.go
index bb1361d33..ff2c2ba05 100644
--- a/restapi/user_version.go
+++ b/restapi/user_version.go
@@ -33,14 +33,14 @@ func registerVersionHandlers(api *operations.ConsoleAPI) {
 	api.SystemCheckMinIOVersionHandler = systemApi.CheckMinIOVersionHandlerFunc(func(params systemApi.CheckMinIOVersionParams) middleware.Responder {
 		versionResponse, err := getVersionResponse(params)
 		if err != nil {
-			return systemApi.NewCheckMinIOVersionDefault(int(err.Code)).WithPayload(err)
+			return systemApi.NewCheckMinIOVersionDefault(err.Code).WithPayload(err.APIError)
 		}
 		return systemApi.NewCheckMinIOVersionOK().WithPayload(versionResponse)
 	})
 }
 
 // getSessionResponse parse the token of the current session and returns a list of allowed actions to render in the UI
-func getVersionResponse(params systemApi.CheckMinIOVersionParams) (*models.CheckVersionResponse, *models.Error) {
+func getVersionResponse(params systemApi.CheckMinIOVersionParams) (*models.CheckVersionResponse, *CodedAPIError) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
diff --git a/sso-integration/sso_test.go b/sso-integration/sso_test.go
index 94441c2a0..7607bd4d7 100644
--- a/sso-integration/sso_test.go
+++ b/sso-integration/sso_test.go
@@ -282,13 +282,13 @@ func TestBadLogin(t *testing.T) {
 	expectedError := response.Status
 	assert.Equal("400 Bad Request", expectedError)
 	bodyBytes, _ := io.ReadAll(response.Body)
-	result2 := models.Error{}
+	result2 := models.APIError{}
 	err = json.Unmarshal(bodyBytes, &result2)
 	if err != nil {
 		log.Println(err)
 		assert.Nil(err)
 	}
-	detailedMessage := *result2.DetailedMessage
+	detailedMessage := result2.DetailedMessage
 	fmt.Println(detailedMessage)
 	assert.Equal("expected 'code' response type - got [], login not allowed", detailedMessage)
 }
diff --git a/swagger.yml b/swagger.yml
index 6a18ea042..ba78796b4 100644
--- a/swagger.yml
+++ b/swagger.yml
@@ -37,7 +37,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       # Exclude this API from the authentication requirement
       security: [ ]
       tags:
@@ -57,7 +57,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       # Exclude this API from the authentication requirement
       security: [ ]
       tags:
@@ -78,7 +78,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       security: [ ]
       tags:
         - Auth
@@ -99,7 +99,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Auth
 
@@ -115,7 +115,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Auth
 
@@ -131,7 +131,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       security: [ ]
       tags:
         - System
@@ -152,7 +152,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Account
 
@@ -172,7 +172,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Account
 
@@ -188,7 +188,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
     post:
@@ -208,7 +208,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -229,7 +229,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
     delete:
@@ -246,7 +246,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -267,7 +267,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
     put:
@@ -289,7 +289,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -334,7 +334,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Object
     delete:
@@ -375,7 +375,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Object
 
@@ -409,7 +409,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Object
 
@@ -435,7 +435,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Object
 
@@ -468,7 +468,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Object
 
@@ -512,7 +512,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Object
 
@@ -545,7 +545,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Object
 
@@ -577,7 +577,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Object
 
@@ -609,7 +609,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Object
     delete:
@@ -634,7 +634,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Object
 
@@ -666,7 +666,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Object
 
@@ -693,7 +693,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Object
 
@@ -718,7 +718,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Object
 
@@ -742,7 +742,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -768,7 +768,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -789,7 +789,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
     put:
@@ -813,7 +813,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -844,7 +844,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
     post:
@@ -866,7 +866,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -894,7 +894,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -916,7 +916,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -938,7 +938,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -959,7 +959,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -984,7 +984,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -1011,7 +1011,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -1034,7 +1034,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -1053,7 +1053,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -1077,7 +1077,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -1098,7 +1098,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
     put:
@@ -1120,7 +1120,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -1141,7 +1141,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -1165,7 +1165,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -1184,7 +1184,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -1205,7 +1205,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -1226,7 +1226,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
     post:
@@ -1248,7 +1248,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -1270,7 +1270,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -1298,7 +1298,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -1320,7 +1320,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -1349,7 +1349,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -1376,7 +1376,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - ServiceAccount
     post:
@@ -1396,7 +1396,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - ServiceAccount
 
@@ -1418,7 +1418,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - ServiceAccount
 
@@ -1437,7 +1437,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - ServiceAccount
 
@@ -1459,7 +1459,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - ServiceAccount
 
@@ -1480,7 +1480,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - ServiceAccount
     put:
@@ -1502,7 +1502,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - ServiceAccount
 
@@ -1529,7 +1529,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - User
     post:
@@ -1549,7 +1549,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - User
 
@@ -1573,7 +1573,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - User
 
@@ -1594,7 +1594,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - User
     put:
@@ -1618,7 +1618,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - User
     delete:
@@ -1635,7 +1635,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - User
 
@@ -1661,7 +1661,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - User
   /user/policy:
@@ -1676,7 +1676,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Policy
   /user/{name}/policies:
@@ -1696,7 +1696,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Policy
   /user/{name}/service-accounts:
@@ -1716,7 +1716,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - User
     post:
@@ -1740,7 +1740,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - User
 
@@ -1766,7 +1766,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - User
 
@@ -1786,7 +1786,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - User
 
@@ -1813,7 +1813,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Group
     post:
@@ -1831,7 +1831,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Group
 
@@ -1852,7 +1852,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Group
     delete:
@@ -1869,7 +1869,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Group
     put:
@@ -1893,7 +1893,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Group
 
@@ -1920,7 +1920,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Policy
     post:
@@ -1940,7 +1940,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Policy
 
@@ -1963,7 +1963,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Policy
 
@@ -1986,7 +1986,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Policy
 
@@ -2017,7 +2017,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -2043,7 +2043,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
     get:
@@ -2072,7 +2072,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
     delete:
@@ -2096,7 +2096,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -2129,7 +2129,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -2150,7 +2150,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Policy
     delete:
@@ -2167,7 +2167,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Policy
 
@@ -2194,7 +2194,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Configuration
 
@@ -2214,7 +2214,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Policy
 
@@ -2234,7 +2234,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Policy
 
@@ -2257,7 +2257,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Configuration
     put:
@@ -2281,7 +2281,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Configuration
 
@@ -2302,7 +2302,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Configuration
 
@@ -2318,7 +2318,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Configuration
   /configs/import:
@@ -2337,7 +2337,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Configuration
   /service/restart:
@@ -2350,7 +2350,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Service
   /profiling/start:
@@ -2371,7 +2371,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Profile
 
@@ -2389,7 +2389,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Profile
   /subnet/registration-token:
@@ -2404,7 +2404,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Subnet
   /subnet/info:
@@ -2419,7 +2419,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Subnet
   /subnet/apikey:
@@ -2439,7 +2439,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Subnet
   /subnet/register:
@@ -2460,7 +2460,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Subnet
 
@@ -2482,7 +2482,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Subnet
 
@@ -2504,7 +2504,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Subnet
 
@@ -2526,7 +2526,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - System
 
@@ -2558,7 +2558,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - System
 
@@ -2574,7 +2574,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - System
 
@@ -2590,7 +2590,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Configuration
     post:
@@ -2610,7 +2610,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Configuration
 
@@ -2626,7 +2626,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - SiteReplication
     post:
@@ -2646,7 +2646,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - SiteReplication
     put:
@@ -2666,7 +2666,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - SiteReplication
     delete:
@@ -2686,7 +2686,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - SiteReplication
 
@@ -2733,7 +2733,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - SiteReplication
 
@@ -2749,7 +2749,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Tiering
     post:
@@ -2767,7 +2767,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Tiering
 
@@ -2797,7 +2797,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Tiering
 
@@ -2830,7 +2830,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Tiering
 
@@ -2848,7 +2848,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - System
 
@@ -2864,7 +2864,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
     post:
@@ -2882,7 +2882,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
 
@@ -2903,7 +2903,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
   /remote-buckets/{source-bucket-name}/{arn}:
@@ -2925,7 +2925,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Bucket
   /logs/search:
@@ -2966,7 +2966,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Logging
 
@@ -2982,7 +2982,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - KMS
   /kms/metrics:
@@ -2997,7 +2997,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - KMS
   /kms/apis:
@@ -3012,7 +3012,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - KMS
   /kms/version:
@@ -3027,7 +3027,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - KMS
   /kms/keys:
@@ -3046,7 +3046,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - KMS
     get:
@@ -3065,7 +3065,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - KMS
   /kms/keys/{name}:
@@ -3086,7 +3086,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - KMS
     delete:
@@ -3104,7 +3104,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - KMS
   /kms/keys/{name}/import:
@@ -3128,7 +3128,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - KMS
   /kms/policies:
@@ -3147,7 +3147,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - KMS
     get:
@@ -3166,7 +3166,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - KMS
   /kms/policies/{name}:
@@ -3187,7 +3187,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - KMS
     delete:
@@ -3205,7 +3205,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - KMS
   /kms/policies/{name}/assign:
@@ -3229,7 +3229,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - KMS
   /kms/policies/{name}/describe:
@@ -3250,7 +3250,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - KMS
   /kms/identities/{name}:
@@ -3269,7 +3269,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - KMS
   /kms/identities/{name}/describe:
@@ -3290,7 +3290,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - KMS
   /kms/describe-self/identity:
@@ -3305,7 +3305,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - KMS
   /kms/identities:
@@ -3325,7 +3325,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - KMS
 
@@ -3357,7 +3357,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Inspect
   /idp/{type}:
@@ -3383,7 +3383,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - idp
     get:
@@ -3403,7 +3403,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - idp
   /idp/{type}/{name}:
@@ -3429,7 +3429,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - idp
     delete:
@@ -3454,7 +3454,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - idp
     put:
@@ -3484,7 +3484,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - idp
 
@@ -3506,7 +3506,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - idp
 
@@ -3540,7 +3540,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - release
 
@@ -3556,7 +3556,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Support
 
@@ -3575,7 +3575,7 @@ paths:
         default:
           description: Generic error response.
           schema:
-            $ref: "#/definitions/error"
+            $ref: "#/definitions/ApiError"
       tags:
         - Support
 
@@ -3794,15 +3794,9 @@ definitions:
         $ref: "#/definitions/setBucketQuota"
       retention:
         $ref: "#/definitions/putBucketRetentionRequest"
-  error:
+  ApiError:
     type: object
-    required:
-      - message
-      - detailedMessage
     properties:
-      code:
-        type: integer
-        format: int32
       message:
         type: string
       detailedMessage:
@@ -4030,7 +4024,7 @@ definitions:
       value:
         type: string
       env_override:
-          $ref: "#/definitions/envOverride"
+        $ref: "#/definitions/envOverride"
   envOverride:
     type: object
     properties:
@@ -4654,7 +4648,7 @@ definitions:
       onlineDrives:
         type: integer
       offlineDrives:
-        type: integer    
+        type: integer
   arnsResponse:
     type: object
     properties: