diff --git a/services/directory/data/Merge.json b/services/directory/data/Merge.json
index ae257fb6f..f0ae55034 100644
--- a/services/directory/data/Merge.json
+++ b/services/directory/data/Merge.json
@@ -1,270 +1,270 @@
 [
   {
-    "mergeFilterListId": 11,
-    "upstreamFilterListId": 12
+    "includedInFilterListId": 11,
+    "includesFilterListId": 12
   },
   {
-    "mergeFilterListId": 11,
-    "upstreamFilterListId": 301
+    "includedInFilterListId": 11,
+    "includesFilterListId": 301
   },
   {
-    "mergeFilterListId": 13,
-    "upstreamFilterListId": 12
+    "includedInFilterListId": 13,
+    "includesFilterListId": 12
   },
   {
-    "mergeFilterListId": 13,
-    "upstreamFilterListId": 14
+    "includedInFilterListId": 13,
+    "includesFilterListId": 14
   },
   {
-    "mergeFilterListId": 13,
-    "upstreamFilterListId": 301
+    "includedInFilterListId": 13,
+    "includesFilterListId": 301
   },
   {
-    "mergeFilterListId": 168,
-    "upstreamFilterListId": 157
+    "includedInFilterListId": 168,
+    "includesFilterListId": 157
   },
   {
-    "mergeFilterListId": 168,
-    "upstreamFilterListId": 159
+    "includedInFilterListId": 168,
+    "includesFilterListId": 159
   },
   {
-    "mergeFilterListId": 168,
-    "upstreamFilterListId": 162
+    "includedInFilterListId": 168,
+    "includesFilterListId": 162
   },
   {
-    "mergeFilterListId": 168,
-    "upstreamFilterListId": 166
+    "includedInFilterListId": 168,
+    "includesFilterListId": 166
   },
   {
-    "mergeFilterListId": 168,
-    "upstreamFilterListId": 242
+    "includedInFilterListId": 168,
+    "includesFilterListId": 242
   },
   {
-    "mergeFilterListId": 168,
-    "upstreamFilterListId": 301
+    "includedInFilterListId": 168,
+    "includesFilterListId": 301
   },
   {
-    "mergeFilterListId": 255,
-    "upstreamFilterListId": 564
+    "includedInFilterListId": 255,
+    "includesFilterListId": 564
   },
   {
-    "mergeFilterListId": 265,
-    "upstreamFilterListId": 564
+    "includedInFilterListId": 265,
+    "includesFilterListId": 564
   },
   {
-    "mergeFilterListId": 266,
-    "upstreamFilterListId": 564
+    "includedInFilterListId": 266,
+    "includesFilterListId": 564
   },
   {
-    "mergeFilterListId": 271,
-    "upstreamFilterListId": 338
+    "includedInFilterListId": 271,
+    "includesFilterListId": 338
   },
   {
-    "mergeFilterListId": 274,
-    "upstreamFilterListId": 275
+    "includedInFilterListId": 274,
+    "includesFilterListId": 275
   },
   {
-    "mergeFilterListId": 309,
-    "upstreamFilterListId": 17
+    "includedInFilterListId": 309,
+    "includesFilterListId": 17
   },
   {
-    "mergeFilterListId": 309,
-    "upstreamFilterListId": 32
+    "includedInFilterListId": 309,
+    "includesFilterListId": 32
   },
   {
-    "mergeFilterListId": 309,
-    "upstreamFilterListId": 54
+    "includedInFilterListId": 309,
+    "includesFilterListId": 54
   },
   {
-    "mergeFilterListId": 309,
-    "upstreamFilterListId": 80
+    "includedInFilterListId": 309,
+    "includesFilterListId": 80
   },
   {
-    "mergeFilterListId": 309,
-    "upstreamFilterListId": 81
+    "includedInFilterListId": 309,
+    "includesFilterListId": 81
   },
   {
-    "mergeFilterListId": 309,
-    "upstreamFilterListId": 99
+    "includedInFilterListId": 309,
+    "includesFilterListId": 99
   },
   {
-    "mergeFilterListId": 309,
-    "upstreamFilterListId": 138
+    "includedInFilterListId": 309,
+    "includesFilterListId": 138
   },
   {
-    "mergeFilterListId": 309,
-    "upstreamFilterListId": 170
+    "includedInFilterListId": 309,
+    "includesFilterListId": 170
   },
   {
-    "mergeFilterListId": 309,
-    "upstreamFilterListId": 177
+    "includedInFilterListId": 309,
+    "includesFilterListId": 177
   },
   {
-    "mergeFilterListId": 309,
-    "upstreamFilterListId": 179
+    "includedInFilterListId": 309,
+    "includesFilterListId": 179
   },
   {
-    "mergeFilterListId": 309,
-    "upstreamFilterListId": 206
+    "includedInFilterListId": 309,
+    "includesFilterListId": 206
   },
   {
-    "mergeFilterListId": 309,
-    "upstreamFilterListId": 226
+    "includedInFilterListId": 309,
+    "includesFilterListId": 226
   },
   {
-    "mergeFilterListId": 309,
-    "upstreamFilterListId": 255
+    "includedInFilterListId": 309,
+    "includesFilterListId": 255
   },
   {
-    "mergeFilterListId": 309,
-    "upstreamFilterListId": 276
+    "includedInFilterListId": 309,
+    "includesFilterListId": 276
   },
   {
-    "mergeFilterListId": 309,
-    "upstreamFilterListId": 282
+    "includedInFilterListId": 309,
+    "includesFilterListId": 282
   },
   {
-    "mergeFilterListId": 309,
-    "upstreamFilterListId": 316
+    "includedInFilterListId": 309,
+    "includesFilterListId": 316
   },
   {
-    "mergeFilterListId": 309,
-    "upstreamFilterListId": 317
+    "includedInFilterListId": 309,
+    "includesFilterListId": 317
   },
   {
-    "mergeFilterListId": 309,
-    "upstreamFilterListId": 324
+    "includedInFilterListId": 309,
+    "includesFilterListId": 324
   },
   {
-    "mergeFilterListId": 309,
-    "upstreamFilterListId": 325
+    "includedInFilterListId": 309,
+    "includesFilterListId": 325
   },
   {
-    "mergeFilterListId": 309,
-    "upstreamFilterListId": 329
+    "includedInFilterListId": 309,
+    "includesFilterListId": 329
   },
   {
-    "mergeFilterListId": 309,
-    "upstreamFilterListId": 340
+    "includedInFilterListId": 309,
+    "includesFilterListId": 340
   },
   {
-    "mergeFilterListId": 331,
-    "upstreamFilterListId": 199
+    "includedInFilterListId": 331,
+    "includesFilterListId": 199
   },
   {
-    "mergeFilterListId": 331,
-    "upstreamFilterListId": 330
+    "includedInFilterListId": 331,
+    "includesFilterListId": 330
   },
   {
-    "mergeFilterListId": 331,
-    "upstreamFilterListId": 332
+    "includedInFilterListId": 331,
+    "includesFilterListId": 332
   },
   {
-    "mergeFilterListId": 331,
-    "upstreamFilterListId": 333
+    "includedInFilterListId": 331,
+    "includesFilterListId": 333
   },
   {
-    "mergeFilterListId": 371,
-    "upstreamFilterListId": 110
+    "includedInFilterListId": 371,
+    "includesFilterListId": 110
   },
   {
-    "mergeFilterListId": 371,
-    "upstreamFilterListId": 232
+    "includedInFilterListId": 371,
+    "includesFilterListId": 232
   },
   {
-    "mergeFilterListId": 375,
-    "upstreamFilterListId": 2
+    "includedInFilterListId": 375,
+    "includesFilterListId": 2
   },
   {
-    "mergeFilterListId": 375,
-    "upstreamFilterListId": 18
+    "includedInFilterListId": 375,
+    "includesFilterListId": 18
   },
   {
-    "mergeFilterListId": 375,
-    "upstreamFilterListId": 19
+    "includedInFilterListId": 375,
+    "includesFilterListId": 19
   },
   {
-    "mergeFilterListId": 375,
-    "upstreamFilterListId": 27
+    "includedInFilterListId": 375,
+    "includesFilterListId": 27
   },
   {
-    "mergeFilterListId": 375,
-    "upstreamFilterListId": 38
+    "includedInFilterListId": 375,
+    "includesFilterListId": 38
   },
   {
-    "mergeFilterListId": 375,
-    "upstreamFilterListId": 70
+    "includedInFilterListId": 375,
+    "includesFilterListId": 70
   },
   {
-    "mergeFilterListId": 375,
-    "upstreamFilterListId": 71
+    "includedInFilterListId": 375,
+    "includesFilterListId": 71
   },
   {
-    "mergeFilterListId": 375,
-    "upstreamFilterListId": 97
+    "includedInFilterListId": 375,
+    "includesFilterListId": 97
   },
   {
-    "mergeFilterListId": 375,
-    "upstreamFilterListId": 99
+    "includedInFilterListId": 375,
+    "includesFilterListId": 99
   },
   {
-    "mergeFilterListId": 375,
-    "upstreamFilterListId": 183
+    "includedInFilterListId": 375,
+    "includesFilterListId": 183
   },
   {
-    "mergeFilterListId": 375,
-    "upstreamFilterListId": 184
+    "includedInFilterListId": 375,
+    "includesFilterListId": 184
   },
   {
-    "mergeFilterListId": 375,
-    "upstreamFilterListId": 214
+    "includedInFilterListId": 375,
+    "includesFilterListId": 214
   },
   {
-    "mergeFilterListId": 375,
-    "upstreamFilterListId": 232
+    "includedInFilterListId": 375,
+    "includesFilterListId": 232
   },
   {
-    "mergeFilterListId": 375,
-    "upstreamFilterListId": 247
+    "includedInFilterListId": 375,
+    "includesFilterListId": 247
   },
   {
-    "mergeFilterListId": 375,
-    "upstreamFilterListId": 279
+    "includedInFilterListId": 375,
+    "includesFilterListId": 279
   },
   {
-    "mergeFilterListId": 375,
-    "upstreamFilterListId": 307
+    "includedInFilterListId": 375,
+    "includesFilterListId": 307
   },
   {
-    "mergeFilterListId": 566,
-    "upstreamFilterListId": 569
+    "includedInFilterListId": 566,
+    "includesFilterListId": 569
   },
   {
-    "mergeFilterListId": 566,
-    "upstreamFilterListId": 570
+    "includedInFilterListId": 566,
+    "includesFilterListId": 570
   },
   {
-    "mergeFilterListId": 566,
-    "upstreamFilterListId": 573
+    "includedInFilterListId": 566,
+    "includesFilterListId": 573
   },
   {
-    "mergeFilterListId": 566,
-    "upstreamFilterListId": 574
+    "includedInFilterListId": 566,
+    "includesFilterListId": 574
   },
   {
-    "mergeFilterListId": 566,
-    "upstreamFilterListId": 575
+    "includedInFilterListId": 566,
+    "includesFilterListId": 575
   },
   {
-    "mergeFilterListId": 566,
-    "upstreamFilterListId": 583
+    "includedInFilterListId": 566,
+    "includesFilterListId": 583
   },
   {
-    "mergeFilterListId": 566,
-    "upstreamFilterListId": 585
+    "includedInFilterListId": 566,
+    "includesFilterListId": 585
   },
   {
-    "mergeFilterListId": 566,
-    "upstreamFilterListId": 586
+    "includedInFilterListId": 566,
+    "includesFilterListId": 586
   }
 ]