diff --git a/devdocs/todo.txt b/devdocs/todo.txt
index ce433f87..21f020a6 100644
--- a/devdocs/todo.txt
+++ b/devdocs/todo.txt
@@ -3,7 +3,7 @@ PRIORITY - ALWAYS Lowest level stuff first
  
 ---
 todo: API REFACTORING (note: workordercontroller / biz should be following all these rules so it's the template if need reference)
-todo: get rid of PATCH in all routes
+
 todo: consider renaming ConcurrencyToken to a shorter string?	
 todo: all api route parameters, post object sb "newObject", put="putObject"
 	IN BIZ TOO
diff --git a/docs/8.0/ayanova/docs/api-response-format.md b/docs/8.0/ayanova/docs/api-response-format.md
index 1dd24422..d358bb39 100644
--- a/docs/8.0/ayanova/docs/api-response-format.md
+++ b/docs/8.0/ayanova/docs/api-response-format.md
@@ -221,7 +221,7 @@ The above example shows multiple validation errors ([API error code](api-error-c
 
 AyaNova uses "optimistic concurrency" tracking. This means a concurrency token needs to accompany most change (PUT, PATCH) routes.
 
-Objects that require concurrency tokens to update are the objects that return a `ConcurrencyToken` property on a GET request.
+Objects that require concurrency tokens to update are the objects that return a `Concurrency` property on a GET request.
 
 Every update to an object results in a new concurrency token for that object.
 
diff --git a/server/AyaNova/Controllers/AttachmentController.cs b/server/AyaNova/Controllers/AttachmentController.cs
index 75fe7f56..05e054b6 100644
--- a/server/AyaNova/Controllers/AttachmentController.cs
+++ b/server/AyaNova/Controllers/AttachmentController.cs
@@ -56,7 +56,7 @@ namespace AyaNova.Api.Controllers
         public class UpdateAttachmentInfo
         {
             [Required]
-            public uint ConcurrencyToken { get; set; }
+            public uint Concurrency { get; set; }
             [Required]
             public string DisplayFileName { get; set; }
             public string Notes { get; set; }
@@ -114,7 +114,7 @@ namespace AyaNova.Api.Controllers
 
                 //Set "original" value of concurrency token to input token
                 //this will allow EF to check it out
-                ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
+                ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
 
                 //Log event and save context             
                 await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, dbObj.AttachToObjectId, dbObj.AttachToObjectType, AyaEvent.AttachmentModified, ChangeTextra), ct);
@@ -492,7 +492,7 @@ namespace AyaNova.Api.Controllers
         async private Task<object> GetFileListForObjectAsync(AyaType ayaType, long ayaId)
         {
             var l = await ct.FileAttachment.AsNoTracking().Where(m => m.AttachToObjectId == ayaId && m.AttachToObjectType == ayaType)
-            .Select(m => new { m.Id, m.ConcurrencyToken, m.ContentType, m.DisplayFileName, m.LastModified, m.Notes })
+            .Select(m => new { m.Id, m.Concurrency, m.ContentType, m.DisplayFileName, m.LastModified, m.Notes })
             .ToArrayAsync();
             var v = l.OrderBy(m => m.DisplayFileName);
             return v;
diff --git a/server/AyaNova/Controllers/ContractController.cs b/server/AyaNova/Controllers/ContractController.cs
index c9da1d4f..5da0b59a 100644
--- a/server/AyaNova/Controllers/ContractController.cs
+++ b/server/AyaNova/Controllers/ContractController.cs
@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
 
diff --git a/server/AyaNova/Controllers/CustomerController.cs b/server/AyaNova/Controllers/CustomerController.cs
index 6ad97b42..bfc47c2f 100644
--- a/server/AyaNova/Controllers/CustomerController.cs
+++ b/server/AyaNova/Controllers/CustomerController.cs
@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
     
 
diff --git a/server/AyaNova/Controllers/DataListViewController.cs b/server/AyaNova/Controllers/DataListViewController.cs
index f94ac8c9..62dd025d 100644
--- a/server/AyaNova/Controllers/DataListViewController.cs
+++ b/server/AyaNova/Controllers/DataListViewController.cs
@@ -133,7 +133,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
 
diff --git a/server/AyaNova/Controllers/FormCustomController.cs b/server/AyaNova/Controllers/FormCustomController.cs
index 307e28d3..49e63872 100644
--- a/server/AyaNova/Controllers/FormCustomController.cs
+++ b/server/AyaNova/Controllers/FormCustomController.cs
@@ -77,7 +77,7 @@ namespace AyaNova.Api.Controllers
             //If concurrency token specified then check if ours is newer
             if (concurrencyToken != null)
             {
-                if (o.ConcurrencyToken == concurrencyToken)
+                if (o.Concurrency == concurrencyToken)
                 {
                     //returns a code 304 (NOT MODIFIED)
                     return StatusCode(304);
@@ -175,7 +175,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
 
diff --git a/server/AyaNova/Controllers/HeadOfficeController.cs b/server/AyaNova/Controllers/HeadOfficeController.cs
index f9f843dc..33ef5eab 100644
--- a/server/AyaNova/Controllers/HeadOfficeController.cs
+++ b/server/AyaNova/Controllers/HeadOfficeController.cs
@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
         /// <summary>
diff --git a/server/AyaNova/Controllers/LoanUnitController.cs b/server/AyaNova/Controllers/LoanUnitController.cs
index 183d4f61..a73f4063 100644
--- a/server/AyaNova/Controllers/LoanUnitController.cs
+++ b/server/AyaNova/Controllers/LoanUnitController.cs
@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
 
diff --git a/server/AyaNova/Controllers/PMController.cs b/server/AyaNova/Controllers/PMController.cs
index 79030779..a19521f9 100644
--- a/server/AyaNova/Controllers/PMController.cs
+++ b/server/AyaNova/Controllers/PMController.cs
@@ -109,7 +109,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
 
diff --git a/server/AyaNova/Controllers/PMTemplateController.cs b/server/AyaNova/Controllers/PMTemplateController.cs
index 30ef0d5b..30aaaa6f 100644
--- a/server/AyaNova/Controllers/PMTemplateController.cs
+++ b/server/AyaNova/Controllers/PMTemplateController.cs
@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
 
diff --git a/server/AyaNova/Controllers/PartController.cs b/server/AyaNova/Controllers/PartController.cs
index cb265d3c..9b0df094 100644
--- a/server/AyaNova/Controllers/PartController.cs
+++ b/server/AyaNova/Controllers/PartController.cs
@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
 
diff --git a/server/AyaNova/Controllers/ProjectController.cs b/server/AyaNova/Controllers/ProjectController.cs
index b23da182..2f7e3936 100644
--- a/server/AyaNova/Controllers/ProjectController.cs
+++ b/server/AyaNova/Controllers/ProjectController.cs
@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
       
diff --git a/server/AyaNova/Controllers/PurchaseOrderController.cs b/server/AyaNova/Controllers/PurchaseOrderController.cs
index a9f0421c..0d93f7c6 100644
--- a/server/AyaNova/Controllers/PurchaseOrderController.cs
+++ b/server/AyaNova/Controllers/PurchaseOrderController.cs
@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
 
diff --git a/server/AyaNova/Controllers/QuoteController.cs b/server/AyaNova/Controllers/QuoteController.cs
index 7edd9093..3273260c 100644
--- a/server/AyaNova/Controllers/QuoteController.cs
+++ b/server/AyaNova/Controllers/QuoteController.cs
@@ -109,7 +109,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
 
diff --git a/server/AyaNova/Controllers/QuoteTemplateController.cs b/server/AyaNova/Controllers/QuoteTemplateController.cs
index 2f632fa0..653155a8 100644
--- a/server/AyaNova/Controllers/QuoteTemplateController.cs
+++ b/server/AyaNova/Controllers/QuoteTemplateController.cs
@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
 
diff --git a/server/AyaNova/Controllers/TranslationController.cs b/server/AyaNova/Controllers/TranslationController.cs
index e6d15732..2f96aac9 100644
--- a/server/AyaNova/Controllers/TranslationController.cs
+++ b/server/AyaNova/Controllers/TranslationController.cs
@@ -234,7 +234,7 @@ namespace AyaNova.Api.Controllers
             }
 
 
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = oFromDb.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = oFromDb.Concurrency }, true));
         }
 
 
