Fix issues in wai-aria and core-aam tests for UIA and IAccessible2 (#8503)

* wai-aria: Update assertions for UIA

* core-aam: Update assertions for UIA; fix a couple of typos for IA2
diff --git a/core-aam/aria-checked_value_changes-manual.html b/core-aam/aria-checked_value_changes-manual.html
index e3fb333..5de5e8a 100644
--- a/core-aam/aria-checked_value_changes-manual.html
+++ b/core-aam/aria-checked_value_changes-manual.html
@@ -59,7 +59,7 @@
                   "event",
                   "type",
                   "is",
-                  "TBD"
+                  "TogglePattern.ToggleStateProperty"
                ]
             ]
          },
@@ -111,7 +111,7 @@
                   "event",
                   "type",
                   "is",
-                  "TBD"
+                  "TogglePattern.ToggleStateProperty"
                ]
             ]
          },
diff --git a/core-aam/aria-expanded_value_changes-manual.html b/core-aam/aria-expanded_value_changes-manual.html
index 873094b..e8f58d2 100644
--- a/core-aam/aria-expanded_value_changes-manual.html
+++ b/core-aam/aria-expanded_value_changes-manual.html
@@ -65,7 +65,7 @@
                   "event",
                   "type",
                   "is",
-                  "TBD"
+                  "ExpandCollapsePattern.ExpandCollapseStateProperty"
                ]
             ]
          },
@@ -123,7 +123,7 @@
                   "event",
                   "type",
                   "is",
-                  "TBD"
+                  "ExpandCollapsePattern.ExpandCollapseStateProperty"
                ]
             ]
          },
diff --git a/core-aam/aria-flowto-manual.html b/core-aam/aria-flowto-manual.html
index f8e55a4..2381631 100644
--- a/core-aam/aria-flowto-manual.html
+++ b/core-aam/aria-flowto-manual.html
@@ -36,7 +36,7 @@
             "IAccessible2" : [
                [
                   "relation",
-                  "IA2_RELATION_FLOW_TO",
+                  "IA2_RELATION_FLOWS_TO",
                   "is",
                   "[next]"
                ]
@@ -67,7 +67,7 @@
             "IAccessible2" : [
                [
                   "relation",
-                  "IA2_RELATION_FLOW_FROM",
+                  "IA2_RELATION_FLOWS_FROM",
                   "is",
                   "[test]"
                ]
diff --git a/core-aam/aria-owns_may_need_manual_verification-manual.html b/core-aam/aria-owns_may_need_manual_verification-manual.html
index 9510432..b7752c3 100644
--- a/core-aam/aria-owns_may_need_manual_verification-manual.html
+++ b/core-aam/aria-owns_may_need_manual_verification-manual.html
@@ -44,15 +44,9 @@
             "UIA" : [
                [
                   "property",
-                  "TBD",
+                  "Children",
                   "is",
-                  "owned1"
-               ],
-               [
-                  "property",
-                  "TBD",
-                  "is",
-                  "owned2"
+                  "[owned1, owned2]"
                ]
             ]
          },
diff --git a/core-aam/aria-roledescription_is_empty_or_whitespace_characters_new-manual.html b/core-aam/aria-roledescription_is_empty_or_whitespace_characters_new-manual.html
index 0703399..88fb7a8 100644
--- a/core-aam/aria-roledescription_is_empty_or_whitespace_characters_new-manual.html
+++ b/core-aam/aria-roledescription_is_empty_or_whitespace_characters_new-manual.html
@@ -28,7 +28,7 @@
             "UIA" : [
                [
                   "property",
-                  "Localized Control Type",
+                  "Localized ControlType",
                   "is",
                   "Group"
                ]
diff --git a/core-aam/aria-valuenow_value_changes-manual.html b/core-aam/aria-valuenow_value_changes-manual.html
index ad3d186..6ef4f52 100644
--- a/core-aam/aria-valuenow_value_changes-manual.html
+++ b/core-aam/aria-valuenow_value_changes-manual.html
@@ -53,7 +53,7 @@
                   "event",
                   "type",
                   "is",
-                  "TBD"
+                  "ValuePattern.ValueProperty"
                ]
             ]
          },
diff --git a/core-aam/progressbar-manual.html b/core-aam/progressbar-manual.html
index a336fa0..3d36392 100644
--- a/core-aam/progressbar-manual.html
+++ b/core-aam/progressbar-manual.html
@@ -62,7 +62,7 @@
                   "property",
                   "interfaces",
                   "contains",
-                  "IAcesssibleValue"
+                  "IAccessibleValue"
                ]
             ],
             "MSAA" : [
diff --git a/core-aam/region_without_an_accessible_name_new-manual.html b/core-aam/region_without_an_accessible_name_new-manual.html
index 05ca5e7..f3b41f0 100644
--- a/core-aam/region_without_an_accessible_name_new-manual.html
+++ b/core-aam/region_without_an_accessible_name_new-manual.html
@@ -56,7 +56,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Group"
                ]
diff --git a/core-aam/scrollbar-manual.html b/core-aam/scrollbar-manual.html
index 3b4b5ff..2d1e400 100644
--- a/core-aam/scrollbar-manual.html
+++ b/core-aam/scrollbar-manual.html
@@ -56,7 +56,7 @@
                   "property",
                   "interfaces",
                   "contains",
-                  "IAcesssibleValue"
+                  "IAccessibleValue"
                ]
             ],
             "MSAA" : [
diff --git a/core-aam/slider-manual.html b/core-aam/slider-manual.html
index d0613e6..687ae79 100644
--- a/core-aam/slider-manual.html
+++ b/core-aam/slider-manual.html
@@ -56,7 +56,7 @@
                   "property",
                   "interfaces",
                   "contains",
-                  "IAcesssibleValue"
+                  "IAccessibleValue"
                ]
             ],
             "MSAA" : [
diff --git a/core-aam/spinbutton-manual.html b/core-aam/spinbutton-manual.html
index 80f3f24..568faf3 100644
--- a/core-aam/spinbutton-manual.html
+++ b/core-aam/spinbutton-manual.html
@@ -56,7 +56,7 @@
                   "property",
                   "interfaces",
                   "contains",
-                  "IAcesssibleValue"
+                  "IAccessibleValue"
                ]
             ],
             "MSAA" : [
diff --git a/wai-aria/alertdialog_modal_false-manual.html b/wai-aria/alertdialog_modal_false-manual.html
index 6dd2cee..5a5829e 100644
--- a/wai-aria/alertdialog_modal_false-manual.html
+++ b/wai-aria/alertdialog_modal_false-manual.html
@@ -76,7 +76,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Pane"
                ],
diff --git a/wai-aria/alertdialog_modal_true-manual.html b/wai-aria/alertdialog_modal_true-manual.html
index 5ff5660..b86bcae 100644
--- a/wai-aria/alertdialog_modal_true-manual.html
+++ b/wai-aria/alertdialog_modal_true-manual.html
@@ -56,7 +56,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Pane"
                ],
diff --git a/wai-aria/application_activedescendant-manual.html b/wai-aria/application_activedescendant-manual.html
index 5a103d9..4e256bd 100644
--- a/wai-aria/application_activedescendant-manual.html
+++ b/wai-aria/application_activedescendant-manual.html
@@ -92,13 +92,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Pane"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "application"
                ],
diff --git a/wai-aria/application_activedescendant_value_changes-manual.html b/wai-aria/application_activedescendant_value_changes-manual.html
index 04260aa..b852323 100644
--- a/wai-aria/application_activedescendant_value_changes-manual.html
+++ b/wai-aria/application_activedescendant_value_changes-manual.html
@@ -87,7 +87,7 @@
                   "event",
                   "type",
                   "is",
-                  "IA2_EVENT_ACTIVE_DESCENDANT_CHANGED"
+                  "EVENT_OBJECT_FOCUS"
                ]
             ],
             "MSAA" : [
@@ -113,13 +113,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Pane"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "application"
                ],
diff --git a/wai-aria/aria-current_not_declared-manual.html b/wai-aria/aria-current_not_declared-manual.html
index 25cf95c..471e718 100644
--- a/wai-aria/aria-current_not_declared-manual.html
+++ b/wai-aria/aria-current_not_declared-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "role",
+                  "ControlType",
                   "is",
                   "ListItem"
                ],
@@ -90,7 +90,7 @@
                   "property",
                   "current",
                   "is",
-                  "false"
+                  ""
                ]
             ]
          },
diff --git a/wai-aria/aria-current_with_value_changes-manual.html b/wai-aria/aria-current_with_value_changes-manual.html
index f4297f1..84e0b60 100644
--- a/wai-aria/aria-current_with_value_changes-manual.html
+++ b/wai-aria/aria-current_with_value_changes-manual.html
@@ -75,9 +75,9 @@
             "UIA" : [
                [
                   "property",
-                  "objectAttributes",
-                  "contains",
-                  "current:false"
+                  "current",
+                  "is",
+                  "false"
                ],
                [
                   "event",
diff --git a/wai-aria/aria-current_with_value_date-manual.html b/wai-aria/aria-current_with_value_date-manual.html
index 8f4cb42..0438ef5 100644
--- a/wai-aria/aria-current_with_value_date-manual.html
+++ b/wai-aria/aria-current_with_value_date-manual.html
@@ -82,8 +82,8 @@
             "UIA" : [
                [
                   "property",
-                  "role",
-                  "is",
+                  "controlPatterns",
+                  "contains",
                   "TableItem"
                ],
                [
diff --git a/wai-aria/aria-current_with_value_location-manual.html b/wai-aria/aria-current_with_value_location-manual.html
index 4e44443..aac8e63 100644
--- a/wai-aria/aria-current_with_value_location-manual.html
+++ b/wai-aria/aria-current_with_value_location-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "role",
+                  "ControlType",
                   "is",
                   "Image"
                ],
diff --git a/wai-aria/aria-current_with_value_page-manual.html b/wai-aria/aria-current_with_value_page-manual.html
index d8fe5a4..4ff50ac 100644
--- a/wai-aria/aria-current_with_value_page-manual.html
+++ b/wai-aria/aria-current_with_value_page-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "role",
+                  "ControlType",
                   "is",
                   "HyperLink"
                ],
diff --git a/wai-aria/aria-current_with_value_step-manual.html b/wai-aria/aria-current_with_value_step-manual.html
index 4b730e7..812ec03 100644
--- a/wai-aria/aria-current_with_value_step-manual.html
+++ b/wai-aria/aria-current_with_value_step-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "role",
+                  "ControlType",
                   "is",
                   "HyperLink"
                ],
diff --git a/wai-aria/aria-current_with_value_time-manual.html b/wai-aria/aria-current_with_value_time-manual.html
index ae78d83..3362af0 100644
--- a/wai-aria/aria-current_with_value_time-manual.html
+++ b/wai-aria/aria-current_with_value_time-manual.html
@@ -82,8 +82,8 @@
             "UIA" : [
                [
                   "property",
-                  "role",
-                  "is",
+                  "controlPatterns",
+                  "contains",
                   "TableItem"
                ],
                [
diff --git a/wai-aria/aria-current_with_value_true-manual.html b/wai-aria/aria-current_with_value_true-manual.html
index 57dcf29..bf73777 100644
--- a/wai-aria/aria-current_with_value_true-manual.html
+++ b/wai-aria/aria-current_with_value_true-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "role",
+                  "ControlType",
                   "is",
                   "ListItem"
                ],
diff --git a/wai-aria/aria-current_with_value_unspecified-manual.html b/wai-aria/aria-current_with_value_unspecified-manual.html
index 74486b8..271c085 100644
--- a/wai-aria/aria-current_with_value_unspecified-manual.html
+++ b/wai-aria/aria-current_with_value_unspecified-manual.html
@@ -76,7 +76,7 @@
             "UIA" : [
                [
                   "property",
-                  "role",
+                  "ControlType",
                   "is",
                   "ListItem"
                ],
@@ -84,7 +84,7 @@
                   "property",
                   "current",
                   "is",
-                  "false"
+                  ""
                ]
             ]
          },
