diff --git a/schema.graphql b/schema.graphql
index f224588be..44b386496 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -2415,6 +2415,29 @@ type Invoice implements ObjectWithMetadata & Job & Node {
   url: String
 }
 
+type InvoiceCreate {
+  errors: [Error!]!
+    @deprecated(
+      reason: "Use typed errors with error codes. This field will be removed after 2020-07-31."
+    )
+  invoiceErrors: [InvoiceError!]!
+  invoice: Invoice
+}
+
+input InvoiceCreateInput {
+  number: String!
+  url: String!
+}
+
+type InvoiceDelete {
+  errors: [Error!]!
+    @deprecated(
+      reason: "Use typed errors with error codes. This field will be removed after 2020-07-31."
+    )
+  invoiceErrors: [InvoiceError!]!
+  invoice: Invoice
+}
+
 type InvoiceError {
   field: String
   message: String
@@ -2431,6 +2454,42 @@ enum InvoiceErrorCode {
   INVALID_STATUS
 }
 
+type InvoiceRequest {
+  errors: [Error!]!
+    @deprecated(
+      reason: "Use typed errors with error codes. This field will be removed after 2020-07-31."
+    )
+  invoiceErrors: [InvoiceError!]!
+  invoice: Invoice
+}
+
+type InvoiceRequestDelete {
+  errors: [Error!]!
+    @deprecated(
+      reason: "Use typed errors with error codes. This field will be removed after 2020-07-31."
+    )
+  invoiceErrors: [InvoiceError!]!
+  invoice: Invoice
+}
+
+type InvoiceSendEmail {
+  errors: [Error!]!
+    @deprecated(
+      reason: "Use typed errors with error codes. This field will be removed after 2020-07-31."
+    )
+  invoiceErrors: [InvoiceError!]!
+  invoice: Invoice
+}
+
+type InvoiceUpdate {
+  errors: [Error!]!
+    @deprecated(
+      reason: "Use typed errors with error codes. This field will be removed after 2020-07-31."
+    )
+  invoiceErrors: [InvoiceError!]!
+  invoice: Invoice
+}
+
 scalar JSONString
 
 interface Job {
@@ -3231,12 +3290,12 @@ type Mutation {
     languageCode: LanguageCodeEnum!
   ): MenuItemTranslate
   menuItemMove(menu: ID!, moves: [MenuItemMoveInput]!): MenuItemMove
-  requestInvoice(number: String, orderId: ID!): RequestInvoice
-  requestDeleteInvoice(id: ID!): RequestDeleteInvoice
-  createInvoice(input: CreateInvoiceInput!, orderId: ID!): CreateInvoice
-  deleteInvoice(id: ID!): DeleteInvoice
-  updateInvoice(id: ID!, input: UpdateInvoiceInput!): UpdateInvoice
-  sendInvoiceEmail(id: ID!): SendInvoiceEmail
+  invoiceRequest(number: String, orderId: ID!): InvoiceRequest
+  invoiceRequestDelete(id: ID!): InvoiceRequestDelete
+  invoiceCreate(input: InvoiceCreateInput!, orderId: ID!): InvoiceCreate
+  invoiceDelete(id: ID!): InvoiceDelete
+  invoiceUpdate(id: ID!, input: UpdateInvoiceInput!): InvoiceUpdate
+  invoiceSendEmail(id: ID!): InvoiceSendEmail
   giftCardActivate(id: ID!): GiftCardActivate
   giftCardCreate(input: GiftCardCreateInput!): GiftCardCreate
   giftCardDeactivate(id: ID!): GiftCardDeactivate
diff --git a/src/orders/mutations.ts b/src/orders/mutations.ts
index 8a5011d0d..c9f3306b0 100644
--- a/src/orders/mutations.ts
+++ b/src/orders/mutations.ts
@@ -464,7 +464,7 @@ const invoiceRequestMutation = gql`
   ${invoiceErrorFragment}
   ${fragmentInvoice}
   mutation InvoiceRequest($orderId: ID!) {
-    requestInvoice(orderId: $orderId) {
+    invoiceRequest(orderId: $orderId) {
       errors: invoiceErrors {
         ...InvoiceErrorFragment
       }
@@ -483,7 +483,7 @@ const invoiceEmailSendMutation = gql`
   ${invoiceErrorFragment}
   ${fragmentInvoice}
   mutation InvoiceEmailSend($id: ID!) {
-    sendInvoiceEmail(id: $id) {
+    invoiceSendEmail(id: $id) {
       errors: invoiceErrors {
         ...InvoiceErrorFragment
       }
diff --git a/src/orders/types/InvoiceEmailSend.ts b/src/orders/types/InvoiceEmailSend.ts
index 68c773998..6406ed5c0 100644
--- a/src/orders/types/InvoiceEmailSend.ts
+++ b/src/orders/types/InvoiceEmailSend.ts
@@ -8,13 +8,13 @@ import { InvoiceErrorCode, JobStatusEnum } from "./../../types/globalTypes";
 // GraphQL mutation operation: InvoiceEmailSend
 // ====================================================
 
-export interface InvoiceEmailSend_sendInvoiceEmail_errors {
+export interface InvoiceEmailSend_invoiceSendEmail_errors {
   __typename: "InvoiceError";
   code: InvoiceErrorCode;
   field: string | null;
 }
 
-export interface InvoiceEmailSend_sendInvoiceEmail_invoice {
+export interface InvoiceEmailSend_invoiceSendEmail_invoice {
   __typename: "Invoice";
   id: string;
   number: string | null;
@@ -23,14 +23,14 @@ export interface InvoiceEmailSend_sendInvoiceEmail_invoice {
   status: JobStatusEnum;
 }
 
-export interface InvoiceEmailSend_sendInvoiceEmail {
-  __typename: "SendInvoiceEmail";
-  errors: InvoiceEmailSend_sendInvoiceEmail_errors[];
-  invoice: InvoiceEmailSend_sendInvoiceEmail_invoice | null;
+export interface InvoiceEmailSend_invoiceSendEmail {
+  __typename: "InvoiceSendEmail";
+  errors: InvoiceEmailSend_invoiceSendEmail_errors[];
+  invoice: InvoiceEmailSend_invoiceSendEmail_invoice | null;
 }
 
 export interface InvoiceEmailSend {
-  sendInvoiceEmail: InvoiceEmailSend_sendInvoiceEmail | null;
+  invoiceSendEmail: InvoiceEmailSend_invoiceSendEmail | null;
 }
 
 export interface InvoiceEmailSendVariables {
diff --git a/src/orders/types/InvoiceRequest.ts b/src/orders/types/InvoiceRequest.ts
index 62befd0fc..6cf106997 100644
--- a/src/orders/types/InvoiceRequest.ts
+++ b/src/orders/types/InvoiceRequest.ts
@@ -8,13 +8,13 @@ import { InvoiceErrorCode, JobStatusEnum } from "./../../types/globalTypes";
 // GraphQL mutation operation: InvoiceRequest
 // ====================================================
 
-export interface InvoiceRequest_requestInvoice_errors {
+export interface InvoiceRequest_invoiceRequest_errors {
   __typename: "InvoiceError";
   code: InvoiceErrorCode;
   field: string | null;
 }
 
-export interface InvoiceRequest_requestInvoice_invoice {
+export interface InvoiceRequest_invoiceRequest_invoice {
   __typename: "Invoice";
   id: string;
   number: string | null;
@@ -23,14 +23,14 @@ export interface InvoiceRequest_requestInvoice_invoice {
   status: JobStatusEnum;
 }
 
-export interface InvoiceRequest_requestInvoice {
-  __typename: "RequestInvoice";
-  errors: InvoiceRequest_requestInvoice_errors[];
-  invoice: InvoiceRequest_requestInvoice_invoice | null;
+export interface InvoiceRequest_invoiceRequest {
+  __typename: "InvoiceRequest";
+  errors: InvoiceRequest_invoiceRequest_errors[];
+  invoice: InvoiceRequest_invoiceRequest_invoice | null;
 }
 
 export interface InvoiceRequest {
-  requestInvoice: InvoiceRequest_requestInvoice | null;
+  invoiceRequest: InvoiceRequest_invoiceRequest | null;
 }
 
 export interface InvoiceRequestVariables {
diff --git a/src/orders/views/OrderDetails/OrderDetailsMessages.tsx b/src/orders/views/OrderDetails/OrderDetailsMessages.tsx
index 8c8c09a38..55617e370 100644
--- a/src/orders/views/OrderDetails/OrderDetailsMessages.tsx
+++ b/src/orders/views/OrderDetails/OrderDetailsMessages.tsx
@@ -256,7 +256,7 @@ export const OrderDetailsMessages: React.FC<OrderDetailsMessages> = ({
     }
   };
   const handleInvoiceGeneratePending = (data: InvoiceRequest) => {
-    const errs = data.requestInvoice?.errors;
+    const errs = data.invoiceRequest?.errors;
     if (errs.length === 0) {
       pushMessage({
         text: intl.formatMessage({
@@ -271,7 +271,7 @@ export const OrderDetailsMessages: React.FC<OrderDetailsMessages> = ({
     }
   };
   const handleInvoiceSend = (data: InvoiceEmailSend) => {
-    const errs = data.sendInvoiceEmail?.errors;
+    const errs = data.invoiceSendEmail?.errors;
     if (errs.length === 0) {
       pushMessage({
         text: intl.formatMessage({
diff --git a/src/orders/views/OrderDetails/index.tsx b/src/orders/views/OrderDetails/index.tsx
index e6f020422..c6c8efe00 100644
--- a/src/orders/views/OrderDetails/index.tsx
+++ b/src/orders/views/OrderDetails/index.tsx
@@ -379,7 +379,7 @@ export const OrderDetails: React.FC<OrderDetailsProps> = ({ id, params }) => {
                         <OrderInvoiceEmailSendDialog
                           confirmButtonState={orderInvoiceSend.opts.status}
                           errors={
-                            orderInvoiceSend.opts.data?.sendInvoiceEmail
+                            orderInvoiceSend.opts.data?.invoiceSendEmail
                               .errors || []
                           }
                           open={params.action === "invoice-send"}