@@ -354,7 +354,7 @@ namespace AyaNova.Api.Controllers
                 }
             }
 
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = oFromDb.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = oFromDb.Concurrency }, true));
         }
 
 
diff --git a/server/AyaNova/Controllers/UnitController.cs b/server/AyaNova/Controllers/UnitController.cs
index ffd82b59..c212e9d0 100644
--- a/server/AyaNova/Controllers/UnitController.cs
+++ b/server/AyaNova/Controllers/UnitController.cs
@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
 
diff --git a/server/AyaNova/Controllers/UnitModelController.cs b/server/AyaNova/Controllers/UnitModelController.cs
index b3b4b7ea..1d6c238c 100644
--- a/server/AyaNova/Controllers/UnitModelController.cs
+++ b/server/AyaNova/Controllers/UnitModelController.cs
@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
 
diff --git a/server/AyaNova/Controllers/UserController.cs b/server/AyaNova/Controllers/UserController.cs
index dd8c6aa6..0a09b196 100644
--- a/server/AyaNova/Controllers/UserController.cs
+++ b/server/AyaNova/Controllers/UserController.cs
@@ -138,7 +138,7 @@ namespace AyaNova.Api.Controllers
                     return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
                 }
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
 
diff --git a/server/AyaNova/Controllers/UserOptionsController.cs b/server/AyaNova/Controllers/UserOptionsController.cs
index f9d1c2ff..2c9c43f3 100644
--- a/server/AyaNova/Controllers/UserOptionsController.cs
+++ b/server/AyaNova/Controllers/UserOptionsController.cs
@@ -138,7 +138,7 @@ namespace AyaNova.Api.Controllers
                 }
             }
 
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
 
diff --git a/server/AyaNova/Controllers/VendorController.cs b/server/AyaNova/Controllers/VendorController.cs
index 7ebf8b1f..d0c7087c 100644
--- a/server/AyaNova/Controllers/VendorController.cs
+++ b/server/AyaNova/Controllers/VendorController.cs
@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
 
diff --git a/server/AyaNova/Controllers/WidgetController.cs b/server/AyaNova/Controllers/WidgetController.cs
index e4318c9b..9575d211 100644
--- a/server/AyaNova/Controllers/WidgetController.cs
+++ b/server/AyaNova/Controllers/WidgetController.cs
@@ -117,7 +117,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
 
diff --git a/server/AyaNova/Controllers/WorkOrderController.cs b/server/AyaNova/Controllers/WorkOrderController.cs
index 30858d87..74fdc27b 100644
--- a/server/AyaNova/Controllers/WorkOrderController.cs
+++ b/server/AyaNova/Controllers/WorkOrderController.cs
@@ -145,7 +145,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return BadRequest(new ApiErrorResponse(biz.Errors));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
         /// <summary>
@@ -252,7 +252,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return BadRequest(new ApiErrorResponse(biz.Errors));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
 
@@ -359,7 +359,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return BadRequest(new ApiErrorResponse(biz.Errors));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
         /// <summary>
@@ -467,7 +467,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return BadRequest(new ApiErrorResponse(biz.Errors));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
 
@@ -575,7 +575,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return BadRequest(new ApiErrorResponse(biz.Errors));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
         /// <summary>
@@ -681,7 +681,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return BadRequest(new ApiErrorResponse(biz.Errors));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
         /// <summary>
@@ -787,7 +787,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return BadRequest(new ApiErrorResponse(biz.Errors));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
         /// <summary>
@@ -893,7 +893,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return BadRequest(new ApiErrorResponse(biz.Errors));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
         /// <summary>
@@ -999,7 +999,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return BadRequest(new ApiErrorResponse(biz.Errors));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
         /// <summary>
@@ -1105,7 +1105,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return BadRequest(new ApiErrorResponse(biz.Errors));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
         /// <summary>
@@ -1211,7 +1211,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return BadRequest(new ApiErrorResponse(biz.Errors));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
         /// <summary>
diff --git a/server/AyaNova/Controllers/WorkOrderTemplateController.cs b/server/AyaNova/Controllers/WorkOrderTemplateController.cs
index ff9c1ee9..03550a6c 100644
--- a/server/AyaNova/Controllers/WorkOrderTemplateController.cs
+++ b/server/AyaNova/Controllers/WorkOrderTemplateController.cs
@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
             }
-            return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
+            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
         }
 
 
diff --git a/server/AyaNova/biz/ContractBiz.cs b/server/AyaNova/biz/ContractBiz.cs
index c186c799..1bbf6210 100644
--- a/server/AyaNova/biz/ContractBiz.cs
+++ b/server/AyaNova/biz/ContractBiz.cs
@@ -111,7 +111,7 @@ namespace AyaNova.Biz
 
 
             outObj.Id = 0;
-            outObj.ConcurrencyToken = 0;
+            outObj.Concurrency = 0;
 
             await ct.Contract.AddAsync(outObj);
             await ct.SaveChangesAsync();
@@ -144,7 +144,7 @@ namespace AyaNova.Biz
 
             //Set "original" value of concurrency token to input token
             //this will allow EF to check it out
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
 
 
             await ValidateAsync(dbObj, SnapshotOfOriginalDBObj);
diff --git a/server/AyaNova/biz/CustomerBiz.cs b/server/AyaNova/biz/CustomerBiz.cs
index 2961fab8..50f1e83a 100644
--- a/server/AyaNova/biz/CustomerBiz.cs
+++ b/server/AyaNova/biz/CustomerBiz.cs
@@ -111,7 +111,7 @@ namespace AyaNova.Biz
 
 
             outObj.Id = 0;
-            outObj.ConcurrencyToken = 0;
+            outObj.Concurrency = 0;
 
             await ct.Customer.AddAsync(outObj);
             await ct.SaveChangesAsync();
@@ -144,7 +144,7 @@ namespace AyaNova.Biz
 
             //Set "original" value of concurrency token to input token
             //this will allow EF to check it out
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
 
 
             await ValidateAsync(dbObj, SnapshotOfOriginalDBObj);
diff --git a/server/AyaNova/biz/DataListViewBiz.cs b/server/AyaNova/biz/DataListViewBiz.cs
index 955d9f3f..13013b2d 100644
--- a/server/AyaNova/biz/DataListViewBiz.cs
+++ b/server/AyaNova/biz/DataListViewBiz.cs
@@ -96,7 +96,7 @@ namespace AyaNova.Biz
             } while (NotUnique);
             outObj.Name = newUniqueName;
             outObj.Id = 0;
-            outObj.ConcurrencyToken = 0;
+            outObj.Concurrency = 0;
 
           
 
@@ -167,7 +167,7 @@ namespace AyaNova.Biz
             CopyObject.Copy(inObj, dbObj, "Id");
             //Set "original" value of concurrency token to input token
             //this will allow EF to check it out
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
 
             await ValidateAsync(dbObj, false);
             if (HasErrors)