diff --git a/wai-aria/article_in_feed_posinset_and_setsize-manual.html b/wai-aria/article_in_feed_posinset_and_setsize-manual.html
index d7145bd..ff96079 100644
--- a/wai-aria/article_in_feed_posinset_and_setsize-manual.html
+++ b/wai-aria/article_in_feed_posinset_and_setsize-manual.html
@@ -124,13 +124,13 @@
             "UIA" : [
                [
                   "property",
-                  "control type",
+                  "ControlType",
                   "is",
                   "Group"
                ],
                [
                   "property",
-                  "localize control type",
+                  "LocalizedControlType",
                   "is",
                   "article"
                ],
diff --git a/wai-aria/article_in_feed_setsize_-1-manual.html b/wai-aria/article_in_feed_setsize_-1-manual.html
index 0c27017..dd87dc5 100644
--- a/wai-aria/article_in_feed_setsize_-1-manual.html
+++ b/wai-aria/article_in_feed_setsize_-1-manual.html
@@ -100,13 +100,13 @@
             "UIA" : [
                [
                   "property",
-                  "control type",
+                  "ControlType",
                   "is",
                   "Group"
                ],
                [
                   "property",
-                  "localize control type",
+                  "LocalizedControlType",
                   "is",
                   "article"
                ],
diff --git a/wai-aria/article_not_in_feed_posinset_and_setsize-manual.html b/wai-aria/article_not_in_feed_posinset_and_setsize-manual.html
index ab45edc..57e92c1 100644
--- a/wai-aria/article_not_in_feed_posinset_and_setsize-manual.html
+++ b/wai-aria/article_not_in_feed_posinset_and_setsize-manual.html
@@ -130,13 +130,13 @@
             "UIA" : [
                [
                   "property",
-                  "control type",
+                  "ControlType",
                   "is",
                   "Group"
                ],
                [
                   "property",
-                  "localize control type",
+                  "LocalizedControlType",
                   "is",
                   "article"
                ],
diff --git a/wai-aria/button_haspopup_unspecified-manual.html b/wai-aria/button_haspopup_unspecified-manual.html
index b03efad..5dd9371 100644
--- a/wai-aria/button_haspopup_unspecified-manual.html
+++ b/wai-aria/button_haspopup_unspecified-manual.html
@@ -99,10 +99,10 @@
                   "Button"
                ],
                [
-                  "Control Pattern",
-                  "ExpandCollapse",
-                  "exists",
-                  "false"
+                  "property",
+                  "controlPatterns",
+                  "doesNotContain",
+                  "ExpandCollapse"
                ]
             ]
          },
diff --git a/wai-aria/button_roledescription_empty-manual.html b/wai-aria/button_roledescription_empty-manual.html
index 0de1df2..5695dff 100644
--- a/wai-aria/button_roledescription_empty-manual.html
+++ b/wai-aria/button_roledescription_empty-manual.html
@@ -70,13 +70,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Button"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "Button"
                ]
diff --git a/wai-aria/button_roledescription_valid-manual.html b/wai-aria/button_roledescription_valid-manual.html
index a3ffbc0..34cbc9e 100644
--- a/wai-aria/button_roledescription_valid-manual.html
+++ b/wai-aria/button_roledescription_valid-manual.html
@@ -70,13 +70,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Button"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "SassyButton"
                ]
diff --git a/wai-aria/button_roledescription_whitespace_only-manual.html b/wai-aria/button_roledescription_whitespace_only-manual.html
index 8edd5b9..a213ed3 100644
--- a/wai-aria/button_roledescription_whitespace_only-manual.html
+++ b/wai-aria/button_roledescription_whitespace_only-manual.html
@@ -70,13 +70,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Button"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "Button"
                ]
diff --git a/wai-aria/cell-manual.html b/wai-aria/cell-manual.html
index f7ea068..fad0e88 100644
--- a/wai-aria/cell-manual.html
+++ b/wai-aria/cell-manual.html
@@ -161,9 +161,9 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
-                  "TableItem"
+                  "DataItem"
                ],
                [
                   "property",
diff --git a/wai-aria/cell_aria-colspan_2_on_div-manual.html b/wai-aria/cell_aria-colspan_2_on_div-manual.html
index 88168fc..a9b83ff 100644
--- a/wai-aria/cell_aria-colspan_2_on_div-manual.html
+++ b/wai-aria/cell_aria-colspan_2_on_div-manual.html
@@ -82,9 +82,9 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
-                  "TableItem"
+                  "DataItem"
                ],
                [
                   "property",
diff --git a/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3-manual.html b/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3-manual.html
index 38b7c4c..c225ab3 100644
--- a/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3-manual.html
+++ b/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3-manual.html
@@ -76,9 +76,9 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
-                  "TableItem"
+                  "DataItem"
                ],
                [
                   "property",
diff --git a/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_headers_and_border-manual.html b/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_headers_and_border-manual.html
index b859a1d..5730d15 100644
--- a/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_headers_and_border-manual.html
+++ b/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_headers_and_border-manual.html
@@ -76,9 +76,9 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
-                  "TableItem"
+                  "DataItem"
                ],
                [
                   "property",
diff --git a/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_three_actual_columns-manual.html b/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_three_actual_columns-manual.html
index 76a7f29..b2a1901 100644
--- a/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_three_actual_columns-manual.html
+++ b/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_three_actual_columns-manual.html
@@ -70,9 +70,9 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
-                  "TableItem"
+                  "DataItem"
                ],
                [
                   "property",
diff --git a/wai-aria/cell_aria-colspan_2_on_td_with_html_colspan_not_specified-manual.html b/wai-aria/cell_aria-colspan_2_on_td_with_html_colspan_not_specified-manual.html
index 182eefb..980f500 100644
--- a/wai-aria/cell_aria-colspan_2_on_td_with_html_colspan_not_specified-manual.html
+++ b/wai-aria/cell_aria-colspan_2_on_td_with_html_colspan_not_specified-manual.html
@@ -82,9 +82,9 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
-                  "TableItem"
+                  "DataItem"
                ],
                [
                   "property",
diff --git a/wai-aria/cell_aria-rowspan_2_on_div-manual.html b/wai-aria/cell_aria-rowspan_2_on_div-manual.html
index d32621b..4abd0de 100644
--- a/wai-aria/cell_aria-rowspan_2_on_div-manual.html
+++ b/wai-aria/cell_aria-rowspan_2_on_div-manual.html
@@ -82,9 +82,9 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
-                  "TableItem"
+                  "DataItem"
                ],
                [
                   "property",
diff --git a/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3-manual.html b/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3-manual.html
index 949af27..356911e 100644
--- a/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3-manual.html
+++ b/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3-manual.html
@@ -76,9 +76,9 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
-                  "TableItem"
+                  "DataItem"
                ],
                [
                   "property",
diff --git a/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3_with_three_actual_rows-manual.html b/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3_with_three_actual_rows-manual.html
index a34f7a1..0fed9ae 100644
--- a/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3_with_three_actual_rows-manual.html
+++ b/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3_with_three_actual_rows-manual.html
@@ -70,9 +70,9 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
-                  "TableItem"
+                  "DataItem"
                ],
                [
                   "property",
diff --git a/wai-aria/cell_aria-rowspan_2_on_td_with_html_rowspan_not_specified-manual.html b/wai-aria/cell_aria-rowspan_2_on_td_with_html_rowspan_not_specified-manual.html
index c257e78..e9c5bd7 100644
--- a/wai-aria/cell_aria-rowspan_2_on_td_with_html_rowspan_not_specified-manual.html
+++ b/wai-aria/cell_aria-rowspan_2_on_td_with_html_rowspan_not_specified-manual.html
@@ -82,9 +82,9 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
-                  "TableItem"
+                  "DataItem"
                ],
                [
                   "property",
diff --git a/wai-aria/cell_colindex_4-manual.html b/wai-aria/cell_colindex_4-manual.html
index 78769af..0c3895a 100644
--- a/wai-aria/cell_colindex_4-manual.html
+++ b/wai-aria/cell_colindex_4-manual.html
@@ -82,9 +82,9 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
-                  "TableItem"
+                  "DataItem"
                ],
                [
                   "property",
diff --git a/wai-aria/cell_rowindex_4-manual.html b/wai-aria/cell_rowindex_4-manual.html
index b4ff297..14a9247 100644
--- a/wai-aria/cell_rowindex_4-manual.html
+++ b/wai-aria/cell_rowindex_4-manual.html
@@ -76,9 +76,9 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
-                  "TableItem"
+                  "DataItem"
                ],
                [
                   "property",
diff --git a/wai-aria/checkbox_readonly_false-manual.html b/wai-aria/checkbox_readonly_false-manual.html
index 59e25a6..dcb1a8b 100644
--- a/wai-aria/checkbox_readonly_false-manual.html
+++ b/wai-aria/checkbox_readonly_false-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Checkbox"
                ],
diff --git a/wai-aria/checkbox_readonly_true-manual.html b/wai-aria/checkbox_readonly_true-manual.html
index e73f898..6718fad 100644
--- a/wai-aria/checkbox_readonly_true-manual.html
+++ b/wai-aria/checkbox_readonly_true-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Checkbox"
                ],
diff --git a/wai-aria/checkbox_readonly_unspecified-manual.html b/wai-aria/checkbox_readonly_unspecified-manual.html
index 73a3b93..f8de209 100644
--- a/wai-aria/checkbox_readonly_unspecified-manual.html
+++ b/wai-aria/checkbox_readonly_unspecified-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Checkbox"
                ],
