diff --git a/api/orders/getActiveCart.cfm b/api/orders/getActiveCart.cfm
index d026bf0..a9800ad 100644
--- a/api/orders/getActiveCart.cfm
+++ b/api/orders/getActiveCart.cfm
@@ -72,9 +72,9 @@ try {
         response["HAS_CART"] = true;
         response["CART"] = {
             "OrderID": val(qCart.ID),
-            "UUID": qCart.UUID ?: "",
+            "OrderUUID": qCart.UUID ?: "",
             "BusinessID": val(qCart.BusinessID),
-            "Name": len(trim(qCart.BusinessName)) ? qCart.BusinessName : "",
+            "BusinessName": len(trim(qCart.BusinessName)) ? qCart.BusinessName : "",
             "OrderTypes": orderTypesArray,
             "OrderTypeID": val(qCart.OrderTypeID),
             "OrderTypeName": orderTypeName,
diff --git a/api/orders/history.cfm b/api/orders/history.cfm
index bfd00a5..0333a47 100644
--- a/api/orders/history.cfm
+++ b/api/orders/history.cfm
@@ -73,10 +73,15 @@ try {
       o.AddedOn,
       o.LastEditedOn,
       b.Name AS BusinessName,
-      COALESCE(ot.tt_OrderTypeName, 'Unknown') as OrderTypeName
+      CASE o.OrderTypeID
+        WHEN 0 THEN 'Undecided'
+        WHEN 1 THEN 'Dine-In'
+        WHEN 2 THEN 'Takeaway'
+        WHEN 3 THEN 'Delivery'
+        ELSE 'Unknown'
+      END AS OrderTypeName
     FROM Orders o
     LEFT JOIN Businesses b ON b.ID = o.BusinessID
-    LEFT JOIN tt_OrderTypes ot ON ot.tt_OrderTypeID = o.OrderTypeID
     WHERE o.UserID = :userId
       AND o.StatusID > 0
     ORDER BY o.AddedOn DESC
@@ -142,11 +147,11 @@ try {
 
     arrayAppend(orders, {
       "OrderID": val(row.ID),
-      "UUID": row.UUID ?: "",
+      "OrderUUID": row.UUID ?: "",
       "BusinessID": val(row.BusinessID),
-      "Name": row.BusinessName ?: "Unknown",
+      "BusinessName": row.BusinessName ?: "Unknown",
       "OrderTotal": round(val(total) * 100) / 100,
-      "StatusID": val(row.StatusID),
+      "OrderStatusID": val(row.StatusID),
       "StatusName": statusText,
       "OrderTypeID": val(row.OrderTypeID),
       "TypeName": row.OrderTypeName ?: "Unknown",