diff --git a/server/AyaNova/biz/FormCustomBiz.cs b/server/AyaNova/biz/FormCustomBiz.cs
index 85b08729..91bdac4c 100644
--- a/server/AyaNova/biz/FormCustomBiz.cs
+++ b/server/AyaNova/biz/FormCustomBiz.cs
@@ -122,7 +122,7 @@ namespace AyaNova.Biz
             CopyObject.Copy(inObj, dbObj, "Id");
             //Set "original" value of concurrency token to input token
             //this will allow EF to check it out
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
 
             await ValidateAsync(dbObj, false);
             if (HasErrors)
diff --git a/server/AyaNova/biz/GlobalBizSettingsBiz.cs b/server/AyaNova/biz/GlobalBizSettingsBiz.cs
index 252e4b60..f6b2f743 100644
--- a/server/AyaNova/biz/GlobalBizSettingsBiz.cs
+++ b/server/AyaNova/biz/GlobalBizSettingsBiz.cs
@@ -66,7 +66,7 @@ namespace AyaNova.Biz
                 throw new System.Exception("GlobalBizSettingsBiz::ReplaceAsync -> Global settings object not found in database!!");
             CopyObject.Copy(inObj, dbObj, "Id");
 
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
 
             Validate(dbObj);
             if (HasErrors)
diff --git a/server/AyaNova/biz/HeadOfficeBiz.cs b/server/AyaNova/biz/HeadOfficeBiz.cs
index 003dbe35..fb5d9e26 100644
--- a/server/AyaNova/biz/HeadOfficeBiz.cs
+++ b/server/AyaNova/biz/HeadOfficeBiz.cs
@@ -111,7 +111,7 @@ namespace AyaNova.Biz
 
 
             outObj.Id = 0;
-            outObj.ConcurrencyToken = 0;
+            outObj.Concurrency = 0;
 
             await ct.HeadOffice.AddAsync(outObj);
             await ct.SaveChangesAsync();
@@ -144,7 +144,7 @@ namespace AyaNova.Biz
 
             //Set "original" value of concurrency token to input token
             //this will allow EF to check it out
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
 
 
             await ValidateAsync(dbObj, SnapshotOfOriginalDBObj);
diff --git a/server/AyaNova/biz/LoanUnitBiz.cs b/server/AyaNova/biz/LoanUnitBiz.cs
index da89107f..c9439630 100644
--- a/server/AyaNova/biz/LoanUnitBiz.cs
+++ b/server/AyaNova/biz/LoanUnitBiz.cs
@@ -111,7 +111,7 @@ namespace AyaNova.Biz
 
 
             outObj.Id = 0;
-            outObj.ConcurrencyToken = 0;
+            outObj.Concurrency = 0;
 
             await ct.LoanUnit.AddAsync(outObj);
             await ct.SaveChangesAsync();
@@ -144,7 +144,7 @@ namespace AyaNova.Biz
 
             //Set "original" value of concurrency token to input token
             //this will allow EF to check it out
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
 
 
             await ValidateAsync(dbObj, SnapshotOfOriginalDBObj);
diff --git a/server/AyaNova/biz/PMBiz.cs b/server/AyaNova/biz/PMBiz.cs
index 5c1f1052..d176a9e6 100644
--- a/server/AyaNova/biz/PMBiz.cs
+++ b/server/AyaNova/biz/PMBiz.cs
@@ -126,7 +126,7 @@ namespace AyaNova.Biz
 
 
             // outObj.Id = 0;
-            // outObj.ConcurrencyToken = 0;
+            // outObj.Concurrency = 0;
 
             // await ct.PM.AddAsync(outObj);
             // await ct.SaveChangesAsync();
@@ -165,7 +165,7 @@ namespace AyaNova.Biz
 
             //Set "original" value of concurrency token to input token
             //this will allow EF to check it out
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = putObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = putObj.Concurrency;
 
 
             await ValidateAsync(dbObj, SnapshotOfOriginalDBObj);
diff --git a/server/AyaNova/biz/PMTemplateBiz.cs b/server/AyaNova/biz/PMTemplateBiz.cs
index a72f979c..24ee005e 100644
--- a/server/AyaNova/biz/PMTemplateBiz.cs
+++ b/server/AyaNova/biz/PMTemplateBiz.cs
@@ -111,7 +111,7 @@ namespace AyaNova.Biz
 
 
             outObj.Id = 0;
-            outObj.ConcurrencyToken = 0;
+            outObj.Concurrency = 0;
 
             await ct.PMTemplate.AddAsync(outObj);
             await ct.SaveChangesAsync();
@@ -144,7 +144,7 @@ namespace AyaNova.Biz
 
             //Set "original" value of concurrency token to input token
             //this will allow EF to check it out
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
 
 
             await ValidateAsync(dbObj, SnapshotOfOriginalDBObj);
diff --git a/server/AyaNova/biz/PartBiz.cs b/server/AyaNova/biz/PartBiz.cs
index f082f951..f6d8b0c9 100644
--- a/server/AyaNova/biz/PartBiz.cs
+++ b/server/AyaNova/biz/PartBiz.cs
@@ -111,7 +111,7 @@ namespace AyaNova.Biz
 
 
             outObj.Id = 0;
-            outObj.ConcurrencyToken = 0;
+            outObj.Concurrency = 0;
 
             await ct.Part.AddAsync(outObj);
             await ct.SaveChangesAsync();
@@ -144,7 +144,7 @@ namespace AyaNova.Biz
 
             //Set "original" value of concurrency token to input token
             //this will allow EF to check it out
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
 
 
             await ValidateAsync(dbObj, SnapshotOfOriginalDBObj);
diff --git a/server/AyaNova/biz/ProjectBiz.cs b/server/AyaNova/biz/ProjectBiz.cs
index 47d9a14d..500812ac 100644
--- a/server/AyaNova/biz/ProjectBiz.cs
+++ b/server/AyaNova/biz/ProjectBiz.cs
@@ -111,7 +111,7 @@ namespace AyaNova.Biz
 
 
             outObj.Id = 0;
-            outObj.ConcurrencyToken = 0;
+            outObj.Concurrency = 0;
 
             await ct.Project.AddAsync(outObj);
             await ct.SaveChangesAsync();
@@ -144,7 +144,7 @@ namespace AyaNova.Biz
 
             //Set "original" value of concurrency token to input token
             //this will allow EF to check it out
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
 
 
             await ValidateAsync(dbObj, SnapshotOfOriginalDBObj);
diff --git a/server/AyaNova/biz/PurchaseOrderBiz.cs b/server/AyaNova/biz/PurchaseOrderBiz.cs
index 112527e2..aed973f5 100644
--- a/server/AyaNova/biz/PurchaseOrderBiz.cs
+++ b/server/AyaNova/biz/PurchaseOrderBiz.cs
@@ -111,7 +111,7 @@ namespace AyaNova.Biz
 
 
             outObj.Id = 0;
-            outObj.ConcurrencyToken = 0;
+            outObj.Concurrency = 0;
 
             await ct.PurchaseOrder.AddAsync(outObj);
             await ct.SaveChangesAsync();
@@ -144,7 +144,7 @@ namespace AyaNova.Biz
 
             //Set "original" value of concurrency token to input token
             //this will allow EF to check it out
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
 
 
             await ValidateAsync(dbObj, SnapshotOfOriginalDBObj);
diff --git a/server/AyaNova/biz/QuoteBiz.cs b/server/AyaNova/biz/QuoteBiz.cs
index 61827e35..f8225b01 100644
--- a/server/AyaNova/biz/QuoteBiz.cs
+++ b/server/AyaNova/biz/QuoteBiz.cs
@@ -126,7 +126,7 @@ namespace AyaNova.Biz
 
 
             // outObj.Id = 0;
-            // outObj.ConcurrencyToken = 0;
+            // outObj.Concurrency = 0;
 
             // await ct.Quote.AddAsync(outObj);
             // await ct.SaveChangesAsync();
