diff --git a/api/admin/cleanupForLazyDaisy.cfm b/api/admin/cleanupForLazyDaisy.cfm
index d13e03b..196a6f1 100644
--- a/api/admin/cleanupForLazyDaisy.cfm
+++ b/api/admin/cleanupForLazyDaisy.cfm
@@ -13,7 +13,7 @@ try {
     queryExecute("
         UPDATE ServicePoints
         SET BeaconID = NULL, AssignedByUserID = NULL
-        WHERE ServicePointBusinessID != :keepID AND BeaconID IS NOT NULL
+        WHERE BusinessID != :keepID AND BeaconID IS NOT NULL
     ", { keepID: keepBusinessID }, { datasource: "payfrit" });
     response.steps.append("Unassigned beacons from other businesses' service points");
 
@@ -54,7 +54,7 @@ try {
 
     // Delete Hours for other businesses
     queryExecute("
-        DELETE FROM Hours WHERE HoursBusinessID != :keepID
+        DELETE FROM Hours WHERE BusinessID != :keepID
     ", { keepID: keepBusinessID }, { datasource: "payfrit" });
     response.steps.append("Deleted hours from other businesses");
 
@@ -71,7 +71,7 @@ try {
     // Delete ServicePoints for other businesses
     try {
         queryExecute("
-            DELETE FROM ServicePoints WHERE ServicePointBusinessID != :keepID
+            DELETE FROM ServicePoints WHERE BusinessID != :keepID
         ", { keepID: keepBusinessID }, { datasource: "payfrit" });
         response.steps.append("Deleted service points from other businesses");
     } catch (any e) {
@@ -106,11 +106,11 @@ try {
 
     // Get beacon status
     qBeacons = queryExecute("
-        SELECT sp.ID AS ServicePointID, sp.BeaconID, sp.ServicePointBusinessID AS BusinessID,
-               b.UUID, biz.Name AS BusinessName, sp.ServicePointName AS ServicePointName
+        SELECT sp.ID AS ServicePointID, sp.BeaconID, sp.BusinessID AS BusinessID,
+               b.UUID, biz.Name AS BusinessName, sp.Name AS ServicePointName
         FROM ServicePoints sp
         JOIN Beacons b ON b.ID = sp.BeaconID
-        JOIN Businesses biz ON biz.ID = sp.ServicePointBusinessID
+        JOIN Businesses biz ON biz.ID = sp.BusinessID
         WHERE sp.BeaconID IS NOT NULL
     ", {}, { datasource: "payfrit" });
 
diff --git a/api/admin/debugUserByPhone.cfm b/api/admin/debugUserByPhone.cfm
index 65f70e9..2832190 100644
--- a/api/admin/debugUserByPhone.cfm
+++ b/api/admin/debugUserByPhone.cfm
@@ -20,10 +20,10 @@ if (len(phone) == 0) {
 
 // Find user by phone
 qUser = queryExecute("
-  SELECT UserID AS ID, UserFirstName AS FirstName, UserLastName AS LastName, UserEmailAddress AS EmailAddress, UserContactNumber AS ContactNumber
+  SELECT ID, FirstName, LastName, EmailAddress, ContactNumber
   FROM Users
-  WHERE REPLACE(REPLACE(REPLACE(UserContactNumber, '-', ''), '(', ''), ')', '') LIKE ?
-     OR UserContactNumber LIKE ?
+  WHERE REPLACE(REPLACE(REPLACE(ContactNumber, '-', ''), '(', ''), ')', '') LIKE ?
+     OR ContactNumber LIKE ?
 ", [
   { value: "%" & phone & "%", cfsqltype: "cf_sql_varchar" },
   { value: "%" & phone & "%", cfsqltype: "cf_sql_varchar" }
diff --git a/api/admin/setupBigDeansInfo.cfm b/api/admin/setupBigDeansInfo.cfm
index 4c90206..b070bfd 100644
--- a/api/admin/setupBigDeansInfo.cfm
+++ b/api/admin/setupBigDeansInfo.cfm
@@ -53,7 +53,7 @@ try {
 
     // Check existing hours for this business
     existingHours = queryExecute("
-        SELECT COUNT(*) as cnt FROM Hours WHERE HoursBusinessID = :bizId
+        SELECT COUNT(*) as cnt FROM Hours WHERE BusinessID = :bizId
     ", { bizId: businessId });
 
     if (existingHours.cnt == 0) {
@@ -64,33 +64,33 @@ try {
         // Sun: 11am-10pm (day 1)
 
         // Sunday (1): 11am-10pm
-        queryExecute("INSERT INTO Hours (HoursBusinessID, HoursDayID, HoursOpenTime, HoursClosingTime) VALUES (:bizId, 1, '11:00:00', '22:00:00')", { bizId: businessId });
+        queryExecute("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 1, '11:00:00', '22:00:00')", { bizId: businessId });
 
         // Monday (2): 11am-10pm
-        queryExecute("INSERT INTO Hours (HoursBusinessID, HoursDayID, HoursOpenTime, HoursClosingTime) VALUES (:bizId, 2, '11:00:00', '22:00:00')", { bizId: businessId });
+        queryExecute("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 2, '11:00:00', '22:00:00')", { bizId: businessId });
 
         // Tuesday (3): 11am-10pm
-        queryExecute("INSERT INTO Hours (HoursBusinessID, HoursDayID, HoursOpenTime, HoursClosingTime) VALUES (:bizId, 3, '11:00:00', '22:00:00')", { bizId: businessId });
+        queryExecute("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 3, '11:00:00', '22:00:00')", { bizId: businessId });
 
         // Wednesday (4): 11am-10pm
-        queryExecute("INSERT INTO Hours (HoursBusinessID, HoursDayID, HoursOpenTime, HoursClosingTime) VALUES (:bizId, 4, '11:00:00', '22:00:00')", { bizId: businessId });
+        queryExecute("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 4, '11:00:00', '22:00:00')", { bizId: businessId });
 
         // Thursday (5): 11am-10pm
-        queryExecute("INSERT INTO Hours (HoursBusinessID, HoursDayID, HoursOpenTime, HoursClosingTime) VALUES (:bizId, 5, '11:00:00', '22:00:00')", { bizId: businessId });
+        queryExecute("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 5, '11:00:00', '22:00:00')", { bizId: businessId });
 
         // Friday (6): 11am-11pm
-        queryExecute("INSERT INTO Hours (HoursBusinessID, HoursDayID, HoursOpenTime, HoursClosingTime) VALUES (:bizId, 6, '11:00:00', '23:00:00')", { bizId: businessId });
+        queryExecute("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 6, '11:00:00', '23:00:00')", { bizId: businessId });
 
         // Saturday (7): 11am-11pm
-        queryExecute("INSERT INTO Hours (HoursBusinessID, HoursDayID, HoursOpenTime, HoursClosingTime) VALUES (:bizId, 7, '11:00:00', '23:00:00')", { bizId: businessId });
+        queryExecute("INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime) VALUES (:bizId, 7, '11:00:00', '23:00:00')", { bizId: businessId });
 
         response["HOURS_ACTION"] = "inserted 7 days";
     } else {
         // Update existing hours
         // Mon-Thu: 11am-10pm
-        queryExecute("UPDATE Hours SET HoursOpenTime = '11:00:00', HoursClosingTime = '22:00:00' WHERE HoursBusinessID = :bizId AND HoursDayID IN (1, 2, 3, 4, 5)", { bizId: businessId });
+        queryExecute("UPDATE Hours SET OpenTime = '11:00:00', ClosingTime = '22:00:00' WHERE BusinessID = :bizId AND DayID IN (1, 2, 3, 4, 5)", { bizId: businessId });
         // Fri-Sat: 11am-11pm
-        queryExecute("UPDATE Hours SET HoursOpenTime = '11:00:00', HoursClosingTime = '23:00:00' WHERE HoursBusinessID = :bizId AND HoursDayID IN (6, 7)", { bizId: businessId });
+        queryExecute("UPDATE Hours SET OpenTime = '11:00:00', ClosingTime = '23:00:00' WHERE BusinessID = :bizId AND DayID IN (6, 7)", { bizId: businessId });
         response["HOURS_ACTION"] = "updated";
     }
 
@@ -114,11 +114,11 @@ try {
     ", { bizId: businessId });
 
     hours = queryExecute("
-        SELECT h.*, d.tt_DayName
+        SELECT h.*, d.Name AS DayName
         FROM Hours h
-        JOIN tt_Days d ON d.tt_DayID = h.HoursDayID
-        WHERE h.HoursBusinessID = :bizId
-        ORDER BY h.HoursDayID
+        JOIN tt_Days d ON d.ID = h.DayID
+        WHERE h.BusinessID = :bizId
+        ORDER BY h.DayID
     ", { bizId: businessId });
 
     response["OK"] = true;
@@ -133,9 +133,9 @@ try {
     hoursArr = [];
     for (h in hours) {
         arrayAppend(hoursArr, {
-            "day": h.tt_DayName,
-            "open": timeFormat(h.HoursOpenTime, "h:mm tt"),
-            "close": timeFormat(h.HoursClosingTime, "h:mm tt")
+            "day": h.DayName,
+            "open": timeFormat(h.OpenTime, "h:mm tt"),
+            "close": timeFormat(h.ClosingTime, "h:mm tt")
         });
     }
     response["HOURS"] = hoursArr;
diff --git a/api/admin/switchBeacons.cfm b/api/admin/switchBeacons.cfm
index 52462a1..eb54e03 100644
--- a/api/admin/switchBeacons.cfm
+++ b/api/admin/switchBeacons.cfm
@@ -25,17 +25,17 @@ queryExecute("
 queryExecute("
     UPDATE ServicePoints
     SET BeaconID = NULL, AssignedByUserID = NULL
-    WHERE ServicePointBusinessID = :fromBiz AND BeaconID IS NOT NULL
+    WHERE BusinessID = :fromBiz AND BeaconID IS NOT NULL
 ", { fromBiz: fromBiz }, { datasource: "payfrit" });
 
 // Get current state
 q = queryExecute("
-    SELECT sp.ID AS ServicePointID, sp.BeaconID, sp.ServicePointBusinessID AS BusinessID,
+    SELECT sp.ID AS ServicePointID, sp.BeaconID, sp.BusinessID AS BusinessID,
            b.Name AS BeaconName, biz.Name AS BusinessName,
-           sp.ServicePointName AS ServicePointName
+           sp.Name AS ServicePointName
     FROM ServicePoints sp
     JOIN Beacons b ON b.ID = sp.BeaconID
-    JOIN Businesses biz ON biz.ID = sp.ServicePointBusinessID
+    JOIN Businesses biz ON biz.ID = sp.BusinessID
     WHERE sp.BeaconID IS NOT NULL
 ", {}, { datasource: "payfrit" });
 
diff --git a/api/admin/updateBeaconMapping.cfm b/api/admin/updateBeaconMapping.cfm
index 7950506..5c5221a 100644
--- a/api/admin/updateBeaconMapping.cfm
+++ b/api/admin/updateBeaconMapping.cfm
@@ -25,7 +25,7 @@ queryExecute("
 queryExecute("
     UPDATE ServicePoints
     SET BeaconID = NULL, AssignedByUserID = NULL
-    WHERE BeaconID = :beaconId AND ServicePointBusinessID = :oldBizId
+    WHERE BeaconID = :beaconId AND BusinessID = :oldBizId
 ", { beaconId: beaconId, oldBizId: oldBusinessId }, { datasource: "payfrit" });
 
 // Get current state
@@ -36,8 +36,8 @@ q = queryExecute("
         b.Name AS BeaconName,
         b.BusinessID AS BeaconBusinessID,
         sp.ID AS ServicePointID,
-        sp.ServicePointName AS ServicePointName,
-        sp.ServicePointBusinessID AS ServicePointBusinessID,
+        sp.Name AS ServicePointName,
+        sp.BusinessID AS ServicePointBusinessID,
         biz.Name AS BusinessName
     FROM Beacons b
     LEFT JOIN ServicePoints sp ON sp.BeaconID = b.ID
diff --git a/api/assignments/save.cfm b/api/assignments/save.cfm
index 4b06c1e..735db83 100644
--- a/api/assignments/save.cfm
+++ b/api/assignments/save.cfm
@@ -48,7 +48,7 @@ ServicePointID = int(data.ServicePointID);
 <!--- Validate Beacon is allowed for this Business:
       Owner (Beacons.BusinessID) OR join table (lt_BeaconsID_BusinessesID) OR parent's owner --->
 <cfquery name="qBiz" datasource="payfrit">
-  SELECT ID, BusinessParentBusinessID AS ParentBusinessID
+  SELECT ID, ParentBusinessID
   FROM Businesses
   WHERE ID = <cfqueryparam cfsqltype="cf_sql_integer" value="#request.BusinessID#">
   LIMIT 1
diff --git a/api/businesses/updateHours.cfm b/api/businesses/updateHours.cfm
index e11b322..ffb6fcc 100644
--- a/api/businesses/updateHours.cfm
+++ b/api/businesses/updateHours.cfm
@@ -38,7 +38,7 @@ try {
 
     // Delete all existing hours for this business
     queryExecute("
-        DELETE FROM Hours WHERE HoursBusinessID = :bizID
+        DELETE FROM Hours WHERE BusinessID = :bizID
     ", { bizID: businessId }, { datasource: "payfrit" });
 
     // Insert new hours
@@ -55,7 +55,7 @@ try {
             if (len(closeTime) == 5) closeTime = closeTime & ":00";
 
             queryExecute("
-                INSERT INTO Hours (HoursBusinessID, HoursDayID, HoursOpenTime, HoursClosingTime)
+                INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime)
                 VALUES (:bizID, :dayID, :openTime, :closeTime)
             ", {
                 bizID: businessId,
diff --git a/api/orders/getCart.cfm b/api/orders/getCart.cfm
index 5d1f522..10f5094 100644
--- a/api/orders/getCart.cfm
+++ b/api/orders/getCart.cfm
@@ -41,7 +41,7 @@
         UUID,
         UserID,
         BusinessID,
-        BusinessDeliveryMultiplier,
+        DeliveryMultiplier,
         OrderTypeID,
         DeliveryFee,
         StatusID,
@@ -130,7 +130,7 @@
       "UUID": qOrder.UUID ?: "",
       "UserID": val(qOrder.UserID),
       "BusinessID": val(qOrder.BusinessID),
-      "DeliveryMultiplier": val(qOrder.BusinessDeliveryMultiplier),
+      "DeliveryMultiplier": val(qOrder.DeliveryMultiplier),
       "OrderTypeID": val(qOrder.OrderTypeID),
       "DeliveryFee": val(qOrder.DeliveryFee),
       "BusinessDeliveryFee": val(businessDeliveryFee),
diff --git a/api/orders/getOrCreateCart.cfm b/api/orders/getOrCreateCart.cfm
index 7d88668..dfea049 100644
--- a/api/orders/getOrCreateCart.cfm
+++ b/api/orders/getOrCreateCart.cfm
@@ -37,7 +37,7 @@
         UUID,
         UserID,
         BusinessID,
-        BusinessDeliveryMultiplier,
+        DeliveryMultiplier,
         OrderTypeID,
         DeliveryFee,
         StatusID,
@@ -73,7 +73,7 @@
     "UUID": qOrder.UUID ?: "",
     "UserID": val(qOrder.UserID),
     "BusinessID": val(qOrder.BusinessID),
-    "DeliveryMultiplier": val(qOrder.BusinessDeliveryMultiplier),
+    "DeliveryMultiplier": val(qOrder.DeliveryMultiplier),
     "OrderTypeID": val(qOrder.OrderTypeID),
     "DeliveryFee": val(qOrder.DeliveryFee),
     "BusinessDeliveryFee": val(businessDeliveryFee),
@@ -266,7 +266,7 @@
         UUID,
         UserID,
         BusinessID,
-        BusinessDeliveryMultiplier,
+        DeliveryMultiplier,
         OrderTypeID,
         DeliveryFee,
         StatusID,
diff --git a/api/orders/setLineItem.cfm b/api/orders/setLineItem.cfm
index 6437bf7..3af7d76 100644
--- a/api/orders/setLineItem.cfm
+++ b/api/orders/setLineItem.cfm
@@ -180,7 +180,7 @@
         o.UUID,
         o.UserID,
         o.BusinessID,
-        o.BusinessDeliveryMultiplier,
+        o.DeliveryMultiplier,
         o.OrderTypeID,
         o.DeliveryFee,
         o.StatusID,
@@ -210,7 +210,7 @@
     "UUID": qOrder.UUID ?: "",
     "UserID": val(qOrder.UserID),
     "BusinessID": val(qOrder.BusinessID),
-    "DeliveryMultiplier": val(qOrder.BusinessDeliveryMultiplier),
+    "DeliveryMultiplier": val(qOrder.DeliveryMultiplier),
     "OrderTypeID": val(qOrder.OrderTypeID),
     "DeliveryFee": val(qOrder.DeliveryFee),
     "StatusID": val(qOrder.StatusID),
diff --git a/api/orders/setOrderType.cfm b/api/orders/setOrderType.cfm
index f0e1150..0d6d420 100644
--- a/api/orders/setOrderType.cfm
+++ b/api/orders/setOrderType.cfm
@@ -37,7 +37,7 @@
         UUID,
         UserID,
         BusinessID,
-        BusinessDeliveryMultiplier,
+        DeliveryMultiplier,
         OrderTypeID,
         DeliveryFee,
         StatusID,
@@ -73,7 +73,7 @@
     "UUID": qOrder.UUID ?: "",
     "UserID": val(qOrder.UserID),
     "BusinessID": val(qOrder.BusinessID),
-    "DeliveryMultiplier": val(qOrder.BusinessDeliveryMultiplier),
+    "DeliveryMultiplier": val(qOrder.DeliveryMultiplier),
     "OrderTypeID": val(qOrder.OrderTypeID),
     "DeliveryFee": val(qOrder.DeliveryFee),
     "BusinessDeliveryFee": val(businessDeliveryFee),
diff --git a/api/orders/submit.cfm b/api/orders/submit.cfm
index 1422c88..1b010b1 100644
--- a/api/orders/submit.cfm
+++ b/api/orders/submit.cfm
@@ -141,9 +141,9 @@
   <cfset qOrder = queryExecute(
     "
       SELECT o.ID, o.StatusID, o.OrderTypeID, o.BusinessID, o.ServicePointID,
-             sp.ServicePointName AS Name
+             sp.Name AS Name
       FROM Orders o
-      LEFT JOIN ServicePoints sp ON sp.ServicePointID = o.ServicePointID
+      LEFT JOIN ServicePoints sp ON sp.ID = o.ServicePointID
       WHERE o.ID = ?
       LIMIT 1
     ",
diff --git a/api/orders/updateStatus.cfm b/api/orders/updateStatus.cfm
index 7ff73d1..31a06cd 100644
--- a/api/orders/updateStatus.cfm
+++ b/api/orders/updateStatus.cfm
@@ -38,9 +38,9 @@
   <!--- Verify order exists and get details --->
   <cfset qOrder = queryExecute("
     SELECT o.ID, o.StatusID, o.BusinessID, o.ServicePointID,
-           sp.ServicePointName AS Name
+           sp.Name AS Name
     FROM Orders o
-    LEFT JOIN ServicePoints sp ON sp.ServicePointID = o.ServicePointID
+    LEFT JOIN ServicePoints sp ON sp.ID = o.ServicePointID
     WHERE o.ID = ?
     LIMIT 1
   ", [ { value = OrderID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
diff --git a/api/portal/getSettings.cfm b/api/portal/getSettings.cfm
index 095b061..b128375 100644
--- a/api/portal/getSettings.cfm
+++ b/api/portal/getSettings.cfm
@@ -60,7 +60,7 @@ try {
 
     // Get owner email from Users table
     qUser = queryExecute("
-        SELECT UserContactNumber AS ContactNumber, UserEmailAddress AS EmailAddress
+        SELECT ContactNumber, EmailAddress
         FROM Users
         WHERE ID = (SELECT UserID FROM Businesses WHERE ID = :businessId)
         LIMIT 1
diff --git a/api/servicepoints/delete.cfm b/api/servicepoints/delete.cfm
index 2b2c8e2..8572d7c 100644
--- a/api/servicepoints/delete.cfm
+++ b/api/servicepoints/delete.cfm
@@ -50,7 +50,7 @@ servicePointId = int(data.ServicePointID);
 <cfquery datasource="payfrit">
   UPDATE ServicePoints
   SET IsActive = 0
-  WHERE ServicePointID = <cfqueryparam cfsqltype="cf_sql_integer" value="#servicePointId#">
+  WHERE ID = <cfqueryparam cfsqltype="cf_sql_integer" value="#servicePointId#">
     AND BusinessID = <cfqueryparam cfsqltype="cf_sql_integer" value="#bizId#">
 </cfquery>
 
diff --git a/api/servicepoints/save.cfm b/api/servicepoints/save.cfm
index ebf8069..4a49ce2 100644
--- a/api/servicepoints/save.cfm
+++ b/api/servicepoints/save.cfm
@@ -66,7 +66,7 @@ if (structKeyExists(data, "IsActive")) {
       TypeID   = <cfqueryparam cfsqltype="cf_sql_integer" value="#spTypeID#">,
       IsActive = <cfqueryparam cfsqltype="cf_sql_tinyint" value="#isActive#">,
       SortOrder            = <cfqueryparam cfsqltype="cf_sql_integer" value="#sortOrder#">
-    WHERE ServicePointID = <cfqueryparam cfsqltype="cf_sql_integer" value="#servicePointId#">
+    WHERE ID = <cfqueryparam cfsqltype="cf_sql_integer" value="#servicePointId#">
       AND BusinessID = <cfqueryparam cfsqltype="cf_sql_integer" value="#request.BusinessID#">
   </cfquery>
 
diff --git a/api/setup/saveWizard.cfm b/api/setup/saveWizard.cfm
index 478f59a..e40f8a9 100644
--- a/api/setup/saveWizard.cfm
+++ b/api/setup/saveWizard.cfm
@@ -173,7 +173,7 @@ try {
 
                 // Insert hours record for this day
                 queryExecute("
-                    INSERT INTO Hours (HoursBusinessID, HoursDayID, HoursOpenTime, HoursClosingTime)
+                    INSERT INTO Hours (BusinessID, DayID, OpenTime, ClosingTime)
                     VALUES (:bizID, :dayID, :openTime, :closeTime)
                 ", {
                     bizID: businessId,
@@ -319,9 +319,9 @@ try {
         // Validate menu hours fall within business operating hours
         if (len(menuStartTime) && len(menuEndTime)) {
             qHours = queryExecute("
-                SELECT MIN(HoursOpenTime) as earliestOpen, MAX(HoursClosingTime) as latestClose
+                SELECT MIN(OpenTime) as earliestOpen, MAX(ClosingTime) as latestClose
                 FROM Hours
-                WHERE HoursBusinessID = :bizID
+                WHERE BusinessID = :bizID
             ", { bizID: businessId }, { datasource: "payfrit" });
 
             if (qHours.recordCount > 0 && !isNull(qHours.earliestOpen) && !isNull(qHours.latestClose)) {