diff --git a/wai-aria/columnheader_aria-colspan_2_on_div-manual.html b/wai-aria/columnheader_aria-colspan_2_on_div-manual.html
index 7b151c5..1797d47 100644
--- a/wai-aria/columnheader_aria-colspan_2_on_div-manual.html
+++ b/wai-aria/columnheader_aria-colspan_2_on_div-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3-manual.html b/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3-manual.html
index 51824ee4..586ff29 100644
--- a/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3-manual.html
+++ b/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3-manual.html
@@ -76,7 +76,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3_with_three_actual_columns-manual.html b/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3_with_three_actual_columns-manual.html
index a26daed..fa7bf0b 100644
--- a/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3_with_three_actual_columns-manual.html
+++ b/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3_with_three_actual_columns-manual.html
@@ -70,7 +70,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/columnheader_aria-colspan_2_on_th_with_html_colspan_not_specified-manual.html b/wai-aria/columnheader_aria-colspan_2_on_th_with_html_colspan_not_specified-manual.html
index 44d11c1..453ff96 100644
--- a/wai-aria/columnheader_aria-colspan_2_on_th_with_html_colspan_not_specified-manual.html
+++ b/wai-aria/columnheader_aria-colspan_2_on_th_with_html_colspan_not_specified-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/columnheader_aria-rowspan_2_on_div-manual.html b/wai-aria/columnheader_aria-rowspan_2_on_div-manual.html
index cae113b..e3431e4 100644
--- a/wai-aria/columnheader_aria-rowspan_2_on_div-manual.html
+++ b/wai-aria/columnheader_aria-rowspan_2_on_div-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3-manual.html b/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3-manual.html
index efff45f..e7dee71 100644
--- a/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3-manual.html
+++ b/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3-manual.html
@@ -76,7 +76,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3_with_three_actual_rows-manual.html b/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3_with_three_actual_rows-manual.html
index 3d964ed..25d827e 100644
--- a/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3_with_three_actual_rows-manual.html
+++ b/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3_with_three_actual_rows-manual.html
@@ -70,7 +70,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/columnheader_aria-rowspan_2_on_th_with_html_rowspan_not_specified-manual.html b/wai-aria/columnheader_aria-rowspan_2_on_th_with_html_rowspan_not_specified-manual.html
index f2298d0..a029e6b 100644
--- a/wai-aria/columnheader_aria-rowspan_2_on_th_with_html_rowspan_not_specified-manual.html
+++ b/wai-aria/columnheader_aria-rowspan_2_on_th_with_html_rowspan_not_specified-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/columnheader_colindex_4-manual.html b/wai-aria/columnheader_colindex_4-manual.html
index c48e5f1..d8d0587 100644
--- a/wai-aria/columnheader_colindex_4-manual.html
+++ b/wai-aria/columnheader_colindex_4-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/columnheader_rowindex_4-manual.html b/wai-aria/columnheader_rowindex_4-manual.html
index 1e45ca3..665d344 100644
--- a/wai-aria/columnheader_rowindex_4-manual.html
+++ b/wai-aria/columnheader_rowindex_4-manual.html
@@ -76,7 +76,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
@@ -102,7 +102,7 @@
   <p>This test examines the ARIA properties for columnheader rowindex 4.</p>
     <div role="table">
     <div role="row">
-       <div id="test" role="columnheader" aria-rowindex ="4">test cell</div>
+       <div id="test" role="columnheader" aria-rowindex="4">test cell</div>
     </div>
   </div>
 
diff --git a/wai-aria/columnheader_selected_false_not_automatically_propagated-manual.html b/wai-aria/columnheader_selected_false_not_automatically_propagated-manual.html
index 4a90597..92cfc2e 100644
--- a/wai-aria/columnheader_selected_false_not_automatically_propagated-manual.html
+++ b/wai-aria/columnheader_selected_false_not_automatically_propagated-manual.html
@@ -86,7 +86,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "DataItem"
                ],
diff --git a/wai-aria/columnheader_selected_true_not_automatically_propagated-manual.html b/wai-aria/columnheader_selected_true_not_automatically_propagated-manual.html
index 8d000b1..32ce45c 100644
--- a/wai-aria/columnheader_selected_true_not_automatically_propagated-manual.html
+++ b/wai-aria/columnheader_selected_true_not_automatically_propagated-manual.html
@@ -86,7 +86,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "DataItem"
                ],
diff --git a/wai-aria/combobox_haspopup_dialog-manual.html b/wai-aria/combobox_haspopup_dialog-manual.html
index 4a52872..4d985a3 100644
--- a/wai-aria/combobox_haspopup_dialog-manual.html
+++ b/wai-aria/combobox_haspopup_dialog-manual.html
@@ -118,7 +118,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Combobox"
                ],
diff --git a/wai-aria/combobox_haspopup_false-manual.html b/wai-aria/combobox_haspopup_false-manual.html
index 5a6036a..5bfcb9f 100644
--- a/wai-aria/combobox_haspopup_false-manual.html
+++ b/wai-aria/combobox_haspopup_false-manual.html
@@ -112,7 +112,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Combobox"
                ],
diff --git a/wai-aria/combobox_haspopup_grid-manual.html b/wai-aria/combobox_haspopup_grid-manual.html
index a68ce44..76ad36e 100644
--- a/wai-aria/combobox_haspopup_grid-manual.html
+++ b/wai-aria/combobox_haspopup_grid-manual.html
@@ -112,7 +112,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Combobox"
                ],
diff --git a/wai-aria/combobox_haspopup_listbox-manual.html b/wai-aria/combobox_haspopup_listbox-manual.html
index 4d97620..1354595 100644
--- a/wai-aria/combobox_haspopup_listbox-manual.html
+++ b/wai-aria/combobox_haspopup_listbox-manual.html
@@ -112,7 +112,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Combobox"
                ],
diff --git a/wai-aria/combobox_haspopup_menu-manual.html b/wai-aria/combobox_haspopup_menu-manual.html
index 8be6b44..85faaf3 100644
--- a/wai-aria/combobox_haspopup_menu-manual.html
+++ b/wai-aria/combobox_haspopup_menu-manual.html
@@ -112,7 +112,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Combobox"
                ],
diff --git a/wai-aria/combobox_haspopup_tree-manual.html b/wai-aria/combobox_haspopup_tree-manual.html
index 546e426..ea2d916 100644
--- a/wai-aria/combobox_haspopup_tree-manual.html
+++ b/wai-aria/combobox_haspopup_tree-manual.html
@@ -112,7 +112,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Combobox"
                ],
diff --git a/wai-aria/combobox_haspopup_true-manual.html b/wai-aria/combobox_haspopup_true-manual.html
index 5f32404..f087508 100644
--- a/wai-aria/combobox_haspopup_true-manual.html
+++ b/wai-aria/combobox_haspopup_true-manual.html
@@ -118,7 +118,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Combobox"
                ],
diff --git a/wai-aria/combobox_haspopup_unspecified-manual.html b/wai-aria/combobox_haspopup_unspecified-manual.html
index f2d3599..a60e9a1 100644
--- a/wai-aria/combobox_haspopup_unspecified-manual.html
+++ b/wai-aria/combobox_haspopup_unspecified-manual.html
@@ -118,7 +118,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Combobox"
                ],
diff --git a/wai-aria/combobox_orientation_horizontal-manual.html b/wai-aria/combobox_orientation_horizontal-manual.html
index 1d173cd..3831f41 100644
--- a/wai-aria/combobox_orientation_horizontal-manual.html
+++ b/wai-aria/combobox_orientation_horizontal-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Combobox"
                ],
diff --git a/wai-aria/combobox_orientation_unspecified-manual.html b/wai-aria/combobox_orientation_unspecified-manual.html
index a31cce5..b37568d 100644
--- a/wai-aria/combobox_orientation_unspecified-manual.html
+++ b/wai-aria/combobox_orientation_unspecified-manual.html
@@ -88,15 +88,21 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Combobox"
                ],
                [
                   "property",
                   "IUIAutomationElement.Orientation",
-                  "is",
-                  "null"
+                  "isNot",
+                  "vertical"
+               ],
+               [
+                  "property",
+                  "IUIAutomationElement.Orientation",
+                  "isNot",
+                  "horizontal"
                ]
             ]
          },
diff --git a/wai-aria/combobox_orientation_vertical-manual.html b/wai-aria/combobox_orientation_vertical-manual.html
index 40e131e..a1a0b83 100644
--- a/wai-aria/combobox_orientation_vertical-manual.html
+++ b/wai-aria/combobox_orientation_vertical-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Combobox"
                ],
diff --git a/wai-aria/combobox_readonly_false-manual.html b/wai-aria/combobox_readonly_false-manual.html
index 476bf2f..4a87a4c 100644
--- a/wai-aria/combobox_readonly_false-manual.html
+++ b/wai-aria/combobox_readonly_false-manual.html
@@ -112,7 +112,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Combobox"
                ],
diff --git a/wai-aria/combobox_readonly_true-manual.html b/wai-aria/combobox_readonly_true-manual.html
index a748476..6f2872a 100644
--- a/wai-aria/combobox_readonly_true-manual.html
+++ b/wai-aria/combobox_readonly_true-manual.html
@@ -118,7 +118,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Combobox"
                ],
diff --git a/wai-aria/combobox_readonly_unspecified-manual.html b/wai-aria/combobox_readonly_unspecified-manual.html
index 1ee51e5..8692658 100644
--- a/wai-aria/combobox_readonly_unspecified-manual.html
+++ b/wai-aria/combobox_readonly_unspecified-manual.html
@@ -112,7 +112,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Combobox"
                ],
diff --git a/wai-aria/dialog_modal_false-manual.html b/wai-aria/dialog_modal_false-manual.html
index 254dbe5..d78f21f 100644
--- a/wai-aria/dialog_modal_false-manual.html
+++ b/wai-aria/dialog_modal_false-manual.html
@@ -76,7 +76,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Pane"
                ],
diff --git a/wai-aria/dialog_modal_true-manual.html b/wai-aria/dialog_modal_true-manual.html
index 2ce3fe6..a58a88f 100644
--- a/wai-aria/dialog_modal_true-manual.html
+++ b/wai-aria/dialog_modal_true-manual.html
@@ -56,7 +56,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Pane"
                ],
diff --git a/wai-aria/dialog_modal_unspecified-manual.html b/wai-aria/dialog_modal_unspecified-manual.html
index 80366a6..117969b 100644
--- a/wai-aria/dialog_modal_unspecified-manual.html
+++ b/wai-aria/dialog_modal_unspecified-manual.html
@@ -76,7 +76,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Pane"
                ],
diff --git a/wai-aria/div_element_without_role_roledescription_valid-manual.html b/wai-aria/div_element_without_role_roledescription_valid-manual.html
index 091c034..7e9b9fc 100644
--- a/wai-aria/div_element_without_role_roledescription_valid-manual.html
+++ b/wai-aria/div_element_without_role_roledescription_valid-manual.html
@@ -100,7 +100,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Group"
                ]
diff --git a/wai-aria/errormessage_object_in_valid_state-manual.html b/wai-aria/errormessage_object_in_valid_state-manual.html
index ccad458..5845479 100644
--- a/wai-aria/errormessage_object_in_valid_state-manual.html
+++ b/wai-aria/errormessage_object_in_valid_state-manual.html
@@ -38,15 +38,15 @@
                   "property",
                   "relations",
                   "doesNotContain",