@@ -165,7 +165,7 @@ namespace AyaNova.Biz
 
             //Set "original" value of concurrency token to input token
             //this will allow EF to check it out
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = putObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = putObj.Concurrency;
 
 
             await ValidateAsync(dbObj, SnapshotOfOriginalDBObj);
diff --git a/server/AyaNova/biz/QuoteTemplateBiz.cs b/server/AyaNova/biz/QuoteTemplateBiz.cs
index c3b4cb43..0089e6c1 100644
--- a/server/AyaNova/biz/QuoteTemplateBiz.cs
+++ b/server/AyaNova/biz/QuoteTemplateBiz.cs
@@ -111,7 +111,7 @@ namespace AyaNova.Biz
 
 
             outObj.Id = 0;
-            outObj.ConcurrencyToken = 0;
+            outObj.Concurrency = 0;
 
             await ct.QuoteTemplate.AddAsync(outObj);
             await ct.SaveChangesAsync();
@@ -144,7 +144,7 @@ namespace AyaNova.Biz
 
             //Set "original" value of concurrency token to input token
             //this will allow EF to check it out
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
 
 
             await ValidateAsync(dbObj, SnapshotOfOriginalDBObj);
diff --git a/server/AyaNova/biz/TranslationBiz.cs b/server/AyaNova/biz/TranslationBiz.cs
index 044911aa..99c1cc94 100644
--- a/server/AyaNova/biz/TranslationBiz.cs
+++ b/server/AyaNova/biz/TranslationBiz.cs
@@ -226,7 +226,7 @@ namespace AyaNova.Biz
             dbObj.Display = inObj.NewText;
             //Set "original" value of concurrency token to input token
             //this will allow EF to check it out
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
 
             //Only thing to validate is if it has data at all in it
             if (string.IsNullOrWhiteSpace(inObj.NewText))
@@ -265,7 +265,7 @@ namespace AyaNova.Biz
 
                 //Set "original" value of concurrency token to input token
                 //this will allow EF to check it out
-                ct.Entry(titem).OriginalValues["ConcurrencyToken"] = tit.ConcurrencyToken;
+                ct.Entry(titem).OriginalValues["Concurrency"] = tit.Concurrency;
 
                 //Only thing to validate is if it has data at all in it
                 if (string.IsNullOrWhiteSpace(tit.NewText))
@@ -294,7 +294,7 @@ namespace AyaNova.Biz
 
             //Set "original" value of concurrency token to input token
             //this will allow EF to check it out
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
 
             await ValidateAsync(dbObj.Name, false);
 
diff --git a/server/AyaNova/biz/UnitBiz.cs b/server/AyaNova/biz/UnitBiz.cs
index a3830b52..7763fd62 100644
--- a/server/AyaNova/biz/UnitBiz.cs
+++ b/server/AyaNova/biz/UnitBiz.cs
@@ -111,7 +111,7 @@ namespace AyaNova.Biz
 
 
             outObj.Id = 0;
-            outObj.ConcurrencyToken = 0;
+            outObj.Concurrency = 0;
 
             await ct.Unit.AddAsync(outObj);
             await ct.SaveChangesAsync();
@@ -144,7 +144,7 @@ namespace AyaNova.Biz
 
             //Set "original" value of concurrency token to input token
             //this will allow EF to check it out
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
 
 
             await ValidateAsync(dbObj, SnapshotOfOriginalDBObj);
diff --git a/server/AyaNova/biz/UnitModelBiz.cs b/server/AyaNova/biz/UnitModelBiz.cs
index 90a5e350..c87b13fa 100644
--- a/server/AyaNova/biz/UnitModelBiz.cs
+++ b/server/AyaNova/biz/UnitModelBiz.cs
@@ -111,7 +111,7 @@ namespace AyaNova.Biz
 
 
             outObj.Id = 0;
-            outObj.ConcurrencyToken = 0;
+            outObj.Concurrency = 0;
 
             await ct.UnitModel.AddAsync(outObj);
             await ct.SaveChangesAsync();
@@ -144,7 +144,7 @@ namespace AyaNova.Biz
 
             //Set "original" value of concurrency token to input token
             //this will allow EF to check it out
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
 
 
             await ValidateAsync(dbObj, SnapshotOfOriginalDBObj);
diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs
index b5f5a8d7..e7874c38 100644
--- a/server/AyaNova/biz/UserBiz.cs
+++ b/server/AyaNova/biz/UserBiz.cs
@@ -177,7 +177,7 @@ namespace AyaNova.Biz
 
             //Set "original" value of concurrency token to input token
             //this will allow EF to check it out
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
 
             await ValidateAsync(dbObj, SnapshotOfOriginalDBObj);
             if (HasErrors)
@@ -464,7 +464,7 @@ namespace AyaNova.Biz
         //     return new
         //     {
         //         Id = o.Id,
-        //         ConcurrencyToken = o.ConcurrencyToken,
+        //         Concurrency = o.Concurrency,
         //         Active = o.Active,
         //         Name = o.Name,
         //         Roles = o.Roles,
diff --git a/server/AyaNova/biz/UserOptionsBiz.cs b/server/AyaNova/biz/UserOptionsBiz.cs
index b3f0931c..b1b3be9b 100644
--- a/server/AyaNova/biz/UserOptionsBiz.cs
+++ b/server/AyaNova/biz/UserOptionsBiz.cs
@@ -51,7 +51,7 @@ namespace AyaNova.Biz
             CopyObject.Copy(inObj, dbObj, "Id, UserId");
             //Set "original" value of concurrency token to input token
             //this will allow EF to check it out
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
 
             Validate(dbObj);
             if (HasErrors)
diff --git a/server/AyaNova/biz/VendorBiz.cs b/server/AyaNova/biz/VendorBiz.cs
index e54fe0e7..0a2ed67f 100644
--- a/server/AyaNova/biz/VendorBiz.cs
+++ b/server/AyaNova/biz/VendorBiz.cs
@@ -111,7 +111,7 @@ namespace AyaNova.Biz
 
 
             outObj.Id = 0;
-            outObj.ConcurrencyToken = 0;
+            outObj.Concurrency = 0;
 
             await ct.Vendor.AddAsync(outObj);
             await ct.SaveChangesAsync();
@@ -144,7 +144,7 @@ namespace AyaNova.Biz
 
             //Set "original" value of concurrency token to input token
             //this will allow EF to check it out
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
 
 
             await ValidateAsync(dbObj, SnapshotOfOriginalDBObj);
diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs
index a1217bcf..fbf12374 100644
--- a/server/AyaNova/biz/WidgetBiz.cs
+++ b/server/AyaNova/biz/WidgetBiz.cs
@@ -107,7 +107,7 @@ namespace AyaNova.Biz
 
 
             outObj.Id = 0;
-            outObj.ConcurrencyToken = 0;
+            outObj.Concurrency = 0;
 
             //Test get serial id visible id number from generator
             outObj.Serial = ServerBootConfig.WIDGET_SERIAL.GetNext();
@@ -143,7 +143,7 @@ namespace AyaNova.Biz
 
             //Set "original" value of concurrency token to input token
             //this will allow EF to check it out
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
 
 
             await ValidateAsync(dbObj, SnapshotOfOriginalDBObj);
diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs
index 1442224c..45160e35 100644
--- a/server/AyaNova/biz/WorkOrderBiz.cs
+++ b/server/AyaNova/biz/WorkOrderBiz.cs
@@ -90,7 +90,7 @@ namespace AyaNova.Biz
             CopyObject.Copy(dbObject, newObject, "Wiki");
             newObject.Serial = ServerBootConfig.WORKORDER_SERIAL.GetNext();
             newObject.Id = 0;
