Changed names to more appropriately reflect fields in DB.