diff --git a/server/AyaNova/Controllers/DataListController.cs b/server/AyaNova/Controllers/DataListController.cs
index 454cd23a..00fee435 100644
--- a/server/AyaNova/Controllers/DataListController.cs
+++ b/server/AyaNova/Controllers/DataListController.cs
@@ -47,22 +47,22 @@ namespace AyaNova.Api.Controllers
         /// Authorization varies list by list, will return 403 - Not Authorized if user has insufficient role
         /// 
         /// </summary>
-        /// <param name="listOptions">List key, Paging, filtering and sorting options</param>
+        /// <param name="tableRequest">List key, Paging, filtering and sorting options</param>
         /// <returns>Collection with paging data</returns>
         // [HttpPost("List", Name = nameof(List))]
         [HttpPost]
-        public async Task<IActionResult> List([FromBody] DataListTableOptions listOptions)
+        public async Task<IActionResult> List([FromBody] DataListTableRequest tableRequest)
         {
             if (!serverState.IsOpen)
                 return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
 
-            if (listOptions.Limit == null || listOptions.Limit < 1)
+            if (tableRequest.Limit == null || tableRequest.Limit < 1)
             {
-                listOptions.Limit = DataListTableOptions.DefaultLimit;
+                tableRequest.Limit = DataListTableOptions.DefaultLimit;
             }
-            if (listOptions.Offset == null)
+            if (tableRequest.Offset == null)
             {
-                listOptions.Offset = 0;
+                tableRequest.Offset = 0;
             }
 
 
@@ -74,7 +74,7 @@ namespace AyaNova.Api.Controllers
 
             try
             {
-                DataListReturnData r = await DataListFetcher.GetResponseAsync(ct, listOptions, UserRoles, log, UserId);
+                DataListReturnData r = await DataListFetcher.GetResponseAsync(ct, tableRequest, UserRoles, log, UserId);
                 return Ok(r);
             }
             catch (System.UnauthorizedAccessException)
diff --git a/server/AyaNova/DataList/AttachmentDataList.cs b/server/AyaNova/DataList/AttachmentDataList.cs
index 2f3d1633..1ac83cb2 100644
--- a/server/AyaNova/DataList/AttachmentDataList.cs
+++ b/server/AyaNova/DataList/AttachmentDataList.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class AttachmentDataList : DataListBase
+    internal class AttachmentDataList : DataListProcessingBase
     {
 
         public AttachmentDataList()
diff --git a/server/AyaNova/DataList/CustomerDataList.cs b/server/AyaNova/DataList/CustomerDataList.cs
index 6c455464..13c1f322 100644
--- a/server/AyaNova/DataList/CustomerDataList.cs
+++ b/server/AyaNova/DataList/CustomerDataList.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class CustomerDataList : DataListBase
+    internal class CustomerDataList : DataListProcessingBase
     {
         public CustomerDataList()
         {
diff --git a/server/AyaNova/DataList/CustomerNoteDataList.cs b/server/AyaNova/DataList/CustomerNoteDataList.cs
index edf98772..9bf1acf2 100644
--- a/server/AyaNova/DataList/CustomerNoteDataList.cs
+++ b/server/AyaNova/DataList/CustomerNoteDataList.cs
@@ -4,7 +4,7 @@ using AyaNova.Models;
 
 namespace AyaNova.DataList
 {
-    internal class CustomerNoteDataList : DataListBase, IDataListInternalCriteria
+    internal class CustomerNoteDataList : DataListProcessingBase, IDataListInternalCriteria
     {
         public CustomerNoteDataList()
         {
diff --git a/server/AyaNova/DataList/CustomerServiceRequestDataList.cs b/server/AyaNova/DataList/CustomerServiceRequestDataList.cs
index fe3c1865..b84b6bf5 100644
--- a/server/AyaNova/DataList/CustomerServiceRequestDataList.cs
+++ b/server/AyaNova/DataList/CustomerServiceRequestDataList.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class CustomerServiceRequestDataList : DataListBase
+    internal class CustomerServiceRequestDataList : DataListProcessingBase
     {
         public CustomerServiceRequestDataList()
         {
diff --git a/server/AyaNova/DataList/DataListFetcher.cs b/server/AyaNova/DataList/DataListFetcher.cs
index d5d34454..2ee49204 100644
--- a/server/AyaNova/DataList/DataListFetcher.cs
+++ b/server/AyaNova/DataList/DataListFetcher.cs
@@ -17,14 +17,14 @@ namespace AyaNova.DataList
         // Get the data list data requested
         //
         //
-        internal static async Task<DataListReturnData> GetResponseAsync(AyContext ct, DataListTableOptions dataListTableOptions, AuthorizationRoles userRoles, ILogger log, long userId)
+        internal static async Task<DataListReturnData> GetResponseAsync(AyContext ct, DataListTableRequest dataListTableRequest, AuthorizationRoles userRoles, ILogger log, long userId)
         {
 
-            var DataList = DataListFactory.GetAyaDataList(dataListTableOptions.DataListKey);
+            var DataList = DataListFactory.GetAyaDataList(dataListTableRequest.DataListKey);
 
             //was the name not found as a list?
             if (DataList == null)
-                throw new System.ArgumentOutOfRangeException($"DataList \"{dataListTableOptions.DataListKey}\" specified does not exist");
+                throw new System.ArgumentOutOfRangeException($"DataList \"{dataListTableRequest.DataListKey}\" specified does not exist");
 
 
             //check rights
diff --git a/server/AyaNova/DataList/DataListBase.cs b/server/AyaNova/DataList/DataListProcessingBase.cs
similarity index 95%
rename from server/AyaNova/DataList/DataListBase.cs
rename to server/AyaNova/DataList/DataListProcessingBase.cs
index 57fa8ccc..d914c611 100644
--- a/server/AyaNova/DataList/DataListBase.cs
+++ b/server/AyaNova/DataList/DataListProcessingBase.cs
@@ -12,11 +12,11 @@ namespace AyaNova.DataList
     /// <summary>
     /// DataList object base class
     /// </summary>
-    internal abstract class DataListBase : IDataList
+    internal abstract class DataListProcessingBase : IDataList
     {
         //CoreBizObject add here
         //well, not here exactly but add a new DATALIST class if it will be displayed as a list anywhere in the UI or reported on
-        public DataListBase()
+        public DataListProcessingBase()
         {
             /*
 
@@ -40,7 +40,7 @@ namespace AyaNova.DataList
         public Dictionary<string, string> DefaultSortBy { get; set; }
 
         //set defaults if not provided in listOptions
-        public void SetListOptionDefaultsIfNecessary(Models.DataListBase listOptions)
+        public void SetListOptionDefaultsIfNecessary(DataListBase listOptions)
         {
             //columns, filter and sortby could all be null
             if (listOptions.Filter == null)
diff --git a/server/AyaNova/DataList/EventDataList.cs b/server/AyaNova/DataList/EventDataList.cs
index a1304192..d1155568 100644
--- a/server/AyaNova/DataList/EventDataList.cs
+++ b/server/AyaNova/DataList/EventDataList.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class EventDataList : DataListBase
+    internal class EventDataList : DataListProcessingBase
     {/*
             Select aevent.id, aevent.created, aevent.ayid, aevent.ayatype, aevent.ayevent, 
                 aevent.textra, auser.name, auser.id
diff --git a/server/AyaNova/DataList/HeadOfficeDataList.cs b/server/AyaNova/DataList/HeadOfficeDataList.cs
index 90be8938..79d522bd 100644
--- a/server/AyaNova/DataList/HeadOfficeDataList.cs
+++ b/server/AyaNova/DataList/HeadOfficeDataList.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class HeadOfficeDataList : DataListBase
+    internal class HeadOfficeDataList : DataListProcessingBase
     {
         public HeadOfficeDataList()
         {
diff --git a/server/AyaNova/DataList/InsideUserDataList.cs b/server/AyaNova/DataList/InsideUserDataList.cs
index e078b24c..8ed0ce63 100644
--- a/server/AyaNova/DataList/InsideUserDataList.cs
+++ b/server/AyaNova/DataList/InsideUserDataList.cs
@@ -4,7 +4,7 @@ using AyaNova.Models;
 
 namespace AyaNova.DataList
 {
-    internal class InsideUserDataList : DataListBase, IDataListInternalCriteria
+    internal class InsideUserDataList : DataListProcessingBase, IDataListInternalCriteria
     {
 
         public InsideUserDataList()
diff --git a/server/AyaNova/DataList/LoanUnitDataList.cs b/server/AyaNova/DataList/LoanUnitDataList.cs
index e28a93f4..a9270d65 100644
--- a/server/AyaNova/DataList/LoanUnitDataList.cs
+++ b/server/AyaNova/DataList/LoanUnitDataList.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class LoanUnitDataList : DataListBase
+    internal class LoanUnitDataList : DataListProcessingBase
     {
         public LoanUnitDataList()
         {
diff --git a/server/AyaNova/DataList/MemoDataList.cs b/server/AyaNova/DataList/MemoDataList.cs
index 16cc9184..1a935039 100644
--- a/server/AyaNova/DataList/MemoDataList.cs
+++ b/server/AyaNova/DataList/MemoDataList.cs
@@ -3,7 +3,7 @@ using AyaNova.Models;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class MemoDataList : DataListBase, IDataListInternalCriteria
+    internal class MemoDataList : DataListProcessingBase, IDataListInternalCriteria
     {
         public MemoDataList()
         {
diff --git a/server/AyaNova/DataList/OutsideUserDataList.cs b/server/AyaNova/DataList/OutsideUserDataList.cs
index 7b0761c2..ef0dd782 100644
--- a/server/AyaNova/DataList/OutsideUserDataList.cs
+++ b/server/AyaNova/DataList/OutsideUserDataList.cs
@@ -3,7 +3,7 @@ using AyaNova.Models;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class OutsideUserDataList : DataListBase, IDataListInternalCriteria
+    internal class OutsideUserDataList : DataListProcessingBase, IDataListInternalCriteria
     {
 
         public OutsideUserDataList()
diff --git a/server/AyaNova/DataList/PartAssemblyDataList.cs b/server/AyaNova/DataList/PartAssemblyDataList.cs
index dc321b1e..7477d222 100644
--- a/server/AyaNova/DataList/PartAssemblyDataList.cs
+++ b/server/AyaNova/DataList/PartAssemblyDataList.cs
@@ -3,7 +3,7 @@ using Newtonsoft.Json.Linq;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class PartAssemblyDataList : DataListBase
+    internal class PartAssemblyDataList : DataListProcessingBase
     {
         public PartAssemblyDataList()
         {
diff --git a/server/AyaNova/DataList/PartDataList.cs b/server/AyaNova/DataList/PartDataList.cs
index 19773298..7026fa00 100644
--- a/server/AyaNova/DataList/PartDataList.cs
+++ b/server/AyaNova/DataList/PartDataList.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class PartDataList : DataListBase
+    internal class PartDataList : DataListProcessingBase
     {
         public PartDataList()
         {
diff --git a/server/AyaNova/DataList/PartInventoryDataList.cs b/server/AyaNova/DataList/PartInventoryDataList.cs
index bafee41a..fe1a7984 100644
--- a/server/AyaNova/DataList/PartInventoryDataList.cs
+++ b/server/AyaNova/DataList/PartInventoryDataList.cs
@@ -5,7 +5,7 @@ using AyaNova.Models;
 
 namespace AyaNova.DataList
 {
-    internal class PartInventoryDataList : DataListBase, IDataListInternalCriteria
+    internal class PartInventoryDataList : DataListProcessingBase, IDataListInternalCriteria
     {
         public PartInventoryDataList()
         {
diff --git a/server/AyaNova/DataList/PartInventoryTransactionsDataList.cs b/server/AyaNova/DataList/PartInventoryTransactionsDataList.cs
index 071fbb87..d9eb8307 100644
--- a/server/AyaNova/DataList/PartInventoryTransactionsDataList.cs
+++ b/server/AyaNova/DataList/PartInventoryTransactionsDataList.cs
@@ -5,7 +5,7 @@ using AyaNova.Models;
 
 namespace AyaNova.DataList
 {
-    internal class PartInventoryTransactionsDataList : DataListBase, IDataListInternalCriteria
+    internal class PartInventoryTransactionsDataList : DataListProcessingBase, IDataListInternalCriteria
     {
         public PartInventoryTransactionsDataList()
         {
diff --git a/server/AyaNova/DataList/PartWarehouseDataList.cs b/server/AyaNova/DataList/PartWarehouseDataList.cs
index d4ddd6ec..53e7abe5 100644
--- a/server/AyaNova/DataList/PartWarehouseDataList.cs
+++ b/server/AyaNova/DataList/PartWarehouseDataList.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class PartWarehouseDataList : DataListBase
+    internal class PartWarehouseDataList : DataListProcessingBase
     {
         public PartWarehouseDataList()
         {
diff --git a/server/AyaNova/DataList/ProjectDataList.cs b/server/AyaNova/DataList/ProjectDataList.cs
index ae43107f..54a04f5a 100644
--- a/server/AyaNova/DataList/ProjectDataList.cs
+++ b/server/AyaNova/DataList/ProjectDataList.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class ProjectDataList : DataListBase
+    internal class ProjectDataList : DataListProcessingBase
     {
         public ProjectDataList()
         {
diff --git a/server/AyaNova/DataList/ReminderDataList.cs b/server/AyaNova/DataList/ReminderDataList.cs
index 1f6367b4..6af42fc2 100644
--- a/server/AyaNova/DataList/ReminderDataList.cs
+++ b/server/AyaNova/DataList/ReminderDataList.cs
@@ -3,7 +3,7 @@ using AyaNova.Models;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class ReminderDataList : DataListBase, IDataListInternalCriteria
+    internal class ReminderDataList : DataListProcessingBase, IDataListInternalCriteria
     {
         public ReminderDataList()
         {
diff --git a/server/AyaNova/DataList/ReportDataList.cs b/server/AyaNova/DataList/ReportDataList.cs
index ff357cb9..146963d2 100644
--- a/server/AyaNova/DataList/ReportDataList.cs
+++ b/server/AyaNova/DataList/ReportDataList.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class ReportDataList : DataListBase
+    internal class ReportDataList : DataListProcessingBase
     {
 
         public ReportDataList()
diff --git a/server/AyaNova/DataList/ReviewDataList.cs b/server/AyaNova/DataList/ReviewDataList.cs
index b26acec2..836f3741 100644
--- a/server/AyaNova/DataList/ReviewDataList.cs
+++ b/server/AyaNova/DataList/ReviewDataList.cs
@@ -3,7 +3,7 @@ using AyaNova.Models;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class ReviewDataList : DataListBase, IDataListInternalCriteria
+    internal class ReviewDataList : DataListProcessingBase, IDataListInternalCriteria
     {
         public ReviewDataList()
         {
diff --git a/server/AyaNova/DataList/ServiceBankDataList.cs b/server/AyaNova/DataList/ServiceBankDataList.cs
index b2b4d36e..4787690b 100644
--- a/server/AyaNova/DataList/ServiceBankDataList.cs
+++ b/server/AyaNova/DataList/ServiceBankDataList.cs
@@ -4,7 +4,7 @@ using AyaNova.Models;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class ServiceBankDataList : DataListBase
+    internal class ServiceBankDataList : DataListProcessingBase
     {
         public ServiceBankDataList()
         {
diff --git a/server/AyaNova/DataList/ServiceRateDataList.cs b/server/AyaNova/DataList/ServiceRateDataList.cs
index 7c2f22d2..2b2e2e36 100644
--- a/server/AyaNova/DataList/ServiceRateDataList.cs
+++ b/server/AyaNova/DataList/ServiceRateDataList.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class ServiceRateDataList : DataListBase
+    internal class ServiceRateDataList : DataListProcessingBase
     {
         public ServiceRateDataList()
         {
diff --git a/server/AyaNova/DataList/TaxCodeDataList.cs b/server/AyaNova/DataList/TaxCodeDataList.cs
index cf6bf7f8..05f97621 100644
--- a/server/AyaNova/DataList/TaxCodeDataList.cs
+++ b/server/AyaNova/DataList/TaxCodeDataList.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class TaxCodeDataList : DataListBase
+    internal class TaxCodeDataList : DataListProcessingBase
     {
         public TaxCodeDataList()
         {
diff --git a/server/AyaNova/DataList/TestWidgetDataList.cs b/server/AyaNova/DataList/TestWidgetDataList.cs
index 762ef36d..da1e065b 100644
--- a/server/AyaNova/DataList/TestWidgetDataList.cs
+++ b/server/AyaNova/DataList/TestWidgetDataList.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class TestWidgetDataList : DataListBase
+    internal class TestWidgetDataList : DataListProcessingBase
     {
         public TestWidgetDataList()
         {
diff --git a/server/AyaNova/DataList/TranslationDataList.cs b/server/AyaNova/DataList/TranslationDataList.cs
index e2b69ec7..28a82a4e 100644
--- a/server/AyaNova/DataList/TranslationDataList.cs
+++ b/server/AyaNova/DataList/TranslationDataList.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class TranslationDataList : DataListBase
+    internal class TranslationDataList : DataListProcessingBase
     {
 
         public TranslationDataList()
diff --git a/server/AyaNova/DataList/TravelRateDataList.cs b/server/AyaNova/DataList/TravelRateDataList.cs
index e2ceb90b..f70ab192 100644
--- a/server/AyaNova/DataList/TravelRateDataList.cs
+++ b/server/AyaNova/DataList/TravelRateDataList.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class TravelRateDataList : DataListBase
+    internal class TravelRateDataList : DataListProcessingBase
     {
         public TravelRateDataList()
         {
diff --git a/server/AyaNova/DataList/UnitDataList.cs b/server/AyaNova/DataList/UnitDataList.cs
index 954be233..2e2964f2 100644
--- a/server/AyaNova/DataList/UnitDataList.cs
+++ b/server/AyaNova/DataList/UnitDataList.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class UnitDataList : DataListBase
+    internal class UnitDataList : DataListProcessingBase
     {
         public UnitDataList()
         {
diff --git a/server/AyaNova/DataList/UnitModelDataList.cs b/server/AyaNova/DataList/UnitModelDataList.cs
index caa4921c..99cb1688 100644
--- a/server/AyaNova/DataList/UnitModelDataList.cs
+++ b/server/AyaNova/DataList/UnitModelDataList.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class UnitModelDataList : DataListBase
+    internal class UnitModelDataList : DataListProcessingBase
     {
         public UnitModelDataList()
         {
diff --git a/server/AyaNova/DataList/VendorDataList.cs b/server/AyaNova/DataList/VendorDataList.cs
index acdc93c1..6d56d47e 100644
--- a/server/AyaNova/DataList/VendorDataList.cs
+++ b/server/AyaNova/DataList/VendorDataList.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using AyaNova.Biz;
 namespace AyaNova.DataList
 {
-    internal class VendorDataList : DataListBase
+    internal class VendorDataList : DataListProcessingBase
     {
         public VendorDataList()
         {