-            newObject.ConcurrencyToken = 0;
+            newObject.Concurrency = 0;
             await ct.WorkOrder.AddAsync(newObject);
             await ct.SaveChangesAsync();
             await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, BizType, AyaEvent.Created), ct);
@@ -170,7 +170,7 @@ namespace AyaNova.Biz
             dbObject.Tags = TagUtil.NormalizeTags(dbObject.Tags);
             dbObject.CustomFields = JsonUtil.CompactJson(dbObject.CustomFields);
 
-            ct.Entry(dbObject).OriginalValues["ConcurrencyToken"] = dtPutObject.ConcurrencyToken;
+            ct.Entry(dbObject).OriginalValues["Concurrency"] = dtPutObject.Concurrency;
             await WorkOrderValidateAsync(dbObject, SnapshotOfOriginalDBObj);
             if (HasErrors)
                 return null;
@@ -414,7 +414,7 @@ namespace AyaNova.Biz
             dbObject.Tags = TagUtil.NormalizeTags(dbObject.Tags);
             dbObject.CustomFields = JsonUtil.CompactJson(dbObject.CustomFields);
 
-            ct.Entry(dbObject).OriginalValues["ConcurrencyToken"] = dtPutObject.ConcurrencyToken;
+            ct.Entry(dbObject).OriginalValues["Concurrency"] = dtPutObject.Concurrency;
             await ItemValidateAsync(dbObject, SnapshotOfOriginalDBObj);
             if (HasErrors)
                 return null;
@@ -665,7 +665,7 @@ namespace AyaNova.Biz
             dbObject.Tags = TagUtil.NormalizeTags(dbObject.Tags);
             dbObject.CustomFields = JsonUtil.CompactJson(dbObject.CustomFields);
 
-            ct.Entry(dbObject).OriginalValues["ConcurrencyToken"] = dtPutObject.ConcurrencyToken;
+            ct.Entry(dbObject).OriginalValues["Concurrency"] = dtPutObject.Concurrency;
             await ExpenseValidateAsync(dbObject, SnapshotOfOriginalDBObj);
             if (HasErrors) return null;
             try
@@ -854,7 +854,7 @@ namespace AyaNova.Biz
             dbObject.Tags = TagUtil.NormalizeTags(dbObject.Tags);
             dbObject.CustomFields = JsonUtil.CompactJson(dbObject.CustomFields);
 
-            ct.Entry(dbObject).OriginalValues["ConcurrencyToken"] = dtPutObject.ConcurrencyToken;
+            ct.Entry(dbObject).OriginalValues["Concurrency"] = dtPutObject.Concurrency;
             await LaborValidateAsync(dbObject, SnapshotOfOriginalDBObj);
             if (HasErrors) return null;
             try
@@ -1042,7 +1042,7 @@ namespace AyaNova.Biz
             dbObject.Tags = TagUtil.NormalizeTags(dbObject.Tags);
             dbObject.CustomFields = JsonUtil.CompactJson(dbObject.CustomFields);
 
-            ct.Entry(dbObject).OriginalValues["ConcurrencyToken"] = dtPutObject.ConcurrencyToken;
+            ct.Entry(dbObject).OriginalValues["Concurrency"] = dtPutObject.Concurrency;
             await LoanValidateAsync(dbObject, SnapshotOfOriginalDBObj);
             if (HasErrors) return null;
             try
@@ -1231,7 +1231,7 @@ namespace AyaNova.Biz
             dbObject.Tags = TagUtil.NormalizeTags(dbObject.Tags);
             dbObject.CustomFields = JsonUtil.CompactJson(dbObject.CustomFields);
 
-            ct.Entry(dbObject).OriginalValues["ConcurrencyToken"] = dtPutObject.ConcurrencyToken;
+            ct.Entry(dbObject).OriginalValues["Concurrency"] = dtPutObject.Concurrency;
             await PartValidateAsync(dbObject, SnapshotOfOriginalDBObj);
             if (HasErrors) return null;
             try
@@ -1417,7 +1417,7 @@ namespace AyaNova.Biz
             dbObject.Tags = TagUtil.NormalizeTags(dbObject.Tags);
             dbObject.CustomFields = JsonUtil.CompactJson(dbObject.CustomFields);
 
-            ct.Entry(dbObject).OriginalValues["ConcurrencyToken"] = dtPutObject.ConcurrencyToken;
+            ct.Entry(dbObject).OriginalValues["Concurrency"] = dtPutObject.Concurrency;
             await PartRequestValidateAsync(dbObject, SnapshotOfOriginalDBObj);
             if (HasErrors) return null;
             try
@@ -1606,7 +1606,7 @@ namespace AyaNova.Biz
             dbObject.Tags = TagUtil.NormalizeTags(dbObject.Tags);
             dbObject.CustomFields = JsonUtil.CompactJson(dbObject.CustomFields);
 
-            ct.Entry(dbObject).OriginalValues["ConcurrencyToken"] = dtPutObject.ConcurrencyToken;
+            ct.Entry(dbObject).OriginalValues["Concurrency"] = dtPutObject.Concurrency;
             await ScheduledUserValidateAsync(dbObject, SnapshotOfOriginalDBObj);
             if (HasErrors) return null;
             try
@@ -1795,7 +1795,7 @@ namespace AyaNova.Biz
             dbObject.Tags = TagUtil.NormalizeTags(dbObject.Tags);
             dbObject.CustomFields = JsonUtil.CompactJson(dbObject.CustomFields);
 
-            ct.Entry(dbObject).OriginalValues["ConcurrencyToken"] = dtPutObject.ConcurrencyToken;
+            ct.Entry(dbObject).OriginalValues["Concurrency"] = dtPutObject.Concurrency;
             await TaskValidateAsync(dbObject, SnapshotOfOriginalDBObj);
             if (HasErrors) return null;
             try
@@ -1984,7 +1984,7 @@ namespace AyaNova.Biz
             dbObject.Tags = TagUtil.NormalizeTags(dbObject.Tags);
             dbObject.CustomFields = JsonUtil.CompactJson(dbObject.CustomFields);
 
-            ct.Entry(dbObject).OriginalValues["ConcurrencyToken"] = dtPutObject.ConcurrencyToken;
+            ct.Entry(dbObject).OriginalValues["Concurrency"] = dtPutObject.Concurrency;
             await TravelValidateAsync(dbObject, SnapshotOfOriginalDBObj);
             if (HasErrors) return null;
             try
@@ -2173,7 +2173,7 @@ namespace AyaNova.Biz
             dbObject.Tags = TagUtil.NormalizeTags(dbObject.Tags);
             dbObject.CustomFields = JsonUtil.CompactJson(dbObject.CustomFields);
 
-            ct.Entry(dbObject).OriginalValues["ConcurrencyToken"] = dtPutObject.ConcurrencyToken;
+            ct.Entry(dbObject).OriginalValues["Concurrency"] = dtPutObject.Concurrency;
             await UnitValidateAsync(dbObject, SnapshotOfOriginalDBObj);
             if (HasErrors) return null;
             try
diff --git a/server/AyaNova/biz/WorkorderTemplateBiz.cs b/server/AyaNova/biz/WorkorderTemplateBiz.cs
index ac420980..2ffc8688 100644
--- a/server/AyaNova/biz/WorkorderTemplateBiz.cs
+++ b/server/AyaNova/biz/WorkorderTemplateBiz.cs
@@ -111,7 +111,7 @@ namespace AyaNova.Biz
 
 
             outObj.Id = 0;
-            outObj.ConcurrencyToken = 0;
+            outObj.Concurrency = 0;
 
             await ct.WorkOrderTemplate.AddAsync(outObj);
             await ct.SaveChangesAsync();
