diff --git a/client/resources/aid_desfire.json b/client/resources/aid_desfire.json
index cb10384f4..88101ba67 100644
--- a/client/resources/aid_desfire.json
+++ b/client/resources/aid_desfire.json
@@ -36,7 +36,7 @@
         "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
         "Country": "NZ",
         "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application (Alternative Endian)",
+        "Description": "Cardax Card Data Application",
         "Type": "pacs"
     },
     {
@@ -44,7 +44,7 @@
         "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
         "Country": "NZ",
         "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application (Alternative Endian)",
+        "Description": "Cardax Card Data Application",
         "Type": "pacs"
     },
     {
@@ -52,7 +52,7 @@
         "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
         "Country": "NZ",
         "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application (Alternative Endian)",
+        "Description": "Cardax Card Data Application",
         "Type": "pacs"
     },
     {
@@ -60,7 +60,7 @@
         "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
         "Country": "NZ",
         "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application (Alternative Endian)",
+        "Description": "Cardax Card Data Application",
         "Type": "pacs"
     },
     {
@@ -68,7 +68,7 @@
         "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
         "Country": "NZ",
         "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application (Alternative Endian)",
+        "Description": "Cardax Card Data Application",
         "Type": "pacs"
     },
     {
@@ -76,7 +76,7 @@
         "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
         "Country": "NZ",
         "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application (Alternative Endian)",
+        "Description": "Cardax Card Data Application",
         "Type": "pacs"
     },
     {
@@ -84,7 +84,7 @@
         "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
         "Country": "NZ",
         "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application (Alternative Endian)",
+        "Description": "Cardax Card Data Application",
         "Type": "pacs"
     },
     {
@@ -92,7 +92,7 @@
         "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
         "Country": "NZ",
         "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application (Alternative Endian)",
+        "Description": "Cardax Card Data Application",
         "Type": "pacs"
     },
     {
@@ -100,7 +100,7 @@
         "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
         "Country": "NZ",
         "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application (Alternative Endian)",
+        "Description": "Cardax Card Data Application",
         "Type": "pacs"
     },
     {
@@ -108,7 +108,7 @@
         "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
         "Country": "NZ",
         "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application (Alternative Endian)",
+        "Description": "Cardax Card Data Application",
         "Type": "pacs"
     },
     {
@@ -116,7 +116,7 @@
         "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
         "Country": "NZ",
         "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application (Alternative Endian)",
+        "Description": "Cardax Card Data Application",
         "Type": "pacs"
     },
     {
@@ -124,7 +124,7 @@
         "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
         "Country": "NZ",
         "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application (Alternative Endian)",
+        "Description": "Cardax Card Data Application",
         "Type": "pacs"
     },
     {
@@ -132,7 +132,7 @@
         "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
         "Country": "NZ",
         "Name": "Gallagher Security Credential",
-        "Description": "Unused Cardax Card Data Application (Alternative Endian)",
+        "Description": "Unused Cardax Card Data Application",
         "Type": "pacs"
     },
     {
@@ -140,7 +140,7 @@
         "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
         "Country": "NZ",
         "Name": "Gallagher Security Credential",
-        "Description": "Unused Cardax Card Data Application (Alternative Endian)",
+        "Description": "Unused Cardax Card Data Application",
         "Type": "pacs"
     },
     {
@@ -148,7 +148,7 @@
         "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
         "Country": "NZ",
         "Name": "Gallagher Security Credential",
-        "Description": "Unused Cardax Card Data Application (Alternative Endian)",
+        "Description": "Unused Cardax Card Data Application",
         "Type": "pacs"
     },
     {
@@ -156,7 +156,7 @@
         "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
         "Country": "NZ",
         "Name": "Gallagher Security Credential",
-        "Description": "Card Application Directory (CAD) (Alternative Endian)",
+        "Description": "Card Application Directory (CAD)",
         "Type": "pacs"
     },
     {
@@ -223,134 +223,6 @@
         "Description": "Securitron DESFire EV2 Credential",
         "Type": "pacs"
     },