-                  "IA2_RELATION_ERROR_MESSAGE"
+                  "IA2_RELATION_ERROR"
                ]
             ],
             "UIA" : [
                [
                   "property",
                   "IUIAutomationElement.ControllerFor",
-                  "exists",
-                  "false"
+                  "is",
+                  ""
                ]
             ]
          },
diff --git a/wai-aria/feed-manual.html b/wai-aria/feed-manual.html
index ad9f1da..ddb684f 100644
--- a/wai-aria/feed-manual.html
+++ b/wai-aria/feed-manual.html
@@ -70,13 +70,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Group"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "feed"
                ]
diff --git a/wai-aria/figure-manual.html b/wai-aria/figure-manual.html
index 5111686..619978f 100644
--- a/wai-aria/figure-manual.html
+++ b/wai-aria/figure-manual.html
@@ -70,13 +70,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Group"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "figure"
                ]
diff --git a/wai-aria/grid_aria-readonly_false_automatically_propagated-manual.html b/wai-aria/grid_aria-readonly_false_automatically_propagated-manual.html
index 3676a10c..21663a7 100644
--- a/wai-aria/grid_aria-readonly_false_automatically_propagated-manual.html
+++ b/wai-aria/grid_aria-readonly_false_automatically_propagated-manual.html
@@ -76,7 +76,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "DataItem"
                ],
@@ -145,7 +145,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
@@ -208,7 +208,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/grid_aria-readonly_true_automatically_propagated-manual.html b/wai-aria/grid_aria-readonly_true_automatically_propagated-manual.html
index 0be4cb4..722d367 100644
--- a/wai-aria/grid_aria-readonly_true_automatically_propagated-manual.html
+++ b/wai-aria/grid_aria-readonly_true_automatically_propagated-manual.html
@@ -76,7 +76,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "DataItem"
                ],
@@ -84,7 +84,7 @@
                   "property",
                   "controlPatterns",
                   "contains",
-                  "selectionitem"
+                  "SelectionItem"
                ],
                [
                   "property",
@@ -145,7 +145,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
@@ -208,7 +208,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/grid_busy_false-manual.html b/wai-aria/grid_busy_false-manual.html
index 1a9572c..68376ef 100644
--- a/wai-aria/grid_busy_false-manual.html
+++ b/wai-aria/grid_busy_false-manual.html
@@ -112,7 +112,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "DataGrid"
                ],
diff --git a/wai-aria/grid_busy_true-manual.html b/wai-aria/grid_busy_true-manual.html
index 37c79ad..873f573 100644
--- a/wai-aria/grid_busy_true-manual.html
+++ b/wai-aria/grid_busy_true-manual.html
@@ -106,7 +106,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "DataGrid"
                ],
diff --git a/wai-aria/grid_busy_value_changes-manual.html b/wai-aria/grid_busy_value_changes-manual.html
index 3752951..ad65db9 100644
--- a/wai-aria/grid_busy_value_changes-manual.html
+++ b/wai-aria/grid_busy_value_changes-manual.html
@@ -149,7 +149,7 @@
                ],
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "DataGrid"
                ],
diff --git a/wai-aria/grid_colcount_8-manual.html b/wai-aria/grid_colcount_8-manual.html
index 5064172..624c1d2 100644
--- a/wai-aria/grid_colcount_8-manual.html
+++ b/wai-aria/grid_colcount_8-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "DataGrid"
                ],
diff --git a/wai-aria/grid_columnheader_readonly_false-manual.html b/wai-aria/grid_columnheader_readonly_false-manual.html
index 6ff7fe3..79f4c82 100644
--- a/wai-aria/grid_columnheader_readonly_false-manual.html
+++ b/wai-aria/grid_columnheader_readonly_false-manual.html
@@ -76,7 +76,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/grid_columnheader_readonly_true-manual.html b/wai-aria/grid_columnheader_readonly_true-manual.html
index d90852a..4ef4e7d 100644
--- a/wai-aria/grid_columnheader_readonly_true-manual.html
+++ b/wai-aria/grid_columnheader_readonly_true-manual.html
@@ -70,7 +70,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/grid_columnheader_readonly_unspecified-manual.html b/wai-aria/grid_columnheader_readonly_unspecified-manual.html
index 35910c3..bf9c24b 100644
--- a/wai-aria/grid_columnheader_readonly_unspecified-manual.html
+++ b/wai-aria/grid_columnheader_readonly_unspecified-manual.html
@@ -62,7 +62,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/grid_columnheader_required_false-manual.html b/wai-aria/grid_columnheader_required_false-manual.html
index 45a5002..f673675 100644
--- a/wai-aria/grid_columnheader_required_false-manual.html
+++ b/wai-aria/grid_columnheader_required_false-manual.html
@@ -70,7 +70,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/grid_columnheader_required_true-manual.html b/wai-aria/grid_columnheader_required_true-manual.html
index 41c936f..c810369 100644
--- a/wai-aria/grid_columnheader_required_true-manual.html
+++ b/wai-aria/grid_columnheader_required_true-manual.html
@@ -70,7 +70,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/grid_columnheader_required_unspecified-manual.html b/wai-aria/grid_columnheader_required_unspecified-manual.html
index feeef96..c9d83d2 100644
--- a/wai-aria/grid_columnheader_required_unspecified-manual.html
+++ b/wai-aria/grid_columnheader_required_unspecified-manual.html
@@ -70,7 +70,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/grid_rowcount_3-manual.html b/wai-aria/grid_rowcount_3-manual.html
index 6a4b140..ed92788 100644
--- a/wai-aria/grid_rowcount_3-manual.html
+++ b/wai-aria/grid_rowcount_3-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "DataGrid"
                ],
diff --git a/wai-aria/grid_rowheader_readonly_false-manual.html b/wai-aria/grid_rowheader_readonly_false-manual.html
index d7e923f..a099315 100644
--- a/wai-aria/grid_rowheader_readonly_false-manual.html
+++ b/wai-aria/grid_rowheader_readonly_false-manual.html
@@ -62,7 +62,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/grid_rowheader_readonly_true-manual.html b/wai-aria/grid_rowheader_readonly_true-manual.html
index 62351e0..67b1004 100644
--- a/wai-aria/grid_rowheader_readonly_true-manual.html
+++ b/wai-aria/grid_rowheader_readonly_true-manual.html
@@ -62,7 +62,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/grid_rowheader_readonly_unspecified-manual.html b/wai-aria/grid_rowheader_readonly_unspecified-manual.html
index 1815252..694e656 100644
--- a/wai-aria/grid_rowheader_readonly_unspecified-manual.html
+++ b/wai-aria/grid_rowheader_readonly_unspecified-manual.html
@@ -62,7 +62,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/grid_rowheader_required_false-manual.html b/wai-aria/grid_rowheader_required_false-manual.html
index 92aab07..ffd30cc 100644
--- a/wai-aria/grid_rowheader_required_false-manual.html
+++ b/wai-aria/grid_rowheader_required_false-manual.html
@@ -70,7 +70,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/grid_rowheader_required_true-manual.html b/wai-aria/grid_rowheader_required_true-manual.html
index 69df488..e9b7324 100644
--- a/wai-aria/grid_rowheader_required_true-manual.html
+++ b/wai-aria/grid_rowheader_required_true-manual.html
@@ -70,7 +70,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/grid_rowheader_required_unspecified-manual.html b/wai-aria/grid_rowheader_required_unspecified-manual.html
index e70bd6a..52d92a6 100644
--- a/wai-aria/grid_rowheader_required_unspecified-manual.html
+++ b/wai-aria/grid_rowheader_required_unspecified-manual.html
@@ -70,7 +70,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/gridcell_aria-colspan_2_on_div-manual.html b/wai-aria/gridcell_aria-colspan_2_on_div-manual.html
index 9ef3f28..47b13a5 100644
--- a/wai-aria/gridcell_aria-colspan_2_on_div-manual.html
+++ b/wai-aria/gridcell_aria-colspan_2_on_div-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "DataItem"
                ],
diff --git a/wai-aria/gridcell_aria-rowspan_2_on_div-manual.html b/wai-aria/gridcell_aria-rowspan_2_on_div-manual.html
index ffb187d..2fc1323 100644
--- a/wai-aria/gridcell_aria-rowspan_2_on_div-manual.html
+++ b/wai-aria/gridcell_aria-rowspan_2_on_div-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "DataItem"
                ],
diff --git a/wai-aria/gridcell_colindex_4-manual.html b/wai-aria/gridcell_colindex_4-manual.html
index d90bee3..a3662ed 100644
--- a/wai-aria/gridcell_colindex_4-manual.html
+++ b/wai-aria/gridcell_colindex_4-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "DataItem"
                ],
diff --git a/wai-aria/gridcell_rowindex_4-manual.html b/wai-aria/gridcell_rowindex_4-manual.html
index 478fc14..5fcae9a 100644
--- a/wai-aria/gridcell_rowindex_4-manual.html
+++ b/wai-aria/gridcell_rowindex_4-manual.html
@@ -76,7 +76,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "DataItem"
                ],
diff --git a/wai-aria/group_hidden_undefined_element_not_rendered-manual.html b/wai-aria/group_hidden_undefined_element_not_rendered-manual.html
index 0f3ea8a..8f2404b 100644
--- a/wai-aria/group_hidden_undefined_element_not_rendered-manual.html
+++ b/wai-aria/group_hidden_undefined_element_not_rendered-manual.html
@@ -21,7 +21,7 @@
                [
                   "property",
                   "accessible",
-                  "exists",
+                  "is",
                   "false"
                ]
             ],
@@ -29,7 +29,7 @@
                [
                   "property",
                   "accessible",
-                  "exists",
+                  "is",
                   "false"
                ]
             ],
@@ -37,7 +37,7 @@
                [
                   "property",
                   "accessible",
-                  "exists",
+                  "is",
                   "false"
                ]
             ],
@@ -45,7 +45,7 @@
                [
                   "property",
                   "accessible",
-                  "exists",
+                  "is",
                   "false"
                ]
             ],
@@ -53,7 +53,7 @@
                [
                   "property",
                   "accessible",
-                  "exists",
+                  "is",
                   "false"
                ]
             ]
diff --git a/wai-aria/group_hidden_undefined_element_rendered-manual.html b/wai-aria/group_hidden_undefined_element_rendered-manual.html
index 8f8baf8..0097832 100644
--- a/wai-aria/group_hidden_undefined_element_rendered-manual.html
+++ b/wai-aria/group_hidden_undefined_element_rendered-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Group"
                ],