@@ -144,7 +144,7 @@ namespace AyaNova.Biz
 
             //Set "original" value of concurrency token to input token
             //this will allow EF to check it out
-            ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
+            ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
 
 
             await ValidateAsync(dbObj, SnapshotOfOriginalDBObj);
diff --git a/server/AyaNova/models/AyContext.cs b/server/AyaNova/models/AyContext.cs
index b2579ba1..4ebcc911 100644
--- a/server/AyaNova/models/AyContext.cs
+++ b/server/AyaNova/models/AyContext.cs
@@ -82,7 +82,7 @@ namespace AyaNova.Models
                 {
                     //Any object that has a concurrencytoken field
                     //set it up to work properly with PostgreSQL
-                    if (property.Name == "ConcurrencyToken")
+                    if (property.Name == "Concurrency")
                     {
                         property.SetColumnName("xmin");
                         property.SetColumnType("xid");
diff --git a/server/AyaNova/models/Contract.cs b/server/AyaNova/models/Contract.cs
index 59a7b1aa..66b80447 100644
--- a/server/AyaNova/models/Contract.cs
+++ b/server/AyaNova/models/Contract.cs
@@ -10,7 +10,7 @@ namespace AyaNova.Models
     public class Contract
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public string Name { get; set; }      
diff --git a/server/AyaNova/models/Customer.cs b/server/AyaNova/models/Customer.cs
index 3f6d0271..4c621999 100644
--- a/server/AyaNova/models/Customer.cs
+++ b/server/AyaNova/models/Customer.cs
@@ -12,7 +12,7 @@ namespace AyaNova.Models
     public class Customer
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public string Name { get; set; }      
diff --git a/server/AyaNova/models/DataListView.cs b/server/AyaNova/models/DataListView.cs
index e547bd2b..766eb02b 100644
--- a/server/AyaNova/models/DataListView.cs
+++ b/server/AyaNova/models/DataListView.cs
@@ -7,7 +7,7 @@ namespace AyaNova.Models
     public class DataListView
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public long UserId { get; set; }//only relevant if non-public for fetching either in list or single (public true OR userid matches)
diff --git a/server/AyaNova/models/Event.cs b/server/AyaNova/models/Event.cs
index 29864901..6d202646 100644
--- a/server/AyaNova/models/Event.cs
+++ b/server/AyaNova/models/Event.cs
@@ -11,7 +11,7 @@ namespace AyaNova.Models
     public class Event
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
         public DateTime Created { get; set; }
         [Required]
         public long UserId { get; set; }
diff --git a/server/AyaNova/models/FileAttachment.cs b/server/AyaNova/models/FileAttachment.cs
index 08ed9848..de9c70ac 100644
--- a/server/AyaNova/models/FileAttachment.cs
+++ b/server/AyaNova/models/FileAttachment.cs
@@ -8,7 +8,7 @@ namespace AyaNova.Models
     public class FileAttachment
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
 
         //-----------------------------------------
diff --git a/server/AyaNova/models/FormCustom.cs b/server/AyaNova/models/FormCustom.cs
index 7cf7ab97..b8df7046 100644
--- a/server/AyaNova/models/FormCustom.cs
+++ b/server/AyaNova/models/FormCustom.cs
@@ -17,7 +17,7 @@ namespace AyaNova.Models
     public class FormCustom
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
       
         [Required, MaxLength(255)]
         public string FormKey { get; set; }//max 255 characters ascii set 
diff --git a/server/AyaNova/models/GlobalBizSettings.cs b/server/AyaNova/models/GlobalBizSettings.cs
index de861aa6..a39cb6c7 100644
--- a/server/AyaNova/models/GlobalBizSettings.cs
+++ b/server/AyaNova/models/GlobalBizSettings.cs
@@ -6,7 +6,7 @@ namespace AyaNova.Models
     public class GlobalBizSettings
     {
         public long Id { get; set; }//this is always 1 as there is only ever one single global biz object
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         //Global settings
         //Picklist and other searches override the normal case insensitive value
diff --git a/server/AyaNova/models/HeadOffice.cs b/server/AyaNova/models/HeadOffice.cs
index 9480861e..a0ca0365 100644
--- a/server/AyaNova/models/HeadOffice.cs
+++ b/server/AyaNova/models/HeadOffice.cs
@@ -12,7 +12,7 @@ namespace AyaNova.Models
     public class HeadOffice
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public string Name { get; set; }      
diff --git a/server/AyaNova/models/LoanUnit.cs b/server/AyaNova/models/LoanUnit.cs
index 6a89824c..29667359 100644
--- a/server/AyaNova/models/LoanUnit.cs
+++ b/server/AyaNova/models/LoanUnit.cs
@@ -12,7 +12,7 @@ namespace AyaNova.Models
     public class LoanUnit
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public string Name { get; set; }      
diff --git a/server/AyaNova/models/OpsJob.cs b/server/AyaNova/models/OpsJob.cs
index 6edafd15..20d5cdd0 100644
--- a/server/AyaNova/models/OpsJob.cs
+++ b/server/AyaNova/models/OpsJob.cs
@@ -15,7 +15,7 @@ namespace AyaNova.Models
 
         [Required]
         public DateTime Created { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         // [Required]
         // public long O wnerId { get; set; }
diff --git a/server/AyaNova/models/PM.cs b/server/AyaNova/models/PM.cs
index 399fd6bd..71ef355b 100644
--- a/server/AyaNova/models/PM.cs
+++ b/server/AyaNova/models/PM.cs
@@ -12,7 +12,7 @@ namespace AyaNova.Models
     public class PM
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public uint Serial { get; set; }
diff --git a/server/AyaNova/models/PMItem.cs b/server/AyaNova/models/PMItem.cs
index 28775699..e8035d57 100644
--- a/server/AyaNova/models/PMItem.cs
+++ b/server/AyaNova/models/PMItem.cs
@@ -11,7 +11,7 @@ namespace AyaNova.Models
     public class PMItem
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public string Name { get; set; }      
diff --git a/server/AyaNova/models/PMTemplate.cs b/server/AyaNova/models/PMTemplate.cs
index 890afc0a..778c12c3 100644
--- a/server/AyaNova/models/PMTemplate.cs
+++ b/server/AyaNova/models/PMTemplate.cs
@@ -12,7 +12,7 @@ namespace AyaNova.Models
     public class PMTemplate
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public string Name { get; set; }      
diff --git a/server/AyaNova/models/PMTemplateItem.cs b/server/AyaNova/models/PMTemplateItem.cs
index 6509901d..6626a3d1 100644
--- a/server/AyaNova/models/PMTemplateItem.cs
+++ b/server/AyaNova/models/PMTemplateItem.cs
@@ -12,7 +12,7 @@ namespace AyaNova.Models
     public class PMTemplateItem
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public string Name { get; set; }      
diff --git a/server/AyaNova/models/Part.cs b/server/AyaNova/models/Part.cs
index bc5af455..0ad93ae3 100644
--- a/server/AyaNova/models/Part.cs
+++ b/server/AyaNova/models/Part.cs
@@ -12,7 +12,7 @@ namespace AyaNova.Models
     public class Part
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public string Name { get; set; }      
diff --git a/server/AyaNova/models/PickListTemplate.cs b/server/AyaNova/models/PickListTemplate.cs
index 1a748747..6d90a0ee 100644
--- a/server/AyaNova/models/PickListTemplate.cs
+++ b/server/AyaNova/models/PickListTemplate.cs
@@ -7,7 +7,7 @@ namespace AyaNova.Models
     public class PickListTemplate
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }      
+        public uint Concurrency { get; set; }      
        
         public string Template { get; set; }//JSON fragment of picklist template
 
diff --git a/server/AyaNova/models/Project.cs b/server/AyaNova/models/Project.cs
index 99eb210a..95290089 100644
--- a/server/AyaNova/models/Project.cs
+++ b/server/AyaNova/models/Project.cs
@@ -12,7 +12,7 @@ namespace AyaNova.Models
     public class Project
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public string Name { get; set; }      
diff --git a/server/AyaNova/models/PurchaseOrder.cs b/server/AyaNova/models/PurchaseOrder.cs
index 4650692e..f73cc5d2 100644
--- a/server/AyaNova/models/PurchaseOrder.cs
+++ b/server/AyaNova/models/PurchaseOrder.cs
@@ -12,7 +12,7 @@ namespace AyaNova.Models
     public class PurchaseOrder
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public string Name { get; set; }      
diff --git a/server/AyaNova/models/Quote.cs b/server/AyaNova/models/Quote.cs
index 221d0fd6..e9260127 100644
--- a/server/AyaNova/models/Quote.cs
+++ b/server/AyaNova/models/Quote.cs
@@ -11,7 +11,7 @@ namespace AyaNova.Models
     public class Quote
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public uint Serial { get; set; }
diff --git a/server/AyaNova/models/QuoteItem.cs b/server/AyaNova/models/QuoteItem.cs
index 88903d95..48303a9f 100644
--- a/server/AyaNova/models/QuoteItem.cs
+++ b/server/AyaNova/models/QuoteItem.cs
@@ -11,7 +11,7 @@ namespace AyaNova.Models
     public class QuoteItem
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public string Name { get; set; }      
diff --git a/server/AyaNova/models/QuoteTemplate.cs b/server/AyaNova/models/QuoteTemplate.cs
index 02f74a9e..62e98f0f 100644
--- a/server/AyaNova/models/QuoteTemplate.cs
+++ b/server/AyaNova/models/QuoteTemplate.cs
@@ -12,7 +12,7 @@ namespace AyaNova.Models
     public class QuoteTemplate
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public string Name { get; set; }      
diff --git a/server/AyaNova/models/QuoteTemplateItem.cs b/server/AyaNova/models/QuoteTemplateItem.cs
index 9a70aaf9..b9ca81f8 100644
--- a/server/AyaNova/models/QuoteTemplateItem.cs
+++ b/server/AyaNova/models/QuoteTemplateItem.cs
@@ -12,7 +12,7 @@ namespace AyaNova.Models
     public class QuoteTemplateItem
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public string Name { get; set; }      
diff --git a/server/AyaNova/models/SearchDictionary.cs b/server/AyaNova/models/SearchDictionary.cs
index 7c5c1a3e..179ac6e4 100644
--- a/server/AyaNova/models/SearchDictionary.cs
+++ b/server/AyaNova/models/SearchDictionary.cs
@@ -6,7 +6,7 @@ namespace AyaNova.Models
     public class SearchDictionary
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
       
         [Required, MaxLength(255)]
         public string Word { get; set; }//max 255 characters ascii set        
diff --git a/server/AyaNova/models/SearchKey.cs b/server/AyaNova/models/SearchKey.cs
index c4ce3d58..80fe1c3a 100644
--- a/server/AyaNova/models/SearchKey.cs
+++ b/server/AyaNova/models/SearchKey.cs
@@ -8,7 +8,7 @@ namespace AyaNova.Models
     public class SearchKey
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
 
         [Required]
diff --git a/server/AyaNova/models/Tag.cs b/server/AyaNova/models/Tag.cs
index 26beb629..903ae71a 100644
--- a/server/AyaNova/models/Tag.cs
+++ b/server/AyaNova/models/Tag.cs
@@ -6,7 +6,7 @@ namespace AyaNova.Models
     public class Tag
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
       
         [Required, MaxLength(255)]
         public string Name { get; set; }//max 255 characters 
diff --git a/server/AyaNova/models/Translation.cs b/server/AyaNova/models/Translation.cs
index a09dc04f..a5d3cb49 100644
--- a/server/AyaNova/models/Translation.cs
+++ b/server/AyaNova/models/Translation.cs
@@ -9,7 +9,7 @@ namespace AyaNova.Models
     public class Translation
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
        
 
         [Required]
diff --git a/server/AyaNova/models/TranslationItem.cs b/server/AyaNova/models/TranslationItem.cs
index 125384c9..d0d48c67 100644
--- a/server/AyaNova/models/TranslationItem.cs
+++ b/server/AyaNova/models/TranslationItem.cs
@@ -12,7 +12,7 @@ namespace AyaNova.Models
     public class TranslationItem
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public string Key { get; set; }
diff --git a/server/AyaNova/models/Unit.cs b/server/AyaNova/models/Unit.cs
index 4cb23e54..b2db0677 100644
--- a/server/AyaNova/models/Unit.cs
+++ b/server/AyaNova/models/Unit.cs
@@ -12,7 +12,7 @@ namespace AyaNova.Models
     public class Unit
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public string Name { get; set; }      
diff --git a/server/AyaNova/models/UnitModel.cs b/server/AyaNova/models/UnitModel.cs
index 4cc66e91..5f984c93 100644
--- a/server/AyaNova/models/UnitModel.cs
+++ b/server/AyaNova/models/UnitModel.cs
@@ -12,7 +12,7 @@ namespace AyaNova.Models
     public class UnitModel
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public string Name { get; set; }      
diff --git a/server/AyaNova/models/User.cs b/server/AyaNova/models/User.cs
index 889cabe7..e0f3415d 100644
--- a/server/AyaNova/models/User.cs
+++ b/server/AyaNova/models/User.cs
@@ -13,7 +13,7 @@ namespace AyaNova.Models
             Tags = new List<string>();
         }
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
         public bool Active { get; set; }
         [Required, MaxLength(255)]
         public string Name { get; set; }
@@ -32,7 +32,7 @@ namespace AyaNova.Models
     public class User
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public bool Active { get; set; }
diff --git a/server/AyaNova/models/UserOptions.cs b/server/AyaNova/models/UserOptions.cs
index 0af126d1..b57b06c5 100644
--- a/server/AyaNova/models/UserOptions.cs
+++ b/server/AyaNova/models/UserOptions.cs
@@ -6,7 +6,7 @@ namespace AyaNova.Models
     public class UserOptions
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public long TranslationId { get; set; }
diff --git a/server/AyaNova/models/Vendor.cs b/server/AyaNova/models/Vendor.cs
index fcbec98a..d7bcc18d 100644
--- a/server/AyaNova/models/Vendor.cs
+++ b/server/AyaNova/models/Vendor.cs
@@ -12,7 +12,7 @@ namespace AyaNova.Models
     public class Vendor
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public string Name { get; set; }      
diff --git a/server/AyaNova/models/Widget.cs b/server/AyaNova/models/Widget.cs
index d843732d..02f6acdb 100644
--- a/server/AyaNova/models/Widget.cs
+++ b/server/AyaNova/models/Widget.cs
@@ -12,7 +12,7 @@ namespace AyaNova.Models
     public class Widget
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public string Name { get; set; }
diff --git a/server/AyaNova/models/WorkOrder.cs b/server/AyaNova/models/WorkOrder.cs
index 54267668..a4e42bd3 100644
--- a/server/AyaNova/models/WorkOrder.cs
+++ b/server/AyaNova/models/WorkOrder.cs
@@ -15,7 +15,7 @@ namespace AyaNova.Models
         }
 
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public uint Serial { get; set; }
@@ -38,7 +38,7 @@ namespace AyaNova.Models
         }
 
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public uint Serial { get; set; }
diff --git a/server/AyaNova/models/WorkOrderItem.cs b/server/AyaNova/models/WorkOrderItem.cs
index fcfddc11..689c427a 100644
--- a/server/AyaNova/models/WorkOrderItem.cs
+++ b/server/AyaNova/models/WorkOrderItem.cs
@@ -12,7 +12,7 @@ namespace AyaNova.Models
             Tags = new List<string>();
         }
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
         public string Notes { get; set; }
         public string Wiki { get; set; }
         public string CustomFields { get; set; }