-    {
-        "AID": "F48120",
-        "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
-        "Country": "NZ",
-        "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application",
-        "Type": "pacs"
-    },
-    {
-        "AID": "F48121",
-        "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
-        "Country": "NZ",
-        "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application",
-        "Type": "pacs"
-    },
-    {
-        "AID": "F48122",
-        "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
-        "Country": "NZ",
-        "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application",
-        "Type": "pacs"
-    },
-    {
-        "AID": "F48123",
-        "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
-        "Country": "NZ",
-        "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application",
-        "Type": "pacs"
-    },
-    {
-        "AID": "F48124",
-        "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
-        "Country": "NZ",
-        "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application",
-        "Type": "pacs"
-    },
-    {
-        "AID": "F48125",
-        "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
-        "Country": "NZ",
-        "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application",
-        "Type": "pacs"
-    },
-    {
-        "AID": "F48126",
-        "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
-        "Country": "NZ",
-        "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application",
-        "Type": "pacs"
-    },
-    {
-        "AID": "F48127",
-        "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
-        "Country": "NZ",
-        "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application",
-        "Type": "pacs"
-    },
-    {
-        "AID": "F48128",
-        "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
-        "Country": "NZ",
-        "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application",
-        "Type": "pacs"
-    },
-    {
-        "AID": "F48129",
-        "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
-        "Country": "NZ",
-        "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application",
-        "Type": "pacs"
-    },
-    {
-        "AID": "F4812A",
-        "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
-        "Country": "NZ",
-        "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application",
-        "Type": "pacs"
-    },
-    {
-        "AID": "F4812B",
-        "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
-        "Country": "NZ",
-        "Name": "Gallagher Security Credential",
-        "Description": "Cardax Card Data Application",
-        "Type": "pacs"
-    },
-    {
-        "AID": "F4812C",
-        "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
-        "Country": "NZ",
-        "Name": "Gallagher Security Credential",
-        "Description": "Unused Cardax Card Data Application",
-        "Type": "pacs"
-    },
-    {
-        "AID": "F4812D",
-        "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
-        "Country": "NZ",
-        "Name": "Gallagher Security Credential",
-        "Description": "Unused Cardax Card Data Application",
-        "Type": "pacs"
-    },
-    {
-        "AID": "F4812E",
-        "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
-        "Country": "NZ",
-        "Name": "Gallagher Security Credential",
-        "Description": "Unused Cardax Card Data Application",
-        "Type": "pacs"
-    },
-    {
-        "AID": "F4812F",
-        "Vendor": "Gallagher Group Limited via PEC (New Zealand) Limited",
-        "Country": "NZ",
-        "Name": "Gallagher Security Credential",
-        "Description": "Card Application Directory (CAD)",
-        "Type": "pacs"
-    },
     {
         "AID": "F484D1",
         "Vendor": "HID",
@@ -895,14 +767,6 @@
         "Description": "car2go - Member Card // Multi Functional Badge / Private Application #1",
         "Type": "carsharing"
     },
-    {
-        "AID": "000005",
-        "Vendor": "Transports Metropolitans de Barcelona (TMB)",
-        "Country": "ES",
-        "Name": "T-mobilitat (BCN)",
-        "Description": "BCN T-mobilitat",
-        "Type": "transport"
-    },
     {
         "AID": "000001",
         "Vendor": "Invalid / Reserved",
@@ -911,6 +775,14 @@
         "Description": "Used by ATL Breeze, PHL FREEDOM, and YVR Compass",
         "Type": "transport"
     },
