diff --git a/scripts/breakUpAriaJSON.js b/scripts/breakUpAriaJSON.js
index f346f8bc..31201339 100755
--- a/scripts/breakUpAriaJSON.js
+++ b/scripts/breakUpAriaJSON.js
@@ -146,6 +146,9 @@ fs.readFile(path.join('scripts/roles.json'), {
       // Deprecate requireContextRole prop. Replace with requiredContextRole.
       // requireContextRole will be removed in a future version.
       aria[name]['requireContextRole'] = aria[name]['requiredContextRole'];
+      // Deprecate baseConcepts prop.
+      // baseConcepts will be removed in a future version.
+      aria[name]['baseConcepts'] = [];
 
       const file = [
         '/**',
diff --git a/scripts/roles.json b/scripts/roles.json
index 9e0ce6e9..4586f926 100644
--- a/scripts/roles.json
+++ b/scripts/roles.json
@@ -27,7 +27,6 @@
     ],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "XForms",
       "concept": {
@@ -64,7 +63,6 @@
     ],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "XForms",
       "concept": {
@@ -100,12 +98,11 @@
     ],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [{
+    "relatedConcepts": [{
       "concept": {
         "name": "Device Independence Delivery Unit"
       }
-    }],
-    "relatedConcepts": []
+    }]
   },
   "article": {
     "superClass": ["document"],
@@ -137,7 +134,6 @@
     ],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "HTML",
       "concept": {
@@ -173,7 +169,6 @@
     ],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": []
   },
   "button": {
@@ -205,17 +200,11 @@
     ],
     "abstract": false,
     "childrenPresentational": true,
-    "baseConcepts": [{
+    "relatedConcepts": [{
       "module": "HTML",
       "concept": {
         "name": "button"
       }
-    }],
-    "relatedConcepts": [{
-      "module": "ARIA",
-      "concept": {
-        "name": "link"
-      }
     }, {
       "module": "XForms",
       "concept": {
@@ -259,13 +248,12 @@
       "aria-roledescription"
     ],
     "abstract": false,
-    "baseConcepts": [{
+    "relatedConcepts": [{
       "module": "HTML",
       "concept": {
         "name": "td"
       }
     }],
-    "relatedConcepts": [],
     "childrenPresentational": false
   },
   "checkbox": {
@@ -299,7 +287,6 @@
     ],
     "abstract": false,
     "childrenPresentational": true,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "ARIA",
       "concept": {
@@ -348,13 +335,12 @@
     ],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [{
+    "relatedConcepts": [{
       "module": "HTML",
       "concept": {
         "name": "th"
       }
-    }],
-    "relatedConcepts": []
+    }]
   },
   "combobox": {
     "superClass": ["select"],
@@ -398,14 +384,32 @@
     ],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
-      "module": "XForms",
+      "module": "HTML",
       "concept": {
-        "name": "select"
+        "name": "select",
+        "attributes": [{
+          "name": "multiple",
+          "constraints": ["unset"]
+        }, {
+          "name": "size",
+          "constraints": ["unset"]
+        }]
       }
     }, {
       "module": "HTML",
+      "concept": {
+        "name": "select",
+        "attributes": [{
+          "name": "multiple",
+          "constraints": ["unset"]
+        }, {
+          "name": "size",
+          "value": 1
+        }]
+      }
+    }, {
+      "module": "XForms",
       "concept": {
         "name": "select"
       }
@@ -443,7 +447,6 @@
     "requiredProps": [],
     "abstract": true,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "HTML",
       "concept": {
@@ -479,7 +482,6 @@
     ],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": []
   },
   "composite": {
@@ -515,7 +517,6 @@
     "requiredProps": [],
     "abstract": true,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": []
   },
   "contentinfo": {
@@ -546,7 +547,6 @@
     ],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": []
   },
   "definition": {
@@ -577,7 +577,6 @@
     ],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "HTML",
       "concept": {
@@ -619,7 +618,6 @@
     ],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": []
   },
   "directory": {
@@ -630,7 +628,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "DAISY Guide"
     }],