@@ -40,7 +40,7 @@ namespace AyaNova.Models
             Units = new List<WorkOrderItemUnit>();
         }
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
         public string Notes { get; set; }
         public string Wiki { get; set; }
         public string CustomFields { get; set; }
diff --git a/server/AyaNova/models/WorkOrderItemExpense.cs b/server/AyaNova/models/WorkOrderItemExpense.cs
index 3e33622f..83a40412 100644
--- a/server/AyaNova/models/WorkOrderItemExpense.cs
+++ b/server/AyaNova/models/WorkOrderItemExpense.cs
@@ -11,7 +11,7 @@ namespace AyaNova.Models
             Tags = new List<string>();
         }
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }       
+        public uint Concurrency { get; set; }       
         public string Notes { get; set; }
         public string CustomFields { get; set; }
         public List<string> Tags { get; set; }        
diff --git a/server/AyaNova/models/WorkOrderItemLabor.cs b/server/AyaNova/models/WorkOrderItemLabor.cs
index 69432513..908f78eb 100644
--- a/server/AyaNova/models/WorkOrderItemLabor.cs
+++ b/server/AyaNova/models/WorkOrderItemLabor.cs
@@ -11,7 +11,7 @@ namespace AyaNova.Models
             Tags = new List<string>();
         }
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
         public string Notes { get; set; }
         public string CustomFields { get; set; }
         public List<string> Tags { get; set; }
