diff --git a/DataFilter/DataFilterCrud.cs b/DataFilter/DataFilterCrud.cs
index 6071075..02ce3c5 100644
--- a/DataFilter/DataFilterCrud.cs
+++ b/DataFilter/DataFilterCrud.cs
@@ -8,7 +8,7 @@ using System.Collections.Concurrent;
 namespace raven_integration
 {
 
-    public class DataFilterCrud
+    public class DataListFilterCrud
     {
 
         /// <summary>
@@ -19,22 +19,22 @@ namespace raven_integration
         {
             //CREATE
             dynamic d = new JObject();
-            d.name = Util.Uniquify("Test DataFilter");
+            d.name = Util.Uniquify("Test DataListFilter");
             
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             //"[{fld:"name",op:"!=",value:"Notequaltothis"},{fld:"tags",op:"Eq",value:"[23,456,54]"}]
             dynamic dfilter = new JArray();
             dynamic df = new JObject();
-            df.fld = "name";
+            df.fld = "widgetname";
             df.op = "%-";
             df.value = "Generic";//lots of seed widgets start with Generic
             dfilter.Add(df);
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            ApiResponse a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            ApiResponse a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long Id = a.ObjectResponse["data"]["id"].Value<long>();
@@ -42,38 +42,38 @@ namespace raven_integration
 
             //RETRIEVE           
             //Get one
-            a = await Util.GetAsync("DataFilter/" + Id.ToString(), await Util.GetTokenAsync("BizAdminFull"));
+            a = await Util.GetAsync("DataListFilter/" + Id.ToString(), await Util.GetTokenAsync("BizAdminFull"));
             Util.ValidateDataReturnResponseOk(a);
-            a.ObjectResponse["data"]["name"].Value<string>().Should().StartWith("Test DataFilter");
+            a.ObjectResponse["data"]["name"].Value<string>().Should().StartWith("Test DataListFilter");
 
             //Get as alternate user should work for public filter
-            a = await Util.GetAsync("DataFilter/" + Id.ToString(), await Util.GetTokenAsync("SubContractorLimited"));
+            a = await Util.GetAsync("DataListFilter/" + Id.ToString(), await Util.GetTokenAsync("SubContractorLimited"));
             Util.ValidateDataReturnResponseOk(a);
-            a.ObjectResponse["data"]["name"].Value<string>().Should().StartWith("Test DataFilter");
+            a.ObjectResponse["data"]["name"].Value<string>().Should().StartWith("Test DataListFilter");
 
 
             //UPDATE
 
             //PUT, make private
             d["public"] = false;
-            d.name = Util.Uniquify("Put - Test DataFilter (privatized)");
+            d.name = Util.Uniquify("Put - Test DataListFilter (privatized)");
             d.concurrencyToken = a.ObjectResponse["data"]["concurrencyToken"].Value<uint>();
-            a = await Util.PutAsync("DataFilter/" + Id.ToString(), await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PutAsync("DataListFilter/" + Id.ToString(), await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateHTTPStatusCode(a, 200);
 
             //check PUT worked
-            a = await Util.GetAsync("DataFilter/" + Id.ToString(), await Util.GetTokenAsync("BizAdminFull"));
+            a = await Util.GetAsync("DataListFilter/" + Id.ToString(), await Util.GetTokenAsync("BizAdminFull"));
             Util.ValidateNoErrorInResponse(a);
             a.ObjectResponse["data"]["name"].Value<string>().Should().Be(d.name.ToString());
 
 
             //FETCH DISALLOWED
             //Get as alternate user should fail for private filter
-            a = await Util.GetAsync("DataFilter/" + Id.ToString(), await Util.GetTokenAsync("SubContractorLimited"));
+            a = await Util.GetAsync("DataListFilter/" + Id.ToString(), await Util.GetTokenAsync("SubContractorLimited"));
             Util.ValidateResponseNotFound(a);
 
             // //DELETE
-            ApiResponse DELETETestResponse = await Util.DeleteAsync("DataFilter/" + Id.ToString(), await Util.GetTokenAsync("BizAdminFull"));
+            ApiResponse DELETETestResponse = await Util.DeleteAsync("DataListFilter/" + Id.ToString(), await Util.GetTokenAsync("BizAdminFull"));
             Util.ValidateHTTPStatusCode(DELETETestResponse, 204);
 
         }
@@ -86,7 +86,7 @@ namespace raven_integration
         {
             //CREATE
             dynamic d = new JObject();
-            d.name = Util.Uniquify("Test DataFilter");
+            d.name = Util.Uniquify("Test DataListFilter");
             
             d["public"] = true;
             d.listKey = "nonexistant";
@@ -101,7 +101,7 @@ namespace raven_integration
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            ApiResponse a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            ApiResponse a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateErrorCodeResponse(a, 2200, 400);
             Util.ShouldContainValidationError(a, "ListKey", "2203");
 
@@ -116,10 +116,10 @@ namespace raven_integration
         {
             //CREATE
             dynamic d = new JObject();
-            d.name = Util.Uniquify("Test DataFilter");
+            d.name = Util.Uniquify("Test DataListFilter");
             
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             //"[{fld:"name",op:"!=",value:"Notequaltothis"},{fld:"tags",op:"Eq",value:"[23,456,54]"}]
             dynamic dfilter = new JArray();
@@ -131,7 +131,7 @@ namespace raven_integration
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            ApiResponse a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            ApiResponse a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateErrorCodeResponse(a, 2200, 400);
             Util.ShouldContainValidationError(a, "Filter", "2203");
 
@@ -147,10 +147,10 @@ namespace raven_integration
         {
             //CREATE
             dynamic d = new JObject();
-            d.name = Util.Uniquify("Test DataFilter");
+            d.name = Util.Uniquify("Test DataListFilter");
             
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             //"[{fld:"name",op:"!=",value:"Notequaltothis"},{fld:"tags",op:"Eq",value:"[23,456,54]"}]
             dynamic dfilter = new JArray();
@@ -162,7 +162,7 @@ namespace raven_integration
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            ApiResponse a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            ApiResponse a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateErrorCodeResponse(a, 2200, 400);
             Util.ShouldContainValidationError(a, "Filter", "2203");
 
diff --git a/DataFilter/DataFilterFilteringLists.cs b/DataFilter/DataFilterFilteringLists.cs
index 204919e..7698d68 100644
--- a/DataFilter/DataFilterFilteringLists.cs
+++ b/DataFilter/DataFilterFilteringLists.cs
@@ -122,7 +122,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -142,7 +142,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -224,7 +224,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -244,7 +244,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -326,7 +326,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -346,7 +346,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -427,7 +427,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -447,7 +447,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -529,7 +529,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -549,7 +549,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -631,7 +631,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -651,7 +651,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -733,7 +733,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -753,7 +753,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -836,7 +836,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -856,7 +856,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -938,7 +938,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -958,7 +958,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -1040,7 +1040,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -1060,7 +1060,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -1143,7 +1143,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -1163,7 +1163,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -1247,7 +1247,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -1267,7 +1267,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -1350,7 +1350,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -1370,7 +1370,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -1456,7 +1456,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -1476,7 +1476,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -1565,7 +1565,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -1585,7 +1585,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -1670,7 +1670,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -1690,7 +1690,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -1776,7 +1776,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -1796,7 +1796,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -1879,7 +1879,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -1899,7 +1899,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -1983,7 +1983,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -2003,7 +2003,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -2089,7 +2089,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -2109,7 +2109,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -2195,7 +2195,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -2215,7 +2215,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -2298,7 +2298,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -2318,7 +2318,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -2401,7 +2401,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -2421,7 +2421,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -2523,7 +2523,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -2543,7 +2543,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -2640,7 +2640,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -2660,7 +2660,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -2755,7 +2755,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -2775,7 +2775,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -2871,7 +2871,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -2891,7 +2891,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -2977,7 +2977,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -2997,7 +2997,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -3081,7 +3081,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -3101,7 +3101,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -3186,7 +3186,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -3206,7 +3206,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -3291,7 +3291,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -3311,7 +3311,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -3395,7 +3395,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -3415,7 +3415,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -3501,7 +3501,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -3521,7 +3521,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -3605,7 +3605,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -3625,7 +3625,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -3710,7 +3710,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -3730,7 +3730,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -3814,7 +3814,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -3834,7 +3834,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -3918,7 +3918,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -3938,7 +3938,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -4023,7 +4023,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -4043,7 +4043,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -4127,7 +4127,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -4147,7 +4147,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -4259,7 +4259,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetRunNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -4279,7 +4279,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -4384,7 +4384,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetRunNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -4404,7 +4404,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -4506,7 +4506,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetRunNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -4526,7 +4526,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -4629,7 +4629,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetRunNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -4649,7 +4649,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -4752,7 +4752,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetRunNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -4772,7 +4772,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -4875,7 +4875,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetRunNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -4895,7 +4895,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -4998,7 +4998,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetRunNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -5018,7 +5018,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -5121,7 +5121,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetRunNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -5141,7 +5141,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -5243,7 +5243,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetRunNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -5263,7 +5263,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -5365,7 +5365,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetRunNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -5385,7 +5385,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -5487,7 +5487,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetRunNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -5507,7 +5507,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -5609,7 +5609,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetRunNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -5629,7 +5629,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -5732,7 +5732,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetRunNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -5752,7 +5752,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -5853,7 +5853,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify("Test INT DataFilter");
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -5874,7 +5874,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -5955,7 +5955,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify("Test INT DataFilter");
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -5976,7 +5976,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -6057,7 +6057,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify("IntegerOpGreaterThanOrEqualToFilterWorks");
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -6078,7 +6078,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -6161,7 +6161,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify("IntegerOpLessThanFilterWorks");
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -6182,7 +6182,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -6264,7 +6264,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify("IntegerOpLessThanOrEqualToFilterWorks");
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -6285,7 +6285,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -6368,7 +6368,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify("IntegerNotEqualToFilterWorks");
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -6389,7 +6389,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -6498,7 +6498,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify("Test BOOL DataFilter");
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -6518,7 +6518,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -6626,7 +6626,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify("Test BOOL DataFilter");
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -6646,7 +6646,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -6740,7 +6740,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify("DecimalOpEqualityFilterWorks");
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -6761,7 +6761,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -6842,7 +6842,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify("DecimalOpGreaterThanFilterWorks");
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -6863,7 +6863,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -6944,7 +6944,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify("DecimalOpGreaterThanOrEqualToFilterWorks");
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -6965,7 +6965,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -7048,7 +7048,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify("DecimalOpLessThanFilterWorks");
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -7069,7 +7069,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -7151,7 +7151,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify("DecimalOpLessThanOrEqualToFilterWorks");
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -7172,7 +7172,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -7255,7 +7255,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify("DecimalNotEqualToFilterWorks");
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -7276,7 +7276,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -7399,7 +7399,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetRunNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -7423,7 +7423,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
@@ -7541,7 +7541,7 @@ same as the server does but in a central location here for all tests to use.
             d.name = Util.Uniquify(WidgetRunNameStart);
 
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             dynamic dfilter = new JArray();
 
@@ -7564,7 +7564,7 @@ same as the server does but in a central location here for all tests to use.
 
             d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
+            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateDataReturnResponseOk(a);
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
diff --git a/DataFilter/DataFilterOrderBy.cs b/DataFilter/DataFilterOrderBy.cs
index c00eae2..cd1930e 100644
--- a/DataFilter/DataFilterOrderBy.cs
+++ b/DataFilter/DataFilterOrderBy.cs
@@ -55,7 +55,7 @@ namespace raven_integration
             dynamic d = new JObject();
             d.name = Util.Uniquify(WidgetNameStart);
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
             dynamic dfilter = new JArray();
 
 
@@ -152,7 +152,7 @@ namespace raven_integration
             dynamic d = new JObject();
             d.name = Util.Uniquify(WidgetNameStart);
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             //FILTER IN BY NAME FOR TESTING THIS RUN ONLY
             dynamic dfilter = new JArray();
@@ -255,7 +255,7 @@ namespace raven_integration
             dynamic d = new JObject();
             d.name = Util.Uniquify(WidgetNameStart);
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             //FILTER IN BY NAME FOR TESTING THIS RUN ONLY
             dynamic dfilter = new JArray();
@@ -391,7 +391,7 @@ namespace raven_integration
             dynamic d = new JObject();
             d.name = Util.Uniquify(WidgetNameStart);
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             //FILTER IN BY NAME FOR TESTING THIS RUN ONLY
             dynamic dfilter = new JArray();
diff --git a/Widget/WidgetLists.cs b/Widget/WidgetLists.cs
index caada09..aa227b6 100644
--- a/Widget/WidgetLists.cs
+++ b/Widget/WidgetLists.cs
@@ -93,7 +93,7 @@ namespace raven_integration
             d = new JObject();
             d.name = Util.Uniquify(NameStart);
             d["public"] = true;
-            d.listKey = "widget";
+            d.listKey="TestWidgetDataList";
 
             //FILTER IN BY NAME FOR TESTING THIS RUN ONLY
             dynamic dfilter = new JArray();