diff --git a/server/routes/photos.js b/server/routes/photos.js
index 7a3bb95..4dd0428 100755
--- a/server/routes/photos.js
+++ b/server/routes/photos.js
@@ -433,8 +433,8 @@ const deletePhoto = function(photo) {
             console.log(`Deleting faces: ${JSON.stringify(ids, null, 2)}`);
             return photoDB.sequelize.query(
               "DELETE FROM facedistances " +
-              "WHERE face1Id IN (:ids) " +
-              "OR face2Id IN (:ids)", {
+              "WHERE descriptor1Id IN (:ids) " +
+              "OR descriptor2Id IN (:ids)", {
               replacements: { ids },
               transaction: transaction
             }).then(() => {
@@ -553,7 +553,7 @@ router.delete("/:id?", function(req, res/*, next*/) {
     }).then((faces) => {
       const faceIds = faces.map(face => face.id);
       return photoDB.sequelize.query(
-        "DELETE FROM facedistances WHERE face1Id IN (:ids) OR face2Id IN (:ids)", {
+        "DELETE FROM facedistances WHERE descriptor1Id IN (:ids) OR descriptor2Id IN (:ids)", {
         replacements: {
           ids: faceIds
         }
@@ -911,12 +911,12 @@ function getFacesForPhoto(id) {
   }).then((faces) => {
     /* For each face in the photo, get the related faces */
     return photoDB.sequelize.query(
-      "SELECT relatedFaces.photoId AS photoId,fd.face1Id,fd.face2Id,fd.distance,relatedFaces.faceConfidence " +
+      "SELECT relatedFaces.photoId AS photoId,fd.descriptor1Id,fd.descriptor2Id,fd.distance,relatedFaces.faceConfidence " +
       "FROM (SELECT id,photoId,faceConfidence FROM faces WHERE faces.faceConfidence>=0.9 AND faces.id IN (:ids)) AS faces " +
-      "INNER JOIN faces AS relatedFaces ON relatedFaces.faceConfidence>=0.9 AND relatedFaces.id IN (fd.face1Id,fd.face2Id) " +
+      "INNER JOIN faces AS relatedFaces ON relatedFaces.faceConfidence>=0.9 AND relatedFaces.id IN (fd.descriptor1Id,fd.descriptor2Id) " +
       "INNER JOIN facedistances AS fd ON fd.distance<=0.5 " +
-      "  AND (fd.face1Id=faces.id OR fd.face2Id=faces.id) " +
-      "WHERE (faces.id=fd.face1Id OR faces.id=fd.face2Id) " +
+      "  AND (fd.descriptor1Id=faces.id OR fd.descriptor2Id=faces.id) " +
+      "WHERE (faces.id=fd.descriptor1Id OR faces.id=fd.descriptor2Id) " +
       "ORDER BY fd.distance ASC", {
       replacements: {
         ids: faces.map(face => face.id),
@@ -926,13 +926,13 @@ function getFacesForPhoto(id) {
     }).then((relatedFaces) => {
       faces.forEach((face) => {
         face.relatedFaces = relatedFaces.filter((related) => {
-          return (related.photoId != id && (related.face1Id == face.id || related.face2Id == face.id));
+          return (related.photoId != id && (related.descriptor1Id == face.id || related.descriptor2Id == face.id));
         }).map((related) => {
           return {
             distance: related.distance,
             faceConfidence: related.faceConfidence,
             photoId: related.photoId,
-            faceId: related.face1Id != face.id ? related.face1Id : related.face2Id
+            faceId: related.descriptor1Id != face.id ? related.descriptor1Id : related.descriptor2Id
           }
         });
       });