diff --git a/server/AyaNova/models/WorkOrderItemLoan.cs b/server/AyaNova/models/WorkOrderItemLoan.cs
index 577ef182..ed2fd871 100644
--- a/server/AyaNova/models/WorkOrderItemLoan.cs
+++ b/server/AyaNova/models/WorkOrderItemLoan.cs
@@ -11,7 +11,7 @@ namespace AyaNova.Models
             Tags = new List<string>();
         }
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }       
+        public uint Concurrency { get; set; }       
         public string Notes { get; set; }
         public string CustomFields { get; set; }
         public List<string> Tags { get; set; }        
diff --git a/server/AyaNova/models/WorkOrderItemPart.cs b/server/AyaNova/models/WorkOrderItemPart.cs
index 344105f1..cb939464 100644
--- a/server/AyaNova/models/WorkOrderItemPart.cs
+++ b/server/AyaNova/models/WorkOrderItemPart.cs
@@ -11,7 +11,7 @@ namespace AyaNova.Models
             Tags = new List<string>();
         }
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }       
+        public uint Concurrency { get; set; }       
         public string Notes { get; set; }
         public string CustomFields { get; set; }
         public List<string> Tags { get; set; }        
diff --git a/server/AyaNova/models/WorkOrderItemPartRequest.cs b/server/AyaNova/models/WorkOrderItemPartRequest.cs
index 6321a341..5457212e 100644
--- a/server/AyaNova/models/WorkOrderItemPartRequest.cs
+++ b/server/AyaNova/models/WorkOrderItemPartRequest.cs
@@ -11,7 +11,7 @@ namespace AyaNova.Models
             Tags = new List<string>();
         }
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
         public string Notes { get; set; }
         public string CustomFields { get; set; }
         public List<string> Tags { get; set; }
diff --git a/server/AyaNova/models/WorkOrderItemScheduledUser.cs b/server/AyaNova/models/WorkOrderItemScheduledUser.cs
index a3f1ea5c..ea0e9d1f 100644
--- a/server/AyaNova/models/WorkOrderItemScheduledUser.cs
+++ b/server/AyaNova/models/WorkOrderItemScheduledUser.cs
@@ -11,7 +11,7 @@ namespace AyaNova.Models
             Tags = new List<string>();
         }
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }       
+        public uint Concurrency { get; set; }       
         public string Notes { get; set; }
         public string CustomFields { get; set; }
         public List<string> Tags { get; set; }        
diff --git a/server/AyaNova/models/WorkOrderItemTask.cs b/server/AyaNova/models/WorkOrderItemTask.cs
index fb80924e..a4e3fd8f 100644
--- a/server/AyaNova/models/WorkOrderItemTask.cs
+++ b/server/AyaNova/models/WorkOrderItemTask.cs
@@ -11,7 +11,7 @@ namespace AyaNova.Models
             Tags = new List<string>();
         }
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }       
+        public uint Concurrency { get; set; }       
         public string Notes { get; set; }
         public string CustomFields { get; set; }
         public List<string> Tags { get; set; }        
diff --git a/server/AyaNova/models/WorkOrderItemTravel.cs b/server/AyaNova/models/WorkOrderItemTravel.cs
index 76692bfa..cccae935 100644
--- a/server/AyaNova/models/WorkOrderItemTravel.cs
+++ b/server/AyaNova/models/WorkOrderItemTravel.cs
@@ -11,7 +11,7 @@ namespace AyaNova.Models
             Tags = new List<string>();
         }
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }       
+        public uint Concurrency { get; set; }       
         public string Notes { get; set; }
         public string CustomFields { get; set; }
         public List<string> Tags { get; set; }        
diff --git a/server/AyaNova/models/WorkOrderItemUnit.cs b/server/AyaNova/models/WorkOrderItemUnit.cs
index ef06c053..ce15467b 100644
--- a/server/AyaNova/models/WorkOrderItemUnit.cs
+++ b/server/AyaNova/models/WorkOrderItemUnit.cs
@@ -11,7 +11,7 @@ namespace AyaNova.Models
             Tags = new List<string>();
         }
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }       
+        public uint Concurrency { get; set; }       
         public string Notes { get; set; }
         public string CustomFields { get; set; }
         public List<string> Tags { get; set; }        
diff --git a/server/AyaNova/models/WorkOrderTemplate.cs b/server/AyaNova/models/WorkOrderTemplate.cs
index 08ae7940..1ea5caee 100644
--- a/server/AyaNova/models/WorkOrderTemplate.cs
+++ b/server/AyaNova/models/WorkOrderTemplate.cs
@@ -12,7 +12,7 @@ namespace AyaNova.Models
     public class WorkOrderTemplate
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public string Name { get; set; }      
diff --git a/server/AyaNova/models/WorkOrderTemplateItem.cs b/server/AyaNova/models/WorkOrderTemplateItem.cs
index edc5a9c4..08185e47 100644
--- a/server/AyaNova/models/WorkOrderTemplateItem.cs
+++ b/server/AyaNova/models/WorkOrderTemplateItem.cs
@@ -12,7 +12,7 @@ namespace AyaNova.Models
     public class WorkOrderTemplateItem
     {
         public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
 
         [Required]
         public string Name { get; set; }      
diff --git a/server/AyaNova/models/dto/NewTextIdConcurrencyTokenItem.cs b/server/AyaNova/models/dto/NewTextIdConcurrencyTokenItem.cs
index 20bb7cc8..61341fcb 100644
--- a/server/AyaNova/models/dto/NewTextIdConcurrencyTokenItem.cs
+++ b/server/AyaNova/models/dto/NewTextIdConcurrencyTokenItem.cs
@@ -5,7 +5,7 @@ namespace AyaNova.Models
     {
         public long Id { get; set; }
         public string NewText { get; set; }
-        public uint ConcurrencyToken { get; set; }
+        public uint Concurrency { get; set; }
     }
 
 }