diff --git a/wai-aria/heading_level_unspecified-manual.html b/wai-aria/heading_level_unspecified-manual.html
index 69962b7..2bf6418 100644
--- a/wai-aria/heading_level_unspecified-manual.html
+++ b/wai-aria/heading_level_unspecified-manual.html
@@ -80,15 +80,15 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Text"
                ],
                [
                   "property",
-                  "StyleId_Heading2",
+                  "StyleId_Heading",
                   "is",
-                  "present"
+                  "2"
                ],
                [
                   "property",
diff --git a/wai-aria/keyshortcuts_multiple_shortcuts-manual.html b/wai-aria/keyshortcuts_multiple_shortcuts-manual.html
index f28e9d3..67e04b0 100644
--- a/wai-aria/keyshortcuts_multiple_shortcuts-manual.html
+++ b/wai-aria/keyshortcuts_multiple_shortcuts-manual.html
@@ -48,7 +48,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Button"
                ],
diff --git a/wai-aria/keyshortcuts_one_shortcut-manual.html b/wai-aria/keyshortcuts_one_shortcut-manual.html
index aecb17e..6cf5c71 100644
--- a/wai-aria/keyshortcuts_one_shortcut-manual.html
+++ b/wai-aria/keyshortcuts_one_shortcut-manual.html
@@ -48,7 +48,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Button"
                ],
diff --git a/wai-aria/listbox_busy_false-manual.html b/wai-aria/listbox_busy_false-manual.html
index 59e3ad6..06258ae 100644
--- a/wai-aria/listbox_busy_false-manual.html
+++ b/wai-aria/listbox_busy_false-manual.html
@@ -86,7 +86,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "List"
                ],
diff --git a/wai-aria/listbox_busy_true-manual.html b/wai-aria/listbox_busy_true-manual.html
index 5a618aa..b8604dc 100644
--- a/wai-aria/listbox_busy_true-manual.html
+++ b/wai-aria/listbox_busy_true-manual.html
@@ -74,7 +74,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "List"
                ],
diff --git a/wai-aria/listbox_orientation_horizontal-manual.html b/wai-aria/listbox_orientation_horizontal-manual.html
index 8d75c69..e496a35 100644
--- a/wai-aria/listbox_orientation_horizontal-manual.html
+++ b/wai-aria/listbox_orientation_horizontal-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "List"
                ],
diff --git a/wai-aria/listbox_orientation_unspecified-manual.html b/wai-aria/listbox_orientation_unspecified-manual.html
index 3627627..d39db91 100644
--- a/wai-aria/listbox_orientation_unspecified-manual.html
+++ b/wai-aria/listbox_orientation_unspecified-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "List"
                ],
diff --git a/wai-aria/listbox_orientation_vertical-manual.html b/wai-aria/listbox_orientation_vertical-manual.html
index ba8b77b..5f6431f 100644
--- a/wai-aria/listbox_orientation_vertical-manual.html
+++ b/wai-aria/listbox_orientation_vertical-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "List"
                ],
diff --git a/wai-aria/listbox_readonly_false-manual.html b/wai-aria/listbox_readonly_false-manual.html
index 4733d64..0f7e2b6 100644
--- a/wai-aria/listbox_readonly_false-manual.html
+++ b/wai-aria/listbox_readonly_false-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "List"
                ],
diff --git a/wai-aria/listbox_readonly_true-manual.html b/wai-aria/listbox_readonly_true-manual.html
index 3a9f794..39771bf 100644
--- a/wai-aria/listbox_readonly_true-manual.html
+++ b/wai-aria/listbox_readonly_true-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "List"
                ],
diff --git a/wai-aria/listbox_readonly_unspecified-manual.html b/wai-aria/listbox_readonly_unspecified-manual.html
index 15ed93f..c1bb93d 100644
--- a/wai-aria/listbox_readonly_unspecified-manual.html
+++ b/wai-aria/listbox_readonly_unspecified-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "List"
                ],
diff --git a/wai-aria/listitem_setsize_-1-manual.html b/wai-aria/listitem_setsize_-1-manual.html
index 48cd2d0..376692e 100644
--- a/wai-aria/listitem_setsize_-1-manual.html
+++ b/wai-aria/listitem_setsize_-1-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "control type",
+                  "ControlType",
                   "is",
                   "ListItem"
                ],
@@ -108,7 +108,7 @@
                   "property",
                   "controlPatterns",
                   "contains",
-                  "selectionitem"
+                  "SelectionItem"
                ]
             ]
          },
diff --git a/wai-aria/menu_orientation_horizontal-manual.html b/wai-aria/menu_orientation_horizontal-manual.html
index d7a00c9..df2f22e 100644
--- a/wai-aria/menu_orientation_horizontal-manual.html
+++ b/wai-aria/menu_orientation_horizontal-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Menu"
                ],
diff --git a/wai-aria/menu_orientation_unspecified-manual.html b/wai-aria/menu_orientation_unspecified-manual.html
index f0a0266..b47451b 100644
--- a/wai-aria/menu_orientation_unspecified-manual.html
+++ b/wai-aria/menu_orientation_unspecified-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Menu"
                ],
diff --git a/wai-aria/menu_orientation_vertical-manual.html b/wai-aria/menu_orientation_vertical-manual.html
index 530918a..c1958d4 100644
--- a/wai-aria/menu_orientation_vertical-manual.html
+++ b/wai-aria/menu_orientation_vertical-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Menu"
                ],
diff --git a/wai-aria/menubar_busy_false-manual.html b/wai-aria/menubar_busy_false-manual.html
index e86c24a..62060a2 100644
--- a/wai-aria/menubar_busy_false-manual.html
+++ b/wai-aria/menubar_busy_false-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "MenuBar"
                ],
diff --git a/wai-aria/menubar_busy_true-manual.html b/wai-aria/menubar_busy_true-manual.html
index 6665c95..e8c6b64 100644
--- a/wai-aria/menubar_busy_true-manual.html
+++ b/wai-aria/menubar_busy_true-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "MenuBar"
                ],
diff --git a/wai-aria/menubar_orientation_horizontal-manual.html b/wai-aria/menubar_orientation_horizontal-manual.html
index e480aa3..66207b9 100644
--- a/wai-aria/menubar_orientation_horizontal-manual.html
+++ b/wai-aria/menubar_orientation_horizontal-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "MenuBar"
                ],
diff --git a/wai-aria/menubar_orientation_unspecified-manual.html b/wai-aria/menubar_orientation_unspecified-manual.html
index dbb1623..e94dd0c 100644
--- a/wai-aria/menubar_orientation_unspecified-manual.html
+++ b/wai-aria/menubar_orientation_unspecified-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "MenuBar"
                ],
diff --git a/wai-aria/menubar_orientation_vertical-manual.html b/wai-aria/menubar_orientation_vertical-manual.html
index a258dd8..dd7434e 100644
--- a/wai-aria/menubar_orientation_vertical-manual.html
+++ b/wai-aria/menubar_orientation_vertical-manual.html
@@ -76,7 +76,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "MenuBar"
                ],
diff --git a/wai-aria/menuitem_posinset_and_setsize-manual.html b/wai-aria/menuitem_posinset_and_setsize-manual.html
index a8bfb63..411086b 100644
--- a/wai-aria/menuitem_posinset_and_setsize-manual.html
+++ b/wai-aria/menuitem_posinset_and_setsize-manual.html
@@ -106,8 +106,8 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
-                  "isNot",
+                  "ControlType",
+                  "is",
                   "MenuItem"
                ],
                [
diff --git a/wai-aria/menuitemcheckbox_posinset_and_setsize-manual.html b/wai-aria/menuitemcheckbox_posinset_and_setsize-manual.html
index ec0c7a3..9368e98 100644
--- a/wai-aria/menuitemcheckbox_posinset_and_setsize-manual.html
+++ b/wai-aria/menuitemcheckbox_posinset_and_setsize-manual.html
@@ -136,8 +136,8 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
-                  "isNot",
+                  "ControlType",
+                  "is",
                   "MenuItem"
                ],
                [
diff --git a/wai-aria/menuitemcheckbox_readonly_false-manual.html b/wai-aria/menuitemcheckbox_readonly_false-manual.html
index bee4e4f..767d01e 100644
--- a/wai-aria/menuitemcheckbox_readonly_false-manual.html
+++ b/wai-aria/menuitemcheckbox_readonly_false-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "MenuItem"
                ],
diff --git a/wai-aria/menuitemcheckbox_readonly_true-manual.html b/wai-aria/menuitemcheckbox_readonly_true-manual.html
index e30b1bd..40fc078 100644
--- a/wai-aria/menuitemcheckbox_readonly_true-manual.html
+++ b/wai-aria/menuitemcheckbox_readonly_true-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "MenuItem"
                ],
diff --git a/wai-aria/menuitemcheckbox_readonly_unspecified-manual.html b/wai-aria/menuitemcheckbox_readonly_unspecified-manual.html
index b9997ab..388d89e 100644
--- a/wai-aria/menuitemcheckbox_readonly_unspecified-manual.html
+++ b/wai-aria/menuitemcheckbox_readonly_unspecified-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "MenuItem"
                ],
diff --git a/wai-aria/menuitemradio_posinset_and_setsize-manual.html b/wai-aria/menuitemradio_posinset_and_setsize-manual.html
index 2d32a57..9f6489e 100644
--- a/wai-aria/menuitemradio_posinset_and_setsize-manual.html
+++ b/wai-aria/menuitemradio_posinset_and_setsize-manual.html
@@ -136,8 +136,8 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
-                  "isNot",
+                  "ControlType",
+                  "is",
                   "MenuItem"
                ],
                [
diff --git a/wai-aria/menuitemradio_readonly_false-manual.html b/wai-aria/menuitemradio_readonly_false-manual.html
index d707725..3771b5d 100644
--- a/wai-aria/menuitemradio_readonly_false-manual.html
+++ b/wai-aria/menuitemradio_readonly_false-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "MenuItem"
                ],
@@ -96,7 +96,7 @@
                   "property",
                   "controlPatterns",
                   "contains",
-                  "SelectItem"
+                  "SelectionItem"
                ],
                [
                   "property",
diff --git a/wai-aria/menuitemradio_readonly_true-manual.html b/wai-aria/menuitemradio_readonly_true-manual.html
index 990b4fa..fd92109 100644
--- a/wai-aria/menuitemradio_readonly_true-manual.html
+++ b/wai-aria/menuitemradio_readonly_true-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "MenuItem"
                ],
@@ -108,7 +108,7 @@
                   "property",
                   "controlPatterns",
                   "contains",
-                  "SelectItem"
+                  "SelectionItem"
                ],
                [
                   "property",
diff --git a/wai-aria/menuitemradio_readonly_unspecified-manual.html b/wai-aria/menuitemradio_readonly_unspecified-manual.html
index ccad591..e391653 100644
--- a/wai-aria/menuitemradio_readonly_unspecified-manual.html
+++ b/wai-aria/menuitemradio_readonly_unspecified-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "MenuItem"
                ],
@@ -96,7 +96,7 @@
                   "property",
                   "controlPatterns",
                   "contains",
-                  "SelectItem"
+                  "SelectionItem"
                ],
                [
                   "property",
diff --git a/wai-aria/none-manual.html b/wai-aria/none-manual.html
index a286a59..f8c38af 100644
--- a/wai-aria/none-manual.html
+++ b/wai-aria/none-manual.html
@@ -21,7 +21,7 @@
                [
                   "property",
                   "accessible",
-                  "exists",
+                  "is",
                   "false"
                ]
             ],