+    {
+        "AID": "000005",
+        "Vendor": "Transports Metropolitans de Barcelona (TMB)",
+        "Country": "ES",
+        "Name": "T-mobilitat (BCN)",
+        "Description": "BCN T-mobilitat",
+        "Type": "transport"
+    },
     {
         "AID": "0000F0",
         "Vendor": "Metropolitan Transportation Authority (MTA) / Bayerische Motoren Werke (BMW) AG",
@@ -921,7 +793,7 @@
     },
     {
         "AID": "002000",
-        "Vendor": "Metrolinx",
+        "Vendor": "Metrolinx via Accenture",
         "Country": "CA",
         "Name": "PRESTO Card (YYZ/YHM/YOW)",
         "Description": "FIDs 00,0F: Backup Data; 08-0E,10-14: Standard Data",
@@ -1209,7 +1081,7 @@
     },
     {
         "AID": "415431",
-        "Vendor": "Athens Urban Transport Organization (OASA)",
+        "Vendor": "Athens Urban Transport Organisation (OASA)",
         "Country": "GR",
         "Name": "ATH.ENA CARD (ATH)",
         "Description": "ATH ATH.ENA CARD",
@@ -1281,7 +1153,7 @@
     },
     {
         "AID": "4F5931",
-        "Vendor": "Transport for London (TfL)",
+        "Vendor": "Transport for London (TfL) via Cubic Transportation Systems",
         "Country": "UK",
         "Name": "Oyster Card (LHR)",
         "Description": "FIDs: 00-07: Standard Data",
@@ -1297,7 +1169,7 @@
     },
     {
         "AID": "534531",
-        "Vendor": "Transport for New South Wales (TfNSW)",
+        "Vendor": "Transport for New South Wales (TfNSW) via Pearl Consortium",
         "Country": "AU",
         "Name": "Opal Card (SYD)",
         "Description": "FIDs 00-06: Standard Data; 07: Card Balance/Number and Trip History",
@@ -1305,7 +1177,7 @@
     },
     {
         "AID": "554000",
-        "Vendor": "Auckland Transport",
+        "Vendor": "Auckland Transport via Thales Group",
         "Country": "NZ",
         "Name": "AT HOP Card (AKL)",
         "Description": "FIDs: 00: Backup Data; 08/09/0A",
@@ -1465,7 +1337,7 @@
     },
     {
         "AID": "F21050",
-        "Vendor": "Metro Christchurch via INIT / Arc",
+        "Vendor": "Metro Christchurch via INIT / Arc via Vix Technologies",
         "Country": "NZ / CA",
         "Name": "Metrocard (CHC) / Arc (YEG)",
         "Description": "CHC FIDs: 00: Backup Data; 01/02: Trip History; 03: Card Balance",
@@ -1473,7 +1345,7 @@
     },
     {
         "AID": "F210E0",
-        "Vendor": "TriMet",
+        "Vendor": "TriMet via INIT",
         "Country": "US",
         "Name": "hop fastpass (PDX)",
         "Description": "PDX hop fastpass Card",
@@ -1521,7 +1393,7 @@
     },
     {
         "AID": "F21201",
-        "Vendor": "Green Bay Metro Transit via Genfare / Winnipeg Transit",
+        "Vendor": "Green Bay Metro Transit via Genfare / Winnipeg Transit via Genfare",
         "Country": "US / CA",
         "Name": "Tap-N-Go Card (GRB) / peggo card (YWG)",
         "Description": "GRB Tap-N-Go Card / YWG peggo card",
@@ -1537,7 +1409,7 @@
     },
     {
         "AID": "F212A0",
-        "Vendor": "CTtransit",
+        "Vendor": "CTtransit via Genfare",
         "Country": "US",
         "Name": "Go CT Card (BDL)",
         "Description": "BDL Go CT Card",
@@ -1545,7 +1417,7 @@
     },
     {
         "AID": "F21360",
-        "Vendor": "INIT",
+        "Vendor": "The City and County of Honolulu via INIT",
         "Country": "US",
         "Name": "HOLO Card (HNL)",
         "Description": "HNL HOLO Card",
@@ -1561,7 +1433,7 @@
     },
     {
         "AID": "F21390",
-        "Vendor": "Multiple NZ Transit Agencies via Otago Regional Council",
+        "Vendor": "Otago Regional Council via INIT",
         "Country": "NZ",
         "Name": "Bee Card (DUD)",
         "Description": "Multi-Modal Transit #0 // FIDs 00: Backup Data; 01-02: Trip History; 03: Card Balance",
@@ -1625,7 +1497,7 @@
     },
     {
         "AID": "FF30FF",
-        "Vendor": "Metrolinx",
+        "Vendor": "Metrolinx via Accenture",
         "Country": "CA",
         "Name": "PRESTO Card (YYZ/YHM/YOW)",
         "Description": "FID 08: Standard Data",