@@ -688,7 +685,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -729,7 +725,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -770,7 +765,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -811,7 +805,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -852,7 +845,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -896,7 +888,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -939,7 +930,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -980,7 +970,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1021,7 +1010,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1062,7 +1050,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1103,7 +1090,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1144,7 +1130,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1185,7 +1170,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1226,7 +1210,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1267,7 +1250,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1311,7 +1293,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1354,7 +1335,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1395,7 +1375,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1436,7 +1415,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1477,7 +1455,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1518,7 +1495,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": []
   },
   "doc-footnote": {
@@ -1554,7 +1530,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1595,7 +1570,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1639,7 +1613,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1680,7 +1653,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1721,7 +1693,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1762,7 +1733,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1803,7 +1773,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1844,7 +1813,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1886,7 +1854,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": true,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1927,7 +1894,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -1968,7 +1934,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -2009,7 +1974,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -2050,7 +2014,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -2068,7 +2031,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -2109,7 +2071,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -2150,7 +2111,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -2191,7 +2151,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -2232,7 +2191,6 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "EPUB",
       "concept": {
@@ -2248,7 +2206,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "concept": {
         "name": "Device Independence Delivery Unit"
@@ -2310,7 +2267,6 @@
       "aria-relevant",
       "aria-roledescription"
     ],
-    "baseConcepts": [],
     "relatedConcepts": []
   },
   "figure": {
@@ -2346,7 +2302,6 @@
       "aria-roledescription"
     ],
     "requiredProps": [],
-    "baseConcepts": [],
     "relatedConcepts":[{
       "module": "HTML",
       "concept": {
@@ -2362,7 +2317,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "HTML",
       "concept": {
@@ -2404,7 +2358,7 @@
     ],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [{
+    "relatedConcepts": [{
       "module": "HTML",
       "concept": {
         "name": "table",
@@ -2414,7 +2368,6 @@
         }]
       }
     }],
-    "relatedConcepts": [],
     "props": [
       "aria-level",
       "aria-multiselectable",
@@ -2448,7 +2401,7 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [{
+    "relatedConcepts": [{
       "module": "HTML",
       "concept": {
         "name": "td",
@@ -2458,7 +2411,6 @@
         }]
       }
     }],
-    "relatedConcepts": [],
     "props": [
       "aria-readonly",
       "aria-required",
@@ -2491,7 +2443,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "HTML",
       "concept": {
@@ -2528,7 +2479,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "HTML",
       "concept": {
@@ -2590,7 +2540,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "HTML",
       "concept": {
@@ -2650,7 +2599,6 @@
     "requiredProps": [],
     "abstract": true,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "XForms",
       "concept": {
@@ -2686,7 +2634,6 @@
     "requiredProps": [],
     "abstract": true,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": []
   },
   "link": {
@@ -2697,7 +2644,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "HTML",
       "concept": {
@@ -2752,7 +2698,7 @@
     ],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [{
+    "relatedConcepts": [{
       "module": "HTML",
       "concept": {
         "name": "ol"
@@ -2763,7 +2709,6 @@
         "name": "ul"
       }
     }],
-    "relatedConcepts": [],
     "props": [
       "aria-expanded",
       "aria-atomic",
@@ -2795,16 +2740,43 @@
     ],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
-      "module": "ARIA",
+      "module": "HTML",
       "concept": {
-        "name": "list"
+        "name": "datalist"
       }
     }, {
       "module": "HTML",
       "concept": {
-        "name": "select"
+        "name": "select",
+        "attributes": [{
+          "name": "multiple"
+        }]
+      }
+    }, {
+      "module": "HTML",
+      "concept": {
+        "name": "select",
+        "attributes": [{
+          "name": "multiple"
+        }, {
+          "name": "size",
+          "constraints": [">1"]
+        }]
+      }
+    }, {
+      "module": "HTML",
+      "concept": {
+        "name": "select",
+        "attributes": [{
+          "name": "size",
+          "constraints": [">1"]
+        }]
+      }
+    }, {
+      "module": "ARIA",
+      "concept": {
+        "name": "list"
       }
     }, {
       "module": "XForms",
@@ -2849,13 +2821,12 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [{
+    "relatedConcepts": [{
       "module": "HTML",
       "concept": {
         "name": "li"
       }
-    }],
-    "relatedConcepts": [{
+    }, {
       "module": "XForms",
       "concept": {
         "name": "item"
@@ -2893,7 +2864,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [],
     "props": [
       "aria-expanded",
@@ -2924,7 +2894,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "HTML",
       "concept": {
@@ -2960,7 +2929,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [],
     "props": [
       "aria-expanded",
@@ -2991,7 +2959,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [],
     "props": [
       "aria-expanded",
@@ -3027,7 +2994,6 @@
     ],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "ARIA",
       "concept": {
@@ -3085,7 +3051,6 @@
     ],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "ARIA",
       "concept": {
@@ -3127,7 +3092,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "ARIA",
       "concept": {
@@ -3184,7 +3148,6 @@
       "aria-checked"
     ],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "ARIA",
       "concept": {
@@ -3226,7 +3189,6 @@
       "aria-checked"
     ],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "ARIA",
       "concept": {
@@ -3265,7 +3227,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "HTML",
       "concept": {
@@ -3301,7 +3262,6 @@
     "requiredContextRole": [],
     "requiredOwnedElements": [],
     "requiredProps": [],
-    "baseConcepts": [],
     "relatedConcepts": [],
     "childrenPresentational": false,
     "abstract": false
@@ -3314,7 +3274,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [],
     "props": [
       "aria-expanded",
@@ -3349,13 +3308,12 @@
       ["aria-selected", "false"]
     ],
     "abstract": false,
-    "baseConcepts": [{
+    "relatedConcepts": [{
       "module": "HTML",
       "concept": {
         "name": "option"
       }
-    }],
-    "relatedConcepts": [{
+    }, {
       "module": "ARIA",
       "concept": {
         "name": "listitem"
@@ -3398,7 +3356,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [],
     "props": [
       "aria-atomic",
@@ -3428,7 +3385,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "ARIA",
       "concept": {
@@ -3469,7 +3425,6 @@
       ["aria-checked", "false"]
     ],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "HTML",
       "concept": {
@@ -3514,7 +3469,6 @@
     ],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "ARIA",
       "concept": {
@@ -3581,7 +3535,6 @@
     "requiredProps": [],
     "abstract": true,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": []
   },
   "region": {
@@ -3592,7 +3545,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "HTML",
       "concept": {
@@ -3661,7 +3613,6 @@
     "requiredProps": [],
     "abstract": true,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "XHTML",
       "concept": {
@@ -3697,13 +3648,12 @@
     ],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [{
+    "relatedConcepts": [{
       "module": "HTML",
       "concept": {
         "name": "tr"
       }
     }],
-    "relatedConcepts": [],
     "props": [
       "aria-colindex",
       "aria-level",
@@ -3744,7 +3694,7 @@
     ],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [{
+    "relatedConcepts": [{
       "module": "HTML",
       "concept": {
         "name": "tbody"
@@ -3760,7 +3710,6 @@
         "name": "thead"
       }
     }],
-    "relatedConcepts": [],
     "props": [
       "aria-activedescendant",
       "aria-expanded",
@@ -3793,7 +3742,7 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [{
+    "relatedConcepts": [{
       "module": "HTML",
       "concept": {
         "name": "th",
@@ -3803,7 +3752,6 @@
         }]
       }
     }],
-    "relatedConcepts": [],
     "props": [
       "aria-sort",
       "aria-readonly",
@@ -3837,7 +3785,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [],
     "props": [
       "aria-controls",
@@ -3856,7 +3803,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [],
     "props": [
       "aria-expanded",
@@ -3917,7 +3863,7 @@
     "requiredProps": [],
     "abstract": false,
     "childrenPresentational": false,
-    "baseConcepts": [{
+    "relatedConcepts": [{
       "module": "HTML",
       "concept": {
         "name": "input",
@@ -3926,8 +3872,7 @@
           "value": "search"
         }]
       }
-    }],
-    "relatedConcepts": []
+    }]
   },
   "section": {
     "superClass": ["structure"],
@@ -3957,7 +3902,6 @@
     "requiredProps": [],
     "abstract": true,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "DTB",
       "concept": {
@@ -4003,7 +3947,6 @@
     "requiredProps": [],
     "abstract": true,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": []
   },
   "select": {
@@ -4037,60 +3980,7 @@
     "requiredProps": [],
     "abstract": true,
     "childrenPresentational": false,
-    "baseConcepts": [],
-    "relatedConcepts": [{
-      "module": "ARIA",
-      "concept": {
-        "name": "combobox",
-        "attributes": [{
-          "name": "multiple",
-          "constraints": ["unset"]
-        }, {
-          "name": "size",
-          "constraints": ["unset"]
-        }]
-      }
-    }, {
-      "module": "ARIA",
-      "concept": {
-        "name": "combobox",
-        "attributes": [{
-          "name": "multiple",
-          "constraints": ["unset"]
-        }, {
-          "name": "size",
-          "value": 1
-        }]
-      }
-    }, {
-      "module": "ARIA",
-      "concept": {
-        "name": "listbox",
-        "attributes": [{
-          "name": "multiple"
-        }]
-      }
-    }, {
-      "module": "ARIA",
-      "concept": {
-        "name": "listbox",
-        "attributes": [{
-          "name": "multiple"
-        }, {
-          "name": "size",
-          "constraints": [">1"]
-        }]
-      }
-    }, {
-      "module": "ARIA",
-      "concept": {
-        "name": "listbox",
-        "attributes": [{
-          "name": "size",
-          "constraints": [">1"]
-        }]
-      }
-    }]
+    "relatedConcepts": []
   },
   "separator": {
     "superClass": ["structure"],
@@ -4100,7 +3990,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "HTML",
       "concept": {
@@ -4143,7 +4032,6 @@
       "aria-valuenow"
     ],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [],
     "props": [
       "aria-controls",
@@ -4182,7 +4070,6 @@
       ["aria-valuenow", "50"]
     ],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [],
     "props": [
       ["aria-orientation", "horizontal"],
@@ -4205,7 +4092,6 @@
       ["aria-valuenow", "0"]
     ],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [],
     "props": [
       "aria-valuemax",
@@ -4241,7 +4127,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [],
     "props": [
       "aria-expanded",
@@ -4296,7 +4181,6 @@
     "requiredProps": [],
     "abstract": true,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": []
   },
   "switch": {
@@ -4329,7 +4213,6 @@
     ],
     "abstract": false,
     "childrenPresentational": true,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "ARIA",
       "concept": {
@@ -4347,7 +4230,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [],
     "props": [
       "aria-posinset",
@@ -4384,13 +4266,12 @@
     ],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [{
+    "relatedConcepts": [{
       "module": "HTML",
       "concept": {
         "name": "table"
       }
     }],
-    "relatedConcepts": [],
     "props": [
       "aria-colcount",
       "aria-rowcount",
@@ -4429,7 +4310,6 @@
     ],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "DAISY",
       "concept": {
@@ -4469,7 +4349,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [],
     "props": [
       "aria-expanded",
@@ -4500,7 +4379,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "HTML",
       "concept": {
@@ -4541,7 +4419,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "XForms",
       "concept": {
@@ -4601,7 +4478,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [],
     "props": [
       "aria-expanded",
@@ -4632,7 +4508,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [{
       "module": "ARIA",
       "concept": {
@@ -4670,7 +4545,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [],
     "props": [
       "aria-expanded",
@@ -4704,7 +4578,6 @@
     ],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [],
     "props": [
       "aria-multiselectable",
@@ -4742,7 +4615,6 @@
     ],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [],
     "props": [
       "aria-level",
@@ -4781,7 +4653,6 @@
     "requiredOwnedElements": [],
     "requiredProps": [],
     "abstract": false,
-    "baseConcepts": [],
     "relatedConcepts": [],
     "props": [
       "aria-level",
@@ -4841,7 +4712,6 @@
     "requiredProps": [],
     "abstract": true,
     "childrenPresentational": false,
-    "baseConcepts": [],
     "relatedConcepts": []
   },
   "window": {
@@ -4878,7 +4748,6 @@
     ],
     "requiredProps": [],
     "abstract": true,
-    "baseConcepts": [],
     "relatedConcepts": [],
     "childrenPresentational": false
   }
diff --git a/src/etc/roles/abstract/selectRole.js b/src/etc/roles/abstract/selectRole.js
index 9df46c9e..4e21f1ab 100644
--- a/src/etc/roles/abstract/selectRole.js
+++ b/src/etc/roles/abstract/selectRole.js
@@ -12,88 +12,7 @@ const selectRole: ARIARoleDefinition = {
   props: {
     'aria-orientation': null,
   },
-  relatedConcepts: [
-    {
-      module: 'ARIA',
-      concept: {
-        name: 'combobox',
-        attributes: [
-          {
-            name: 'multiple',
-            constraints: [
-              'unset',
-            ],
-          },
-          {
-            name: 'size',
-            constraints: [
-              'unset',
-            ],
-          },
-        ],
-      },
-    },
-    {
-      module: 'ARIA',
-      concept: {
-        name: 'combobox',
-        attributes: [
-          {
-            name: 'multiple',
-            constraints: [
-              'unset',
-            ],
-          },
-          {
-            name: 'size',
-            value: 1,
-          },
-        ],
-      },
-    },
-    {
-      module: 'ARIA',
-      concept: {
-        name: 'listbox',
-        attributes: [
-          {
-            name: 'multiple',
-          },
-        ],
-      },
-    },
-    {
-      module: 'ARIA',
-      concept: {
-        name: 'listbox',
-        attributes: [
-          {
-            name: 'multiple',
-          },
-          {
-            name: 'size',
-            constraints: [
-              '>1',
-            ],
-          },
-        ],
-      },
-    },
-    {
-      module: 'ARIA',
-      concept: {
-        name: 'listbox',
-        attributes: [
-          {
-            name: 'size',
-            constraints: [
-              '>1',
-            ],
-          },
-        ],
-      },
-    },
-  ],
+  relatedConcepts: [],
   requireContextRole: [],
   requiredContextRole: [],
   requiredOwnedElements: [],
diff --git a/src/etc/roles/literal/applicationRole.js b/src/etc/roles/literal/applicationRole.js
index 066920ed..644e597f 100644
--- a/src/etc/roles/literal/applicationRole.js
+++ b/src/etc/roles/literal/applicationRole.js
@@ -4,13 +4,7 @@
 const applicationRole: ARIARoleDefinition = {
   abstract: false,
   accessibleNameRequired: true,
-  baseConcepts: [
-    {
-      concept: {
-        name: 'Device Independence Delivery Unit',
-      },
-    },
-  ],
+  baseConcepts: [],
   childrenPresentational: false,
   nameFrom: [
     'author',
@@ -18,7 +12,13 @@ const applicationRole: ARIARoleDefinition = {
   props: {
     'aria-activedescendant': null,
   },
-  relatedConcepts: [],
+  relatedConcepts: [
+    {
+      concept: {
+        name: 'Device Independence Delivery Unit',
+      },
+    },
+  ],
   requireContextRole: [],
   requiredContextRole: [],
   requiredOwnedElements: [],
diff --git a/src/etc/roles/literal/buttonRole.js b/src/etc/roles/literal/buttonRole.js
index e975fc7f..526a4156 100644
--- a/src/etc/roles/literal/buttonRole.js
+++ b/src/etc/roles/literal/buttonRole.js
@@ -4,14 +4,7 @@
 const buttonRole: ARIARoleDefinition = {
   abstract: false,
   accessibleNameRequired: true,
-  baseConcepts: [
-    {
-      module: 'HTML',
-      concept: {
-        name: 'button',
-      },
-    },
-  ],
+  baseConcepts: [],
   childrenPresentational: true,
   nameFrom: [
     'author',
@@ -23,9 +16,9 @@ const buttonRole: ARIARoleDefinition = {
   },
   relatedConcepts: [
     {
-      module: 'ARIA',
+      module: 'HTML',
       concept: {
-        name: 'link',
+        name: 'button',
       },
     },
     {
diff --git a/src/etc/roles/literal/cellRole.js b/src/etc/roles/literal/cellRole.js
index 98dd7128..91e8ee31 100644
--- a/src/etc/roles/literal/cellRole.js
+++ b/src/etc/roles/literal/cellRole.js
@@ -4,14 +4,7 @@
 const cellRole: ARIARoleDefinition = {
   abstract: false,
   accessibleNameRequired: false,
-  baseConcepts: [
-    {
-      module: 'HTML',
-      concept: {
-        name: 'td',
-      },
-    },
-  ],
+  baseConcepts: [],
   childrenPresentational: false,
   nameFrom: [
     'author',
@@ -23,7 +16,14 @@ const cellRole: ARIARoleDefinition = {
     'aria-rowindex': null,
     'aria-rowspan': null,
   },
-  relatedConcepts: [],
+  relatedConcepts: [
+    {
+      module: 'HTML',
+      concept: {
+        name: 'td',
+      },
+    },
+  ],
   requireContextRole: [
     'row',
   ],
diff --git a/src/etc/roles/literal/columnheaderRole.js b/src/etc/roles/literal/columnheaderRole.js
index 14830dea..cc09747e 100644
--- a/src/etc/roles/literal/columnheaderRole.js
+++ b/src/etc/roles/literal/columnheaderRole.js
@@ -4,14 +4,7 @@
 const columnheaderRole: ARIARoleDefinition = {
   abstract: false,
   accessibleNameRequired: true,
-  baseConcepts: [
-    {
-      module: 'HTML',
-      concept: {
-        name: 'th',
-      },
-    },
-  ],
+  baseConcepts: [],
   childrenPresentational: false,
   nameFrom: [
     'author',
@@ -20,7 +13,14 @@ const columnheaderRole: ARIARoleDefinition = {
   props: {
     'aria-sort': null,
   },
-  relatedConcepts: [],
+  relatedConcepts: [
+    {
+      module: 'HTML',
+      concept: {
+        name: 'th',
+      },
+    },
+  ],
   requireContextRole: [
     'row',
   ],
diff --git a/src/etc/roles/literal/comboboxRole.js b/src/etc/roles/literal/comboboxRole.js
index 241414a2..1e6c139b 100644
--- a/src/etc/roles/literal/comboboxRole.js
+++ b/src/etc/roles/literal/comboboxRole.js
@@ -18,13 +18,45 @@ const comboboxRole: ARIARoleDefinition = {
   },
   relatedConcepts: [
     {
-      module: 'XForms',
+      module: 'HTML',
       concept: {
         name: 'select',
+        attributes: [
+          {
+            name: 'multiple',
+            constraints: [
+              'unset',
+            ],
+          },
+          {
+            name: 'size',
+            constraints: [
+              'unset',
+            ],
+          },
+        ],
       },
     },
     {
       module: 'HTML',
+      concept: {
+        name: 'select',
+        attributes: [
+          {
+            name: 'multiple',
+            constraints: [
+              'unset',
+            ],
+          },
+          {
+            name: 'size',
+            value: 1,
+          },
+        ],
+      },
+    },
+    {
+      module: 'XForms',
       concept: {
         name: 'select',
       },
diff --git a/src/etc/roles/literal/gridRole.js b/src/etc/roles/literal/gridRole.js
index 5045fbfa..eda6ac23 100644
--- a/src/etc/roles/literal/gridRole.js
+++ b/src/etc/roles/literal/gridRole.js
@@ -4,7 +4,17 @@
 const gridRole: ARIARoleDefinition = {
   abstract: false,
   accessibleNameRequired: true,
-  baseConcepts: [
+  baseConcepts: [],
+  childrenPresentational: false,
+  nameFrom: [
+    'author',
+  ],
+  props: {
+    'aria-level': null,
+    'aria-multiselectable': null,
+    'aria-readonly': null,
+  },
+  relatedConcepts: [
     {
       module: 'HTML',
       concept: {
@@ -18,16 +28,6 @@ const gridRole: ARIARoleDefinition = {
       },
     },
   ],
-  childrenPresentational: false,
-  nameFrom: [
-    'author',
-  ],
-  props: {
-    'aria-level': null,
-    'aria-multiselectable': null,
-    'aria-readonly': null,
-  },
-  relatedConcepts: [],
   requireContextRole: [],
   requiredContextRole: [],
   requiredOwnedElements: [
diff --git a/src/etc/roles/literal/gridcellRole.js b/src/etc/roles/literal/gridcellRole.js
index 5baab2d2..6c0aef37 100644
--- a/src/etc/roles/literal/gridcellRole.js
+++ b/src/etc/roles/literal/gridcellRole.js
@@ -4,7 +4,18 @@
 const gridcellRole: ARIARoleDefinition = {
   abstract: false,
   accessibleNameRequired: true,
-  baseConcepts: [
+  baseConcepts: [],
+  childrenPresentational: false,
+  nameFrom: [
+    'author',
+    'contents',
+  ],
+  props: {
+    'aria-readonly': null,
+    'aria-required': null,
+    'aria-selected': null,
+  },
+  relatedConcepts: [
     {
       module: 'HTML',
       concept: {
@@ -18,17 +29,6 @@ const gridcellRole: ARIARoleDefinition = {
       },
     },
   ],
-  childrenPresentational: false,
-  nameFrom: [
-    'author',
-    'contents',
-  ],
-  props: {
-    'aria-readonly': null,
-    'aria-required': null,
-    'aria-selected': null,
-  },
-  relatedConcepts: [],
   requireContextRole: [
     'row',
   ],
diff --git a/src/etc/roles/literal/listRole.js b/src/etc/roles/literal/listRole.js
index a67c72ba..11f69a09 100644
--- a/src/etc/roles/literal/listRole.js
+++ b/src/etc/roles/literal/listRole.js
@@ -4,7 +4,13 @@
 const listRole: ARIARoleDefinition = {
   abstract: false,
   accessibleNameRequired: false,
-  baseConcepts: [
+  baseConcepts: [],
+  childrenPresentational: false,
+  nameFrom: [
+    'author',
+  ],
+  props: {},
+  relatedConcepts: [
     {
       module: 'HTML',
       concept: {
@@ -18,12 +24,6 @@ const listRole: ARIARoleDefinition = {
       },
     },
   ],
-  childrenPresentational: false,
-  nameFrom: [
-    'author',
-  ],
-  props: {},
-  relatedConcepts: [],
   requireContextRole: [],
   requiredContextRole: [],
   requiredOwnedElements: [
diff --git a/src/etc/roles/literal/listboxRole.js b/src/etc/roles/literal/listboxRole.js
index e45e86f0..bf83986c 100644
--- a/src/etc/roles/literal/listboxRole.js
+++ b/src/etc/roles/literal/listboxRole.js
@@ -17,15 +17,57 @@ const listboxRole: ARIARoleDefinition = {
   },
   relatedConcepts: [
     {
-      module: 'ARIA',
+      module: 'HTML',
       concept: {
-        name: 'list',
+        name: 'datalist',
       },
     },
     {
       module: 'HTML',
       concept: {
         name: 'select',
+        attributes: [
+          {
+            name: 'multiple',
+          },
+        ],
+      },
+    },
+    {
+      module: 'HTML',
+      concept: {
+        name: 'select',
+        attributes: [
+          {
+            name: 'multiple',
+          },
+          {
+            name: 'size',
+            constraints: [
+              '>1',
+            ],
+          },
+        ],
+      },
+    },
+    {
+      module: 'HTML',
+      concept: {
+        name: 'select',
+        attributes: [
+          {
+            name: 'size',
+            constraints: [
+              '>1',
+            ],
+          },
+        ],
+      },
+    },
+    {
+      module: 'ARIA',
+      concept: {
+        name: 'list',
       },
     },
     {
diff --git a/src/etc/roles/literal/listitemRole.js b/src/etc/roles/literal/listitemRole.js
index 92b8bd48..eeb76c66 100644
--- a/src/etc/roles/literal/listitemRole.js
+++ b/src/etc/roles/literal/listitemRole.js
@@ -4,14 +4,7 @@
 const listitemRole: ARIARoleDefinition = {
   abstract: false,
   accessibleNameRequired: false,
-  baseConcepts: [
-    {
-      module: 'HTML',
-      concept: {
-        name: 'li',
-      },
-    },
-  ],
+  baseConcepts: [],
   childrenPresentational: false,
   nameFrom: [
     'author',
@@ -22,6 +15,12 @@ const listitemRole: ARIARoleDefinition = {
     'aria-setsize': null,
   },
   relatedConcepts: [
+    {
+      module: 'HTML',
+      concept: {
+        name: 'li',
+      },
+    },
     {
       module: 'XForms',
       concept: {
diff --git a/src/etc/roles/literal/optionRole.js b/src/etc/roles/literal/optionRole.js
index 30caba33..fa29fe65 100644
--- a/src/etc/roles/literal/optionRole.js
+++ b/src/etc/roles/literal/optionRole.js
@@ -4,14 +4,7 @@
 const optionRole: ARIARoleDefinition = {
   abstract: false,
   accessibleNameRequired: true,
-  baseConcepts: [
-    {
-      module: 'HTML',
-      concept: {
-        name: 'option',
-      },
-    },
-  ],
+  baseConcepts: [],
   childrenPresentational: true,
   nameFrom: [
     'author',
@@ -24,6 +17,12 @@ const optionRole: ARIARoleDefinition = {
     'aria-setsize': null,
   },
   relatedConcepts: [
+    {
+      module: 'HTML',
+      concept: {
+        name: 'option',
+      },
+    },
     {
       module: 'ARIA',
       concept: {
diff --git a/src/etc/roles/literal/rowRole.js b/src/etc/roles/literal/rowRole.js
index 27b74de0..f904591a 100644
--- a/src/etc/roles/literal/rowRole.js
+++ b/src/etc/roles/literal/rowRole.js
@@ -4,14 +4,7 @@
 const rowRole: ARIARoleDefinition = {
   abstract: false,
   accessibleNameRequired: false,
-  baseConcepts: [
-    {
-      module: 'HTML',
-      concept: {
-        name: 'tr',
-      },
-    },
-  ],
+  baseConcepts: [],
   childrenPresentational: false,
   nameFrom: [
     'author',
@@ -23,7 +16,14 @@ const rowRole: ARIARoleDefinition = {
     'aria-rowindex': null,
     'aria-selected': null,
   },
-  relatedConcepts: [],
+  relatedConcepts: [
+    {
+      module: 'HTML',
+      concept: {
+        name: 'tr',
+      },
+    },
+  ],
   requireContextRole: [
     'grid',
     'rowgroup',
diff --git a/src/etc/roles/literal/rowgroupRole.js b/src/etc/roles/literal/rowgroupRole.js
index 640fde2e..c62d82b6 100644
--- a/src/etc/roles/literal/rowgroupRole.js
+++ b/src/etc/roles/literal/rowgroupRole.js
@@ -4,7 +4,17 @@
 const rowgroupRole: ARIARoleDefinition = {
   abstract: false,
   accessibleNameRequired: false,
-  baseConcepts: [
+  baseConcepts: [],
+  childrenPresentational: false,
+  nameFrom: [
+    'author',
+    'contents',
+  ],
+  props: {
+    'aria-activedescendant': null,
+    'aria-expanded': null,
+  },
+  relatedConcepts: [
     {
       module: 'HTML',
       concept: {
@@ -24,16 +34,6 @@ const rowgroupRole: ARIARoleDefinition = {
       },
     },
   ],
-  childrenPresentational: false,
-  nameFrom: [
-    'author',
-    'contents',
-  ],
-  props: {
-    'aria-activedescendant': null,
-    'aria-expanded': null,
-  },
-  relatedConcepts: [],
   requireContextRole: [
     'grid',
     'table',
diff --git a/src/etc/roles/literal/rowheaderRole.js b/src/etc/roles/literal/rowheaderRole.js
index c1515d6e..afed8463 100644
--- a/src/etc/roles/literal/rowheaderRole.js
+++ b/src/etc/roles/literal/rowheaderRole.js
@@ -4,7 +4,16 @@
 const rowheaderRole: ARIARoleDefinition = {
   abstract: false,
   accessibleNameRequired: true,
-  baseConcepts: [
+  baseConcepts: [],
+  childrenPresentational: false,
+  nameFrom: [
+    'author',
+    'contents',
+  ],
+  props: {
+    'aria-sort': null,
+  },
+  relatedConcepts: [
     {
       module: 'HTML',
       concept: {
@@ -18,15 +27,6 @@ const rowheaderRole: ARIARoleDefinition = {
       },
     },
   ],
-  childrenPresentational: false,
-  nameFrom: [
-    'author',
-    'contents',
-  ],
-  props: {
-    'aria-sort': null,
-  },
-  relatedConcepts: [],
   requireContextRole: [
     'row',
   ],
diff --git a/src/etc/roles/literal/searchboxRole.js b/src/etc/roles/literal/searchboxRole.js
index c00601e9..244a8cba 100644
--- a/src/etc/roles/literal/searchboxRole.js
+++ b/src/etc/roles/literal/searchboxRole.js
@@ -4,7 +4,13 @@
 const searchboxRole: ARIARoleDefinition = {
   abstract: false,
   accessibleNameRequired: true,
-  baseConcepts: [
+  baseConcepts: [],
+  childrenPresentational: false,
+  nameFrom: [
+    'author',
+  ],
+  props: {},
+  relatedConcepts: [
     {
       module: 'HTML',
       concept: {
@@ -18,12 +24,6 @@ const searchboxRole: ARIARoleDefinition = {
       },
     },
   ],
-  childrenPresentational: false,
-  nameFrom: [
-    'author',
-  ],
-  props: {},
-  relatedConcepts: [],
   requireContextRole: [],
   requiredContextRole: [],
   requiredOwnedElements: [],
diff --git a/src/etc/roles/literal/tableRole.js b/src/etc/roles/literal/tableRole.js
index 5b2d9b5d..b6b49930 100644
--- a/src/etc/roles/literal/tableRole.js
+++ b/src/etc/roles/literal/tableRole.js
@@ -4,14 +4,7 @@
 const tableRole: ARIARoleDefinition = {
   abstract: false,
   accessibleNameRequired: true,
-  baseConcepts: [
-    {
-      module: 'HTML',
-      concept: {
-        name: 'table',
-      },
-    },
-  ],
+  baseConcepts: [],
   childrenPresentational: false,
   nameFrom: [
     'author',
@@ -20,7 +13,14 @@ const tableRole: ARIARoleDefinition = {
     'aria-colcount': null,
     'aria-rowcount': null,
   },
-  relatedConcepts: [],
+  relatedConcepts: [
+    {
+      module: 'HTML',
+      concept: {
+        name: 'table',
+      },
+    },
+  ],
   requireContextRole: [],
   requiredContextRole: [],
   requiredOwnedElements: [