@@ -29,7 +29,7 @@
                [
                   "property",
                   "accessible",
-                  "exists",
+                  "is",
                   "false"
                ]
             ],
@@ -37,7 +37,7 @@
                [
                   "property",
                   "accessible",
-                  "exists",
+                  "is",
                   "false"
                ]
             ],
@@ -45,7 +45,7 @@
                [
                   "property",
                   "accessible",
-                  "exists",
+                  "is",
                   "false"
                ]
             ],
@@ -53,7 +53,7 @@
                [
                   "property",
                   "accessible",
-                  "exists",
+                  "is",
                   "false"
                ]
             ]
diff --git a/wai-aria/option_selected_false-manual.html b/wai-aria/option_selected_false-manual.html
index e77d50c..c709120 100644
--- a/wai-aria/option_selected_false-manual.html
+++ b/wai-aria/option_selected_false-manual.html
@@ -86,7 +86,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "ListItem"
                ],
diff --git a/wai-aria/option_selected_true-manual.html b/wai-aria/option_selected_true-manual.html
index b9839f8..3769bcc 100644
--- a/wai-aria/option_selected_true-manual.html
+++ b/wai-aria/option_selected_true-manual.html
@@ -86,7 +86,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "ListItem"
                ],
diff --git a/wai-aria/option_selected_undefined-manual.html b/wai-aria/option_selected_undefined-manual.html
index f13ccfa..536ac9b 100644
--- a/wai-aria/option_selected_undefined-manual.html
+++ b/wai-aria/option_selected_undefined-manual.html
@@ -86,7 +86,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "ListItem"
                ],
diff --git a/wai-aria/radiogroup_orientation_horizontal-manual.html b/wai-aria/radiogroup_orientation_horizontal-manual.html
index 82b91ec..695f1c6 100644
--- a/wai-aria/radiogroup_orientation_horizontal-manual.html
+++ b/wai-aria/radiogroup_orientation_horizontal-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "List"
                ],
diff --git a/wai-aria/radiogroup_orientation_unspecified-manual.html b/wai-aria/radiogroup_orientation_unspecified-manual.html
index 97e5e5a..6cc09ea 100644
--- a/wai-aria/radiogroup_orientation_unspecified-manual.html
+++ b/wai-aria/radiogroup_orientation_unspecified-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "List"
                ],
diff --git a/wai-aria/radiogroup_orientation_vertical-manual.html b/wai-aria/radiogroup_orientation_vertical-manual.html
index 4442f25..ef3090b 100644
--- a/wai-aria/radiogroup_orientation_vertical-manual.html
+++ b/wai-aria/radiogroup_orientation_vertical-manual.html
@@ -76,7 +76,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "List"
                ],
diff --git a/wai-aria/radiogroup_readonly_false-manual.html b/wai-aria/radiogroup_readonly_false-manual.html
index e99875a..cb829c4 100644
--- a/wai-aria/radiogroup_readonly_false-manual.html
+++ b/wai-aria/radiogroup_readonly_false-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "List"
                ],
diff --git a/wai-aria/radiogroup_readonly_true-manual.html b/wai-aria/radiogroup_readonly_true-manual.html
index 9955b9d..279da4e 100644
--- a/wai-aria/radiogroup_readonly_true-manual.html
+++ b/wai-aria/radiogroup_readonly_true-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "List"
                ],
diff --git a/wai-aria/radiogroup_readonly_unspecified-manual.html b/wai-aria/radiogroup_readonly_unspecified-manual.html
index d822301..6b3596b 100644
--- a/wai-aria/radiogroup_readonly_unspecified-manual.html
+++ b/wai-aria/radiogroup_readonly_unspecified-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "List"
                ],
diff --git a/wai-aria/row_colindex_4-manual.html b/wai-aria/row_colindex_4-manual.html
index 060217f..1e483bf 100644
--- a/wai-aria/row_colindex_4-manual.html
+++ b/wai-aria/row_colindex_4-manual.html
@@ -64,7 +64,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "DataItem"
                ],
@@ -109,6 +109,20 @@
                   "is",
                   "4"
                ]
+            ],
+            "UIA" : [
+               [
+                  "property",
+                  "ControlType",
+                  "is",
+                  "DataItem"
+               ],
+               [
+                  "property",
+                  "Column",
+                  "is",
+                  "3"
+               ]
             ]
          },
          "title" : "step 2",
diff --git a/wai-aria/row_rowindex_4-manual.html b/wai-aria/row_rowindex_4-manual.html
index e391dff..98c9e15 100644
--- a/wai-aria/row_rowindex_4-manual.html
+++ b/wai-aria/row_rowindex_4-manual.html
@@ -64,7 +64,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "DataItem"
                ],
@@ -109,6 +109,20 @@
                   "is",
                   "4"
                ]
+            ],
+            "UIA" : [
+               [
+                  "property",
+                  "ControlType",
+                  "is",
+                  "DataItem"
+               ],
+               [
+                  "property",
+                  "Row",
+                  "is",
+                  "3"
+               ]
             ]
          },
          "title" : "step 2",
diff --git a/wai-aria/rowheader_aria-colspan_2_on_div-manual.html b/wai-aria/rowheader_aria-colspan_2_on_div-manual.html
index 883ebe0..294e505 100644
--- a/wai-aria/rowheader_aria-colspan_2_on_div-manual.html
+++ b/wai-aria/rowheader_aria-colspan_2_on_div-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/rowheader_aria-rowspan_2_on_div-manual.html b/wai-aria/rowheader_aria-rowspan_2_on_div-manual.html
index e5c331f..361526f 100644
--- a/wai-aria/rowheader_aria-rowspan_2_on_div-manual.html
+++ b/wai-aria/rowheader_aria-rowspan_2_on_div-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/rowheader_colindex_4-manual.html b/wai-aria/rowheader_colindex_4-manual.html
index a48cd2f..e3fa115 100644
--- a/wai-aria/rowheader_colindex_4-manual.html
+++ b/wai-aria/rowheader_colindex_4-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
diff --git a/wai-aria/rowheader_rowindex_4-manual.html b/wai-aria/rowheader_rowindex_4-manual.html
index a146fc9..8591196 100644
--- a/wai-aria/rowheader_rowindex_4-manual.html
+++ b/wai-aria/rowheader_rowindex_4-manual.html
@@ -76,7 +76,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "HeaderItem"
                ],
@@ -102,7 +102,7 @@
   <p>This test examines the ARIA properties for rowheader rowindex 4.</p>
     <div role="table">
     <div role="row">
-       <div id="test" role="rowheader" aria-rowindex ="4">test cell</div>
+       <div id="test" role="rowheader" aria-rowindex="4">test cell</div>
     </div>
   </div>
 
diff --git a/wai-aria/rowheader_selected_false_not_automatically_propagated-manual.html b/wai-aria/rowheader_selected_false_not_automatically_propagated-manual.html
index 948b11e..cc6eb5d 100644
--- a/wai-aria/rowheader_selected_false_not_automatically_propagated-manual.html
+++ b/wai-aria/rowheader_selected_false_not_automatically_propagated-manual.html
@@ -86,7 +86,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "DataItem"
                ],
diff --git a/wai-aria/rowheader_selected_true_not_automatically_propagated-manual.html b/wai-aria/rowheader_selected_true_not_automatically_propagated-manual.html
index 26aab4e..fe34db9 100644
--- a/wai-aria/rowheader_selected_true_not_automatically_propagated-manual.html
+++ b/wai-aria/rowheader_selected_true_not_automatically_propagated-manual.html
@@ -86,7 +86,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "DataItem"
                ],
diff --git a/wai-aria/scrollbar_all_values_unspecified-manual.html b/wai-aria/scrollbar_all_values_unspecified-manual.html
index 00d9314..c5849c5 100644
--- a/wai-aria/scrollbar_all_values_unspecified-manual.html
+++ b/wai-aria/scrollbar_all_values_unspecified-manual.html
@@ -130,7 +130,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "scrollbar"
                ],
diff --git a/wai-aria/scrollbar_only_valuenow_unspecified-manual.html b/wai-aria/scrollbar_only_valuenow_unspecified-manual.html
index 8efb7ed..34c59ce 100644
--- a/wai-aria/scrollbar_only_valuenow_unspecified-manual.html
+++ b/wai-aria/scrollbar_only_valuenow_unspecified-manual.html
@@ -130,7 +130,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "ScrollBar"
                ],
diff --git a/wai-aria/scrollbar_orientation_unspecified-manual.html b/wai-aria/scrollbar_orientation_unspecified-manual.html
index 890a464..0fb9ae8 100644
--- a/wai-aria/scrollbar_orientation_unspecified-manual.html
+++ b/wai-aria/scrollbar_orientation_unspecified-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "ScrollBar"
                ],
@@ -108,7 +108,7 @@
                   "property",
                   "interfaces",
                   "contains",
-                  "Range control pattern"
+                  "RangeValue"
                ]
             ]
          },
diff --git a/wai-aria/searchbox-manual.html b/wai-aria/searchbox-manual.html
index 016f77a..f3e1548 100644
--- a/wai-aria/searchbox-manual.html
+++ b/wai-aria/searchbox-manual.html
@@ -88,13 +88,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Edit"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "search box"
                ]
diff --git a/wai-aria/searchbox_activedescendant-manual.html b/wai-aria/searchbox_activedescendant-manual.html
index 3976c26..1e2ad17 100644
--- a/wai-aria/searchbox_activedescendant-manual.html
+++ b/wai-aria/searchbox_activedescendant-manual.html
@@ -112,13 +112,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Edit"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "search box"
                ],
diff --git a/wai-aria/searchbox_activedescendant_value_changes-manual.html b/wai-aria/searchbox_activedescendant_value_changes-manual.html
index 9f2507c..a1ceab6 100644
--- a/wai-aria/searchbox_activedescendant_value_changes-manual.html
+++ b/wai-aria/searchbox_activedescendant_value_changes-manual.html
@@ -105,7 +105,7 @@
                   "event",
                   "type",
                   "is",
-                  "IA2_EVENT_ACTIVE_DESCENDANT_CHANGED"
+                  "EVENT_OBJECT_FOCUS"
                ]
             ],
             "MSAA" : [
@@ -131,13 +131,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Edit"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "search box"
                ],
diff --git a/wai-aria/searchbox_autocomplete_unspecified-manual.html b/wai-aria/searchbox_autocomplete_unspecified-manual.html
index 8b13749..3513eeb 100644
--- a/wai-aria/searchbox_autocomplete_unspecified-manual.html
+++ b/wai-aria/searchbox_autocomplete_unspecified-manual.html
@@ -102,7 +102,7 @@
                   "property",
                   "autocomplete",
                   "is",
-                  "none"
+                  ""
                ]
             ]
          },
