diff --git a/packages/protos/io/restorecommerce/fulfillment.proto b/packages/protos/io/restorecommerce/fulfillment.proto
index 2b0aaa43..3be744c4 100644
--- a/packages/protos/io/restorecommerce/fulfillment.proto
+++ b/packages/protos/io/restorecommerce/fulfillment.proto
@@ -90,14 +90,14 @@ service FulfillmentService {
 }
 
 enum State {
-  FAILED = 0;
+  PENDING = 0;
   INVALID = 1;
-  CREATED = 2;
-  SUBMITTED = 3;
-  IN_TRANSIT = 4;
-  FULFILLED = 5;
-  WITHDRAWN = 6;
-  CANCELLED = 7;
+  SUBMITTED = 2;
+  IN_TRANSIT = 3;
+  COMPLETED = 4;
+  WITHDRAWN = 5;
+  CANCELLED = 6;
+  FAILED = 7;
 }
 
 message Item {
diff --git a/packages/protos/io/restorecommerce/order.proto b/packages/protos/io/restorecommerce/order.proto
index 61635f97..9d2ced5b 100644
--- a/packages/protos/io/restorecommerce/order.proto
+++ b/packages/protos/io/restorecommerce/order.proto
@@ -21,6 +21,7 @@ import "io/restorecommerce/invoice.proto";
 import "io/restorecommerce/user.proto";
 import "io/restorecommerce/customer.proto";
 import "io/restorecommerce/shop.proto";
+import "io/restorecommerce/product.proto";
 
 
 service OrderService {
@@ -50,14 +51,13 @@ service OrderService {
 }
 
 enum OrderState {
-  FAILED = 0;
+  PENDING = 0;
   INVALID = 1;
-  CREATED = 2;
-  SUBMITTED = 3;
-  IN_PROCESS = 4;
-  DONE = 5;
-  WITHDRAWN = 6;
-  CANCELLED = 7;
+  SUBMITTED = 2;
+  COMPLETED = 3;
+  WITHDRAWN = 4;
+  CANCELLED = 5;
+  FAILED = 6;
 }
 
 enum FulfillmentInvoiceMode {