diff --git a/wai-aria/searchbox_multiline_false-manual.html b/wai-aria/searchbox_multiline_false-manual.html
index 6c0053a..2413dd4 100644
--- a/wai-aria/searchbox_multiline_false-manual.html
+++ b/wai-aria/searchbox_multiline_false-manual.html
@@ -94,13 +94,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Edit"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "search box"
                ]
diff --git a/wai-aria/searchbox_multiline_true-manual.html b/wai-aria/searchbox_multiline_true-manual.html
index 311cbf5..4a3d657 100644
--- a/wai-aria/searchbox_multiline_true-manual.html
+++ b/wai-aria/searchbox_multiline_true-manual.html
@@ -100,21 +100,21 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Edit"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "search box"
                ],
                [
                   "property",
-                  "AriaProperties",
-                  "contains",
-                  "multiline:true"
+                  "AriaProperties.multiline",
+                  "is",
+                  "true"
                ]
             ]
          },
diff --git a/wai-aria/searchbox_multiline_unspecified-manual.html b/wai-aria/searchbox_multiline_unspecified-manual.html
index 240698f..8768b5b 100644
--- a/wai-aria/searchbox_multiline_unspecified-manual.html
+++ b/wai-aria/searchbox_multiline_unspecified-manual.html
@@ -76,13 +76,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Edit"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "search box"
                ]
diff --git a/wai-aria/searchbox_placeholder-manual.html b/wai-aria/searchbox_placeholder-manual.html
index 086508f..4e9ddba 100644
--- a/wai-aria/searchbox_placeholder-manual.html
+++ b/wai-aria/searchbox_placeholder-manual.html
@@ -100,13 +100,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Edit"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "search box"
                ],
diff --git a/wai-aria/searchbox_readonly_false-manual.html b/wai-aria/searchbox_readonly_false-manual.html
index 2c8d4ae..a587eb5 100644
--- a/wai-aria/searchbox_readonly_false-manual.html
+++ b/wai-aria/searchbox_readonly_false-manual.html
@@ -100,13 +100,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Edit"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "search box"
                ],
diff --git a/wai-aria/searchbox_readonly_true-manual.html b/wai-aria/searchbox_readonly_true-manual.html
index ba0f388..83ff4ec 100644
--- a/wai-aria/searchbox_readonly_true-manual.html
+++ b/wai-aria/searchbox_readonly_true-manual.html
@@ -100,13 +100,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Edit"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "search box"
                ],
diff --git a/wai-aria/searchbox_readonly_unspecified-manual.html b/wai-aria/searchbox_readonly_unspecified-manual.html
index c3f49a2..615785f 100644
--- a/wai-aria/searchbox_readonly_unspecified-manual.html
+++ b/wai-aria/searchbox_readonly_unspecified-manual.html
@@ -100,13 +100,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Edit"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "search box"
                ],
diff --git a/wai-aria/searchbox_required_false-manual.html b/wai-aria/searchbox_required_false-manual.html
index 6d57677..dc544dd 100644
--- a/wai-aria/searchbox_required_false-manual.html
+++ b/wai-aria/searchbox_required_false-manual.html
@@ -88,13 +88,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Edit"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "search box"
                ],
diff --git a/wai-aria/searchbox_required_true-manual.html b/wai-aria/searchbox_required_true-manual.html
index 764fe33..a1dcb29 100644
--- a/wai-aria/searchbox_required_true-manual.html
+++ b/wai-aria/searchbox_required_true-manual.html
@@ -88,13 +88,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Edit"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "search box"
                ],
diff --git a/wai-aria/searchbox_required_unspecified-manual.html b/wai-aria/searchbox_required_unspecified-manual.html
index 592e0e4..fb7c657 100644
--- a/wai-aria/searchbox_required_unspecified-manual.html
+++ b/wai-aria/searchbox_required_unspecified-manual.html
@@ -88,13 +88,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Edit"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "search box"
                ],
diff --git a/wai-aria/separator_focusable_all_values_unspecified-manual.html b/wai-aria/separator_focusable_all_values_unspecified-manual.html
index 971f454..5f2d8ba 100644
--- a/wai-aria/separator_focusable_all_values_unspecified-manual.html
+++ b/wai-aria/separator_focusable_all_values_unspecified-manual.html
@@ -130,7 +130,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Thumb"
                ],
diff --git a/wai-aria/separator_focusable_only_valuenow_unspecified-manual.html b/wai-aria/separator_focusable_only_valuenow_unspecified-manual.html
index abc35fe..8c4c809 100644
--- a/wai-aria/separator_focusable_only_valuenow_unspecified-manual.html
+++ b/wai-aria/separator_focusable_only_valuenow_unspecified-manual.html
@@ -130,7 +130,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Thumb"
                ],
diff --git a/wai-aria/separator_focusable_valuetext-manual.html b/wai-aria/separator_focusable_valuetext-manual.html
index edbb7bd..ebfd211 100644
--- a/wai-aria/separator_focusable_valuetext-manual.html
+++ b/wai-aria/separator_focusable_valuetext-manual.html
@@ -148,7 +148,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Thumb"
                ],
@@ -178,12 +178,6 @@
                ],
                [
                   "property",
-                  "controlPatterns",
-                  "contains",
-                  "Value"
-               ],
-               [
-                  "property",
                   "Value.Value",
                   "is",
                   "Bonaire"
diff --git a/wai-aria/separator_orientation_unspecified-manual.html b/wai-aria/separator_orientation_unspecified-manual.html
index 3b496a8..43dfe6d 100644
--- a/wai-aria/separator_orientation_unspecified-manual.html
+++ b/wai-aria/separator_orientation_unspecified-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Separator"
                ],
diff --git a/wai-aria/separator_unfocusable_all_values_unspecified-manual.html b/wai-aria/separator_unfocusable_all_values_unspecified-manual.html
index 8ab8e96..5dbe67d 100644
--- a/wai-aria/separator_unfocusable_all_values_unspecified-manual.html
+++ b/wai-aria/separator_unfocusable_all_values_unspecified-manual.html
@@ -62,7 +62,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Separator"
                ]
diff --git a/wai-aria/separator_unfocusable_valuetext-manual.html b/wai-aria/separator_unfocusable_valuetext-manual.html
index 71527bf..4e8fd40 100644
--- a/wai-aria/separator_unfocusable_valuetext-manual.html
+++ b/wai-aria/separator_unfocusable_valuetext-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Separator"
                ],
@@ -90,7 +90,7 @@
                   "property",
                   "controlPatterns",
                   "doesNotContain",
-                  "Value"
+                  "RangeValue"
                ]
             ]
          },
diff --git a/wai-aria/slider_all_values_unspecified-manual.html b/wai-aria/slider_all_values_unspecified-manual.html
index 2b3e440..2a72d5d 100644
--- a/wai-aria/slider_all_values_unspecified-manual.html
+++ b/wai-aria/slider_all_values_unspecified-manual.html
@@ -130,7 +130,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Slider"
                ],
diff --git a/wai-aria/slider_only_valuenow_unspecified-manual.html b/wai-aria/slider_only_valuenow_unspecified-manual.html
index 9421dfc..4f80a39 100644
--- a/wai-aria/slider_only_valuenow_unspecified-manual.html
+++ b/wai-aria/slider_only_valuenow_unspecified-manual.html
@@ -130,7 +130,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Slider"
                ],
diff --git a/wai-aria/slider_orientation_unspecified-manual.html b/wai-aria/slider_orientation_unspecified-manual.html
index d882fc4..50e87c8 100644
--- a/wai-aria/slider_orientation_unspecified-manual.html
+++ b/wai-aria/slider_orientation_unspecified-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Slider"
                ],
@@ -108,7 +108,7 @@
                   "property",
                   "interfaces",
                   "contains",
-                  "Range control pattern"
+                  "RangeValue"
                ]
             ]
          },
diff --git a/wai-aria/slider_readonly_false-manual.html b/wai-aria/slider_readonly_false-manual.html
index 666cb12..13c36ef 100644
--- a/wai-aria/slider_readonly_false-manual.html
+++ b/wai-aria/slider_readonly_false-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Slider"
                ],
diff --git a/wai-aria/slider_readonly_true-manual.html b/wai-aria/slider_readonly_true-manual.html
index f33e07e..5793bf2 100644
--- a/wai-aria/slider_readonly_true-manual.html
+++ b/wai-aria/slider_readonly_true-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Slider"
                ],
diff --git a/wai-aria/slider_readonly_unspecified-manual.html b/wai-aria/slider_readonly_unspecified-manual.html
index 86f7500..dc5ce40 100644
--- a/wai-aria/slider_readonly_unspecified-manual.html
+++ b/wai-aria/slider_readonly_unspecified-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Slider"
                ],
diff --git a/wai-aria/spinbutton_all_values_unspecified-manual.html b/wai-aria/spinbutton_all_values_unspecified-manual.html
index eb7e288..446f453 100644
--- a/wai-aria/spinbutton_all_values_unspecified-manual.html
+++ b/wai-aria/spinbutton_all_values_unspecified-manual.html
@@ -130,7 +130,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Spinner"
                ],
diff --git a/wai-aria/spinbutton_only_aria-valuenow_unspecified-manual.html b/wai-aria/spinbutton_only_aria-valuenow_unspecified-manual.html
index 8a9dc74..ae6948b 100644
--- a/wai-aria/spinbutton_only_aria-valuenow_unspecified-manual.html
+++ b/wai-aria/spinbutton_only_aria-valuenow_unspecified-manual.html
@@ -130,7 +130,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Spinner"
                ],
diff --git a/wai-aria/spinbutton_readonly_false-manual.html b/wai-aria/spinbutton_readonly_false-manual.html
index bda4b58..94a9d44 100644
--- a/wai-aria/spinbutton_readonly_false-manual.html
+++ b/wai-aria/spinbutton_readonly_false-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Spinner"
                ],
diff --git a/wai-aria/spinbutton_readonly_true-manual.html b/wai-aria/spinbutton_readonly_true-manual.html
index 6234e50..7652a56 100644
--- a/wai-aria/spinbutton_readonly_true-manual.html
+++ b/wai-aria/spinbutton_readonly_true-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Spinner"
                ],
diff --git a/wai-aria/spinbutton_readonly_unspecified-manual.html b/wai-aria/spinbutton_readonly_unspecified-manual.html
index c96f2e0..8a3f2d7 100644
--- a/wai-aria/spinbutton_readonly_unspecified-manual.html
+++ b/wai-aria/spinbutton_readonly_unspecified-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Spinner"
                ],
diff --git a/wai-aria/switch_checked_false-manual.html b/wai-aria/switch_checked_false-manual.html
index f499550..b5cf84f 100644
--- a/wai-aria/switch_checked_false-manual.html
+++ b/wai-aria/switch_checked_false-manual.html
@@ -86,13 +86,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Button"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "toggleswitch"
                ],
diff --git a/wai-aria/switch_checked_mixed-manual.html b/wai-aria/switch_checked_mixed-manual.html
index e6320e0..f9e45cf 100644
--- a/wai-aria/switch_checked_mixed-manual.html
+++ b/wai-aria/switch_checked_mixed-manual.html
@@ -92,13 +92,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Button"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "toggleswitch"
                ],
diff --git a/wai-aria/switch_checked_true-manual.html b/wai-aria/switch_checked_true-manual.html
index 8ae8579..fbe80ae 100644
--- a/wai-aria/switch_checked_true-manual.html
+++ b/wai-aria/switch_checked_true-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Button"
                ],
@@ -106,7 +106,7 @@
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "toggleswitch"
                ],
diff --git a/wai-aria/switch_checked_undefined-manual.html b/wai-aria/switch_checked_undefined-manual.html
index 7ae70c6..94297a4 100644
--- a/wai-aria/switch_checked_undefined-manual.html
+++ b/wai-aria/switch_checked_undefined-manual.html
@@ -86,13 +86,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Button"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "toggleswitch"
                ],
diff --git a/wai-aria/switch_checked_value_changes-manual.html b/wai-aria/switch_checked_value_changes-manual.html
index 699f332..11ebcb3 100644
--- a/wai-aria/switch_checked_value_changes-manual.html
+++ b/wai-aria/switch_checked_value_changes-manual.html
@@ -119,13 +119,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Button"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "toggleswitch"
                ],
@@ -139,7 +139,7 @@
                   "event",
                   "type",
                   "is",
-                  "Toggle.ToggleStateProperty"
+                  "TogglePattern.ToggleStateProperty"
                ]
             ]
          },
diff --git a/wai-aria/switch_readonly_false-manual.html b/wai-aria/switch_readonly_false-manual.html
index 4afbff1..fdb095d 100644
--- a/wai-aria/switch_readonly_false-manual.html
+++ b/wai-aria/switch_readonly_false-manual.html
@@ -80,13 +80,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Button"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "toggleswitch"
                ],
diff --git a/wai-aria/switch_readonly_true-manual.html b/wai-aria/switch_readonly_true-manual.html
index eab0bf5..2a6f6fb 100644
--- a/wai-aria/switch_readonly_true-manual.html
+++ b/wai-aria/switch_readonly_true-manual.html
@@ -80,13 +80,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Button"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "toggleswitch"
                ],
diff --git a/wai-aria/switch_readonly_unspecified-manual.html b/wai-aria/switch_readonly_unspecified-manual.html
index f3e1f6b..7a25365 100644
--- a/wai-aria/switch_readonly_unspecified-manual.html
+++ b/wai-aria/switch_readonly_unspecified-manual.html
@@ -80,13 +80,13 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Button"
                ],
                [
                   "property",
-                  "Localized Control Type",
+                  "LocalizedControlType",
                   "is",
                   "toggleswitch"
                ],
diff --git a/wai-aria/tab_posinset_and_setsize-manual.html b/wai-aria/tab_posinset_and_setsize-manual.html
index 6f3d796..f00d598 100644
--- a/wai-aria/tab_posinset_and_setsize-manual.html
+++ b/wai-aria/tab_posinset_and_setsize-manual.html
@@ -142,8 +142,8 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
-                  "isNot",
+                  "ControlType",
+                  "is",
                   "TabItem"
                ],
                [
diff --git a/wai-aria/table_colcount_-1-manual.html b/wai-aria/table_colcount_-1-manual.html
index 7516426..8a6e46f 100644
--- a/wai-aria/table_colcount_-1-manual.html
+++ b/wai-aria/table_colcount_-1-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Table"
                ],
diff --git a/wai-aria/table_colcount_8-manual.html b/wai-aria/table_colcount_8-manual.html
index daaa03f..0c25f18 100644
--- a/wai-aria/table_colcount_8-manual.html
+++ b/wai-aria/table_colcount_8-manual.html
@@ -76,7 +76,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Table"
                ],
diff --git a/wai-aria/table_rowcount_-1-manual.html b/wai-aria/table_rowcount_-1-manual.html
index 8ca6717..fbc809b 100644
--- a/wai-aria/table_rowcount_-1-manual.html
+++ b/wai-aria/table_rowcount_-1-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Table"
                ],
diff --git a/wai-aria/table_rowcount_3-manual.html b/wai-aria/table_rowcount_3-manual.html
index bb685bd..81a3a3c 100644
--- a/wai-aria/table_rowcount_3-manual.html
+++ b/wai-aria/table_rowcount_3-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Table"
                ],
diff --git a/wai-aria/tablist_orientation_horizontal-manual.html b/wai-aria/tablist_orientation_horizontal-manual.html
index a01acf1..2d7062a 100644
--- a/wai-aria/tablist_orientation_horizontal-manual.html
+++ b/wai-aria/tablist_orientation_horizontal-manual.html
@@ -100,7 +100,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Tab"
                ],
diff --git a/wai-aria/tablist_orientation_unspecified-manual.html b/wai-aria/tablist_orientation_unspecified-manual.html
index f4524c2..497751d 100644
--- a/wai-aria/tablist_orientation_unspecified-manual.html
+++ b/wai-aria/tablist_orientation_unspecified-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Tab"
                ],
diff --git a/wai-aria/tablist_orientation_vertical-manual.html b/wai-aria/tablist_orientation_vertical-manual.html
index 9cf69ca..18c196b 100644
--- a/wai-aria/tablist_orientation_vertical-manual.html
+++ b/wai-aria/tablist_orientation_vertical-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Tab"
                ],
diff --git a/wai-aria/term_role-manual.html b/wai-aria/term_role-manual.html
index d583765..76941b5 100644
--- a/wai-aria/term_role-manual.html
+++ b/wai-aria/term_role-manual.html
@@ -74,9 +74,9 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
-                  "ListItem"
+                  "Text"
                ]
             ]
          },
diff --git a/wai-aria/textbox_placeholder-manual.html b/wai-aria/textbox_placeholder-manual.html
index 6c234a1..5c40558 100644
--- a/wai-aria/textbox_placeholder-manual.html
+++ b/wai-aria/textbox_placeholder-manual.html
@@ -100,7 +100,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Edit"
                ],
diff --git a/wai-aria/toolbar_orientation_horizontal-manual.html b/wai-aria/toolbar_orientation_horizontal-manual.html
index e2327e7..356c983 100644
--- a/wai-aria/toolbar_orientation_horizontal-manual.html
+++ b/wai-aria/toolbar_orientation_horizontal-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "ToolBar"
                ],
diff --git a/wai-aria/toolbar_orientation_unspecified-manual.html b/wai-aria/toolbar_orientation_unspecified-manual.html
index a08e45a..bd2c399 100644
--- a/wai-aria/toolbar_orientation_unspecified-manual.html
+++ b/wai-aria/toolbar_orientation_unspecified-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "ToolBar"
                ],
diff --git a/wai-aria/toolbar_orientation_vertical-manual.html b/wai-aria/toolbar_orientation_vertical-manual.html
index 92a39cd..b0d85f9 100644
--- a/wai-aria/toolbar_orientation_vertical-manual.html
+++ b/wai-aria/toolbar_orientation_vertical-manual.html
@@ -88,7 +88,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "ToolBar"
                ],
diff --git a/wai-aria/tree_orientation_horizontal-manual.html b/wai-aria/tree_orientation_horizontal-manual.html
index 7478821..88ba1e7 100644
--- a/wai-aria/tree_orientation_horizontal-manual.html
+++ b/wai-aria/tree_orientation_horizontal-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Tree"
                ],
diff --git a/wai-aria/tree_orientation_unspecified-manual.html b/wai-aria/tree_orientation_unspecified-manual.html
index ada952d..b8c2566 100644
--- a/wai-aria/tree_orientation_unspecified-manual.html
+++ b/wai-aria/tree_orientation_unspecified-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Tree"
                ],
diff --git a/wai-aria/tree_orientation_vertical-manual.html b/wai-aria/tree_orientation_vertical-manual.html
index 799413b..b9e88b0 100644
--- a/wai-aria/tree_orientation_vertical-manual.html
+++ b/wai-aria/tree_orientation_vertical-manual.html
@@ -94,7 +94,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "Tree"
                ],
diff --git a/wai-aria/treegrid_colcount_8-manual.html b/wai-aria/treegrid_colcount_8-manual.html
index b44672c..381f39c 100644
--- a/wai-aria/treegrid_colcount_8-manual.html
+++ b/wai-aria/treegrid_colcount_8-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "DataGrid"
                ],
diff --git a/wai-aria/treegrid_orientation_horizontal-manual.html b/wai-aria/treegrid_orientation_horizontal-manual.html
index 180aebd..41b49e7 100644
--- a/wai-aria/treegrid_orientation_horizontal-manual.html
+++ b/wai-aria/treegrid_orientation_horizontal-manual.html
@@ -100,7 +100,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "DataGrid"
                ],
diff --git a/wai-aria/treegrid_orientation_unspecified-manual.html b/wai-aria/treegrid_orientation_unspecified-manual.html
index 4bc2a05..1eabb26 100644
--- a/wai-aria/treegrid_orientation_unspecified-manual.html
+++ b/wai-aria/treegrid_orientation_unspecified-manual.html
@@ -112,7 +112,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "DataGrid"
                ],
diff --git a/wai-aria/treegrid_orientation_vertical-manual.html b/wai-aria/treegrid_orientation_vertical-manual.html
index 3bed156..92c0e28 100644
--- a/wai-aria/treegrid_orientation_vertical-manual.html
+++ b/wai-aria/treegrid_orientation_vertical-manual.html
@@ -100,7 +100,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "DataGrid"
                ],
diff --git a/wai-aria/treegrid_rowcount_3-manual.html b/wai-aria/treegrid_rowcount_3-manual.html
index 15b63f3..8694270 100644
--- a/wai-aria/treegrid_rowcount_3-manual.html
+++ b/wai-aria/treegrid_rowcount_3-manual.html
@@ -82,7 +82,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "DataGrid"
                ],
diff --git a/wai-aria/treeitem_selected_false-manual.html b/wai-aria/treeitem_selected_false-manual.html
index f401a52..0e2c1f9 100644
--- a/wai-aria/treeitem_selected_false-manual.html
+++ b/wai-aria/treeitem_selected_false-manual.html
@@ -86,7 +86,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "TreeItem"
                ],
diff --git a/wai-aria/treeitem_selected_true-manual.html b/wai-aria/treeitem_selected_true-manual.html
index 80cf627..2177564 100644
--- a/wai-aria/treeitem_selected_true-manual.html
+++ b/wai-aria/treeitem_selected_true-manual.html
@@ -86,7 +86,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "TreeItem"
                ],
diff --git a/wai-aria/treeitem_selected_undefined-manual.html b/wai-aria/treeitem_selected_undefined-manual.html
index a7ca892..f988087 100644
--- a/wai-aria/treeitem_selected_undefined-manual.html
+++ b/wai-aria/treeitem_selected_undefined-manual.html
@@ -86,7 +86,7 @@
             "UIA" : [
                [
                   "property",
-                  "Control Type",
+                  "ControlType",
                   "is",
                   "TreeItem"
                ],