Re-land: Change mapping of text leaf nodes and line breaks to ATK_ROLE_STATIC

Originally landed: crrev.com/c/1749145
Reverted: crrev.com/c/1751830

The revert was due to Trusty not supporting ATK_ROLE_STATIC. The change
is something which can wait but should be made eventually.

Original commit message:

  Text leaf nodes and line breaks were being exposed as ATK_ROLE_TEXT.
  However, the definition of ATK_ROLE_TEXT is:

    An interactive widget that supports multiple lines of text
    and optionally accepts user input, but whose purpose is not
    to solicit user input.

  In contrast, ATK_ROLE_STATIC is defined as:

    A generic non-container object whose purpose is to display
    a brief amount of information to the user and whose role is
    known by the implementor but lacks semantic value for the user.

  Thus text leaf nodes and line breaks should be exposed with the latter
  role; not the former.

Bug: 984590
Change-Id: I7da4ea79dcac546a96e55d5ef57c9a052e9bd578
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1872409
Auto-Submit: Joanmarie Diggs <jdiggs@igalia.com>
Commit-Queue: Martin Robinson <mrobinson@igalia.com>
Reviewed-by: Martin Robinson <mrobinson@igalia.com>
Cr-Commit-Position: refs/heads/master@{#712495}
diff --git a/chrome/test/data/pdf/accessibility/directional-text-runs-expected-auralinux.txt b/chrome/test/data/pdf/accessibility/directional-text-runs-expected-auralinux.txt
index eba079f4..b57f693 100644
--- a/chrome/test/data/pdf/accessibility/directional-text-runs-expected-auralinux.txt
+++ b/chrome/test/data/pdf/accessibility/directional-text-runs-expected-auralinux.txt
@@ -2,6 +2,6 @@
 ++[document frame]
 ++++[landmark] name='Page 1'
 ++++++[paragraph]
-++++++++[text] name='Hello,<newline> world!<newline><newline>Goodbye,<newline> world!<newline>'
+++++++++[static] name='Hello,<newline> world!<newline><newline>Goodbye,<newline> world!<newline>'
 ++++++[paragraph]
-++++++++[text] name='This is some text abc<newline>def'
+++++++++[static] name='This is some text abc<newline>def'
diff --git a/chrome/test/data/pdf/accessibility/hello-world-expected-auralinux.txt b/chrome/test/data/pdf/accessibility/hello-world-expected-auralinux.txt
index 31e73ffa..4295536 100644
--- a/chrome/test/data/pdf/accessibility/hello-world-expected-auralinux.txt
+++ b/chrome/test/data/pdf/accessibility/hello-world-expected-auralinux.txt
@@ -2,4 +2,4 @@
 ++[document frame]
 ++++[landmark] name='Page 1'
 ++++++[paragraph]
-++++++++[text] name='Hello, world!'
+++++++++[static] name='Hello, world!'
diff --git a/chrome/test/data/pdf/accessibility/multi-page-expected-auralinux.txt b/chrome/test/data/pdf/accessibility/multi-page-expected-auralinux.txt
index f8013d8..f6c86a1 100644
--- a/chrome/test/data/pdf/accessibility/multi-page-expected-auralinux.txt
+++ b/chrome/test/data/pdf/accessibility/multi-page-expected-auralinux.txt
@@ -2,7 +2,7 @@
 ++[document frame]
 ++++[landmark] name='Page 1'
 ++++++[paragraph]
-++++++++[text] name='Page 1'
+++++++++[static] name='Page 1'
 ++++[landmark] name='Page 2'
 ++++++[paragraph]
-++++++++[text] name='Page 2'
+++++++++[static] name='Page 2'
diff --git a/chrome/test/data/pdf/accessibility/paragraphs-and-heading-untagged-expected-auralinux.txt b/chrome/test/data/pdf/accessibility/paragraphs-and-heading-untagged-expected-auralinux.txt
index 2822240a..70a91c6 100644
--- a/chrome/test/data/pdf/accessibility/paragraphs-and-heading-untagged-expected-auralinux.txt
+++ b/chrome/test/data/pdf/accessibility/paragraphs-and-heading-untagged-expected-auralinux.txt
@@ -2,12 +2,12 @@
 ++[document frame]
 ++++[landmark] name='Page 1'
 ++++++[heading]
-++++++++[text] name='Heading<newline>'
+++++++++[static] name='Heading<newline>'
 ++++++[paragraph]
-++++++++[text] name='This is a small pdf file:<newline>'
+++++++++[static] name='This is a small pdf file:<newline>'
 ++++++[paragraph]
-++++++++[text] name='Lorem Ipsum is simply dummy text of the printing and typesetting industry.<newline>Lorem Ipsum has been the industry's standard dummy text ever since the 1500s.<newline>'
+++++++++[static] name='Lorem Ipsum is simply dummy text of the printing and typesetting industry.<newline>Lorem Ipsum has been the industry's standard dummy text ever since the 1500s.<newline>'
 ++++++[paragraph]
-++++++++[text] name='It has survived not only five centuries, but also the leap into electronic typesetting,<newline>remaining essentially unchanged. It was popularised in the 1960s with the release of<newline>Letraset sheets containing Lorem Ipsum passages, and more recently with desktop<newline>publishing software like Aldus PageMaker including versions of Lorem Ipsum.<newline>'
+++++++++[static] name='It has survived not only five centuries, but also the leap into electronic typesetting,<newline>remaining essentially unchanged. It was popularised in the 1960s with the release of<newline>Letraset sheets containing Lorem Ipsum passages, and more recently with desktop<newline>publishing software like Aldus PageMaker including versions of Lorem Ipsum.<newline>'
 ++++++[paragraph]
-++++++++[text] name='Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots<newline>in a piece of classical Latin literature from 45 BC, making it over 2000 years old.'
+++++++++[static] name='Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots<newline>in a piece of classical Latin literature from 45 BC, making it over 2000 years old.'
diff --git a/chrome/test/data/pdf/accessibility/text-image-link-expected-auralinux.txt b/chrome/test/data/pdf/accessibility/text-image-link-expected-auralinux.txt
index dca194b..68c4efd 100644
--- a/chrome/test/data/pdf/accessibility/text-image-link-expected-auralinux.txt
+++ b/chrome/test/data/pdf/accessibility/text-image-link-expected-auralinux.txt
@@ -2,24 +2,24 @@
 ++[document frame]
 ++++[landmark] name='Page 1'
 ++++++[heading]
-++++++++[text] name='Link Annotations - Page 1<newline>'
+++++++++[static] name='Link Annotations - Page 1<newline>'
 ++++++[heading]
 ++++++++[link] name='Link with destination to second page<newline>'
-++++++++++[text] name='Link with destination to second page<newline>'
+++++++++++[static] name='Link with destination to second page<newline>'
 ++++++[paragraph]
 ++++++++[link] name='PDF Reference, Version 1.7,'
-++++++++++[text] name='PDF Reference, Version 1.7,'
-++++++++[text] name=' Section 8.4.5 defines Annotations<newline>3. Hello World<newline>'
+++++++++++[static] name='PDF Reference, Version 1.7,'
+++++++++[static] name=' Section 8.4.5 defines Annotations<newline>3. Hello World<newline>'
 ++++++++[link] name='https://pdfium.googlesource.com/pdfium'
-++++++++++[text] name='https://pdfium.googlesource.com/pdfium'
-++++++++[text] name=' is link in plain text, not link annotation. These are referred to<newline>as '
+++++++++++[static] name='https://pdfium.googlesource.com/pdfium'
+++++++++[static] name=' is link in plain text, not link annotation. These are referred to<newline>as '
 ++++++++[link] name='WebLinks in PDFium'
-++++++++++[text] name='WebLinks in PDFium'
-++++++++[text] name='.'
+++++++++++[static] name='WebLinks in PDFium'
+++++++++[static] name='.'
 ++++++++[link]
 ++++++++[image] name='Image 1'
 ++++++++[image] name='Unlabeled image'
 ++++++++[image] name='Unlabeled image'
 ++++[landmark] name='Page 2'
 ++++++[paragraph]
-++++++++[text] name='Second Page'
\ No newline at end of file
+++++++++[static] name='Second Page'
diff --git a/chrome/test/data/pdf/accessibility/text-run-style-heuristic-expected-auralinux.txt b/chrome/test/data/pdf/accessibility/text-run-style-heuristic-expected-auralinux.txt
index 5456337..4fdfa9f 100644
--- a/chrome/test/data/pdf/accessibility/text-run-style-heuristic-expected-auralinux.txt
+++ b/chrome/test/data/pdf/accessibility/text-run-style-heuristic-expected-auralinux.txt
@@ -2,4 +2,4 @@
 ++[document frame]
 ++++[landmark] name='Page 1'
 ++++++[paragraph]
-++++++++[text] name='Hello world! One word equals to one text run.'
\ No newline at end of file
+++++++++[static] name='Hello world! One word equals to one text run.'
diff --git a/chrome/test/data/pdf/accessibility/weblinks-expected-auralinux.txt b/chrome/test/data/pdf/accessibility/weblinks-expected-auralinux.txt
index 915f3b5..83278741 100644
--- a/chrome/test/data/pdf/accessibility/weblinks-expected-auralinux.txt
+++ b/chrome/test/data/pdf/accessibility/weblinks-expected-auralinux.txt
@@ -2,16 +2,16 @@
 ++[document frame]
 ++++[landmark] name='Page 1'
 ++++++[paragraph]
-++++++++[text] name='Hello, '
+++++++++[static] name='Hello, '
 ++++++++[link] name='http://yahoo.com'
-++++++++++[text] name='http://yahoo.com'
-++++++++[text] name='! nice meeting you<newline>'
+++++++++++[static] name='http://yahoo.com'
+++++++++[static] name='! nice meeting you<newline>'
 ++++++[paragraph]
-++++++++[text] name='Goodbye, '
+++++++++[static] name='Goodbye, '
 ++++++++[link] name='http://bing.com'
-++++++++++[text] name='http://bing.com'
-++++++++[text] name='! nice meeting you<newline>'
+++++++++++[static] name='http://bing.com'
+++++++++[static] name='! nice meeting you<newline>'
 ++++++[paragraph]
-++++++++[text] name='Bye, '
+++++++++[static] name='Bye, '
 ++++++++[link] name='http://google.com'
-++++++++++[text] name='http://google.com'
+++++++++++[static] name='http://google.com'
diff --git a/content/test/data/accessibility/aria/aria-alert-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-alert-expected-auralinux.txt
index ad13113..10cf607 100644
--- a/content/test/data/accessibility/aria/aria-alert-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-alert-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[alert]
-++++[text] name='This test is for aria role="alert"' member-of
+++++[static] name='This test is for aria role="alert"' member-of
diff --git a/content/test/data/accessibility/aria/aria-article-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-article-expected-auralinux.txt
index cacef213..2eda633 100644
--- a/content/test/data/accessibility/aria/aria-article-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-article-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[article]
-++++[text] name='This is an ARIA article.'
+++++[static] name='This is an ARIA article.'
diff --git a/content/test/data/accessibility/aria/aria-atomic-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-atomic-expected-auralinux.txt
index b33acc5..d4586549 100644
--- a/content/test/data/accessibility/aria/aria-atomic-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-atomic-expected-auralinux.txt
@@ -1,9 +1,9 @@
 [document web]
 ++[log] atomic:false container-atomic:false live:polite
-++++[text] name='This test is for aria-atomic="false"' atomic:false container-atomic:false
+++++[static] name='This test is for aria-atomic="false"' atomic:false container-atomic:false
 ++[log] atomic:true container-atomic:true live:polite
-++++[text] name='This test is for aria-atomic="true"' member-of atomic:false container-atomic:true
+++++[static] name='This test is for aria-atomic="true"' member-of atomic:false container-atomic:true
 ++[alert] atomic:true container-atomic:true live:assertive
-++++[text] name='This test is for alert.' member-of atomic:false container-atomic:true
+++++[static] name='This test is for alert.' member-of atomic:false container-atomic:true
 ++[statusbar] atomic:true container-atomic:true live:polite
-++++[text] name='This test is for status.' member-of atomic:false container-atomic:true
+++++[static] name='This test is for status.' member-of atomic:false container-atomic:true
diff --git a/content/test/data/accessibility/aria/aria-banner-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-banner-expected-auralinux.txt
index 228a02f..4cd09db 100644
--- a/content/test/data/accessibility/aria/aria-banner-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-banner-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[landmark] xml-roles:banner
-++++[text] name='Chromium Browser'
+++++[static] name='Chromium Browser'
diff --git a/content/test/data/accessibility/aria/aria-blockquote-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-blockquote-expected-auralinux.txt
index 8997e80f..68490d7 100644
--- a/content/test/data/accessibility/aria/aria-blockquote-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-blockquote-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[block quote] xml-roles:blockquote
-++++[text] name='Blockquote'
+++++[static] name='Blockquote'
diff --git a/content/test/data/accessibility/aria/aria-button-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-button-expected-auralinux.txt
index e67661d09..4ff6f9be7 100644
--- a/content/test/data/accessibility/aria/aria-button-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-button-expected-auralinux.txt
@@ -5,11 +5,11 @@
 ++[push button] name='Button4' haspopup:menu xml-roles:button
 ++[push button] name='Button5' xml-roles:button
 ++[push button] name='Complex button ' xml-roles:button
-++++[text] name='Complex button '
+++++[static] name='Complex button '
 ++++[entry] selectable-text
 ++[toggle button] name='Complex toggle button ' pressed checkable:true xml-roles:button
-++++[text] name='Complex toggle button '
+++++[static] name='Complex toggle button '
 ++++[entry] selectable-text
 ++[push button] name='Complex pop up button ' haspopup:menu xml-roles:button
-++++[text] name='Complex pop up button '
+++++[static] name='Complex pop up button '
 ++++[entry] selectable-text
diff --git a/content/test/data/accessibility/aria/aria-caption-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-caption-expected-auralinux.txt
index 8370b6a..ddaa0ca 100644
--- a/content/test/data/accessibility/aria/aria-caption-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-caption-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[caption] xml-roles:caption
-++++[text] name='Caption'
+++++[static] name='Caption'
diff --git a/content/test/data/accessibility/aria/aria-cell-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-cell-expected-auralinux.txt
index 7f1e4d00d..780df295 100644
--- a/content/test/data/accessibility/aria/aria-cell-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-cell-expected-auralinux.txt
@@ -2,11 +2,11 @@
 ++[table] cols=2 headers=('Browser', 'Rendering Engine'); rows=2 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row] selectable
 ++++++[column header] name='Browser' selectable (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Browser'
+++++++++[static] name='Browser'
 ++++++[column header] name='Rendering Engine' selectable (row=0, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Rendering Engine'
+++++++++[static] name='Rendering Engine'
 ++++[table row] selectable
 ++++++[table cell] name='Chrome' selectable (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='Chrome'
+++++++++[static] name='Chrome'
 ++++++[table cell] name='Blink' selectable (row=1, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='Blink'
+++++++++[static] name='Blink'
diff --git a/content/test/data/accessibility/aria/aria-checkbox-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-checkbox-expected-auralinux.txt
index 40ad16d..4a1f6f4 100644
--- a/content/test/data/accessibility/aria/aria-checkbox-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-checkbox-expected-auralinux.txt
@@ -4,6 +4,6 @@
 ++[check box] name='CheckBox3' indeterminate checkable:true xml-roles:checkbox
 ++[check box] name='CheckBox4' checkable:true xml-roles:checkbox
 ++[check box] name='Complex checkbox' checkable:true xml-roles:checkbox
-++++[text] name='Complex '
+++++[static] name='Complex '
 ++++[entry] selectable-text
-++++[text] name=' checkbox'
+++++[static] name=' checkbox'
diff --git a/content/test/data/accessibility/aria/aria-code-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-code-expected-auralinux.txt
index 02e4a79a..437fd9d 100644
--- a/content/test/data/accessibility/aria/aria-code-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-code-expected-auralinux.txt
@@ -1,7 +1,7 @@
 [document web]
 ++[static] xml-roles:code
-++++[text] name='role'
-++[text] name='element (no name)'
-++[text] name=' '
+++++[static] name='role'
+++[static] name='element (no name)'
+++[static] name=' '
 ++[static] name='include me'
-++++[text] name='element (with name)'
+++++[static] name='element (with name)'
diff --git a/content/test/data/accessibility/aria/aria-col-attr-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-col-attr-expected-auralinux.txt
index 43091386..bf02197 100644
--- a/content/test/data/accessibility/aria/aria-col-attr-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-col-attr-expected-auralinux.txt
@@ -2,17 +2,17 @@
 ++[table] colcount:5 cols=4 headers=('cell 2', 'cell 4', 'cell 5'); rows=2 headers=(NONE); caption=false; spans=(cell at 0,3: 0x0)
 ++++[table row] selectable
 ++++++[column header] name='cell 2' selectable colindex:2 colspan:2 (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='cell 2'
+++++++++[static] name='cell 2'
 ++++++[column header] name='cell 4' selectable colindex:4 (row=0, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='cell 4'
+++++++++[static] name='cell 4'
 ++++++[column header] name='cell 5' selectable colindex:5 (row=0, col=2, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='cell 5'
+++++++++[static] name='cell 5'
 ++++[table row] selectable
 ++++++[table cell] name='cell 2' selectable colindex:2 (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='cell 2'
+++++++++[static] name='cell 2'
 ++++++[table cell] name='cell 3' selectable colindex:3 (row=1, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='cell 3'
+++++++++[static] name='cell 3'
 ++++++[table cell] name='cell 4' selectable colindex:4 (row=1, col=2, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='cell 4'
+++++++++[static] name='cell 4'
 ++++++[table cell] name='cell 5' selectable colindex:5 (row=1, col=3, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='cell 5'
+++++++++[static] name='cell 5'
diff --git a/content/test/data/accessibility/aria/aria-columnheader-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-columnheader-expected-auralinux.txt
index 78dabd1..ad729b45 100644
--- a/content/test/data/accessibility/aria/aria-columnheader-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-columnheader-expected-auralinux.txt
@@ -2,16 +2,16 @@
 ++[table] cols=2 headers=('Browser', 'Rendering Engine'); rows=3 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row] selectable
 ++++++[column header] name='Browser' selectable (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Browser'
+++++++++[static] name='Browser'
 ++++++[column header] name='Rendering Engine' selectable (row=0, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Rendering Engine'
+++++++++[static] name='Rendering Engine'
 ++++[table row] selectable
 ++++++[table cell] name='Chrome' selectable (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='Chrome'
+++++++++[static] name='Chrome'
 ++++++[table cell] name='Blink' selectable (row=1, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='Blink'
+++++++++[static] name='Blink'
 ++++[table row] selectable
 ++++++[table cell] name='Safari' selectable (row=2, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='Safari'
+++++++++[static] name='Safari'
 ++++++[table cell] name='WebKit' selectable (row=2, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='WebKit'
+++++++++[static] name='WebKit'
diff --git a/content/test/data/accessibility/aria/aria-combobox-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-combobox-expected-auralinux.txt
index a4a85c0..bd2e61fa 100644
--- a/content/test/data/accessibility/aria/aria-combobox-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-combobox-expected-auralinux.txt
@@ -1,6 +1,6 @@
 [document web]
 ++[section] label-for
-++++[text] name='State'
+++++[static] name='State'
 ++[combo box] name='State' expandable expanded selectable-text labelled-by haspopup:listbox
 ++[list box]
 ++++[list item] name='Alabama' selectable
diff --git a/content/test/data/accessibility/aria/aria-complementary-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-complementary-expected-auralinux.txt
index 664adf4..cc7af9c 100644
--- a/content/test/data/accessibility/aria/aria-complementary-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-complementary-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[landmark] xml-roles:complementary
-++++[text] name='This is ARIA role complementary.'
+++++[static] name='This is ARIA role complementary.'
diff --git a/content/test/data/accessibility/aria/aria-contentinfo-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-contentinfo-expected-auralinux.txt
index d2cdac59a..10811cc 100644
--- a/content/test/data/accessibility/aria/aria-contentinfo-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-contentinfo-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[landmark] xml-roles:contentinfo
-++++[text] name='This is ARIA role contentinfo.'
+++++[static] name='This is ARIA role contentinfo.'
diff --git a/content/test/data/accessibility/aria/aria-current-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-current-expected-auralinux.txt
index 25bd797..3e98e9a 100644
--- a/content/test/data/accessibility/aria/aria-current-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-current-expected-auralinux.txt
@@ -1,24 +1,24 @@
 [document web]
 ++[link] name='Section one'
-++++[text] name='Section one'
-++[text] name=' '
+++++[static] name='Section one'
+++[static] name=' '
 ++[link] name='Section two'
-++++[text] name='Section two'
-++[text] name=' '
+++++[static] name='Section two'
+++[static] name=' '
 ++[link] name='Section three' current:location
-++++[text] name='Section three'
-++[text] name='<newline>'
+++++[static] name='Section three'
+++[static] name='<newline>'
 ++[heading] name='Section one heading'
-++++[text] name='Section one heading'
+++++[static] name='Section one heading'
 ++[heading] name='Section two heading'
-++++[text] name='Section two heading'
+++++[static] name='Section two heading'
 ++[heading] name='Section three heading'
-++++[text] name='Section three heading'
-++[text] name='<newline>'
+++++[static] name='Section three heading'
+++[static] name='<newline>'
 ++[section]
-++++[text] name='Span 1'
-++++[text] name=' '
+++++[static] name='Span 1'
+++++[static] name=' '
 ++++[section] current:true
-++++++[text] name='Span 2'
-++++[text] name=' '
-++++[text] name='Span 3'
+++++++[static] name='Span 2'
+++++[static] name=' '
+++++[static] name='Span 3'
diff --git a/content/test/data/accessibility/aria/aria-describedby-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-describedby-expected-auralinux.txt
index 4df9e90..84a1734 100644
--- a/content/test/data/accessibility/aria/aria-describedby-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-describedby-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web]
 ++[entry] description='Your username should be your email id' selectable-text described-by
 ++[tool tip] description-for xml-roles:tooltip
-++++[text]
+++++[static]
 ++[entry] description='mmddyy' selectable-text described-by
diff --git a/content/test/data/accessibility/aria/aria-dialog-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-dialog-expected-auralinux.txt
index 410aa911..d03ce50 100644
--- a/content/test/data/accessibility/aria/aria-dialog-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-dialog-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[dialog]
-++++[text] name='This is ARIA dialog.'
+++++[static] name='This is ARIA dialog.'
diff --git a/content/test/data/accessibility/aria/aria-document-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-document-expected-auralinux.txt
index ff64487..66bf85f 100644
--- a/content/test/data/accessibility/aria/aria-document-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-document-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[document frame] xml-roles:document
-++++[text] name='aria role document'
+++++[static] name='aria role document'
diff --git a/content/test/data/accessibility/aria/aria-dropeffect-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-dropeffect-expected-auralinux.txt
index ff196c67..f3ba596 100644
--- a/content/test/data/accessibility/aria/aria-dropeffect-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-dropeffect-expected-auralinux.txt
@@ -1,15 +1,15 @@
 [document web]
 ++[section] dropeffect:copy
-++++[text] name='copy'
+++++[static] name='copy'
 ++[section] dropeffect:move
-++++[text] name='move'
+++++[static] name='move'
 ++[section] dropeffect:link
-++++[text] name='link'
+++++[static] name='link'
 ++[section] dropeffect:execute
-++++[text] name='execute'
+++++[static] name='execute'
 ++[section] dropeffect:popup
-++++[text] name='popup'
+++++[static] name='popup'
 ++[section] dropeffect:none
-++++[text] name='none(default)'
+++++[static] name='none(default)'
 ++[section] dropeffect:link popup
-++++[text] name='link popup'
+++++[static] name='link popup'
diff --git a/content/test/data/accessibility/aria/aria-editable-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-editable-expected-auralinux.txt
index 0d5871a..23734e9 100644
--- a/content/test/data/accessibility/aria/aria-editable-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-editable-expected-auralinux.txt
@@ -1,8 +1,8 @@
 [document web]
 ++[section] editable selectable-text
 ++++[paragraph] editable
-++++++[text] name='Editable text/' editable
+++++++[static] name='Editable text/' editable
 ++++[paragraph]
-++++++[text] name='Non-editable text'
+++++++[static] name='Non-editable text'
 ++[section] editable
-++++[text] name='Fake-editable' editable
+++++[static] name='Fake-editable' editable
diff --git a/content/test/data/accessibility/aria/aria-emphasis-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-emphasis-expected-auralinux.txt
index a7e3097..dd71d07 100644
--- a/content/test/data/accessibility/aria/aria-emphasis-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-emphasis-expected-auralinux.txt
@@ -1,7 +1,7 @@
 [document web]
 ++[static] xml-roles:emphasis
-++++[text] name='role'
-++[text] name='element (no name)'
-++[text] name=' '
+++++[static] name='role'
+++[static] name='element (no name)'
+++[static] name=' '
 ++[static] name='include me'
-++++[text] name='element (with name)'
+++++[static] name='element (with name)'
diff --git a/content/test/data/accessibility/aria/aria-feed-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-feed-expected-auralinux.txt
index 993cd45b..9f5fd4c 100644
--- a/content/test/data/accessibility/aria/aria-feed-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-feed-expected-auralinux.txt
@@ -1,6 +1,6 @@
 [document web]
 ++[panel] xml-roles:feed
 ++++[article] xml-roles:article
-++++++[text] name='First'
+++++++[static] name='First'
 ++++[article] xml-roles:article
-++++++[text] name='Second'
+++++++[static] name='Second'
diff --git a/content/test/data/accessibility/aria/aria-figure-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-figure-expected-auralinux.txt
index 620fe7b..50125d2 100644
--- a/content/test/data/accessibility/aria/aria-figure-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-figure-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[panel] xml-roles:figure
-++++[text] name='Figure'
+++++[static] name='Figure'
diff --git a/content/test/data/accessibility/aria/aria-generic-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-generic-expected-auralinux.txt
index a2a9055..bd89d00 100644
--- a/content/test/data/accessibility/aria/aria-generic-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-generic-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[section]
-++++[text] name='content'
+++++[static] name='content'
diff --git a/content/test/data/accessibility/aria/aria-grabbed-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-grabbed-expected-auralinux.txt
index 64ce5bf..e97efe09 100644
--- a/content/test/data/accessibility/aria/aria-grabbed-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-grabbed-expected-auralinux.txt
@@ -2,13 +2,13 @@
 ++[list]
 ++++[list item] grabbed:true
 ++++++[static] name='• '
-++++++[text] name='grabbed-true '
+++++++[static] name='grabbed-true '
 ++++++[image] name='blue'
 ++++[list item] grabbed:false
 ++++++[static] name='• '
-++++++[text] name='grabbed-false '
+++++++[static] name='grabbed-false '
 ++++++[image] name='blue'
 ++++[list item]
 ++++++[static] name='• '
-++++++[text] name='grabbed-undefined '
+++++++[static] name='grabbed-undefined '
 ++++++[image] name='blue'
diff --git a/content/test/data/accessibility/aria/aria-grid-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-grid-expected-auralinux.txt
index 57b3c43..76d028e 100644
--- a/content/test/data/accessibility/aria/aria-grid-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-grid-expected-auralinux.txt
@@ -2,11 +2,11 @@
 ++[table] xml-roles:grid cols=2 headers=('Browser', 'Rendering Engine'); rows=2 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row] selectable xml-roles:row
 ++++++[column header] name='Browser' selectable colindex:1 rowindex:1 xml-roles:columnheader (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Browser'
+++++++++[static] name='Browser'
 ++++++[column header] name='Rendering Engine' selectable colindex:2 rowindex:1 xml-roles:columnheader (row=0, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Rendering Engine'
+++++++++[static] name='Rendering Engine'
 ++++[table row] selectable xml-roles:row
 ++++++[table cell] name='Chrome' selectable colindex:1 rowindex:2 xml-roles:gridcell (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='Chrome'
+++++++++[static] name='Chrome'
 ++++++[table cell] name='Blink' selectable colindex:2 rowindex:2 xml-roles:gridcell (row=1, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='Blink'
+++++++++[static] name='Blink'
diff --git a/content/test/data/accessibility/aria/aria-gridcell-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-gridcell-expected-auralinux.txt
index 48b74fd..b2c492bf 100644
--- a/content/test/data/accessibility/aria/aria-gridcell-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-gridcell-expected-auralinux.txt
@@ -2,11 +2,11 @@
 ++[table] multiselectable xml-roles:grid cols=2 headers=('Browser', 'Rendering Engine'); rows=2 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row] selectable xml-roles:row
 ++++++[column header] name='Browser' selectable colindex:1 rowindex:1 xml-roles:columnheader (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Browser'
+++++++++[static] name='Browser'
 ++++++[column header] name='Rendering Engine' selectable colindex:2 rowindex:1 xml-roles:columnheader (row=0, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Rendering Engine'
+++++++++[static] name='Rendering Engine'
 ++++[table row] selectable xml-roles:row
 ++++++[table cell] name='Chrome' selectable colindex:1 rowindex:2 xml-roles:gridcell (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='Chrome'
+++++++++[static] name='Chrome'
 ++++++[table cell] name='Blink' selectable colindex:2 rowindex:2 xml-roles:gridcell (row=1, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='Blink'
+++++++++[static] name='Blink'
diff --git a/content/test/data/accessibility/aria/aria-group-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-group-expected-auralinux.txt
index fcef1bb..4605948 100644
--- a/content/test/data/accessibility/aria/aria-group-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-group-expected-auralinux.txt
@@ -1,6 +1,6 @@
 [document web]
 ++[panel] xml-roles:group
 ++++[link] name='Group Link1' xml-roles:link
-++++++[text] name='Group Link1'
+++++++[static] name='Group Link1'
 ++++[link] name='Group Link2' xml-roles:link
-++++++[text] name='Group Link2'
+++++++[static] name='Group Link2'
diff --git a/content/test/data/accessibility/aria/aria-heading-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-heading-expected-auralinux.txt
index 08ba4d4..518580d 100644
--- a/content/test/data/accessibility/aria/aria-heading-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-heading-expected-auralinux.txt
@@ -1,16 +1,16 @@
 [document web]
 ++[heading] name='ARIA Heading 1' level:1 xml-roles:heading
-++++[text] name='ARIA Heading 1'
+++++[static] name='ARIA Heading 1'
 ++[heading] name='ARIA Heading 2' level:2 xml-roles:heading
-++++[text] name='ARIA Heading 2'
+++++[static] name='ARIA Heading 2'
 ++[heading] name='ARIA Heading 3' level:3 xml-roles:heading
-++++[text] name='ARIA Heading 3'
+++++[static] name='ARIA Heading 3'
 ++[heading] name='ARIA Heading 4' level:4 xml-roles:heading
-++++[text] name='ARIA Heading 4'
+++++[static] name='ARIA Heading 4'
 ++[heading] name='ARIA Heading 5' level:5 xml-roles:heading
-++++[text] name='ARIA Heading 5'
+++++[static] name='ARIA Heading 5'
 ++[heading] name='ARIA Heading 6' level:6 xml-roles:heading
-++++[text] name='ARIA Heading 6'
+++++[static] name='ARIA Heading 6'
 ++[section]
 ++++[heading] name='Heading' level:2 xml-roles:heading
-++++++[text] name='Heading'
+++++++[static] name='Heading'
diff --git a/content/test/data/accessibility/aria/aria-hidden-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-hidden-expected-auralinux.txt
index 81ab41d4..0819af1 100644
--- a/content/test/data/accessibility/aria/aria-hidden-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-hidden-expected-auralinux.txt
@@ -1,7 +1,7 @@
 [document web]
 ++[section]
-++++[text] name='blockDisplay'
+++++[static] name='blockDisplay'
 ++[section]
-++++[text] name='blockDisplay Hiddenfalse'
+++++[static] name='blockDisplay Hiddenfalse'
 ++[section]
 ++[section] name='blockDisplay Hiddentruefocusable' hidden:true
diff --git a/content/test/data/accessibility/aria/aria-insertion-deletion-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-insertion-deletion-expected-auralinux.txt
index ef81f6b..39bcc4f 100644
--- a/content/test/data/accessibility/aria/aria-insertion-deletion-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-insertion-deletion-expected-auralinux.txt
@@ -1,9 +1,9 @@
 [document web]
 ++[paragraph]
-++++[text] name='My favorite browser is '
+++++[static] name='My favorite browser is '
 ++++[content deletion]
-++++++[text] name='ABC'
-++++[text] name=' '
+++++++[static] name='ABC'
+++++[static] name=' '
 ++++[content insertion]
-++++++[text] name='Chrome'
-++++[text] name='!'
+++++++[static] name='Chrome'
+++++[static] name='!'
diff --git a/content/test/data/accessibility/aria/aria-invalid-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-invalid-expected-auralinux.txt
index ccbe786..74caecf 100644
--- a/content/test/data/accessibility/aria/aria-invalid-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-invalid-expected-auralinux.txt
@@ -1,23 +1,23 @@
 [document web]
 ++[section] invalid-entry
-++++[text] name='invalid=true'
+++++[static] name='invalid=true'
 ++[entry] selectable-text
-++++[text] name='An '
+++++[static] name='An '
 ++++[section] invalid-entry
-++++++[text] name='eror'
-++++[text] name=' via invalid=spelling'
+++++++[static] name='eror'
+++++[static] name=' via invalid=spelling'
 ++[entry] selectable-text
-++++[text] name='An '
+++++[static] name='An '
 ++++[section] invalid-entry
-++++++[text] name='errors'
-++++[text] name=' via invalid=grammar'
+++++++[static] name='errors'
+++++[static] name=' via invalid=grammar'
 ++[section]
-++++[text] name='invalid=false'
+++++[static] name='invalid=false'
 ++[section]
-++++[text] name='invalid=<empty>'
+++++[static] name='invalid=<empty>'
 ++[section]
-++++[text] name='invalid=<default>'
+++++[static] name='invalid=<default>'
 ++[section] invalid-entry
-++++[text] name='invalid=unknown'
+++++[static] name='invalid=unknown'
 ++[form]
 ++++[entry] invalid-entry selectable-text
diff --git a/content/test/data/accessibility/aria/aria-level-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-level-expected-auralinux.txt
index 10b7909..1018eb4 100644
--- a/content/test/data/accessibility/aria/aria-level-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-level-expected-auralinux.txt
@@ -1,30 +1,30 @@
 [document web]
 ++[heading] name='Level 2' level:2
-++++[text] name='Level 2'
+++++[static] name='Level 2'
 ++[heading] name='Level 9' level:9
-++++[text] name='Level 9'
+++++[static] name='Level 9'
 ++[heading] name='Level 1' level:1
-++++[text] name='Level 1'
+++++[static] name='Level 1'
 ++[heading] name='Level 3' level:3
-++++[text] name='Level 3'
+++++[static] name='Level 3'
 ++[heading] name='Level 3' level:3
-++++[text] name='Level 3'
+++++[static] name='Level 3'
 ++[heading] name='Level 4' level:4
-++++[text] name='Level 4'
+++++[static] name='Level 4'
 ++[heading] name='Level 5' level:5
-++++[text] name='Level 5'
+++++[static] name='Level 5'
 ++[tree]
 ++++[tree item] name='Tree item at level 1' expandable expanded selectable level:1
-++++++[text] name='Tree item at level 1'
+++++++[static] name='Tree item at level 1'
 ++++++[panel]
 ++++++++[tree item] name='Tree item at level 2' selectable level:2
-++++++++++[text] name='Tree item at level 2'
+++++++++++[static] name='Tree item at level 2'
 ++++[tree item] name='Tree item at level 3' selectable level:3
-++++++[text] name='Tree item at level 3'
+++++++[static] name='Tree item at level 3'
 ++[tree table] cols=1 headers=(NONE); rows=2 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row] selectable level:1
 ++++++[table cell] name='Cell at level 1' selectable (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Cell at level 1'
+++++++++[static] name='Cell at level 1'
 ++++[table row] selectable level:2
 ++++++[table cell] name='Cell at level 2' selectable (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Cell at level 2'
+++++++++[static] name='Cell at level 2'
diff --git a/content/test/data/accessibility/aria/aria-link-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-link-expected-auralinux.txt
index 4f67019..74c9eba 100644
--- a/content/test/data/accessibility/aria/aria-link-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-link-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[link] name='ARIA Link'
-++++[text] name='ARIA Link'
+++++[static] name='ARIA Link'
diff --git a/content/test/data/accessibility/aria/aria-list-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-list-expected-auralinux.txt
index 040163ec..342aebf 100644
--- a/content/test/data/accessibility/aria/aria-list-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-list-expected-auralinux.txt
@@ -1,8 +1,8 @@
 [document web]
 ++[list]
 ++++[list item] name='1'
-++++++[text] name='Item 1'
+++++++[static] name='Item 1'
 ++++[list item] name='2'
-++++++[text] name='Item 2'
+++++++[static] name='Item 2'
 ++++[list item] name='3'
-++++++[text] name='Item 3'
+++++++[static] name='Item 3'
diff --git a/content/test/data/accessibility/aria/aria-listitem-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-listitem-expected-auralinux.txt
index d43b654..5c6a645 100644
--- a/content/test/data/accessibility/aria/aria-listitem-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-listitem-expected-auralinux.txt
@@ -1,6 +1,6 @@
 [document web]
 ++[list]
 ++++[list item] name='1'
-++++++[text] name='Item 1'
+++++++[static] name='Item 1'
 ++++[list item] name='2'
-++++++[text] name='Item 2'
+++++++[static] name='Item 2'
diff --git a/content/test/data/accessibility/aria/aria-menuitem-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-menuitem-expected-auralinux.txt
index 273df846..5441db8 100644
--- a/content/test/data/accessibility/aria/aria-menuitem-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-menuitem-expected-auralinux.txt
@@ -3,6 +3,6 @@
 ++++[menu item] name='File'
 ++++[menu item] name='Edit'
 ++++[menu item] name='Complex menuitem'
-++++++[text] name='Complex '
+++++++[static] name='Complex '
 ++++++[entry] selectable-text
-++++++[text] name=' menuitem'
+++++++[static] name=' menuitem'
diff --git a/content/test/data/accessibility/aria/aria-modal-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-modal-expected-auralinux.txt
index c33fe0a..a0a9535 100644
--- a/content/test/data/accessibility/aria/aria-modal-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-modal-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web]
 ++[dialog]
-++++[text] name='Nonmodal'
+++++[static] name='Nonmodal'
 ++[dialog] modal
-++++[text] name='Modal'
+++++[static] name='Modal'
diff --git a/content/test/data/accessibility/aria/aria-none-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-none-expected-auralinux.txt
index 42e242c..6764d18 100644
--- a/content/test/data/accessibility/aria/aria-none-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-none-expected-auralinux.txt
@@ -1,2 +1,2 @@
 [document web]
-++[text] name='With aria-role none'
+++[static] name='With aria-role none'
diff --git a/content/test/data/accessibility/aria/aria-paragraph-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-paragraph-expected-auralinux.txt
index 8d532173..47d8ade 100644
--- a/content/test/data/accessibility/aria/aria-paragraph-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-paragraph-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[paragraph] xml-roles:paragraph
-++++[text] name='Paragraph'
+++++[static] name='Paragraph'
diff --git a/content/test/data/accessibility/aria/aria-posinset-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-posinset-expected-auralinux.txt
index 1ce72973..0751e81 100644
--- a/content/test/data/accessibility/aria/aria-posinset-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-posinset-expected-auralinux.txt
@@ -1,8 +1,8 @@
 [document web]
 ++[article] posinset:0 setsize:0
-++++[text] name='This is an ARIA article 1.'
+++++[static] name='This is an ARIA article 1.'
 ++[article] posinset:0 setsize:0
-++++[text] name='This is an ARIA article 2.'
+++++[static] name='This is an ARIA article 2.'
 ++[list box] setsize:2
 ++++[list item] name='Item 1' selectable posinset:1 setsize:2
 ++++[list item] name='Item 2' selectable posinset:2 setsize:2
@@ -11,26 +11,26 @@
 ++++[list item] name='Item 2' selectable posinset:2 setsize:2
 ++[form]
 ++++[radio button] checkable:true posinset:3 setsize:4
-++++[text] name='1'
-++++[text] name='<newline>'
+++++[static] name='1'
+++++[static] name='<newline>'
 ++++[radio button] checkable:true posinset:4 setsize:4
-++++[text] name='2'
+++++[static] name='2'
 ++[radio button] checkable:true posinset:1 setsize:2
-++[text] name='Apple'
-++[text] name='<newline>'
+++[static] name='Apple'
+++[static] name='<newline>'
 ++[radio button] checkable:true posinset:2 setsize:2
-++[text] name='Banana'
+++[static] name='Banana'
 ++[panel] name='Cake' labelled-by setsize:0
 ++++[label] label-for
-++++++[text] name='Cake'
+++++++[static] name='Cake'
 ++++[radio button] name='Chiffon cakes' checked checkable:true posinset:1 setsize:2
-++++[text] name='<newline>'
+++++[static] name='<newline>'
 ++++[radio button] name='Chocolate cakes' checkable:true posinset:2 setsize:2
 ++[form]
 ++++[paragraph]
 ++++++[push button] name='changedFromRadio'
 ++++++[label]
-++++++++[text] name='red'
-++++++[text] name='<newline>'
+++++++++[static] name='red'
+++++++[static] name='<newline>'
 ++++++[radio button] name='blue' checkable:true posinset:1 setsize:1
-++[text] name='Done'
+++[static] name='Done'
diff --git a/content/test/data/accessibility/aria/aria-presentation-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-presentation-expected-auralinux.txt
index 34294f8..9b33b9e 100644
--- a/content/test/data/accessibility/aria/aria-presentation-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-presentation-expected-auralinux.txt
@@ -1,2 +1,2 @@
 [document web]
-++[text] name='aria-role presentation'
+++[static] name='aria-role presentation'
diff --git a/content/test/data/accessibility/aria/aria-region-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-region-expected-auralinux.txt
index e755ca9e..24e77b1 100644
--- a/content/test/data/accessibility/aria/aria-region-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-region-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[landmark] xml-roles:region
-++++[text] name='This is an ARIA region.'
+++++[static] name='This is an ARIA region.'
diff --git a/content/test/data/accessibility/aria/aria-row-attr-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-row-attr-expected-auralinux.txt
index cb00691d..584d983 100644
--- a/content/test/data/accessibility/aria/aria-row-attr-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-row-attr-expected-auralinux.txt
@@ -2,13 +2,13 @@
 ++[table] rowcount:5 cols=3 headers=('cell 2', 'cell 3', 'cell 4'); rows=2 headers=(NONE); caption=false; spans=(cell at 1,2: 0x0)
 ++++[table row] selectable
 ++++++[column header] name='cell 2' selectable rowindex:3 (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='cell 2'
+++++++++[static] name='cell 2'
 ++++++[column header] name='cell 3' selectable rowindex:3 (row=0, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='cell 3'
+++++++++[static] name='cell 3'
 ++++++[column header] name='cell 4' selectable rowindex:3 rowspan:2 (row=0, col=2, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='cell 4'
+++++++++[static] name='cell 4'
 ++++[table row] selectable
 ++++++[table cell] name='cell 2' selectable rowindex:4 (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='cell 2'
+++++++++[static] name='cell 2'
 ++++++[table cell] name='cell 3' selectable rowindex:4 (row=1, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='cell 3'
+++++++++[static] name='cell 3'
diff --git a/content/test/data/accessibility/aria/aria-row-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-row-expected-auralinux.txt
index 78dabd1..ad729b45 100644
--- a/content/test/data/accessibility/aria/aria-row-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-row-expected-auralinux.txt
@@ -2,16 +2,16 @@
 ++[table] cols=2 headers=('Browser', 'Rendering Engine'); rows=3 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row] selectable
 ++++++[column header] name='Browser' selectable (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Browser'
+++++++++[static] name='Browser'
 ++++++[column header] name='Rendering Engine' selectable (row=0, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Rendering Engine'
+++++++++[static] name='Rendering Engine'
 ++++[table row] selectable
 ++++++[table cell] name='Chrome' selectable (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='Chrome'
+++++++++[static] name='Chrome'
 ++++++[table cell] name='Blink' selectable (row=1, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='Blink'
+++++++++[static] name='Blink'
 ++++[table row] selectable
 ++++++[table cell] name='Safari' selectable (row=2, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='Safari'
+++++++++[static] name='Safari'
 ++++++[table cell] name='WebKit' selectable (row=2, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='WebKit'
+++++++++[static] name='WebKit'
diff --git a/content/test/data/accessibility/aria/aria-rowheader-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-rowheader-expected-auralinux.txt
index 8334afd..ea424554 100644
--- a/content/test/data/accessibility/aria/aria-rowheader-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-rowheader-expected-auralinux.txt
@@ -2,15 +2,15 @@
 ++[table] xml-roles:grid cols=3 headers=(NONE); rows=2 headers=('Browser', 'Rendering Engine'); caption=false; spans=(all: 1x1)
 ++++[table row] selectable xml-roles:row
 ++++++[row header] name='Browser' selectable xml-roles:rowheader (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Browser'
+++++++++[static] name='Browser'
 ++++++[table cell] name='Chrome' selectable xml-roles:gridcell (row=0, col=1, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='Chrome'
+++++++++[static] name='Chrome'
 ++++++[table cell] name='Safari' selectable xml-roles:gridcell (row=0, col=2, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='Safari'
+++++++++[static] name='Safari'
 ++++[table row] selectable xml-roles:row
 ++++++[row header] name='Rendering Engine' selectable xml-roles:rowheader (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Rendering Engine'
+++++++++[static] name='Rendering Engine'
 ++++++[table cell] name='Blink' selectable xml-roles:gridcell (row=1, col=1, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='Blink'
+++++++++[static] name='Blink'
 ++++++[table cell] name='WebKit' selectable xml-roles:gridcell (row=1, col=2, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='WebKit'
+++++++++[static] name='WebKit'
diff --git a/content/test/data/accessibility/aria/aria-rowtext-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-rowtext-expected-auralinux.txt
index 952d1e1..b9541eb 100644
--- a/content/test/data/accessibility/aria/aria-rowtext-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-rowtext-expected-auralinux.txt
@@ -2,11 +2,11 @@
 ++[table] cols=2 headers=(NONE); rows=2 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row] selectable
 ++++++[table cell] name='cell A3' selectable colindex:1 coltext:A rowindex:3 rowtext:3 (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='cell A3'
+++++++++[static] name='cell A3'
 ++++++[table cell] name='cell B3' selectable colindex:2 coltext:B rowindex:3 rowtext:3 (row=0, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='cell B3'
+++++++++[static] name='cell B3'
 ++++[table row] selectable
 ++++++[table cell] name='cell A4' selectable colindex:1 coltext:A rowindex:4 rowtext:4 (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='cell A4'
+++++++++[static] name='cell A4'
 ++++++[table cell] name='cell B4' selectable colindex:2 coltext:B rowindex:4 rowtext:4 (row=1, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='cell B4'
+++++++++[static] name='cell B4'
diff --git a/content/test/data/accessibility/aria/aria-search-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-search-expected-auralinux.txt
index 411619e..2e321d4 100644
--- a/content/test/data/accessibility/aria/aria-search-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-search-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[landmark] xml-roles:search
-++++[text] name='ARIA role search.'
+++++[static] name='ARIA role search.'
diff --git a/content/test/data/accessibility/aria/aria-separator-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-separator-expected-auralinux.txt
index dddf0a9..ebdfbd7 100644
--- a/content/test/data/accessibility/aria/aria-separator-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-separator-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web]
-++[text] name='Before'
+++[static] name='Before'
 ++[separator] horizontal
 ++[separator] horizontal current=1.000000 minimum=1.000000 maximum=3.000000
-++[text] name='After'
+++[static] name='After'
diff --git a/content/test/data/accessibility/aria/aria-sort-aria-grid-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-sort-aria-grid-expected-auralinux.txt
index 3dfa23d..158a446 100644
--- a/content/test/data/accessibility/aria/aria-sort-aria-grid-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-sort-aria-grid-expected-auralinux.txt
@@ -2,90 +2,90 @@
 ++[table] cols=1 headers=('Alphabet'); rows=3 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row] selectable
 ++++++[column header] name='Alphabet' selectable (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Alphabet'
+++++++++[static] name='Alphabet'
 ++++[table row] selectable
 ++++++[table cell] name='A' selectable (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++++[table row] selectable
 ++++++[table cell] name='B' selectable (row=2, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='B'
+++++++++[static] name='B'
 ++[table] cols=1 headers=('Alphabet'); rows=3 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row] selectable
 ++++++[column header] name='Alphabet' selectable (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Alphabet'
+++++++++[static] name='Alphabet'
 ++++[table row] selectable
 ++++++[table cell] name='A' selectable (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++++[table row] selectable
 ++++++[table cell] name='B' selectable (row=2, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='B'
+++++++++[static] name='B'
 ++[table] cols=1 headers=('Alphabet'); rows=3 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row] selectable
 ++++++[column header] name='Alphabet' selectable sort:ascending (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Alphabet'
+++++++++[static] name='Alphabet'
 ++++[table row] selectable
 ++++++[table cell] name='A' selectable (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++++[table row] selectable
 ++++++[table cell] name='B' selectable (row=2, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='B'
+++++++++[static] name='B'
 ++[table] cols=1 headers=('Alphabet'); rows=3 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row] selectable
 ++++++[column header] name='Alphabet' selectable sort:descending (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Alphabet'
+++++++++[static] name='Alphabet'
 ++++[table row] selectable
 ++++++[table cell] name='B' selectable (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='B'
+++++++++[static] name='B'
 ++++[table row] selectable
 ++++++[table cell] name='A' selectable (row=2, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++[table] cols=1 headers=('Alphabet'); rows=3 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row] selectable
 ++++++[column header] name='Alphabet' selectable sort:other (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Alphabet'
+++++++++[static] name='Alphabet'
 ++++[table row] selectable
 ++++++[table cell] name='A' selectable (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++++[table row] selectable
 ++++++[table cell] name='A' selectable (row=2, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++[table] cols=3 headers=(NONE); rows=1 headers=('Alphabet'); caption=false; spans=(all: 1x1)
 ++++[table row] selectable
 ++++++[row header] name='Alphabet' selectable (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Alphabet'
+++++++++[static] name='Alphabet'
 ++++++[table cell] name='A' selectable (row=0, col=1, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++++++[table cell] name='B' selectable (row=0, col=2, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='B'
+++++++++[static] name='B'
 ++[table] cols=3 headers=(NONE); rows=1 headers=('Alphabet'); caption=false; spans=(all: 1x1)
 ++++[table row] selectable
 ++++++[row header] name='Alphabet' selectable (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Alphabet'
+++++++++[static] name='Alphabet'
 ++++++[table cell] name='A' selectable (row=0, col=1, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++++++[table cell] name='B' selectable (row=0, col=2, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='B'
+++++++++[static] name='B'
 ++[table] cols=3 headers=(NONE); rows=1 headers=('Alphabet'); caption=false; spans=(all: 1x1)
 ++++[table row] selectable
 ++++++[row header] name='Alphabet' selectable sort:ascending (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Alphabet'
+++++++++[static] name='Alphabet'
 ++++++[table cell] name='A' selectable (row=0, col=1, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++++++[table cell] name='B' selectable (row=0, col=2, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='B'
+++++++++[static] name='B'
 ++[table] cols=3 headers=(NONE); rows=1 headers=('Alphabet'); caption=false; spans=(all: 1x1)
 ++++[table row] selectable
 ++++++[row header] name='Alphabet' selectable sort:descending (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Alphabet'
+++++++++[static] name='Alphabet'
 ++++++[table cell] name='B' selectable (row=0, col=1, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='B'
+++++++++[static] name='B'
 ++++++[table cell] name='A' selectable (row=0, col=2, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++[table] cols=3 headers=(NONE); rows=1 headers=('Alphabet'); caption=false; spans=(all: 1x1)
 ++++[table row] selectable
 ++++++[row header] name='Alphabet' selectable sort:other (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Alphabet'
+++++++++[static] name='Alphabet'
 ++++++[table cell] name='A' selectable (row=0, col=1, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++++++[table cell] name='A' selectable (row=0, col=2, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='A'
+++++++++[static] name='A'
diff --git a/content/test/data/accessibility/aria/aria-sort-html-table-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-sort-html-table-expected-auralinux.txt
index 3b2497a7..df1e7d4 100644
--- a/content/test/data/accessibility/aria/aria-sort-html-table-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-sort-html-table-expected-auralinux.txt
@@ -2,102 +2,102 @@
 ++[table] name='Data table' cols=1 headers=('Alphabet'); rows=3 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row]
 ++++++[column header] name='Alphabet' (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Alphabet'
+++++++++[static] name='Alphabet'
 ++++[table row]
 ++++++[table cell] name='A' (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++++[table row]
 ++++++[table cell] name='B' (row=2, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='B'
+++++++++[static] name='B'
 ++[table] name='Data table' cols=1 headers=('Alphabet'); rows=3 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row]
 ++++++[column header] name='Alphabet' (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Alphabet'
+++++++++[static] name='Alphabet'
 ++++[table row]
 ++++++[table cell] name='A' (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++++[table row]
 ++++++[table cell] name='B' (row=2, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='B'
+++++++++[static] name='B'
 ++[table] name='Data table' cols=1 headers=('Alphabet'); rows=3 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row]
 ++++++[column header] name='Alphabet' sort:ascending (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Alphabet'
+++++++++[static] name='Alphabet'
 ++++[table row]
 ++++++[table cell] name='A' (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++++[table row]
 ++++++[table cell] name='B' (row=2, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='B'
+++++++++[static] name='B'
 ++[table] name='Data table' cols=1 headers=('Alphabet'); rows=3 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row]
 ++++++[column header] name='Alphabet' sort:descending (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Alphabet'
+++++++++[static] name='Alphabet'
 ++++[table row]
 ++++++[table cell] name='B' (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='B'
+++++++++[static] name='B'
 ++++[table row]
 ++++++[table cell] name='A' (row=2, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++[table] name='Data table' cols=1 headers=('Alphabet'); rows=3 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row]
 ++++++[column header] name='Alphabet' sort:other (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Alphabet'
+++++++++[static] name='Alphabet'
 ++++[table row]
 ++++++[table cell] name='A' (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++++[table row]
 ++++++[table cell] name='A' (row=2, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++[table] name='Data table' cols=3 headers=(NONE); rows=1 headers=('Alphabet'); caption=false; spans=(all: 1x1)
 ++++[table row]
 ++++++[row header] name='Alphabet' (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Alphabet'
+++++++++[static] name='Alphabet'
 ++++++[table cell] name='A' (row=0, col=1, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++++++[table cell] name='B' (row=0, col=2, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='B'
+++++++++[static] name='B'
 ++[table] name='Data table' cols=3 headers=(NONE); rows=1 headers=('Alphabet'); caption=false; spans=(all: 1x1)
 ++++[table row]
 ++++++[row header] name='Alphabet' (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Alphabet'
+++++++++[static] name='Alphabet'
 ++++++[table cell] name='A' (row=0, col=1, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++++++[table cell] name='B' (row=0, col=2, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='B'
+++++++++[static] name='B'
 ++[table] name='Data table' cols=3 headers=(NONE); rows=1 headers=('Alphabet'); caption=false; spans=(all: 1x1)
 ++++[table row]
 ++++++[row header] name='Alphabet' sort:ascending (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Alphabet'
+++++++++[static] name='Alphabet'
 ++++++[table cell] name='A' (row=0, col=1, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++++++[table cell] name='B' (row=0, col=2, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='B'
+++++++++[static] name='B'
 ++[table] name='Data table' cols=3 headers=(NONE); rows=1 headers=('Alphabet'); caption=false; spans=(all: 1x1)
 ++++[table row]
 ++++++[row header] name='Alphabet' sort:descending (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Alphabet'
+++++++++[static] name='Alphabet'
 ++++++[table cell] name='B' (row=0, col=1, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='B'
+++++++++[static] name='B'
 ++++++[table cell] name='A' (row=0, col=2, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++[table] name='Data table' cols=3 headers=(NONE); rows=1 headers=('Alphabet'); caption=false; spans=(all: 1x1)
 ++++[table row]
 ++++++[row header] name='Alphabet' sort:other (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Alphabet'
+++++++++[static] name='Alphabet'
 ++++++[table cell] name='A' (row=0, col=1, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++++++[table cell] name='A' (row=0, col=2, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++[table] name='Data table' cols=1 headers=('Alphabet'); rows=3 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row]
 ++++++[column header] name='Alphabet' (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Alphabet'
+++++++++[static] name='Alphabet'
 ++++[table row]
 ++++++[table cell] name='A' (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++++[table row]
 ++++++[table cell] name='B' (row=2, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='B'
+++++++++[static] name='B'
 ++[section]
-++++[text] name='Alphabet'
+++++[static] name='Alphabet'
diff --git a/content/test/data/accessibility/aria/aria-spinbutton-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-spinbutton-expected-auralinux.txt
index 6ae0707..b95bbfd 100644
--- a/content/test/data/accessibility/aria/aria-spinbutton-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-spinbutton-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web]
 ++[spin button] current=5.000000 minimum=0.000000 maximum=0.000000
-++++[text] name='Inner text'
+++++[static] name='Inner text'
 ++[spin button] current=5.000000 minimum=1.000000 maximum=10.000000
-++++[text] name='Inner text'
+++++[static] name='Inner text'
diff --git a/content/test/data/accessibility/aria/aria-strong-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-strong-expected-auralinux.txt
index d7fe1fa..ced0fca 100644
--- a/content/test/data/accessibility/aria/aria-strong-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-strong-expected-auralinux.txt
@@ -1,7 +1,7 @@
 [document web]
 ++[static] xml-roles:strong
-++++[text] name='role'
-++[text] name='element (no name)'
-++[text] name=' '
+++++[static] name='role'
+++[static] name='element (no name)'
+++[static] name=' '
 ++[static] name='include me'
-++++[text] name='element (with name)'
+++++[static] name='element (with name)'
diff --git a/content/test/data/accessibility/aria/aria-table-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-table-expected-auralinux.txt
index 7f1e4d00d..780df295 100644
--- a/content/test/data/accessibility/aria/aria-table-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-table-expected-auralinux.txt
@@ -2,11 +2,11 @@
 ++[table] cols=2 headers=('Browser', 'Rendering Engine'); rows=2 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row] selectable
 ++++++[column header] name='Browser' selectable (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Browser'
+++++++++[static] name='Browser'
 ++++++[column header] name='Rendering Engine' selectable (row=0, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Rendering Engine'
+++++++++[static] name='Rendering Engine'
 ++++[table row] selectable
 ++++++[table cell] name='Chrome' selectable (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='Chrome'
+++++++++[static] name='Chrome'
 ++++++[table cell] name='Blink' selectable (row=1, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='Blink'
+++++++++[static] name='Blink'
diff --git a/content/test/data/accessibility/aria/aria-tabpanel-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-tabpanel-expected-auralinux.txt
index c40105a3..130ed426 100644
--- a/content/test/data/accessibility/aria/aria-tabpanel-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-tabpanel-expected-auralinux.txt
@@ -2,7 +2,7 @@
 ++[scroll pane]
 ++++[page tab] name='Item' selectable
 ++++++[heading] name='Item'
-++++++++[text] name='Item'
+++++++++[static] name='Item'
 ++++[page tab] name='Prices' selectable
 ++++++[heading] name='Prices'
-++++++++[text] name='Prices'
+++++++++[static] name='Prices'
diff --git a/content/test/data/accessibility/aria/aria-term-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-term-expected-auralinux.txt
index f4ef87c..80af6fd22 100644
--- a/content/test/data/accessibility/aria/aria-term-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-term-expected-auralinux.txt
@@ -1,10 +1,10 @@
 [document web]
 ++[list] xml-roles:list
 ++++[description term] xml-roles:term
-++++++[text] name='Term1'
+++++++[static] name='Term1'
 ++++[description value] xml-roles:definition
-++++++[text] name='Definition1'
+++++++[static] name='Definition1'
 ++++[description term] xml-roles:term
-++++++[text] name='Term2'
+++++++[static] name='Term2'
 ++++[description value] xml-roles:definition
-++++++[text] name='Definition2'
+++++++[static] name='Definition2'
diff --git a/content/test/data/accessibility/aria/aria-textbox-with-rich-text-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-textbox-with-rich-text-expected-auralinux.txt
index 529e41b..9ba4d7b 100644
--- a/content/test/data/accessibility/aria/aria-textbox-with-rich-text-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-textbox-with-rich-text-expected-auralinux.txt
@@ -1,9 +1,9 @@
 [document web] caret_offset=0
 ++[entry] editable single-line selectable-text xml-roles:textbox caret_offset=0
 ++++[heading] name='TextBox1' editable xml-roles:heading
-++++++[text] name='TextBox1' editable
+++++++[static] name='TextBox1' editable
 ++[entry] editable multi-line selectable-text xml-roles:textbox
 ++++[heading] name='TextBox2' editable xml-roles:heading
-++++++[text] name='TextBox2' editable
+++++++[static] name='TextBox2' editable
 ++++[paragraph] editable
-++++++[text] name='Some text.' editable
+++++++[static] name='Some text.' editable
diff --git a/content/test/data/accessibility/aria/aria-time-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-time-expected-auralinux.txt
index 6b0c16b..f494a421 100644
--- a/content/test/data/accessibility/aria/aria-time-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-time-expected-auralinux.txt
@@ -1,8 +1,8 @@
 [document web]
 ++[static] xml-roles:time
-++++[text] name='role'
+++++[static] name='role'
 ++[static] xml-roles:time
-++++[text] name='element (no name)'
-++[text] name=' '
+++++[static] name='element (no name)'
+++[static] name=' '
 ++[static] name='include me' xml-roles:time
-++++[text] name='element (with name)'
+++++[static] name='element (with name)'
diff --git a/content/test/data/accessibility/aria/aria-timer-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-timer-expected-auralinux.txt
index 5adecf3..f4d7732 100644
--- a/content/test/data/accessibility/aria/aria-timer-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-timer-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[timer] atomic:false container-atomic:false live:polite
-++++[text] name='This test is for aria-role = timer' atomic:false container-atomic:false
+++++[static] name='This test is for aria-role = timer' atomic:false container-atomic:false
diff --git a/content/test/data/accessibility/aria/aria-toolbar-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-toolbar-expected-auralinux.txt
index 45194e9..1fb78a9 100644
--- a/content/test/data/accessibility/aria/aria-toolbar-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-toolbar-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[tool bar] horizontal
-++++[text] name='A toolbar'
+++++[static] name='A toolbar'
diff --git a/content/test/data/accessibility/aria/aria-tooltip-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-tooltip-expected-auralinux.txt
index c97d2f0..dbcbe5c 100644
--- a/content/test/data/accessibility/aria/aria-tooltip-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-tooltip-expected-auralinux.txt
@@ -1,4 +1,4 @@
 [document web]
 ++[entry] description='Your username should be your email id' selectable-text described-by
 ++[tool tip] name='Your username should be your email id' description-for
-++++[text] name='Your username should be your email id'
+++++[static] name='Your username should be your email id'
diff --git a/content/test/data/accessibility/aria/aria-tree-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-tree-expected-auralinux.txt
index c907bc1..c278252 100644
--- a/content/test/data/accessibility/aria/aria-tree-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-tree-expected-auralinux.txt
@@ -2,21 +2,21 @@
 ++[tree] setsize:2
 ++++[tree item] name='Animals' selectable indeterminate checkable:true level:1 posinset:1 setsize:2
 ++++++[link] name='Animals'
-++++++++[text] name='Animals'
+++++++++[static] name='Animals'
 ++++++[panel] setsize:2
 ++++++++[tree item] name='Domesticated' selectable level:2 posinset:1 setsize:2
 ++++++++++[link] name='Domesticated'
-++++++++++++[text] name='Domesticated'
+++++++++++++[static] name='Domesticated'
 ++++++++++[panel] setsize:2
 ++++++++++++[tree item] name='Dog' checked selectable checkable:true level:3 posinset:1 setsize:2
 ++++++++++++++[link] name='Dog'
-++++++++++++++++[text] name='Dog'
+++++++++++++++++[static] name='Dog'
 ++++++++++++[tree item] name='Cat' selectable checkable:true level:3 posinset:2 setsize:2
 ++++++++++++++[link] name='Cat'
-++++++++++++++++[text] name='Cat'
+++++++++++++++++[static] name='Cat'
 ++++++++[tree item] name='Wild' selectable level:2 posinset:2 setsize:2
 ++++++++++[link] name='Wild'
-++++++++++++[text] name='Wild'
+++++++++++++[static] name='Wild'
 ++++[tree item] name='Plants' selectable level:1 posinset:2 setsize:2
 ++++++[link] name='Plants'
-++++++++[text] name='Plants'
+++++++++[static] name='Plants'
diff --git a/content/test/data/accessibility/aria/aria-treegrid-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-treegrid-expected-auralinux.txt
index 740c964f..6374e29 100644
--- a/content/test/data/accessibility/aria/aria-treegrid-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-treegrid-expected-auralinux.txt
@@ -2,11 +2,11 @@
 ++[tree table] xml-roles:treegrid cols=1 headers=(NONE); rows=2 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row] selectable level:1 xml-roles:row
 ++++++[table cell] name='Cell at level 1' selectable xml-roles:gridcell (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Cell at level 1'
+++++++++[static] name='Cell at level 1'
 ++++[table row] selectable level:2 xml-roles:row
 ++++++[table cell] name='Cell at level 2' selectable xml-roles:gridcell (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Cell at level 2'
+++++++++[static] name='Cell at level 2'
 ++[tree table] xml-roles:treegrid cols=1 headers=(NONE); rows=1 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row] selectable level:1 xml-roles:row
 ++++++[table cell] name='Cell at level 1' selectable xml-roles:gridcell (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Cell at level 1'
+++++++++[static] name='Cell at level 1'
diff --git a/content/test/data/accessibility/aria/aria-valuemax-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-valuemax-expected-auralinux.txt
index ac97a7c..539751b 100644
--- a/content/test/data/accessibility/aria/aria-valuemax-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-valuemax-expected-auralinux.txt
@@ -3,4 +3,4 @@
 ++[scroll bar] current=52.000000 minimum=2.000000 maximum=102.000000
 ++[slider] horizontal current=53.000000 minimum=3.000000 maximum=103.000000
 ++[spin button] current=54.000000 minimum=4.000000 maximum=104.000000
-++++[text] name='Spin'
+++++[static] name='Spin'
diff --git a/content/test/data/accessibility/aria/aria-valuemin-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-valuemin-expected-auralinux.txt
index ac97a7c..539751b 100644
--- a/content/test/data/accessibility/aria/aria-valuemin-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria-valuemin-expected-auralinux.txt
@@ -3,4 +3,4 @@
 ++[scroll bar] current=52.000000 minimum=2.000000 maximum=102.000000
 ++[slider] horizontal current=53.000000 minimum=3.000000 maximum=103.000000
 ++[spin button] current=54.000000 minimum=4.000000 maximum=104.000000
-++++[text] name='Spin'
+++++[static] name='Spin'
diff --git a/content/test/data/accessibility/aria/aria1.1-combobox-expected-auralinux.txt b/content/test/data/accessibility/aria/aria1.1-combobox-expected-auralinux.txt
index 95254d33..aedf330 100644
--- a/content/test/data/accessibility/aria/aria1.1-combobox-expected-auralinux.txt
+++ b/content/test/data/accessibility/aria/aria1.1-combobox-expected-auralinux.txt
@@ -1,6 +1,6 @@
 [document web]
 ++[section] label-for
-++++[text] name='State'
+++++[static] name='State'
 ++[combo box] name='State' expandable expanded labelled-by haspopup:listbox
 ++++[entry] selectable-text controller-for
 ++[list box] controlled-by
diff --git a/content/test/data/accessibility/css/color-expected-auralinux.txt b/content/test/data/accessibility/css/color-expected-auralinux.txt
index e6b40eb7..87deaa6 100644
--- a/content/test/data/accessibility/css/color-expected-auralinux.txt
+++ b/content/test/data/accessibility/css/color-expected-auralinux.txt
@@ -1,10 +1,10 @@
 [document web] offset=0 bg-color=0,0,255 fg-color=255,0,0 offset=1
 ++[paragraph] offset=0 bg-color=0,0,255 fg-color=255,0,0
-++++[text] name='Red on blue.' offset=0 bg-color=0,0,255 fg-color=255,0,0
+++++[static] name='Red on blue.' offset=0 bg-color=0,0,255 fg-color=255,0,0
 ++[section] selectable-text offset=0 offset=9 bg-color=0,0,255 offset=25 offset=26 fg-color=0,255,0
-++++[text] name='Default.' offset=0
-++++[text] name=' ' offset=0
-++++[text] name='Blue background.' offset=0 bg-color=0,0,255
-++++[text] name=' ' offset=0
-++++[text] name='Green text.' offset=0 fg-color=0,255,0
+++++[static] name='Default.' offset=0
+++++[static] name=' ' offset=0
+++++[static] name='Blue background.' offset=0 bg-color=0,0,255
+++++[static] name=' ' offset=0
+++++[static] name='Green text.' offset=0 fg-color=0,255,0
 
diff --git a/content/test/data/accessibility/css/font-family-expected-auralinux.txt b/content/test/data/accessibility/css/font-family-expected-auralinux.txt
index 0f42f13..a9caeaf 100644
--- a/content/test/data/accessibility/css/font-family-expected-auralinux.txt
+++ b/content/test/data/accessibility/css/font-family-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web] offset=0 family-name=Tinos
 ++[landmark] offset=0 family-name=Cousine offset=1 family-name=Arimo
 ++++[paragraph] offset=0 family-name=Cousine
-++++++[text] name='Monospace' offset=0 family-name=Cousine
-++++[text] name='Sans serif' offset=0 family-name=Arimo
+++++++[static] name='Monospace' offset=0 family-name=Cousine
+++++[static] name='Sans serif' offset=0 family-name=Arimo
diff --git a/content/test/data/accessibility/css/font-size-expected-auralinux.txt b/content/test/data/accessibility/css/font-size-expected-auralinux.txt
index 0b56463..525ad2b 100644
--- a/content/test/data/accessibility/css/font-size-expected-auralinux.txt
+++ b/content/test/data/accessibility/css/font-size-expected-auralinux.txt
@@ -1,45 +1,45 @@
 [document web] size=7.5pt size=8.5pt size=9pt size=10pt size=10.5pt size=11.5pt size=15pt size=30pt size=37.5pt size=75pt size=10pt size=11pt size=12pt size=13pt size=14pt size=15pt size=20pt size=40pt size=50pt size=100pt
 ++[paragraph] size=7.5pt
-++++[text] name='10.2340920823px' size=7.5pt
+++++[static] name='10.2340920823px' size=7.5pt
 ++[paragraph] size=7.5pt
-++++[text] name='10px' size=7.5pt
+++++[static] name='10px' size=7.5pt
 ++[paragraph] size=8.5pt
-++++[text] name='11px' size=8.5pt
+++++[static] name='11px' size=8.5pt
 ++[paragraph] size=9pt
-++++[text] name='12px' size=9pt
+++++[static] name='12px' size=9pt
 ++[paragraph] size=10pt
-++++[text] name='13px' size=10pt
+++++[static] name='13px' size=10pt
 ++[paragraph] size=10.5pt
-++++[text] name='14px' size=10.5pt
+++++[static] name='14px' size=10.5pt
 ++[paragraph] size=11.5pt
-++++[text] name='15px' size=11.5pt
+++++[static] name='15px' size=11.5pt
 ++[paragraph] size=15pt
-++++[text] name='20px' size=15pt
+++++[static] name='20px' size=15pt
 ++[paragraph] size=30pt
-++++[text] name='40px' size=30pt
+++++[static] name='40px' size=30pt
 ++[paragraph] size=37.5pt
-++++[text] name='50px' size=37.5pt
+++++[static] name='50px' size=37.5pt
 ++[paragraph] size=75pt
-++++[text] name='100px' size=75pt
+++++[static] name='100px' size=75pt
 ++[paragraph] size=10pt
-++++[text] name='10.2340920823pt' size=10pt
+++++[static] name='10.2340920823pt' size=10pt
 ++[paragraph] size=10pt
-++++[text] name='10pt' size=10pt
+++++[static] name='10pt' size=10pt
 ++[paragraph] size=11pt
-++++[text] name='11pt' size=11pt
+++++[static] name='11pt' size=11pt
 ++[paragraph] size=12pt
-++++[text] name='12pt' size=12pt
+++++[static] name='12pt' size=12pt
 ++[paragraph] size=13pt
-++++[text] name='13pt' size=13pt
+++++[static] name='13pt' size=13pt
 ++[paragraph] size=14pt
-++++[text] name='14pt' size=14pt
+++++[static] name='14pt' size=14pt
 ++[paragraph] size=15pt
-++++[text] name='15pt' size=15pt
+++++[static] name='15pt' size=15pt
 ++[paragraph] size=20pt
-++++[text] name='20pt' size=20pt
+++++[static] name='20pt' size=20pt
 ++[paragraph] size=40pt
-++++[text] name='40pt' size=40pt
+++++[static] name='40pt' size=40pt
 ++[paragraph] size=50pt
-++++[text] name='50pt' size=50pt
+++++[static] name='50pt' size=50pt
 ++[paragraph] size=100pt
-++++[text] name='100pt' size=100pt
+++++[static] name='100pt' size=100pt
diff --git a/content/test/data/accessibility/css/font-style-expected-auralinux.txt b/content/test/data/accessibility/css/font-style-expected-auralinux.txt
index 49fa228..8d403c9 100644
--- a/content/test/data/accessibility/css/font-style-expected-auralinux.txt
+++ b/content/test/data/accessibility/css/font-style-expected-auralinux.txt
@@ -1,29 +1,29 @@
 [document web] offset=0
 ++[paragraph] offset=0 offset=4 weight=700 offset=9 offset=10 style=italic offset=15 offset=16 underline=single offset=19 offset=20 weight=700 style=italic offset=26 offset=27 style=italic underline=single offset=31 offset=32 weight=700 style=italic underline=single
-++++[text] name='The ' offset=0
-++++[text] name='quick' offset=0 weight=700
-++++[text] name=' ' offset=0
-++++[text] name='brown' offset=0 style=italic
-++++[text] name=' ' offset=0
-++++[text] name='fox' offset=0 underline=single
-++++[text] name=' ' offset=0
-++++[text] name='jumped' offset=0 weight=700 style=italic
-++++[text] name=' ' offset=0
-++++[text] name='over' offset=0 style=italic underline=single
-++++[text] name=' ' offset=0
-++++[text] name='dog' offset=0 weight=700 style=italic underline=single
+++++[static] name='The ' offset=0
+++++[static] name='quick' offset=0 weight=700
+++++[static] name=' ' offset=0
+++++[static] name='brown' offset=0 style=italic
+++++[static] name=' ' offset=0
+++++[static] name='fox' offset=0 underline=single
+++++[static] name=' ' offset=0
+++++[static] name='jumped' offset=0 weight=700 style=italic
+++++[static] name=' ' offset=0
+++++[static] name='over' offset=0 style=italic underline=single
+++++[static] name=' ' offset=0
+++++[static] name='dog' offset=0 weight=700 style=italic underline=single
 ++[section] selectable-text offset=0 offset=7 weight=700 offset=11 offset=12 style=italic offset=18 offset=19 underline=single offset=28 offset=29 offset=41 offset=42 text-position=sub offset=51 offset=52 text-position=super
-++++[text] name='Normal' offset=0
-++++[text] name=' ' offset=0
-++++[text] name='bold' offset=0 weight=700
-++++[text] name=' ' offset=0
-++++[text] name='italic' offset=0 style=italic
-++++[text] name=' ' offset=0
-++++[text] name='underline' offset=0 underline=single
-++++[text] name=' ' offset=0
-++++[text] name='line-through' offset=0
-++++[text] name=' ' offset=0
+++++[static] name='Normal' offset=0
+++++[static] name=' ' offset=0
+++++[static] name='bold' offset=0 weight=700
+++++[static] name=' ' offset=0
+++++[static] name='italic' offset=0 style=italic
+++++[static] name=' ' offset=0
+++++[static] name='underline' offset=0 underline=single
+++++[static] name=' ' offset=0
+++++[static] name='line-through' offset=0
+++++[static] name=' ' offset=0
 ++++[subscript] name='subscript' offset=0 text-position=sub
-++++[text] name=' ' offset=0
+++++[static] name=' ' offset=0
 ++++[superscript] name='superscript' offset=0 text-position=super
 
diff --git a/content/test/data/accessibility/css/language-expected-auralinux.txt b/content/test/data/accessibility/css/language-expected-auralinux.txt
index 9d23747..0935cd4 100644
--- a/content/test/data/accessibility/css/language-expected-auralinux.txt
+++ b/content/test/data/accessibility/css/language-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web] offset=0 language=es-ES offset=1 language=fr-FR
 ++[paragraph] offset=0 language=es-ES
-++++[text] name='Espanyol' offset=0 language=es-ES
-++[text] name='Comment allez-vous?' offset=0 language=fr-FR
+++++[static] name='Espanyol' offset=0 language=es-ES
+++[static] name='Comment allez-vous?' offset=0 language=fr-FR
 
diff --git a/content/test/data/accessibility/css/pseudo-element-alternative-text-expected-auralinux.txt b/content/test/data/accessibility/css/pseudo-element-alternative-text-expected-auralinux.txt
index 21304d1..72823ca 100644
--- a/content/test/data/accessibility/css/pseudo-element-alternative-text-expected-auralinux.txt
+++ b/content/test/data/accessibility/css/pseudo-element-alternative-text-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web]
 ++[section]
 ++++[image] name='alternative text'
-++++[text] name='DOM text'
+++++[static] name='DOM text'
 ++++[image]
diff --git a/content/test/data/accessibility/css/visibility-expected-auralinux.txt b/content/test/data/accessibility/css/visibility-expected-auralinux.txt
index 5a11f7a..f1c13d1 100644
--- a/content/test/data/accessibility/css/visibility-expected-auralinux.txt
+++ b/content/test/data/accessibility/css/visibility-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
-++[text] name='visible link'
-++[text] name='visible link'
\ No newline at end of file
+++[static] name='visible link'
+++[static] name='visible link'
diff --git a/content/test/data/accessibility/event/text-changed-contenteditable-expected-auralinux.txt b/content/test/data/accessibility/event/text-changed-contenteditable-expected-auralinux.txt
index e95b59a6..22db469c 100644
--- a/content/test/data/accessibility/event/text-changed-contenteditable-expected-auralinux.txt
+++ b/content/test/data/accessibility/event/text-changed-contenteditable-expected-auralinux.txt
@@ -1,13 +1,13 @@
-CHILDREN-CHANGED index:0 CHILD:(role=ROLE_TEXT) role=ROLE_PARAGRAPH EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
-CHILDREN-CHANGED index:0 CHILD:(role=ROLE_TEXT) role=ROLE_PARAGRAPH EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
-CHILDREN-CHANGED index:0 CHILD:(role=ROLE_TEXT) role=ROLE_PARAGRAPH EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
-CHILDREN-CHANGED index:0 CHILD:(role=ROLE_TEXT) role=ROLE_PARAGRAPH EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
-CHILDREN-CHANGED index:0 CHILD:(role=ROLE_TEXT) role=ROLE_PARAGRAPH EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
-CHILDREN-CHANGED index:0 CHILD:(role=ROLE_TEXT) role=ROLE_SECTION EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
-CHILDREN-CHANGED index:0 CHILD:(role=ROLE_TEXT) role=ROLE_SECTION EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
-CHILDREN-CHANGED index:0 CHILD:(role=ROLE_TEXT) role=ROLE_SECTION EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
-CHILDREN-CHANGED index:0 CHILD:(role=ROLE_TEXT) role=ROLE_SECTION EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
-CHILDREN-CHANGED index:0 CHILD:(role=ROLE_TEXT) role=ROLE_SECTION EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
+CHILDREN-CHANGED index:0 CHILD:(role=ROLE_STATIC) role=ROLE_PARAGRAPH EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
+CHILDREN-CHANGED index:0 CHILD:(role=ROLE_STATIC) role=ROLE_PARAGRAPH EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
+CHILDREN-CHANGED index:0 CHILD:(role=ROLE_STATIC) role=ROLE_PARAGRAPH EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
+CHILDREN-CHANGED index:0 CHILD:(role=ROLE_STATIC) role=ROLE_PARAGRAPH EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
+CHILDREN-CHANGED index:0 CHILD:(role=ROLE_STATIC) role=ROLE_PARAGRAPH EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
+CHILDREN-CHANGED index:0 CHILD:(role=ROLE_STATIC) role=ROLE_SECTION EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
+CHILDREN-CHANGED index:0 CHILD:(role=ROLE_STATIC) role=ROLE_SECTION EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
+CHILDREN-CHANGED index:0 CHILD:(role=ROLE_STATIC) role=ROLE_SECTION EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
+CHILDREN-CHANGED index:0 CHILD:(role=ROLE_STATIC) role=ROLE_SECTION EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
+CHILDREN-CHANGED index:0 CHILD:(role=ROLE_STATIC) role=ROLE_SECTION EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
 STATE-CHANGE:DEFUNCT:TRUE role=ROLE_INVALID name='(null)' DEFUNCT
 STATE-CHANGE:DEFUNCT:TRUE role=ROLE_INVALID name='(null)' DEFUNCT
 STATE-CHANGE:DEFUNCT:TRUE role=ROLE_INVALID name='(null)' DEFUNCT
@@ -27,4 +27,4 @@
 TEXT-REMOVE (start=0 length=3 'Div') role=ROLE_SECTION name='d2' EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
 TEXT-REMOVE (start=0 length=3 'Div') role=ROLE_SECTION name='d3' EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
 TEXT-REMOVE (start=0 length=9 'Paragraph') role=ROLE_PARAGRAPH name='p2' EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
-TEXT-REMOVE (start=0 length=9 'Paragraph') role=ROLE_PARAGRAPH name='p3' EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
\ No newline at end of file
+TEXT-REMOVE (start=0 length=9 'Paragraph') role=ROLE_PARAGRAPH name='p3' EDITABLE,ENABLED,FOCUSABLE,MULTI-LINE,SENSITIVE,SHOWING,VISIBLE,SELECTABLE-TEXT
diff --git a/content/test/data/accessibility/event/text-changed-expected-auralinux.txt b/content/test/data/accessibility/event/text-changed-expected-auralinux.txt
index ea7a3a74..b1573d5a 100644
--- a/content/test/data/accessibility/event/text-changed-expected-auralinux.txt
+++ b/content/test/data/accessibility/event/text-changed-expected-auralinux.txt
@@ -1,10 +1,10 @@
-CHILDREN-CHANGED index:0 CHILD:(role=ROLE_TEXT) role=ROLE_PARAGRAPH ENABLED,SENSITIVE,SHOWING,VISIBLE
-CHILDREN-CHANGED index:0 CHILD:(role=ROLE_TEXT) role=ROLE_PARAGRAPH ENABLED,SENSITIVE,SHOWING,VISIBLE
-CHILDREN-CHANGED index:0 CHILD:(role=ROLE_TEXT) role=ROLE_TEXT ENABLED,SENSITIVE,SHOWING,VISIBLE
-CHILDREN-CHANGED index:0 CHILD:(role=ROLE_TEXT) role=ROLE_TEXT ENABLED,SENSITIVE,SHOWING,VISIBLE
-NAME-CHANGED:Modified Div role=ROLE_TEXT name='Modified Div' ENABLED,SENSITIVE,SHOWING,VISIBLE
-NAME-CHANGED:Modified Heading role=ROLE_TEXT name='Modified Heading' ENABLED,SENSITIVE,SHOWING,VISIBLE
+CHILDREN-CHANGED index:0 CHILD:(role=ROLE_STATIC) role=ROLE_PARAGRAPH ENABLED,SENSITIVE,SHOWING,VISIBLE
+CHILDREN-CHANGED index:0 CHILD:(role=ROLE_STATIC) role=ROLE_PARAGRAPH ENABLED,SENSITIVE,SHOWING,VISIBLE
+CHILDREN-CHANGED index:0 CHILD:(role=ROLE_STATIC) role=ROLE_STATIC ENABLED,SENSITIVE,SHOWING,VISIBLE
+CHILDREN-CHANGED index:0 CHILD:(role=ROLE_STATIC) role=ROLE_STATIC ENABLED,SENSITIVE,SHOWING,VISIBLE
+NAME-CHANGED:Modified Div role=ROLE_STATIC name='Modified Div' ENABLED,SENSITIVE,SHOWING,VISIBLE
+NAME-CHANGED:Modified Heading role=ROLE_STATIC name='Modified Heading' ENABLED,SENSITIVE,SHOWING,VISIBLE
 STATE-CHANGE:DEFUNCT:TRUE role=ROLE_INVALID name='(null)' DEFUNCT
 STATE-CHANGE:DEFUNCT:TRUE role=ROLE_INVALID name='(null)' DEFUNCT
 STATE-CHANGE:DEFUNCT:TRUE role=ROLE_INVALID name='(null)' DEFUNCT
-STATE-CHANGE:DEFUNCT:TRUE role=ROLE_INVALID name='(null)' DEFUNCT
\ No newline at end of file
+STATE-CHANGE:DEFUNCT:TRUE role=ROLE_INVALID name='(null)' DEFUNCT
diff --git a/content/test/data/accessibility/html/a-expected-auralinux.txt b/content/test/data/accessibility/html/a-expected-auralinux.txt
index d4be624a..e2589ac 100644
--- a/content/test/data/accessibility/html/a-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/a-expected-auralinux.txt
@@ -1,4 +1,4 @@
 [document web] focusable focused
 ++[section]
 ++++[link] name='normal link' focusable
-++++++[text] name='normal link'
+++++++[static] name='normal link'
diff --git a/content/test/data/accessibility/html/a-name-calc-expected-auralinux.txt b/content/test/data/accessibility/html/a-name-calc-expected-auralinux.txt
index bd955730..9e2a3c9e 100644
--- a/content/test/data/accessibility/html/a-name-calc-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/a-name-calc-expected-auralinux.txt
@@ -1,15 +1,15 @@
 [document web]
 ++[link] name='InnerText0'
-++++[text] name='InnerText0'
-++[text] name=' '
+++++[static] name='InnerText0'
+++[static] name=' '
 ++[link] name='InnerText1' description='Title1'
-++++[text] name='InnerText1'
-++[text] name=' '
+++++[static] name='InnerText1'
+++[static] name=' '
 ++[link] name='Title2' explicit-name:true
-++++[text] name='InnerText2'
-++[text] name=' '
+++++[static] name='InnerText2'
+++[static] name=' '
 ++[link] name='LabelledBy3' labelled-by explicit-name:true
-++++[text] name='InnerText3'
+++++[static] name='InnerText3'
 ++[link] name='Title4' explicit-name:true
 ++[link] name='Label5' explicit-name:true
 ++[link] name='LabelledBy6' labelled-by explicit-name:true
diff --git a/content/test/data/accessibility/html/a-name-expected-auralinux.txt b/content/test/data/accessibility/html/a-name-expected-auralinux.txt
index 4b4260bb6..8194f69 100644
--- a/content/test/data/accessibility/html/a-name-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/a-name-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web]
 ++[link] name='named anchor'
-++++[text] name='named anchor'
+++++[static] name='named anchor'
 ++[link] name='both a named anchor and a link'
-++++[text] name='both a named anchor and a link'
+++++[static] name='both a named anchor and a link'
diff --git a/content/test/data/accessibility/html/a-with-img-expected-auralinux.txt b/content/test/data/accessibility/html/a-with-img-expected-auralinux.txt
index 515332a..84ce0bc 100644
--- a/content/test/data/accessibility/html/a-with-img-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/a-with-img-expected-auralinux.txt
@@ -2,18 +2,18 @@
 ++[section]
 ++++[link] name='Link with image at start.'
 ++++++[image] name='Link'
-++++++[text] name=' with image at start.'
-++++[text] name=' '
+++++++[static] name=' with image at start.'
+++++[static] name=' '
 ++++[link] name='Link with image in the middle.'
-++++++[text] name='Link with '
+++++++[static] name='Link with '
 ++++++[image] name='image'
-++++++[text] name=' in the middle.'
-++++[text] name=' '
+++++++[static] name=' in the middle.'
+++++[static] name=' '
 ++++[link] name='Link with broken in the middle.'
-++++++[text] name='Link with '
+++++++[static] name='Link with '
 ++++++[image] name='broken'
-++++++[text] name=' in the middle.'
-++++[text] name=' '
+++++++[static] name=' in the middle.'
+++++[static] name=' '
 ++++[link] name='Link with image at the end'
-++++++[text] name='Link with image at the '
+++++++[static] name='Link with image at the '
 ++++++[image] name='end'
diff --git a/content/test/data/accessibility/html/abbr-expected-auralinux.txt b/content/test/data/accessibility/html/abbr-expected-auralinux.txt
index 1b168654..2605e08d 100644
--- a/content/test/data/accessibility/html/abbr-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/abbr-expected-auralinux.txt
@@ -1,6 +1,6 @@
 [document web]
 ++[paragraph]
-++++[text] name='The '
+++++[static] name='The '
 ++++[static] name='World Health Organization'
-++++++[text] name='WHO'
-++++[text] name=' was founded in 1948.'
+++++++[static] name='WHO'
+++++[static] name=' was founded in 1948.'
diff --git a/content/test/data/accessibility/html/address-expected-auralinux.txt b/content/test/data/accessibility/html/address-expected-auralinux.txt
index 3dcd78f..87bec46 100644
--- a/content/test/data/accessibility/html/address-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/address-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[section]
-++++[text] name='Please contact John Citizen for more information.'
+++++[static] name='Please contact John Citizen for more information.'
diff --git a/content/test/data/accessibility/html/article-expected-auralinux.txt b/content/test/data/accessibility/html/article-expected-auralinux.txt
index 2ab5917..bceb8fa6 100644
--- a/content/test/data/accessibility/html/article-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/article-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[article] xml-roles:article
-++++[text] name='This is an article element.'
+++++[static] name='This is an article element.'
diff --git a/content/test/data/accessibility/html/aside-expected-auralinux.txt b/content/test/data/accessibility/html/aside-expected-auralinux.txt
index b3c13bf..264d413 100644
--- a/content/test/data/accessibility/html/aside-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/aside-expected-auralinux.txt
@@ -1,8 +1,8 @@
 [document web]
 ++[paragraph]
-++++[text] name='The aside tag defines some content aside from the content it is placed in.'
+++++[static] name='The aside tag defines some content aside from the content it is placed in.'
 ++[landmark] xml-roles:complementary
 ++++[heading] name='Aside tag' xml-roles:heading
-++++++[text] name='Aside tag'
+++++++[static] name='Aside tag'
 ++++[paragraph]
-++++++[text] name='The aside content should be related to the surrounding content.'
+++++++[static] name='The aside content should be related to the surrounding content.'
diff --git a/content/test/data/accessibility/html/audio-expected-auralinux.txt b/content/test/data/accessibility/html/audio-expected-auralinux.txt
index 33c06b1..cf9063a 100644
--- a/content/test/data/accessibility/html/audio-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/audio-expected-auralinux.txt
@@ -6,9 +6,9 @@
 ++++++++++[section]
 ++++++++++++[push button] name='play' xml-roles:button
 ++++++++++++[section] name='elapsed time: 0:00'
-++++++++++++++[text] name='0:00'
+++++++++++++++[static] name='0:00'
 ++++++++++++[section] name='remaining time: / 0:00'
-++++++++++++++[text] name='/ 0:00'
+++++++++++++++[static] name='/ 0:00'
 ++++++++++++[slider] name='audio time scrubber 0:00 / 0:00' horizontal xml-roles:slider
 ++++++++++++[section]
 ++++++++++++++[section]
diff --git a/content/test/data/accessibility/html/b-expected-auralinux.txt b/content/test/data/accessibility/html/b-expected-auralinux.txt
index 644c967..bb2efefe 100644
--- a/content/test/data/accessibility/html/b-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/b-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web]
 ++[paragraph]
-++++[text] name='Some '
-++++[text] name='bold'
-++++[text] name=' text'
+++++[static] name='Some '
+++++[static] name='bold'
+++++[static] name=' text'
diff --git a/content/test/data/accessibility/html/bdo-expected-auralinux.txt b/content/test/data/accessibility/html/bdo-expected-auralinux.txt
index 17fc34d..4de72b4 100644
--- a/content/test/data/accessibility/html/bdo-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/bdo-expected-auralinux.txt
@@ -1,6 +1,6 @@
 [document web]
 ++[section]
-++++[text] name='Some LTR text'
-++++[text] name=' '
-++++[text] name='Some RTL text '
-++++[text] name='with some LTR text embedded'
+++++[static] name='Some LTR text'
+++++[static] name=' '
+++++[static] name='Some RTL text '
+++++[static] name='with some LTR text embedded'
diff --git a/content/test/data/accessibility/html/blockquote-expected-auralinux.txt b/content/test/data/accessibility/html/blockquote-expected-auralinux.txt
index 6266276..4b61419 100644
--- a/content/test/data/accessibility/html/blockquote-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/blockquote-expected-auralinux.txt
@@ -1,6 +1,6 @@
 [document web]
 ++[block quote]
 ++++[paragraph]
-++++++[text] name='First blockquote has a child element.'
+++++++[static] name='First blockquote has a child element.'
 ++[block quote]
-++++[text] name='Second blockquote has no child.'
+++++[static] name='Second blockquote has no child.'
diff --git a/content/test/data/accessibility/html/body-expected-auralinux.txt b/content/test/data/accessibility/html/body-expected-auralinux.txt
index 89b5fee..c805b71 100644
--- a/content/test/data/accessibility/html/body-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/body-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[paragraph]
-++++[text] name='This test is for body tag'
+++++[static] name='This test is for body tag'
diff --git a/content/test/data/accessibility/html/br-expected-auralinux.txt b/content/test/data/accessibility/html/br-expected-auralinux.txt
index b8f61444..401f3c5 100644
--- a/content/test/data/accessibility/html/br-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/br-expected-auralinux.txt
@@ -1,8 +1,8 @@
 [document web]
-++[text] name='<newline>'
-++[text] name='Text line 1'
+++[static] name='<newline>'
+++[static] name='Text line 1'
 ++[paragraph]
-++++[text] name='Text line 2'
-++++[text] name='<newline>'
-++++[text] name='Text line 3'
-++[text] name='<newline>'
+++++[static] name='Text line 2'
+++++[static] name='<newline>'
+++++[static] name='Text line 3'
+++[static] name='<newline>'
diff --git a/content/test/data/accessibility/html/button-name-calc-expected-auralinux.txt b/content/test/data/accessibility/html/button-name-calc-expected-auralinux.txt
index bc25abb..e02efa8 100644
--- a/content/test/data/accessibility/html/button-name-calc-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/button-name-calc-expected-auralinux.txt
@@ -6,15 +6,15 @@
 ++[push button] name='LabelledBy4' description='DescribedBy4' labelled-by described-by explicit-name:true
 ++[push button] name='InnerText5' description='DescribedBy5' described-by
 ++[push button] name='Outer inner'
-++++[text] name='Outer'
+++++[static] name='Outer'
 ++++[section]
-++++++[text] name='inner'
+++++++[static] name='inner'
 ++[push button] name='Outer inner1'
-++++[text] name='Outer'
+++++[static] name='Outer'
 ++++[section] name='inner1' explicit-name:true
-++++++[text] name='inner2'
+++++++[static] name='inner2'
 ++[push button] name='Outer grandchild'
-++++[text] name='Outer'
+++++[static] name='Outer'
 ++++[section]
 ++++++[section]
-++++++++[text] name='grandchild'
+++++++++[static] name='grandchild'
diff --git a/content/test/data/accessibility/html/button-with-listbox-popup-expected-auralinux.txt b/content/test/data/accessibility/html/button-with-listbox-popup-expected-auralinux.txt
index c0387aab..c1972b17 100644
--- a/content/test/data/accessibility/html/button-with-listbox-popup-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/button-with-listbox-popup-expected-auralinux.txt
@@ -1,9 +1,9 @@
 [document web]
 ++[section]
 ++++[section] label-for
-++++++[text] name='Choose one:'
+++++++[static] name='Choose one:'
 ++++[push button] name='Choose one: Foo' labelled-by
-++++++[text] name='Foo'
+++++++[static] name='Foo'
 ++++[list box] name='Choose one:' labelled-by
 ++++++[list item] name='Baz' selectable
 ++++++[list item] name='Bar' selectable
diff --git a/content/test/data/accessibility/html/canvas-expected-auralinux.txt b/content/test/data/accessibility/html/canvas-expected-auralinux.txt
index 36378eb..3cafba9a 100644
--- a/content/test/data/accessibility/html/canvas-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/canvas-expected-auralinux.txt
@@ -1,7 +1,7 @@
 [document web]
 ++[section]
 ++++[canvas]
-++++++[text] name='Static fallback'
+++++++[static] name='Static fallback'
 ++++[canvas]
 ++++++[link] name='Interactive fallback'
-++++++++[text] name='Interactive fallback'
+++++++++[static] name='Interactive fallback'
diff --git a/content/test/data/accessibility/html/canvas-fallback-expected-auralinux.txt b/content/test/data/accessibility/html/canvas-fallback-expected-auralinux.txt
index 9e300b4..4e5c47d 100644
--- a/content/test/data/accessibility/html/canvas-fallback-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/canvas-fallback-expected-auralinux.txt
@@ -1,21 +1,21 @@
 [document web]
 ++[section]
 ++++[canvas]
-++++++[text] name='Static fallback'
+++++++[static] name='Static fallback'
 ++++[canvas]
-++++++[text] name='<newline>    '
+++++++[static] name='<newline>    '
 ++++++[paragraph] name='Aria hidden paragraph in fallback content' labelled-by
-++++++++[text] name='Line breaking content in a fallback'
-++++++[text] name='<newline>    '
+++++++++[static] name='Line breaking content in a fallback'
+++++++[static] name='<newline>    '
 ++++++[paragraph] name='Visibility hidden paragraph in fallback content' labelled-by
-++++++++[text] name='This is another paragraph in fallback'
-++++++[text] name='<newline>    '
+++++++++[static] name='This is another paragraph in fallback'
+++++++[static] name='<newline>    '
 ++++++[heading] name='Aria hidden paragraph in fallback content' label-for
-++++++++[text] name='Aria hidden paragraph in fallback content'
-++++++[text] name='<newline>    '
+++++++++[static] name='Aria hidden paragraph in fallback content'
+++++++[static] name='<newline>    '
 ++++++[heading]
-++++++++[text] name='Display none text in fallback content '
-++++++[text] name='<newline>    '
+++++++++[static] name='Display none text in fallback content '
+++++++[static] name='<newline>    '
 ++++++[heading] label-for
-++++++++[text] name='Visibility hidden paragraph in fallback content'
-++++++[text] name='<newline>  '
\ No newline at end of file
+++++++++[static] name='Visibility hidden paragraph in fallback content'
+++++++[static] name='<newline>  '
diff --git a/content/test/data/accessibility/html/caption-expected-auralinux.txt b/content/test/data/accessibility/html/caption-expected-auralinux.txt
index 2e805b63..8293576 100644
--- a/content/test/data/accessibility/html/caption-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/caption-expected-auralinux.txt
@@ -1,19 +1,19 @@
 [document web]
 ++[table] name='Browser and Engine' labelled-by cols=2 headers=('Browser', 'Engine'); rows=3 headers=(NONE); caption=true; spans=(all: 1x1)
 ++++[caption] label-for
-++++++[text] name='Browser and Engine'
+++++++[static] name='Browser and Engine'
 ++++[table row]
 ++++++[column header] name='Browser' (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Browser'
+++++++++[static] name='Browser'
 ++++++[column header] name='Engine' (row=0, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Engine'
+++++++++[static] name='Engine'
 ++++[table row]
 ++++++[table cell] name='Chrome' (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='Chrome'
+++++++++[static] name='Chrome'
 ++++++[table cell] name='Blink' (row=1, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='Blink'
+++++++++[static] name='Blink'
 ++++[table row]
 ++++++[table cell] name='Safari' (row=2, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='Safari'
+++++++++[static] name='Safari'
 ++++++[table cell] name='WebKit' (row=2, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='WebKit'
+++++++++[static] name='WebKit'
diff --git a/content/test/data/accessibility/html/cite-expected-auralinux.txt b/content/test/data/accessibility/html/cite-expected-auralinux.txt
index 29e849c..173be1a 100644
--- a/content/test/data/accessibility/html/cite-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/cite-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web]
 ++[image] name='Pipe'
 ++[paragraph]
-++++[text] name='The pipe'
-++++[text] name=' clicked by SomeOne.'
+++++[static] name='The pipe'
+++++[static] name=' clicked by SomeOne.'
diff --git a/content/test/data/accessibility/html/code-expected-auralinux.txt b/content/test/data/accessibility/html/code-expected-auralinux.txt
index c1366e3..c0e6e02 100644
--- a/content/test/data/accessibility/html/code-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/code-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[section]
-++++[text] name='A piece of computer code'
+++++[static] name='A piece of computer code'
diff --git a/content/test/data/accessibility/html/col-expected-auralinux.txt b/content/test/data/accessibility/html/col-expected-auralinux.txt
index cfa81eb..92bc14e 100644
--- a/content/test/data/accessibility/html/col-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/col-expected-auralinux.txt
@@ -2,11 +2,11 @@
 ++[table] cols=2 headers=('Browser', 'Rendering Engine'); rows=2 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row]
 ++++++[column header] name='Browser' (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Browser'
+++++++++[static] name='Browser'
 ++++++[column header] name='Rendering Engine' (row=0, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Rendering Engine'
+++++++++[static] name='Rendering Engine'
 ++++[table row]
 ++++++[table cell] name='Chrome' (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='Chrome'
+++++++++[static] name='Chrome'
 ++++++[table cell] name='Blink' (row=1, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='Blink'
+++++++++[static] name='Blink'
diff --git a/content/test/data/accessibility/html/colgroup-expected-auralinux.txt b/content/test/data/accessibility/html/colgroup-expected-auralinux.txt
index 173f62b1..af21893 100644
--- a/content/test/data/accessibility/html/colgroup-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/colgroup-expected-auralinux.txt
@@ -2,11 +2,11 @@
 ++[table] cols=2 headers=('Single', 'Pair'); rows=2 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row]
 ++++++[column header] name='Single' (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Single'
+++++++++[static] name='Single'
 ++++++[column header] name='Pair' (row=0, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Pair'
+++++++++[static] name='Pair'
 ++++[table row]
 ++++++[table cell] name='A' (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='A'
+++++++++[static] name='A'
 ++++++[table cell] name='AA' (row=1, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='AA'
+++++++++[static] name='AA'
diff --git a/content/test/data/accessibility/html/contenteditable-descendants-expected-auralinux.txt b/content/test/data/accessibility/html/contenteditable-descendants-expected-auralinux.txt
index 40c01f6e..872ffb7 100644
--- a/content/test/data/accessibility/html/contenteditable-descendants-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/contenteditable-descendants-expected-auralinux.txt
@@ -1,23 +1,23 @@
 [document web]
 ++[section] editable multi-line selectable-text
 ++++[paragraph] editable
-++++++[text] name='A contenteditable with a ' editable
+++++++[static] name='A contenteditable with a ' editable
 ++++++[link] name='link' editable
-++++++++[text] name='link' editable
-++++++[text] name=' and an ' editable
+++++++++[static] name='link' editable
+++++++[static] name=' and an ' editable
 ++++++[image] name='Image' editable
-++++++[text] name=' and a ' editable
+++++++[static] name=' and a ' editable
 ++++++[push button] name='Button' editable
-++++++[text] name='.' editable
+++++++[static] name='.' editable
 ++++[table] editable cols=1 headers=(NONE); rows=1 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++++[table row] editable
 ++++++++[table cell] name='Always expose editable tables as tables.' editable (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++++[text] name='Always expose editable tables as tables.' editable
+++++++++++[static] name='Always expose editable tables as tables.' editable
 ++++[list] editable
 ++++++[list item] editable
 ++++++++[static] name='1. ' editable
-++++++++[text] name='Editable list item.' editable
+++++++++[static] name='Editable list item.' editable
 ++[paragraph]
-++++[text] name='Non-editable paragraph.'
+++++[static] name='Non-editable paragraph.'
 ++[paragraph] editable multi-line selectable-text
-++++[text] name='Should keep the role but change the state.' editable
+++++[static] name='Should keep the role but change the state.' editable
diff --git a/content/test/data/accessibility/html/contenteditable-descendants-with-selection-expected-auralinux.txt b/content/test/data/accessibility/html/contenteditable-descendants-with-selection-expected-auralinux.txt
index c5691a8..7d89afef 100644
--- a/content/test/data/accessibility/html/contenteditable-descendants-with-selection-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/contenteditable-descendants-with-selection-expected-auralinux.txt
@@ -1,19 +1,19 @@
 [document web] caret_offset=1 selection_start=0 selection_end=1
 ++[section] editable multi-line selectable-text caret_offset=3 selection_start=0 selection_end=3
 ++++[paragraph] editable selection_start=0 selection_end=3
-++++++[text] name='A contenteditable with a ' editable selection_start=0 selection_end=3
+++++++[static] name='A contenteditable with a ' editable selection_start=0 selection_end=3
 ++++++[link] name='link' editable selection_start=0 selection_end=3
-++++++++[text] name='link' editable selection_start=0 selection_end=3
-++++++[text] name=' and an ' editable selection_start=0 selection_end=3
+++++++++[static] name='link' editable selection_start=0 selection_end=3
+++++++[static] name=' and an ' editable selection_start=0 selection_end=3
 ++++++[image] name='Image' editable
-++++++[text] name=' and a ' editable selection_start=0 selection_end=3
+++++++[static] name=' and a ' editable selection_start=0 selection_end=3
 ++++++[push button] name='Button' editable selection_start=0 selection_end=3
-++++++[text] name='.' editable selection_start=0 selection_end=3
+++++++[static] name='.' editable selection_start=0 selection_end=3
 ++++[table] editable cols=1 headers=(NONE); rows=1 headers=(NONE); caption=false; spans=(all: 1x1) selection_start=0 selection_end=3
 ++++++[table row] editable selection_start=0 selection_end=3
 ++++++++[table cell] name='Always expose editable tables as tables.' editable (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0) selection_start=0 selection_end=3
-++++++++++[text] name='Always expose editable tables as tables.' editable selection_start=0 selection_end=3
+++++++++++[static] name='Always expose editable tables as tables.' editable selection_start=0 selection_end=3
 ++++[list] editable selection_start=0 selection_end=3
 ++++++[list item] editable selection_start=0 selection_end=3
 ++++++++[static] name='1. ' editable selection_start=0 selection_end=3
-++++++++[text] name='Editable list item.' editable selection_start=0 selection_end=3
+++++++++[static] name='Editable list item.' editable selection_start=0 selection_end=3
diff --git a/content/test/data/accessibility/html/contenteditable-with-embedded-contenteditables-expected-auralinux.txt b/content/test/data/accessibility/html/contenteditable-with-embedded-contenteditables-expected-auralinux.txt
index e2aa623..d7b072b 100644
--- a/content/test/data/accessibility/html/contenteditable-with-embedded-contenteditables-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/contenteditable-with-embedded-contenteditables-expected-auralinux.txt
@@ -1,10 +1,10 @@
 [document web]
 ++[section] editable multi-line selectable-text
 ++++[paragraph] editable
-++++++[text] name='This is editable.' editable
-++++[text] name='This is not editable.'
-++++[text] name='<newline>'
+++++++[static] name='This is editable.' editable
+++++[static] name='This is not editable.'
+++++[static] name='<newline>'
 ++++[paragraph] editable multi-line selectable-text
-++++++[text] name='But this one is.' editable
+++++++[static] name='But this one is.' editable
 ++++[paragraph] editable
-++++++[text] name='So is this one.' editable
+++++++[static] name='So is this one.' editable
diff --git a/content/test/data/accessibility/html/contenteditable-with-no-descendants-expected-auralinux.txt b/content/test/data/accessibility/html/contenteditable-with-no-descendants-expected-auralinux.txt
index 93f97ba..58873f2 100644
--- a/content/test/data/accessibility/html/contenteditable-with-no-descendants-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/contenteditable-with-no-descendants-expected-auralinux.txt
@@ -3,4 +3,4 @@
 ++[section] description='description' editable selectable-text described-by
 ++[section] name='title' editable selectable-text
 ++[paragraph] description-for
-++++[text] name='description'
+++++[static] name='description'
diff --git a/content/test/data/accessibility/html/dd-expected-auralinux.txt b/content/test/data/accessibility/html/dd-expected-auralinux.txt
index 083192e..46e222c 100644
--- a/content/test/data/accessibility/html/dd-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/dd-expected-auralinux.txt
@@ -1,6 +1,6 @@
 [document web]
 ++[description list]
 ++++[description term]
-++++++[text] name='Coffee'
+++++++[static] name='Coffee'
 ++++[description value]
-++++++[text] name='Black hot drink'
+++++++[static] name='Black hot drink'
diff --git a/content/test/data/accessibility/html/del-expected-auralinux.txt b/content/test/data/accessibility/html/del-expected-auralinux.txt
index c274f8f7..b308653 100644
--- a/content/test/data/accessibility/html/del-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/del-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web]
 ++[paragraph]
-++++[text] name='I am '
+++++[static] name='I am '
 ++++[content deletion]
-++++++[text] name='vegetarian'
+++++++[static] name='vegetarian'
diff --git a/content/test/data/accessibility/html/details-expected-auralinux.txt b/content/test/data/accessibility/html/details-expected-auralinux.txt
index 5bb55e5..067a010c 100644
--- a/content/test/data/accessibility/html/details-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/details-expected-auralinux.txt
@@ -1,9 +1,9 @@
 [document web] focusable focused
 ++[panel]
 ++++[toggle button] name='details tag' expandable focusable
-++++++[text] name='details tag'
+++++++[static] name='details tag'
 ++[panel]
 ++++[toggle button] name='details tag open' expandable expanded focusable
-++++++[text] name='details tag open'
+++++++[static] name='details tag open'
 ++++[paragraph]
-++++++[text] name='The details tag with open specifies that the details should be visible (open) to the user.'
+++++++[static] name='The details tag with open specifies that the details should be visible (open) to the user.'
diff --git a/content/test/data/accessibility/html/dfn-expected-auralinux.txt b/content/test/data/accessibility/html/dfn-expected-auralinux.txt
index 1563d67..41c9b04 100644
--- a/content/test/data/accessibility/html/dfn-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/dfn-expected-auralinux.txt
@@ -1,4 +1,4 @@
 [document web] tag:#document
 ++[section] tag:body
-++++[text] name='Web Browser'
-++++[text] name=' A computer program with a graphical user interface for displaying HTML files, used to navigate the World Wide Web.'
+++++[static] name='Web Browser'
+++++[static] name=' A computer program with a graphical user interface for displaying HTML files, used to navigate the World Wide Web.'
diff --git a/content/test/data/accessibility/html/dialog-expected-auralinux.txt b/content/test/data/accessibility/html/dialog-expected-auralinux.txt
index 82d3f36..1678791c 100644
--- a/content/test/data/accessibility/html/dialog-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/dialog-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[dialog]
-++++[text] name='Text in dialog'
+++++[static] name='Text in dialog'
diff --git a/content/test/data/accessibility/html/div-expected-auralinux.txt b/content/test/data/accessibility/html/div-expected-auralinux.txt
index a7e4408..9064a19 100644
--- a/content/test/data/accessibility/html/div-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/div-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web]
 ++[section]
-++++[text] name='Unfocusable div'
+++++[static] name='Unfocusable div'
 ++[section] name='Focusable div'
-++++[text] name='Focusable div'
+++++[static] name='Focusable div'
diff --git a/content/test/data/accessibility/html/dl-expected-auralinux.txt b/content/test/data/accessibility/html/dl-expected-auralinux.txt
index 959d890..a0f70e4 100644
--- a/content/test/data/accessibility/html/dl-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/dl-expected-auralinux.txt
@@ -1,8 +1,8 @@
 [document web]
 ++[description list]
 ++++[description term]
-++++++[text] name='Term'
+++++++[static] name='Term'
 ++++[description value]
-++++++[text] name='Description'
+++++++[static] name='Description'
 ++[description value]
-++++[text] name='Definition'
+++++[static] name='Definition'
diff --git a/content/test/data/accessibility/html/dt-expected-auralinux.txt b/content/test/data/accessibility/html/dt-expected-auralinux.txt
index 083192e..46e222c 100644
--- a/content/test/data/accessibility/html/dt-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/dt-expected-auralinux.txt
@@ -1,6 +1,6 @@
 [document web]
 ++[description list]
 ++++[description term]
-++++++[text] name='Coffee'
+++++++[static] name='Coffee'
 ++++[description value]
-++++++[text] name='Black hot drink'
+++++++[static] name='Black hot drink'
diff --git a/content/test/data/accessibility/html/element-class-id-src-attr-expected-auralinux.txt b/content/test/data/accessibility/html/element-class-id-src-attr-expected-auralinux.txt
index b8a871ce..a693275 100644
--- a/content/test/data/accessibility/html/element-class-id-src-attr-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/element-class-id-src-attr-expected-auralinux.txt
@@ -1,4 +1,4 @@
 [document web] tag:#document
 ++[heading] name='Image' class:headerClass id:headerID tag:h1
-++++[text] name='Image'
+++++[static] name='Image'
 ++[image] name='ImageAlt' class:imageClass id:imageID src:greenbox.png tag:img
diff --git a/content/test/data/accessibility/html/em-expected-auralinux.txt b/content/test/data/accessibility/html/em-expected-auralinux.txt
index 8d7fdb04..4a596ff 100644
--- a/content/test/data/accessibility/html/em-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/em-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web]
 ++[section]
-++++[text] name='One word is '
-++++[text] name='emphasized'
-++++[text] name='.'
+++++[static] name='One word is '
+++++[static] name='emphasized'
+++++[static] name='.'
diff --git a/content/test/data/accessibility/html/fieldset-expected-auralinux.txt b/content/test/data/accessibility/html/fieldset-expected-auralinux.txt
index 606ccea..b95d105 100644
--- a/content/test/data/accessibility/html/fieldset-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/fieldset-expected-auralinux.txt
@@ -2,4 +2,4 @@
 ++[form]
 ++++[panel] name='Browser Engines:' labelled-by
 ++++++[label] label-for
-++++++++[text] name='Browser Engines:'
+++++++++[static] name='Browser Engines:'
diff --git a/content/test/data/accessibility/html/figcaption-expected-auralinux.txt b/content/test/data/accessibility/html/figcaption-expected-auralinux.txt
index 75188b30..baf4146c 100644
--- a/content/test/data/accessibility/html/figcaption-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/figcaption-expected-auralinux.txt
@@ -2,4 +2,4 @@
 ++[panel] name='Fig.1 - A green Box' labelled-by
 ++++[image] name='This is a green box.'
 ++++[caption] label-for
-++++++[text] name='Fig.1 - A green Box'
+++++++[static] name='Fig.1 - A green Box'
diff --git a/content/test/data/accessibility/html/footer-expected-auralinux.txt b/content/test/data/accessibility/html/footer-expected-auralinux.txt
index 86b85ab..4cb8154 100644
--- a/content/test/data/accessibility/html/footer-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/footer-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[landmark] xml-roles:contentinfo
-++++[text] name='Footer element'
+++++[static] name='Footer element'
diff --git a/content/test/data/accessibility/html/footer-inside-other-section-expected-auralinux.txt b/content/test/data/accessibility/html/footer-inside-other-section-expected-auralinux.txt
index f5d6a1b..9a23831 100644
--- a/content/test/data/accessibility/html/footer-inside-other-section-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/footer-inside-other-section-expected-auralinux.txt
@@ -2,12 +2,12 @@
 ++[article] xml-roles:article
 ++++[section]
 ++++++[paragraph]
-++++++++[text] name='footer inside article.'
+++++++++[static] name='footer inside article.'
 ++[section] xml-roles:region
 ++++[section]
 ++++++[paragraph]
-++++++++[text] name='footer inside section.'
+++++++++[static] name='footer inside section.'
 ++[landmark] xml-roles:main
 ++++[section]
 ++++++[paragraph]
-++++++++[text] name='footer inside main.'
+++++++++[static] name='footer inside main.'
diff --git a/content/test/data/accessibility/html/frameset-expected-auralinux.txt b/content/test/data/accessibility/html/frameset-expected-auralinux.txt
index b4de8b2..72d8e33 100644
--- a/content/test/data/accessibility/html/frameset-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/frameset-expected-auralinux.txt
@@ -2,17 +2,17 @@
 ++[internal frame]
 ++++[document web]
 ++++++[paragraph]
-++++++++[text] name='My favorite browser is '
+++++++++[static] name='My favorite browser is '
 ++++++++[content deletion]
-++++++++++[text] name='ABC'
-++++++++[text] name=' '
+++++++++++[static] name='ABC'
+++++++++[static] name=' '
 ++++++++[content insertion]
-++++++++++[text] name='Chrome'
-++++++++[text] name='!'
+++++++++++[static] name='Chrome'
+++++++++[static] name='!'
 ++[internal frame]
 ++++[document web]
 ++++++[paragraph]
-++++++++[text] name='This test is to check '
+++++++++[static] name='This test is to check '
 ++++++++[static]
-++++++++++[text] name='mark tag'
-++++++++[text] name='.'
+++++++++++[static] name='mark tag'
+++++++++[static] name='.'
diff --git a/content/test/data/accessibility/html/header-expected-auralinux.txt b/content/test/data/accessibility/html/header-expected-auralinux.txt
index 228a02f..4cd09db 100644
--- a/content/test/data/accessibility/html/header-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/header-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[landmark] xml-roles:banner
-++++[text] name='Chromium Browser'
+++++[static] name='Chromium Browser'
diff --git a/content/test/data/accessibility/html/header-inside-other-section-expected-auralinux.txt b/content/test/data/accessibility/html/header-inside-other-section-expected-auralinux.txt
index 77cbdf4..4055f6a 100644
--- a/content/test/data/accessibility/html/header-inside-other-section-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/header-inside-other-section-expected-auralinux.txt
@@ -2,12 +2,12 @@
 ++[article] xml-roles:article
 ++++[section]
 ++++++[paragraph]
-++++++++[text] name='Header inside article.'
+++++++++[static] name='Header inside article.'
 ++[section] xml-roles:region
 ++++[section]
 ++++++[paragraph]
-++++++++[text] name='Header inside section.'
+++++++++[static] name='Header inside section.'
 ++[landmark] xml-roles:main
 ++++[section]
 ++++++[paragraph]
-++++++++[text] name='Header inside main.'
+++++++++[static] name='Header inside main.'
diff --git a/content/test/data/accessibility/html/heading-expected-auralinux.txt b/content/test/data/accessibility/html/heading-expected-auralinux.txt
index b67d197..de7be7d 100644
--- a/content/test/data/accessibility/html/heading-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/heading-expected-auralinux.txt
@@ -1,13 +1,13 @@
 [document web]
 ++[heading] name='Heading 1' level:1 xml-roles:heading
-++++[text] name='Heading 1'
+++++[static] name='Heading 1'
 ++[heading] name='Heading 2' level:2 xml-roles:heading
-++++[text] name='Heading 2'
+++++[static] name='Heading 2'
 ++[heading] name='Heading 3' level:3 xml-roles:heading
-++++[text] name='Heading 3'
+++++[static] name='Heading 3'
 ++[heading] name='Heading 4' level:4 xml-roles:heading
-++++[text] name='Heading 4'
+++++[static] name='Heading 4'
 ++[heading] name='Heading 5' level:5 xml-roles:heading
-++++[text] name='Heading 5'
+++++[static] name='Heading 5'
 ++[heading] name='Heading 6' level:6 xml-roles:heading
-++++[text] name='Heading 6'
+++++[static] name='Heading 6'
diff --git a/content/test/data/accessibility/html/hr-expected-auralinux.txt b/content/test/data/accessibility/html/hr-expected-auralinux.txt
index 91f6f2b1..bd024269 100644
--- a/content/test/data/accessibility/html/hr-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/hr-expected-auralinux.txt
@@ -1,9 +1,9 @@
 [document web]
 ++[paragraph]
-++++[text] name='Before.'
+++++[static] name='Before.'
 ++[separator] name='Dividing line' horizontal
 ++[paragraph]
-++++[text] name='Middle.'
+++++[static] name='Middle.'
 ++[separator] horizontal
 ++[paragraph]
-++++[text] name='After.'
+++++[static] name='After.'
diff --git a/content/test/data/accessibility/html/i-expected-auralinux.txt b/content/test/data/accessibility/html/i-expected-auralinux.txt
index b65c3435..528f374 100644
--- a/content/test/data/accessibility/html/i-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/i-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web]
 ++[paragraph]
-++++[text] name='This is to check '
-++++[text] name='italic property'
-++++[text] name=' using i tag.'
+++++[static] name='This is to check '
+++++[static] name='italic property'
+++++[static] name=' using i tag.'
diff --git a/content/test/data/accessibility/html/iframe-cross-process-expected-auralinux.txt b/content/test/data/accessibility/html/iframe-cross-process-expected-auralinux.txt
index c9c7795..be81ac5 100644
--- a/content/test/data/accessibility/html/iframe-cross-process-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/iframe-cross-process-expected-auralinux.txt
@@ -1,10 +1,10 @@
 [document web]
 ++[paragraph]
-++++[text] name='Before frame'
+++++[static] name='Before frame'
 ++[section]
 ++++[internal frame] name='Cross-process iframe'
 ++++++[document web]
 ++++++++[section]
-++++++++++[text] name='Text in iframe'
+++++++++++[static] name='Text in iframe'
 ++[paragraph]
-++++[text] name='After frame'
+++++[static] name='After frame'
diff --git a/content/test/data/accessibility/html/ignored-selection-between-text-expected-auralinux.txt b/content/test/data/accessibility/html/ignored-selection-between-text-expected-auralinux.txt
index ce518f5..bd0349d 100644
--- a/content/test/data/accessibility/html/ignored-selection-between-text-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/ignored-selection-between-text-expected-auralinux.txt
@@ -1,8 +1,8 @@
 [document web] caret_offset=2 selection_start=0 selection_end=2
 ++[section]
-++++[text] name='before selection'
+++++[static] name='before selection'
 ++[section] selection_start=0 selection_end=24
-++++[text] name='this text is not ignored' selection_start=0 selection_end=24
+++++[static] name='this text is not ignored' selection_start=0 selection_end=24
 ++[section] caret_offset=0
-++++[text] name='after selection' caret_offset=0
-++[text] name='Done'
+++++[static] name='after selection' caret_offset=0
+++[static] name='Done'
diff --git a/content/test/data/accessibility/html/ignored-selection-expected-auralinux.txt b/content/test/data/accessibility/html/ignored-selection-expected-auralinux.txt
index 1581150..e27e9f5 100644
--- a/content/test/data/accessibility/html/ignored-selection-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/ignored-selection-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web] caret_offset=24 selection_start=0 selection_end=24
-++[text] name='this text is not ignored' selection_start=0 selection_end=24
+++[static] name='this text is not ignored' selection_start=0 selection_end=24
 ++[section] caret_offset=0
-++++[text] name='after selection' caret_offset=0
-++[text] name='Done'
+++++[static] name='after selection' caret_offset=0
+++[static] name='Done'
diff --git a/content/test/data/accessibility/html/ignored-selection-no-unignored-expected-auralinux.txt b/content/test/data/accessibility/html/ignored-selection-no-unignored-expected-auralinux.txt
index 5d01d2c..4fe980b 100644
--- a/content/test/data/accessibility/html/ignored-selection-no-unignored-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/ignored-selection-no-unignored-expected-auralinux.txt
@@ -1,2 +1,2 @@
 [document web] caret_offset=0
-++[text] name='Done' caret_offset=0
+++[static] name='Done' caret_offset=0
diff --git a/content/test/data/accessibility/html/img-expected-auralinux.txt b/content/test/data/accessibility/html/img-expected-auralinux.txt
index 24def55..bf45e65 100644
--- a/content/test/data/accessibility/html/img-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/img-expected-auralinux.txt
@@ -1,7 +1,7 @@
 [document web]
 ++[section]
 ++++[image] name='pipe' xml-roles:img
-++++[text] name=' '
+++++[static] name=' '
 ++++[image] name='' xml-roles:img
-++++[text] name=' '
+++++[static] name=' '
 ++++[image] name='  ' xml-roles:img
diff --git a/content/test/data/accessibility/html/img-link-empty-alt-expected-auralinux.txt b/content/test/data/accessibility/html/img-link-empty-alt-expected-auralinux.txt
index abb430c..2b16c3f 100644
--- a/content/test/data/accessibility/html/img-link-empty-alt-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/img-link-empty-alt-expected-auralinux.txt
@@ -1,13 +1,13 @@
 [document web]
 ++[section]
 ++++[link] name='unread '
-++++++[text] name='unread '
+++++++[static] name='unread '
 ++++[link] name='read '
 ++++++[image] name=''
-++++++[text] name='read '
+++++++[static] name='read '
 ++++[link] name='read '
 ++++++[image] name=''
-++++++[text] name='read '
+++++++[static] name='read '
 ++++[link] name='read'
 ++++++[image]
-++++++[text] name='read'
+++++++[static] name='read'
diff --git a/content/test/data/accessibility/html/in-page-links-expected-auralinux.txt b/content/test/data/accessibility/html/in-page-links-expected-auralinux.txt
index 2ecd2ae..03dc4387 100644
--- a/content/test/data/accessibility/html/in-page-links-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/in-page-links-expected-auralinux.txt
@@ -1,35 +1,35 @@
 [document web]
 ++[link] name='Empty anchor'
-++++[text] name='Empty anchor'
-++[text] name=' '
+++++[static] name='Empty anchor'
+++[static] name=' '
 ++[link] name='Anchor with content'
-++++[text] name='Anchor with content'
-++[text] name=' '
+++++[static] name='Anchor with content'
+++[static] name=' '
 ++[link] name='Anchor with ID'
-++++[text] name='Anchor with ID'
-++[text] name=' '
+++++[static] name='Anchor with ID'
+++[static] name=' '
 ++[link] name='Empty span'
-++++[text] name='Empty span'
-++[text] name=' '
+++++[static] name='Empty span'
+++[static] name=' '
 ++[link] name='Span with content'
-++++[text] name='Span with content'
-++[text] name=' '
+++++[static] name='Span with content'
+++[static] name=' '
 ++[link] name='Paragraph with content'
-++++[text] name='Paragraph with content'
+++++[static] name='Paragraph with content'
 ++[paragraph]
 ++++[link]
-++++[text] name='After empty anchor'
+++++[static] name='After empty anchor'
 ++[paragraph]
 ++++[link] name='Anchor with content'
-++++++[text] name='Anchor with content'
+++++++[static] name='Anchor with content'
 ++[paragraph]
 ++++[link] name='Anchor with ID'
-++++++[text] name='Anchor with ID'
+++++++[static] name='Anchor with ID'
 ++[paragraph]
 ++++[section]
-++++[text] name='After empty span'
+++++[static] name='After empty span'
 ++[paragraph]
 ++++[section]
-++++++[text] name='Span with content'
+++++++[static] name='Span with content'
 ++[paragraph]
-++++[text] name='Paragraph with content'
+++++[static] name='Paragraph with content'
diff --git a/content/test/data/accessibility/html/input-date-expected-auralinux.txt b/content/test/data/accessibility/html/input-date-expected-auralinux.txt
index 59939a0..7043d05 100644
--- a/content/test/data/accessibility/html/input-date-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/input-date-expected-auralinux.txt
@@ -4,23 +4,23 @@
 ++++++[section]
 ++++++++[section]
 ++++++++++[spin button] name='Month' current=9.000000 minimum=1.000000 maximum=12.000000
-++++++++++++[text] name='09'
-++++++++++[text] name='/'
+++++++++++++[static] name='09'
+++++++++++[static] name='/'
 ++++++++++[spin button] name='Day' current=1.000000 minimum=1.000000 maximum=31.000000
-++++++++++++[text] name='01'
-++++++++++[text] name='/'
+++++++++++++[static] name='01'
+++++++++++[static] name='/'
 ++++++++++[spin button] name='Year' current=2008.000000 minimum=1.000000 maximum=275760.000000
-++++++++++++[text] name='2008'
+++++++++++++[static] name='2008'
 ++++++[push button] name='Show date picker'
 ++++[dateeditor] name='When'
 ++++++[section]
 ++++++++[section]
 ++++++++++[spin button] name='Month When' current=9.000000 minimum=1.000000 maximum=12.000000
-++++++++++++[text] name='09'
-++++++++++[text] name='/'
+++++++++++++[static] name='09'
+++++++++++[static] name='/'
 ++++++++++[spin button] name='Day When' current=1.000000 minimum=1.000000 maximum=31.000000
-++++++++++++[text] name='01'
-++++++++++[text] name='/'
+++++++++++++[static] name='01'
+++++++++++[static] name='/'
 ++++++++++[spin button] name='Year When' current=2008.000000 minimum=1.000000 maximum=275760.000000
-++++++++++++[text] name='2008'
-++++++[push button] name='Show date picker'
\ No newline at end of file
+++++++++++++[static] name='2008'
+++++++[push button] name='Show date picker'
diff --git a/content/test/data/accessibility/html/input-date-with-popup-open-expected-auralinux.txt b/content/test/data/accessibility/html/input-date-with-popup-open-expected-auralinux.txt
index 743e25ee..8c35d3d 100644
--- a/content/test/data/accessibility/html/input-date-with-popup-open-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/input-date-with-popup-open-expected-auralinux.txt
@@ -4,20 +4,20 @@
 ++++++[section]
 ++++++++[section]
 ++++++++++[spin button] name='Month' current=9.000000 minimum=1.000000 maximum=12.000000
-++++++++++++[text] name='09'
-++++++++++[text] name='/'
+++++++++++++[static] name='09'
+++++++++++[static] name='/'
 ++++++++++[spin button] name='Day' current=1.000000 minimum=1.000000 maximum=31.000000
-++++++++++++[text] name='01'
-++++++++++[text] name='/'
+++++++++++++[static] name='01'
+++++++++++[static] name='/'
 ++++++++++[spin button] name='Year' current=2008.000000 minimum=1.000000 maximum=275760.000000
-++++++++++++[text] name='2008'
+++++++++++++[static] name='2008'
 ++++++[push button] name='Show date picker'
 ++++++[document web] controlled-by
 ++++++++[section]
 ++++++++++[section]
 ++++++++++++[section]
 ++++++++++++++[push button] name='Show month selection panel'
-++++++++++++++++[text] name='September 2008'
+++++++++++++++++[static] name='September 2008'
 ++++++++++++++++[document frame]
 ++++++++++++[push button] name='Show previous month'
 ++++++++++++++[document frame]
@@ -28,18 +28,18 @@
 ++++++++++++[table] cols=0 headers=(NONE); rows=0 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++++++++++++[section]
 ++++++++++++++++[section]
-++++++++++++++++++[text] name='Sun'
+++++++++++++++++++[static] name='Sun'
 ++++++++++++++++[section]
-++++++++++++++++++[text] name='Mon'
+++++++++++++++++++[static] name='Mon'
 ++++++++++++++++[section]
-++++++++++++++++++[text] name='Tue'
+++++++++++++++++++[static] name='Tue'
 ++++++++++++++++[section]
-++++++++++++++++++[text] name='Wed'
+++++++++++++++++++[static] name='Wed'
 ++++++++++++++++[section]
-++++++++++++++++++[text] name='Thu'
+++++++++++++++++++[static] name='Thu'
 ++++++++++++++++[section]
-++++++++++++++++++[text] name='Fri'
+++++++++++++++++++[static] name='Fri'
 ++++++++++++++++[section]
-++++++++++++++++++[text] name='Sat'
+++++++++++++++++++[static] name='Sat'
 ++++++++++++++[section]
 ++++++++++++++++[section]
diff --git a/content/test/data/accessibility/html/input-datetime-local-expected-auralinux.txt b/content/test/data/accessibility/html/input-datetime-local-expected-auralinux.txt
index d054fb8..018703d8 100644
--- a/content/test/data/accessibility/html/input-datetime-local-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/input-datetime-local-expected-auralinux.txt
@@ -4,20 +4,20 @@
 ++++++[section]
 ++++++++[section]
 ++++++++++[spin button] name='Month' current=0.000000 minimum=1.000000 maximum=12.000000
-++++++++++++[text] name='mm'
-++++++++++[text] name='/'
+++++++++++++[static] name='mm'
+++++++++++[static] name='/'
 ++++++++++[spin button] name='Day' current=0.000000 minimum=1.000000 maximum=31.000000
-++++++++++++[text] name='dd'
-++++++++++[text] name='/'
+++++++++++++[static] name='dd'
+++++++++++[static] name='/'
 ++++++++++[spin button] name='Year' current=0.000000 minimum=1.000000 maximum=275760.000000
-++++++++++++[text] name='yyyy'
-++++++++++[text] name=', '
+++++++++++++[static] name='yyyy'
+++++++++++[static] name=', '
 ++++++++++[spin button] name='Hours' current=0.000000 minimum=1.000000 maximum=12.000000
-++++++++++++[text] name='--'
-++++++++++[text] name=':'
+++++++++++++[static] name='--'
+++++++++++[static] name=':'
 ++++++++++[spin button] name='Minutes' current=0.000000 minimum=0.000000 maximum=59.000000
-++++++++++++[text] name='--'
-++++++++++[text] name=' '
+++++++++++++[static] name='--'
+++++++++++[static] name=' '
 ++++++++++[spin button] name='AM/PM' current=0.000000 minimum=1.000000 maximum=2.000000
-++++++++++++[text] name='--'
+++++++++++++[static] name='--'
 ++++++[push button] name='Show date picker' haspopup:menu
diff --git a/content/test/data/accessibility/html/input-list-expected-auralinux.txt b/content/test/data/accessibility/html/input-list-expected-auralinux.txt
index 75e4014..d71ca83 100644
--- a/content/test/data/accessibility/html/input-list-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/input-list-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web] focusable focused
 ++[section]
 ++++[label] label-for
-++++++[text] name='Choose a pokemon '
+++++++[static] name='Choose a pokemon '
 ++++++[combo box] name='Choose a pokemon' editable focusable selectable-text labelled-by autocomplete:list haspopup:listbox
diff --git a/content/test/data/accessibility/html/input-month-expected-auralinux.txt b/content/test/data/accessibility/html/input-month-expected-auralinux.txt
index 23bc244..0be20d4 100644
--- a/content/test/data/accessibility/html/input-month-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/input-month-expected-auralinux.txt
@@ -4,8 +4,8 @@
 ++++++[section]
 ++++++++[section]
 ++++++++++[spin button] name='Month' valuetext:0 current=0.000000 minimum=1.000000 maximum=12.000000
-++++++++++++[text] name='---------'
-++++++++++[text] name=' '
+++++++++++++[static] name='---------'
+++++++++++[static] name=' '
 ++++++++++[spin button] name='Year' valuetext:0 current=0.000000 minimum=1.000000 maximum=275760.000000
-++++++++++++[text] name='----'
+++++++++++++[static] name='----'
 ++++++[push button] name='Show date picker' haspopup:menu
diff --git a/content/test/data/accessibility/html/input-radio-expected-auralinux.txt b/content/test/data/accessibility/html/input-radio-expected-auralinux.txt
index 8b447953..73e2485 100644
--- a/content/test/data/accessibility/html/input-radio-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/input-radio-expected-auralinux.txt
@@ -1,10 +1,10 @@
 [document web]
 ++[form]
 ++++[radio button] checkable:true
-++++[text] name='Radio1'
-++++[text] name='<newline>'
+++++[static] name='Radio1'
+++++[static] name='<newline>'
 ++++[radio button] checkable:true
-++++[text] name='Radio2'
+++++[static] name='Radio2'
 ++[form]
 ++++[radio button] name='Radio3' checkable:true
 ++++[radio button] name='Radio4' checked checkable:true
diff --git a/content/test/data/accessibility/html/input-radio-in-menu-expected-auralinux.txt b/content/test/data/accessibility/html/input-radio-in-menu-expected-auralinux.txt
index 93ae1dc..b94da3e 100644
--- a/content/test/data/accessibility/html/input-radio-in-menu-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/input-radio-in-menu-expected-auralinux.txt
@@ -1,9 +1,9 @@
 [document web]
 ++[section]
 ++++[radio menu item] checked checkable:true
-++++[text] name='Radio0 '
+++++[static] name='Radio0 '
 ++++[radio menu item] checkable:true
-++++[text] name='Radio1 '
+++++[static] name='Radio1 '
 ++++[radio button] name='Radio2' checkable:true xml-roles:radio
 ++[menu] xml-roles:menu
 ++++[radio button] name='Radio3' checkable:true xml-roles:radio
diff --git a/content/test/data/accessibility/html/input-submit-expected-auralinux.txt b/content/test/data/accessibility/html/input-submit-expected-auralinux.txt
index b7d90048..d9caef6 100644
--- a/content/test/data/accessibility/html/input-submit-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/input-submit-expected-auralinux.txt
@@ -7,8 +7,8 @@
 ++++[entry] editable focusable selectable-text text-input-type:text
 ++++[push button] name='First image button in a form is a valid default button' focusable default
 ++++++[image]
-++++++[text] name='First image button in a form is a valid default button'
+++++++[static] name='First image button in a form is a valid default button'
 ++++[push button] name='Second image button in a form not a valid default button' focusable
 ++++++[image]
-++++++[text] name='Second image button in a form not a valid default button'
+++++++[static] name='Second image button in a form not a valid default button'
 ++[push button] name='Submit outside of form not a valid default button' focusable
diff --git a/content/test/data/accessibility/html/input-text-value-expected-auralinux.txt b/content/test/data/accessibility/html/input-text-value-expected-auralinux.txt
index 61d3d3a..2725f22c 100644
--- a/content/test/data/accessibility/html/input-text-value-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/input-text-value-expected-auralinux.txt
@@ -1,15 +1,15 @@
 [document web]
 ++[section]
 ++++[label] label-for
-++++++[text] name='l1'
+++++++[static] name='l1'
 ++++[entry] name='l1' single-line labelled-by
 ++++[label] label-for
-++++++[text] name='l2'
+++++++[static] name='l2'
 ++++[entry] name='l2' single-line labelled-by
 ++++[entry] name='l2' single-line
 ++++[entry] name='l2' single-line
 ++++[label] label-for
-++++++[text] name='Email'
+++++++[static] name='Email'
 ++++[section] label-for
 ++++[entry] name='Email' single-line labelled-by
 ++++[entry] name='Email' single-line labelled-by
diff --git a/content/test/data/accessibility/html/input-time-expected-auralinux.txt b/content/test/data/accessibility/html/input-time-expected-auralinux.txt
index 2887c00..8aedaa9 100644
--- a/content/test/data/accessibility/html/input-time-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/input-time-expected-auralinux.txt
@@ -4,21 +4,21 @@
 ++++++[section]
 ++++++++[section]
 ++++++++++[spin button] name='Hours' xml-roles:spinbutton current=12.000000 minimum=1.000000 maximum=12.000000
-++++++++++++[text] name='12'
-++++++++++[text] name=':'
+++++++++++++[static] name='12'
+++++++++++[static] name=':'
 ++++++++++[spin button] name='Minutes' xml-roles:spinbutton current=0.000000 minimum=0.000000 maximum=59.000000
-++++++++++++[text] name='00'
-++++++++++[text] name=' '
+++++++++++++[static] name='00'
+++++++++++[static] name=' '
 ++++++++++[spin button] name='AM/PM' xml-roles:spinbutton current=1.000000 minimum=1.000000 maximum=2.000000
-++++++++++++[text] name='AM'
+++++++++++++[static] name='AM'
 ++++[dateeditor] name='Breakfast'
 ++++++[section]
 ++++++++[section]
 ++++++++++[spin button] name='Hours Breakfast' xml-roles:spinbutton current=12.000000 minimum=1.000000 maximum=12.000000
-++++++++++++[text] name='12'
-++++++++++[text] name=':'
+++++++++++++[static] name='12'
+++++++++++[static] name=':'
 ++++++++++[spin button] name='Minutes Breakfast' xml-roles:spinbutton current=0.000000 minimum=0.000000 maximum=59.000000
-++++++++++++[text] name='00'
-++++++++++[text] name=' '
+++++++++++++[static] name='00'
+++++++++++[static] name=' '
 ++++++++++[spin button] name='AM/PM Breakfast' xml-roles:spinbutton current=1.000000 minimum=1.000000 maximum=2.000000
-++++++++++++[text] name='AM'
\ No newline at end of file
+++++++++++++[static] name='AM'
diff --git a/content/test/data/accessibility/html/input-types-expected-auralinux.txt b/content/test/data/accessibility/html/input-types-expected-auralinux.txt
index b563d75..9502421 100644
--- a/content/test/data/accessibility/html/input-types-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/input-types-expected-auralinux.txt
@@ -1,52 +1,52 @@
 [document web]
 ++[section]
 ++++[label] label-for
-++++++[text] name='Default: '
+++++++[static] name='Default: '
 ++++++[entry] name='Default:' selectable-text labelled-by
 ++++[label] label-for
-++++++[text] name='Button: '
+++++++[static] name='Button: '
 ++++++[push button] name='Button:' labelled-by
 ++++[check box] name='Checkbox:' checkable:true
 ++++[label] label-for
-++++++[text] name='Color: '
+++++++[static] name='Color: '
 ++++++[push button] name='Color:' labelled-by
 ++++[label] label-for
-++++++[text] name='Email: '
+++++++[static] name='Email: '
 ++++++[entry] name='Email:' selectable-text labelled-by text-input-type:email
 ++++[label] label-for
-++++++[text] name='File: '
+++++++[static] name='File: '
 ++++++[push button] name='File:' labelled-by
 ++++++++[push button] name='Choose File'
 ++++[label] label-for
-++++++[text] name='Image: '
+++++++[static] name='Image: '
 ++++++[push button] name='Image:' labelled-by
 ++++++++[image]
-++++++++[text] name='Submit'
+++++++++[static] name='Submit'
 ++++[label] label-for
-++++++[text] name='Number: '
+++++++[static] name='Number: '
 ++++++[spin button] name='Number:' selectable-text labelled-by text-input-type:number current=0.000000 minimum=0.000000 maximum=0.000000
 ++++[label] label-for
-++++++[text] name='Password: '
+++++++[static] name='Password: '
 ++++++[password text] name='Password:' selectable-text labelled-by text-input-type:password
 ++++[radio button] name='Radio:' checkable:true
 ++++[label] label-for
-++++++[text] name='Range: '
+++++++[static] name='Range: '
 ++++++[slider] name='Range:' horizontal labelled-by current=50.000000 minimum=0.000000 maximum=100.000000
 ++++[label] label-for
-++++++[text] name='Reset: '
+++++++[static] name='Reset: '
 ++++++[push button] name='Reset:' labelled-by
 ++++[label] label-for
-++++++[text] name='Search: '
+++++++[static] name='Search: '
 ++++++[entry] name='Search:' selectable-text labelled-by text-input-type:search
 ++++[label] label-for
-++++++[text] name='Submit: '
+++++++[static] name='Submit: '
 ++++++[push button] name='Submit:' labelled-by
 ++++[label] label-for
-++++++[text] name='Tel: '
+++++++[static] name='Tel: '
 ++++++[entry] name='Tel:' selectable-text labelled-by text-input-type:tel
 ++++[label] label-for
-++++++[text] name='Text: '
+++++++[static] name='Text: '
 ++++++[entry] name='Text:' selectable-text labelled-by text-input-type:text
 ++++[label] label-for
-++++++[text] name='Url: '
+++++++[static] name='Url: '
 ++++++[entry] name='Url:' selectable-text labelled-by text-input-type:url
diff --git a/content/test/data/accessibility/html/input-week-expected-auralinux.txt b/content/test/data/accessibility/html/input-week-expected-auralinux.txt
index ed8ce50..8977e60 100644
--- a/content/test/data/accessibility/html/input-week-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/input-week-expected-auralinux.txt
@@ -3,10 +3,10 @@
 ++++[dateeditor]
 ++++++[section]
 ++++++++[section]
-++++++++++[text] name='Week '
+++++++++++[static] name='Week '
 ++++++++++[spin button] name='Week' current=0.000000 minimum=1.000000 maximum=53.000000
-++++++++++++[text] name='--'
-++++++++++[text] name=', '
+++++++++++++[static] name='--'
+++++++++++[static] name=', '
 ++++++++++[spin button] name='Year' current=0.000000 minimum=1.000000 maximum=275760.000000
-++++++++++++[text] name='----'
+++++++++++++[static] name='----'
 ++++++[push button] name='Show date picker' haspopup:menu
diff --git a/content/test/data/accessibility/html/ins-expected-auralinux.txt b/content/test/data/accessibility/html/ins-expected-auralinux.txt
index ef81f6b..39bcc4f 100644
--- a/content/test/data/accessibility/html/ins-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/ins-expected-auralinux.txt
@@ -1,9 +1,9 @@
 [document web]
 ++[paragraph]
-++++[text] name='My favorite browser is '
+++++[static] name='My favorite browser is '
 ++++[content deletion]
-++++++[text] name='ABC'
-++++[text] name=' '
+++++++[static] name='ABC'
+++++[static] name=' '
 ++++[content insertion]
-++++++[text] name='Chrome'
-++++[text] name='!'
+++++++[static] name='Chrome'
+++++[static] name='!'
diff --git a/content/test/data/accessibility/html/label-expected-auralinux.txt b/content/test/data/accessibility/html/label-expected-auralinux.txt
index ea3c90b..e838b0e 100644
--- a/content/test/data/accessibility/html/label-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/label-expected-auralinux.txt
@@ -1,4 +1,4 @@
 [document web]
 ++[section]
 ++++[label]
-++++++[text] name='Label'
+++++++[static] name='Label'
diff --git a/content/test/data/accessibility/html/landmark-expected-auralinux.txt b/content/test/data/accessibility/html/landmark-expected-auralinux.txt
index 93e1550..dfbaf8d 100644
--- a/content/test/data/accessibility/html/landmark-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/landmark-expected-auralinux.txt
@@ -1,149 +1,149 @@
 [document web]
 ++[landmark] xml-roles:banner
-++++[text] name='This is a header element.'
+++++[static] name='This is a header element.'
 ++[landmark] xml-roles:complementary
-++++[text] name='This is an aside element.'
+++++[static] name='This is an aside element.'
 ++[section]
-++++[text] name='This is an address element.'
+++++[static] name='This is an address element.'
 ++[landmark] xml-roles:contentinfo
-++++[text] name='This is a footer element.'
+++++[static] name='This is a footer element.'
 ++[form]
-++++[text] name='This is a form element.'
+++++[static] name='This is a form element.'
 ++[landmark] xml-roles:main
-++++[text] name='This is a main element.'
+++++[static] name='This is a main element.'
 ++[landmark] xml-roles:navigation
-++++[text] name='This is a nav element.'
+++++[static] name='This is a nav element.'
 ++[embedded component] xml-roles:application
-++++[text] name='This is an ARIA application landmark.'
+++++[static] name='This is an ARIA application landmark.'
 ++[landmark] xml-roles:banner
-++++[text] name='This is an ARIA banner landmark.'
+++++[static] name='This is an ARIA banner landmark.'
 ++[landmark] xml-roles:complementary
-++++[text] name='This is an ARIA complementary landmark.'
+++++[static] name='This is an ARIA complementary landmark.'
 ++[landmark] xml-roles:contentinfo
-++++[text] name='This is an ARIA contentinfo landmark.'
+++++[static] name='This is an ARIA contentinfo landmark.'
 ++[form] xml-roles:form
-++++[text] name='This is an ARIA form landmark.'
+++++[static] name='This is an ARIA form landmark.'
 ++[landmark] xml-roles:main
-++++[text] name='This is an ARIA main landmark.'
+++++[static] name='This is an ARIA main landmark.'
 ++[landmark] xml-roles:navigation
-++++[text] name='This is an ARIA navigation landmark.'
+++++[static] name='This is an ARIA navigation landmark.'
 ++[landmark] xml-roles:search
-++++[text] name='This is an ARIA search landmark.'
+++++[static] name='This is an ARIA search landmark.'
 ++[article] xml-roles:article
 ++++[section]
-++++++[text] name='This should NOT banner role.'
+++++++[static] name='This should NOT banner role.'
 ++[landmark] xml-roles:complementary
 ++++[section]
-++++++[text] name='This should NOT have banner role.'
+++++++[static] name='This should NOT have banner role.'
 ++[landmark] xml-roles:navigation
 ++++[section]
-++++++[text] name='This should NOT have banner role.'
+++++++[static] name='This should NOT have banner role.'
 ++[section] xml-roles:region
 ++++[section]
-++++++[text] name='This should NOT have banner role.'
+++++++[static] name='This should NOT have banner role.'
 ++[block quote]
 ++++[section]
-++++++[text] name='This should NOT have banner role.'
+++++++[static] name='This should NOT have banner role.'
 ++[panel]
 ++++[toggle button] name='Details'
-++++++[text] name='Details'
+++++++[static] name='Details'
 ++[panel]
 ++++[section]
-++++++[text] name='This should NOT have banner role.'
+++++++[static] name='This should NOT have banner role.'
 ++[panel] xml-roles:figure
 ++++[section]
-++++++[text] name='This should NOT have banner role.'
+++++++[static] name='This should NOT have banner role.'
 ++[panel] xml-roles:group
 ++++[section]
-++++++[text] name='This should NOT have banner role.'
+++++++[static] name='This should NOT have banner role.'
 ++[landmark] xml-roles:main
 ++++[section]
-++++++[text] name='This should NOT have banner role.'
+++++++[static] name='This should NOT have banner role.'
 ++[article] xml-roles:article
 ++++[section]
-++++++[text] name='This should NOT banner role.'
+++++++[static] name='This should NOT banner role.'
 ++[landmark] xml-roles:complementary
 ++++[section]
-++++++[text] name='This should NOT have banner role.'
+++++++[static] name='This should NOT have banner role.'
 ++[landmark] xml-roles:navigation
 ++++[section]
-++++++[text] name='This should NOT have banner role.'
+++++++[static] name='This should NOT have banner role.'
 ++[section] xml-roles:region
 ++++[section]
-++++++[text] name='This should NOT have banner role.'
+++++++[static] name='This should NOT have banner role.'
 ++[block quote]
 ++++[section]
-++++++[text] name='This should NOT have banner role.'
+++++++[static] name='This should NOT have banner role.'
 ++[panel]
 ++++[toggle button] name='Details'
-++++++[text] name='Details'
+++++++[static] name='Details'
 ++[panel]
 ++++[section]
-++++++[text] name='This should NOT have banner role.'
+++++++[static] name='This should NOT have banner role.'
 ++[panel] xml-roles:figure
 ++++[section]
-++++++[text] name='This should NOT have banner role.'
+++++++[static] name='This should NOT have banner role.'
 ++[section]
-++++[text] name='This should NOT have banner role.'
+++++[static] name='This should NOT have banner role.'
 ++[landmark] xml-roles:main
 ++++[section]
-++++++[text] name='This should NOT have banner role.'
+++++++[static] name='This should NOT have banner role.'
 ++[article] xml-roles:article
 ++++[section]
-++++++[text] name='This should NOT footer role.'
+++++++[static] name='This should NOT footer role.'
 ++[landmark] xml-roles:complementary
 ++++[section]
-++++++[text] name='This should NOT have footer role.'
+++++++[static] name='This should NOT have footer role.'
 ++[landmark] xml-roles:navigation
 ++++[section]
-++++++[text] name='This should NOT have footer role.'
+++++++[static] name='This should NOT have footer role.'
 ++[section] xml-roles:region
 ++++[section]
-++++++[text] name='This should NOT have footer role.'
+++++++[static] name='This should NOT have footer role.'
 ++[block quote]
 ++++[section]
-++++++[text] name='This should NOT have footer role.'
+++++++[static] name='This should NOT have footer role.'
 ++[panel]
 ++++[toggle button] name='Details'
-++++++[text] name='Details'
+++++++[static] name='Details'
 ++[panel]
 ++++[section]
-++++++[text] name='This should NOT have footer role.'
+++++++[static] name='This should NOT have footer role.'
 ++[panel] xml-roles:figure
 ++++[section]
-++++++[text] name='This should NOT have footer role.'
+++++++[static] name='This should NOT have footer role.'
 ++[section]
-++++[text] name='This should NOT have footer role.'
+++++[static] name='This should NOT have footer role.'
 ++[landmark] xml-roles:main
 ++++[section]
-++++++[text] name='This should NOT have footer role.'
+++++++[static] name='This should NOT have footer role.'
 ++[article] xml-roles:article
 ++++[section]
-++++++[text] name='This should NOT footer role.'
+++++++[static] name='This should NOT footer role.'
 ++[landmark] xml-roles:complementary
 ++++[section]
-++++++[text] name='This should NOT have footer role.'
+++++++[static] name='This should NOT have footer role.'
 ++[landmark] xml-roles:navigation
 ++++[section]
-++++++[text] name='This should NOT have footer role.'
+++++++[static] name='This should NOT have footer role.'
 ++[section] xml-roles:region
 ++++[section]
-++++++[text] name='This should NOT have footer role.'
+++++++[static] name='This should NOT have footer role.'
 ++[block quote]
 ++++[section]
-++++++[text] name='This should NOT have footer role.'
+++++++[static] name='This should NOT have footer role.'
 ++[panel]
 ++++[toggle button] name='Details'
-++++++[text] name='Details'
+++++++[static] name='Details'
 ++[panel]
 ++++[section]
-++++++[text] name='This should NOT have footer role.'
+++++++[static] name='This should NOT have footer role.'
 ++[panel] xml-roles:figure
 ++++[section]
-++++++[text] name='This should NOT have footer role.'
+++++++[static] name='This should NOT have footer role.'
 ++[panel] xml-roles:group
 ++++[section]
-++++++[text] name='This should NOT have footer role.'
+++++++[static] name='This should NOT have footer role.'
 ++[landmark] xml-roles:main
 ++++[section]
-++++++[text] name='This should NOT have footer role.'
+++++++[static] name='This should NOT have footer role.'
diff --git a/content/test/data/accessibility/html/legend-expected-auralinux.txt b/content/test/data/accessibility/html/legend-expected-auralinux.txt
index 9b52186..567bf495 100644
--- a/content/test/data/accessibility/html/legend-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/legend-expected-auralinux.txt
@@ -2,8 +2,8 @@
 ++[form]
 ++++[panel] name='Browser Engines:' labelled-by
 ++++++[label] label-for
-++++++++[text] name='Browser Engines:'
-++++++[text] name='Browser: '
+++++++++[static] name='Browser Engines:'
+++++++[static] name='Browser: '
 ++++++[entry] editable focusable single-line selectable-text
-++++++[text] name=' Rendering Engine: '
+++++++[static] name=' Rendering Engine: '
 ++++++[entry] editable focusable single-line selectable-text
diff --git a/content/test/data/accessibility/html/li-expected-auralinux.txt b/content/test/data/accessibility/html/li-expected-auralinux.txt
index 8ddbd7ec..db075a4 100644
--- a/content/test/data/accessibility/html/li-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/li-expected-auralinux.txt
@@ -2,10 +2,10 @@
 ++[list] display:block setsize:3
 ++++[list item] display:list-item posinset:1 setsize:3
 ++++++[static] name='• '
-++++++[text] name='Item 1' display:list-item
+++++++[static] name='Item 1' display:list-item
 ++++[list item] display:list-item posinset:2 setsize:3
 ++++++[static] name='• '
-++++++[text] name='Item 2' display:list-item
+++++++[static] name='Item 2' display:list-item
 ++++[list item] display:list-item posinset:3 setsize:3
 ++++++[static] name='• '
-++++++[text] name='Item 3' display:list-item
+++++++[static] name='Item 3' display:list-item
diff --git a/content/test/data/accessibility/html/link-inside-heading-expected-auralinux.txt b/content/test/data/accessibility/html/link-inside-heading-expected-auralinux.txt
index 981ca104..3da9083 100644
--- a/content/test/data/accessibility/html/link-inside-heading-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/link-inside-heading-expected-auralinux.txt
@@ -1,4 +1,4 @@
 [document web]
 ++[heading] name='Link In Heading'
 ++++[link] name='Link In Heading'
-++++++[text] name='Link In Heading'
+++++++[static] name='Link In Heading'
diff --git a/content/test/data/accessibility/html/list-expected-auralinux.txt b/content/test/data/accessibility/html/list-expected-auralinux.txt
index 5979c752..fc2f2d5 100644
--- a/content/test/data/accessibility/html/list-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/list-expected-auralinux.txt
@@ -2,19 +2,19 @@
 ++[list]
 ++++[list item]
 ++++++[static] name='• '
-++++++[text] name='tic'
+++++++[static] name='tic'
 ++++[list item]
 ++++++[static] name='• '
-++++++[text] name='tac'
+++++++[static] name='tac'
 ++++[list item]
 ++++++[static] name='• '
-++++++[text] name='toe'
+++++++[static] name='toe'
 ++[list]
 ++++[list item]
-++++++[text] name='tic'
-++++[text] name=' '
+++++++[static] name='tic'
+++++[static] name=' '
 ++++[list item]
-++++++[text] name='tac'
-++++[text] name=' '
+++++++[static] name='tac'
+++++[static] name=' '
 ++++[list item]
-++++++[text] name='toe'
+++++++[static] name='toe'
diff --git a/content/test/data/accessibility/html/list-markers-expected-auralinux.txt b/content/test/data/accessibility/html/list-markers-expected-auralinux.txt
index 189d8a4..190fbbec 100644
--- a/content/test/data/accessibility/html/list-markers-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/list-markers-expected-auralinux.txt
@@ -2,16 +2,16 @@
 ++[list]
 ++++[list item]
 ++++++[static] name='• '
-++++++[text] name='First item properly groups itself despite '
-++++++[text] name='bolded'
-++++++[text] name=' text.'
+++++++[static] name='First item properly groups itself despite '
+++++++[static] name='bolded'
+++++++[static] name=' text.'
 ++++[list item]
 ++++++[static] name='• '
-++++++[text] name='This should also be '
-++++++[text] name='seen'
-++++++[text] name=' as a group.'
+++++++[static] name='This should also be '
+++++++[static] name='seen'
+++++++[static] name=' as a group.'
 ++++[list item]
 ++++++[static] name='• '
-++++++[text] name='Some '
-++++++[text] name='more'
-++++++[text] name=' text.'
+++++++[static] name='Some '
+++++++[static] name='more'
+++++++[static] name=' text.'
diff --git a/content/test/data/accessibility/html/main-expected-auralinux.txt b/content/test/data/accessibility/html/main-expected-auralinux.txt
index 385eb48..3f3028f 100644
--- a/content/test/data/accessibility/html/main-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/main-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web]
 ++[landmark] xml-roles:main
-++++[text] name='This is main element.'
+++++[static] name='This is main element.'
 ++[landmark] xml-roles:main
-++++[text] name='This is an ARIA role main.'
+++++[static] name='This is an ARIA role main.'
diff --git a/content/test/data/accessibility/html/mark-expected-auralinux.txt b/content/test/data/accessibility/html/mark-expected-auralinux.txt
index 6a5eeb9d..7e77116 100644
--- a/content/test/data/accessibility/html/mark-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/mark-expected-auralinux.txt
@@ -1,6 +1,6 @@
 [document web]
 ++[paragraph]
-++++[text] name='This test is to check '
+++++[static] name='This test is to check '
 ++++[static]
-++++++[text] name='mark tag'
-++++[text] name='.'
+++++++[static] name='mark tag'
+++++[static] name='.'
diff --git a/content/test/data/accessibility/html/math-expected-auralinux.txt b/content/test/data/accessibility/html/math-expected-auralinux.txt
index e9f3a6d..1f1ee9f1 100644
--- a/content/test/data/accessibility/html/math-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/math-expected-auralinux.txt
@@ -1,10 +1,10 @@
 [document web]
 ++[section]
 ++++[math]
-++++++[text] name='a'
-++++++[text] name='2'
-++++++[text] name=' '
-++++++[text] name='+'
-++++++[text] name=' '
-++++++[text] name='b'
-++++++[text] name='2'
+++++++[static] name='a'
+++++++[static] name='2'
+++++++[static] name=' '
+++++++[static] name='+'
+++++++[static] name=' '
+++++++[static] name='b'
+++++++[static] name='2'
diff --git a/content/test/data/accessibility/html/modal-dialog-closed-expected-auralinux.txt b/content/test/data/accessibility/html/modal-dialog-closed-expected-auralinux.txt
index 8b14944..9ea1ce3 100644
--- a/content/test/data/accessibility/html/modal-dialog-closed-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/modal-dialog-closed-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web]
-++[text] name='Test that elements respawn in the accessibility tree after a modal dialog closes.'
+++[static] name='Test that elements respawn in the accessibility tree after a modal dialog closes.'
 ++[section]
 ++++[combo box] expandable haspopup:menu
 ++++++[menu]
diff --git a/content/test/data/accessibility/html/modal-dialog-opened-expected-auralinux.txt b/content/test/data/accessibility/html/modal-dialog-opened-expected-auralinux.txt
index 6a184f3..bd9a359 100644
--- a/content/test/data/accessibility/html/modal-dialog-opened-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/modal-dialog-opened-expected-auralinux.txt
@@ -1,6 +1,6 @@
 [document web]
 ++[section]
 ++[dialog] modal
-++++[text] name='The dialog subtree should be the only text content in the accessibility tree. '
+++++[static] name='The dialog subtree should be the only text content in the accessibility tree. '
 ++++[link] name='Link inside the dialog.'
-++++++[text] name='Link inside the dialog.'
+++++++[static] name='Link inside the dialog.'
diff --git a/content/test/data/accessibility/html/modal-dialog-stack-expected-auralinux.txt b/content/test/data/accessibility/html/modal-dialog-stack-expected-auralinux.txt
index 7a0a189..99a1c2c 100644
--- a/content/test/data/accessibility/html/modal-dialog-stack-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/modal-dialog-stack-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web]
 ++[section]
 ++[dialog] modal
-++++[text] name='This is the now active dialog. Of course it should be in the tree. '
+++++[static] name='This is the now active dialog. Of course it should be in the tree. '
 ++++[push button] name='This is in the active dialog and should be in the tree.'
diff --git a/content/test/data/accessibility/html/navigation-expected-auralinux.txt b/content/test/data/accessibility/html/navigation-expected-auralinux.txt
index 2e306a7a..25997f6 100644
--- a/content/test/data/accessibility/html/navigation-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/navigation-expected-auralinux.txt
@@ -1,4 +1,4 @@
 [document web]
 ++[landmark] xml-roles:navigation
 ++++[link] name='Don't click on me'
-++++++[text] name='Don't click on me'
+++++++[static] name='Don't click on me'
diff --git a/content/test/data/accessibility/html/ol-expected-auralinux.txt b/content/test/data/accessibility/html/ol-expected-auralinux.txt
index 7ba3e99f..81c0ab4 100644
--- a/content/test/data/accessibility/html/ol-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/ol-expected-auralinux.txt
@@ -2,20 +2,20 @@
 ++[list]
 ++++[list item]
 ++++++[static] name='1. '
-++++++[text] name='Chrome'
+++++++[static] name='Chrome'
 ++++[list item]
 ++++++[static] name='2. '
-++++++[text] name='Safari'
+++++++[static] name='Safari'
 ++++[list item]
 ++++++[static] name='3. '
-++++++[text] name='IE'
+++++++[static] name='IE'
 ++[list]
 ++++[list item]
 ++++++[static] name='10. '
-++++++[text] name='Android'
+++++++[static] name='Android'
 ++++[list item]
 ++++++[static] name='11. '
-++++++[text] name='Mac'
+++++++[static] name='Mac'
 ++++[list item]
 ++++++[static] name='12. '
-++++++[text] name='Windows'
+++++++[static] name='Windows'
diff --git a/content/test/data/accessibility/html/optgroup-expected-auralinux.txt b/content/test/data/accessibility/html/optgroup-expected-auralinux.txt
index 64b1d73..b90d438 100644
--- a/content/test/data/accessibility/html/optgroup-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/optgroup-expected-auralinux.txt
@@ -2,13 +2,13 @@
 ++[section] enabled
 ++++[list box] enabled setsize:8
 ++++++[panel] name='Enabled' enabled setsize:0 xml-roles:group
-++++++++[text] name='Enabled' enabled
+++++++++[static] name='Enabled' enabled
 ++++++[list item] name='One' enabled selectable posinset:1 setsize:8
 ++++++[list item] name='Two' enabled selectable posinset:2 setsize:8
 ++++++[list item] name='Three' enabled selectable posinset:3 setsize:8
 ++++++[list item] name='Four' enabled selectable posinset:4 setsize:8
 ++++++[panel] name='Disabled' enabled setsize:0 xml-roles:group
-++++++++[text] name='Disabled' enabled
+++++++++[static] name='Disabled' enabled
 ++++++[list item] name='One' posinset:5 setsize:8
 ++++++[list item] name='Two' posinset:6 setsize:8
 ++++++[list item] name='Three' posinset:7 setsize:8
diff --git a/content/test/data/accessibility/html/p-expected-auralinux.txt b/content/test/data/accessibility/html/p-expected-auralinux.txt
index 718bc482..5131f1e 100644
--- a/content/test/data/accessibility/html/p-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/p-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web]
-++[text] name='Before'
+++[static] name='Before'
 ++[paragraph]
-++++[text] name='Paragraph'
-++[text] name='After'
+++++[static] name='Paragraph'
+++[static] name='After'
diff --git a/content/test/data/accessibility/html/pre-expected-auralinux.txt b/content/test/data/accessibility/html/pre-expected-auralinux.txt
index 098f82c..c093fce 100644
--- a/content/test/data/accessibility/html/pre-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/pre-expected-auralinux.txt
@@ -1,9 +1,9 @@
 [document web]
 ++[section]
-++++[text] name='This test is to check   pre<newline>formatting.'
+++++[static] name='This test is to check   pre<newline>formatting.'
 ++[section]
-++++[text] name='This test is to check   pre<newline>formatting'
+++++[static] name='This test is to check   pre<newline>formatting'
 ++[section]
-++++[text] name='This test is to check   pre<newline>formatting.'
+++++[static] name='This test is to check   pre<newline>formatting.'
 ++[section]
-++++[text] name='This test is to check pre formatting.'
+++++[static] name='This test is to check pre formatting.'
diff --git a/content/test/data/accessibility/html/q-expected-auralinux.txt b/content/test/data/accessibility/html/q-expected-auralinux.txt
index 7100a91..c33550a 100644
--- a/content/test/data/accessibility/html/q-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/q-expected-auralinux.txt
@@ -1,7 +1,7 @@
 [document web]
 ++[paragraph]
-++++[text] name='This is '
-++++[text] name='"'
-++++[text] name='Chromium Blink'
-++++[text] name='"'
-++++[text] name=' based browser.'
+++++[static] name='This is '
+++++[static] name='"'
+++++[static] name='Chromium Blink'
+++++[static] name='"'
+++++[static] name=' based browser.'
diff --git a/content/test/data/accessibility/html/ruby-expected-auralinux.txt b/content/test/data/accessibility/html/ruby-expected-auralinux.txt
index 5c8f462..0fbf4855 100644
--- a/content/test/data/accessibility/html/ruby-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/ruby-expected-auralinux.txt
@@ -2,5 +2,5 @@
 ++[section]
 ++++[static]
 ++++++[panel]
-++++++++[text] name='ruby text'
-++++++[text] name='ruby base'
+++++++++[static] name='ruby text'
+++++++[static] name='ruby base'
diff --git a/content/test/data/accessibility/html/s-expected-auralinux.txt b/content/test/data/accessibility/html/s-expected-auralinux.txt
index 39d97b1..8ed215f 100644
--- a/content/test/data/accessibility/html/s-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/s-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[section]
-++++[text] name='My car is blue.'
+++++[static] name='My car is blue.'
diff --git a/content/test/data/accessibility/html/samp-expected-auralinux.txt b/content/test/data/accessibility/html/samp-expected-auralinux.txt
index b2de3eff..80e948e 100644
--- a/content/test/data/accessibility/html/samp-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/samp-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[section]
-++++[text] name='Sample output from a computer program'
+++++[static] name='Sample output from a computer program'
diff --git a/content/test/data/accessibility/html/section-expected-auralinux.txt b/content/test/data/accessibility/html/section-expected-auralinux.txt
index 4b69fd55f..8e8d1a2 100644
--- a/content/test/data/accessibility/html/section-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/section-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web]
 ++[section] xml-roles:region
-++++[text] name='This is a section element.'
+++++[static] name='This is a section element.'
 ++[landmark] name='section' xml-roles:region
-++++[text] name='This is a named section element.'
+++++[static] name='This is a named section element.'
diff --git a/content/test/data/accessibility/html/small-expected-auralinux.txt b/content/test/data/accessibility/html/small-expected-auralinux.txt
index 140e0d4..658f312 100644
--- a/content/test/data/accessibility/html/small-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/small-expected-auralinux.txt
@@ -1,4 +1,4 @@
 [document web]
 ++[paragraph]
-++++[text] name='Chromium'
-++++[text] name='open source project'
+++++[static] name='Chromium'
+++++[static] name='open source project'
diff --git a/content/test/data/accessibility/html/source-expected-auralinux.txt b/content/test/data/accessibility/html/source-expected-auralinux.txt
index c9866f0a..9f30f2d 100644
--- a/content/test/data/accessibility/html/source-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/source-expected-auralinux.txt
@@ -5,8 +5,8 @@
 ++++++++[tool bar] name='audio' description='audio' horizontal
 ++++++++++[tool bar] name='audio' description='audio' horizontal
 ++++++++++++[push button] name='play' focusable
-++++++++++++[text] name='0:00'
-++++++++++++[text] name='/ 0:00'
+++++++++++++[static] name='0:00'
+++++++++++++[static] name='/ 0:00'
 ++++++++++++[slider] description='audio time scrubber' focusable horizontal
 ++++++++++++[section]
 ++++++++++++++[section]
diff --git a/content/test/data/accessibility/html/span-expected-auralinux.txt b/content/test/data/accessibility/html/span-expected-auralinux.txt
index e8bdc30..d42d3d6 100644
--- a/content/test/data/accessibility/html/span-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/span-expected-auralinux.txt
@@ -1,70 +1,70 @@
 [document web]
 ++[paragraph]
-++++[text] name='This'
-++++[text] name=' '
-++++[text] name='paragraph has '
-++++[text] name='text'
-++++[text] name=' '
-++++[text] name='in'
-++++[text] name=' '
-++++[text] name='spans'
-++++[text] name='.'
+++++[static] name='This'
+++++[static] name=' '
+++++[static] name='paragraph has '
+++++[static] name='text'
+++++[static] name=' '
+++++[static] name='in'
+++++[static] name=' '
+++++[static] name='spans'
+++++[static] name='.'
 ++[paragraph]
-++++[text] name='E1. Eat'
-++++[text] name=' '
+++++[static] name='E1. Eat'
+++++[static] name=' '
 ++++[link] name='space'
-++++++[text] name='space'
+++++++[static] name='space'
 ++[paragraph]
-++++[text] name='E2. Eat'
-++++[text] name=' '
+++++[static] name='E2. Eat'
+++++[static] name=' '
 ++++[link] name='space'
-++++++[text] name='space'
+++++++[static] name='space'
 ++[paragraph]
-++++[text] name='E3. Eat'
-++++[text] name=' '
+++++[static] name='E3. Eat'
+++++[static] name=' '
 ++++[link] name='space'
-++++++[text] name='space'
+++++++[static] name='space'
 ++[paragraph]
 ++++[link] name='E4. Eat'
-++++++[text] name='E4. Eat'
-++++[text] name=' '
-++++[text] name='space'
+++++++[static] name='E4. Eat'
+++++[static] name=' '
+++++[static] name='space'
 ++[paragraph]
 ++++[link] name='E5. Eat'
-++++++[text] name='E5. Eat'
-++++[text] name=' '
-++++[text] name='space'
+++++++[static] name='E5. Eat'
+++++[static] name=' '
+++++[static] name='space'
 ++[paragraph]
 ++++[link] name='E6. Eat'
-++++++[text] name='E6. Eat'
-++++[text] name=' '
-++++[text] name='space'
+++++++[static] name='E6. Eat'
+++++[static] name=' '
+++++[static] name='space'
 ++[paragraph]
-++++[text] name='K1. Keep'
-++++[text] name=' '
-++++[text] name='space'
+++++[static] name='K1. Keep'
+++++[static] name=' '
+++++[static] name='space'
 ++[paragraph]
-++++[text] name='K2. Keep'
-++++[text] name=' '
-++++[text] name='space'
+++++[static] name='K2. Keep'
+++++[static] name=' '
+++++[static] name='space'
 ++[paragraph]
-++++[text] name='K3. Keep'
-++++[text] name=' '
-++++[text] name='space'
+++++[static] name='K3. Keep'
+++++[static] name=' '
+++++[static] name='space'
 ++[paragraph]
-++++[text] name='K4. Keep '
-++++[text] name='space'
+++++[static] name='K4. Keep '
+++++[static] name='space'
 ++[paragraph]
-++++[text] name='K5. Keep'
-++++[text] name=' '
-++++[text] name='space'
+++++[static] name='K5. Keep'
+++++[static] name=' '
+++++[static] name='space'
 ++[paragraph]
-++++[text] name='K6. Keep '
-++++[text] name='space'
+++++[static] name='K6. Keep '
+++++[static] name='space'
 ++[paragraph]
-++++[text] name='K7. Keep'
-++++[text] name=' space'
+++++[static] name='K7. Keep'
+++++[static] name=' space'
 ++[paragraph]
-++++[text] name='K8. Keep'
-++++[text] name=' '
-++++[text] name='space'
+++++[static] name='K8. Keep'
+++++[static] name=' '
+++++[static] name='space'
diff --git a/content/test/data/accessibility/html/strong-expected-auralinux.txt b/content/test/data/accessibility/html/strong-expected-auralinux.txt
index c056af1e..54276bb0 100644
--- a/content/test/data/accessibility/html/strong-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/strong-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[section]
-++++[text] name='Strong text'
+++++[static] name='Strong text'
diff --git a/content/test/data/accessibility/html/sub-expected-auralinux.txt b/content/test/data/accessibility/html/sub-expected-auralinux.txt
index 5d75f9c..2a3afdb 100644
--- a/content/test/data/accessibility/html/sub-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/sub-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web]
 ++[paragraph]
-++++[text] name='This text contains '
+++++[static] name='This text contains '
 ++++[subscript] name='subscript'
-++++[text] name=' text.'
+++++[static] name=' text.'
diff --git a/content/test/data/accessibility/html/summary-expected-auralinux.txt b/content/test/data/accessibility/html/summary-expected-auralinux.txt
index a4032a4..3ffe0f9 100644
--- a/content/test/data/accessibility/html/summary-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/summary-expected-auralinux.txt
@@ -1,4 +1,4 @@
 [document web]
 ++[panel]
 ++++[toggle button] name='details tag'
-++++++[text] name='details tag'
+++++++[static] name='details tag'
diff --git a/content/test/data/accessibility/html/sup-expected-auralinux.txt b/content/test/data/accessibility/html/sup-expected-auralinux.txt
index 50beb15..d0eb721 100644
--- a/content/test/data/accessibility/html/sup-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/sup-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web]
 ++[paragraph]
-++++[text] name='This text contains'
+++++[static] name='This text contains'
 ++++[superscript] name='superscript'
-++++[text] name='text.'
+++++[static] name='text.'
diff --git a/content/test/data/accessibility/html/svg-expected-auralinux.txt b/content/test/data/accessibility/html/svg-expected-auralinux.txt
index d7ff00d3..fde7d78 100644
--- a/content/test/data/accessibility/html/svg-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/svg-expected-auralinux.txt
@@ -2,4 +2,4 @@
 ++[section]
 ++++[document frame] name='svg'
 ++++++[section]
-++++++++[text] name='Test'
+++++++++[static] name='Test'
diff --git a/content/test/data/accessibility/html/table-focusable-sections-expected-auralinux.txt b/content/test/data/accessibility/html/table-focusable-sections-expected-auralinux.txt
index 92491f7..23f5e22 100644
--- a/content/test/data/accessibility/html/table-focusable-sections-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/table-focusable-sections-expected-auralinux.txt
@@ -3,23 +3,23 @@
 ++++[panel]
 ++++++[table row]
 ++++++++[column header] name='Sum' (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++++[text] name='Sum'
+++++++++++[static] name='Sum'
 ++++++++[column header] name='Subtraction' (row=0, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++++[text] name='Subtraction'
+++++++++++[static] name='Subtraction'
 ++++[panel]
 ++++++[table row]
 ++++++++[table cell] name='10' (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++++[text] name='10'
+++++++++++[static] name='10'
 ++++++++[table cell] name='7' (row=1, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++++[text] name='7'
+++++++++++[static] name='7'
 ++++++[table row]
 ++++++++[table cell] name='2' (row=2, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++++[text] name='2'
+++++++++++[static] name='2'
 ++++++++[table cell] name='4' (row=2, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++++[text] name='4'
+++++++++++[static] name='4'
 ++++[panel]
 ++++++[table row]
 ++++++++[table cell] name='12' (row=3, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++++[text] name='12'
+++++++++++[static] name='12'
 ++++++++[table cell] name='3' (row=3, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++++[text] name='3'
+++++++++++[static] name='3'
diff --git a/content/test/data/accessibility/html/table-layout-expected-auralinux.txt b/content/test/data/accessibility/html/table-layout-expected-auralinux.txt
index 7be2ccc..4f30c34 100644
--- a/content/test/data/accessibility/html/table-layout-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/table-layout-expected-auralinux.txt
@@ -2,22 +2,22 @@
 ++[section]
 ++++[section]
 ++++++[section] name='1'
-++++++++[text] name='1'
+++++++++[static] name='1'
 ++++++[section] name='2'
-++++++++[text] name='2'
+++++++++[static] name='2'
 ++++++[section] name='3'
-++++++++[text] name='3'
+++++++++[static] name='3'
 ++++[section]
 ++++++[section] name='4'
-++++++++[text] name='4'
+++++++++[static] name='4'
 ++++++[section] name='5'
-++++++++[text] name='5'
+++++++++[static] name='5'
 ++++++[section] name='6'
-++++++++[text] name='6'
+++++++++[static] name='6'
 ++++[section]
 ++++++[section] name='7'
-++++++++[text] name='7'
+++++++++[static] name='7'
 ++++++[section] name='8'
-++++++++[text] name='8'
+++++++++[static] name='8'
 ++++++[section] name='9'
-++++++++[text] name='9'
+++++++++[static] name='9'
diff --git a/content/test/data/accessibility/html/table-presentation-expected-auralinux.txt b/content/test/data/accessibility/html/table-presentation-expected-auralinux.txt
index a4d0af5..abe604d 100644
--- a/content/test/data/accessibility/html/table-presentation-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/table-presentation-expected-auralinux.txt
@@ -1,9 +1,9 @@
 [document web] name='Table with role=presentation'
 ++[section]
-++++[text] name='1'
+++++[static] name='1'
 ++[section]
-++++[text] name='2'
+++++[static] name='2'
 ++[section]
-++++[text] name='4'
+++++[static] name='4'
 ++[section]
-++++[text] name='5'
+++++[static] name='5'
diff --git a/content/test/data/accessibility/html/table-simple-expected-auralinux.txt b/content/test/data/accessibility/html/table-simple-expected-auralinux.txt
index b086df3..759419e 100644
--- a/content/test/data/accessibility/html/table-simple-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/table-simple-expected-auralinux.txt
@@ -2,16 +2,16 @@
 ++[table] cols=2 headers=('Pair', 'Single'); rows=3 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row]
 ++++++[column header] name='Pair' (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Pair'
+++++++++[static] name='Pair'
 ++++++[column header] name='Single' (row=0, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Single'
+++++++++[static] name='Single'
 ++++[table row]
 ++++++[table cell] name='AB' (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='AB'
+++++++++[static] name='AB'
 ++++++[table cell] name='B' (row=1, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='B'
+++++++++[static] name='B'
 ++++[table row]
 ++++++[table cell] name='CD' (row=2, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='CD'
+++++++++[static] name='CD'
 ++++++[table cell] name='D' (row=2, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='D'
+++++++++[static] name='D'
diff --git a/content/test/data/accessibility/html/table-spans-expected-auralinux.txt b/content/test/data/accessibility/html/table-spans-expected-auralinux.txt
index 4161be06..9681ddf 100644
--- a/content/test/data/accessibility/html/table-spans-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/table-spans-expected-auralinux.txt
@@ -2,20 +2,20 @@
 ++[table] cols=2 headers=(NONE); rows=2 headers=(NONE); caption=false; spans=(cell at 0,0: 2x1, cell at 1,0: 2x1)
 ++++[table row]
 ++++++[table cell] name='AD' (row=0, col=0, row_span=2, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='AD'
+++++++++[static] name='AD'
 ++++++[table cell] name='BC' (row=0, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='BC'
+++++++++[static] name='BC'
 ++++[table row]
 ++++++[table cell] name='EF' (row=1, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='EF'
+++++++++[static] name='EF'
 ++[table] cols=3 headers=(NONE); rows=2 headers=(NONE); caption=false; spans=(cell at 0,0: 2x1, cell at 0,1: 1x2, cell at 0,2: 1x2, cell at 1,0: 2x1)
 ++++[table row]
 ++++++[table cell] name='AD' (row=0, col=0, row_span=2, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='AD'
+++++++++[static] name='AD'
 ++++++[table cell] name='BC' (row=0, col=1, row_span=1, col_span=2, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='BC'
+++++++++[static] name='BC'
 ++++[table row]
 ++++++[table cell] name='EF' (row=1, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='EF'
+++++++++[static] name='EF'
 ++++++[table cell] name='GH' (row=1, col=2, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='GH'
+++++++++[static] name='GH'
diff --git a/content/test/data/accessibility/html/table-th-colheader-expected-auralinux.txt b/content/test/data/accessibility/html/table-th-colheader-expected-auralinux.txt
index 53fa61da..4d0dadb 100644
--- a/content/test/data/accessibility/html/table-th-colheader-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/table-th-colheader-expected-auralinux.txt
@@ -2,11 +2,11 @@
 ++[table] cols=2 headers=('Firstname', 'Lastname'); rows=2 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row]
 ++++++[column header] name='Firstname' table-cell-index:0 (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Firstname'
+++++++++[static] name='Firstname'
 ++++++[column header] name='Lastname' table-cell-index:1 (row=0, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Lastname'
+++++++++[static] name='Lastname'
 ++++[table row]
 ++++++[table cell] name='Jill' table-cell-index:2 (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='Jill'
+++++++++[static] name='Jill'
 ++++++[table cell] name='Smith' table-cell-index:3 (row=1, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='Smith'
+++++++++[static] name='Smith'
diff --git a/content/test/data/accessibility/html/table-th-rowheader-expected-auralinux.txt b/content/test/data/accessibility/html/table-th-rowheader-expected-auralinux.txt
index 6455469..f47b84f 100644
--- a/content/test/data/accessibility/html/table-th-rowheader-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/table-th-rowheader-expected-auralinux.txt
@@ -2,11 +2,11 @@
 ++[table] cols=2 headers=(NONE); rows=2 headers=('Firstname', 'Lastname'); caption=false; spans=(all: 1x1)
 ++++[table row]
 ++++++[row header] name='Firstname' (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Firstname'
+++++++++[static] name='Firstname'
 ++++++[table cell] name='Jill' (row=0, col=1, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='Jill'
+++++++++[static] name='Jill'
 ++++[table row]
 ++++++[row header] name='Lastname' (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Lastname'
+++++++++[static] name='Lastname'
 ++++++[table cell] name='Smith' (row=1, col=1, row_span=1, col_span=1, n_row_headers=1, n_col_headers=0)
-++++++++[text] name='Smith'
+++++++++[static] name='Smith'
diff --git a/content/test/data/accessibility/html/table-thead-tbody-tfoot-expected-auralinux.txt b/content/test/data/accessibility/html/table-thead-tbody-tfoot-expected-auralinux.txt
index 49d96556..71ac31e 100644
--- a/content/test/data/accessibility/html/table-thead-tbody-tfoot-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/table-thead-tbody-tfoot-expected-auralinux.txt
@@ -2,21 +2,21 @@
 ++[table] cols=2 headers=('Sum', 'Subtraction'); rows=4 headers=(NONE); caption=false; spans=(all: 1x1)
 ++++[table row]
 ++++++[column header] name='Sum' (row=0, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Sum'
+++++++++[static] name='Sum'
 ++++++[column header] name='Subtraction' (row=0, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=0)
-++++++++[text] name='Subtraction'
+++++++++[static] name='Subtraction'
 ++++[table row]
 ++++++[table cell] name='10' (row=1, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='10'
+++++++++[static] name='10'
 ++++++[table cell] name='7' (row=1, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='7'
+++++++++[static] name='7'
 ++++[table row]
 ++++++[table cell] name='2' (row=2, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='2'
+++++++++[static] name='2'
 ++++++[table cell] name='4' (row=2, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='4'
+++++++++[static] name='4'
 ++++[table row]
 ++++++[table cell] name='12' (row=3, col=0, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='12'
+++++++++[static] name='12'
 ++++++[table cell] name='3' (row=3, col=1, row_span=1, col_span=1, n_row_headers=0, n_col_headers=1)
-++++++++[text] name='3'
+++++++++[static] name='3'
diff --git a/content/test/data/accessibility/html/time-expected-auralinux.txt b/content/test/data/accessibility/html/time-expected-auralinux.txt
index 4d2f4b2..5959c6e 100644
--- a/content/test/data/accessibility/html/time-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/time-expected-auralinux.txt
@@ -1,7 +1,7 @@
 [document web]
 ++[section]
 ++++[static]
-++++++[text] name='10:00'
-++++[text] name=' '
+++++++[static] name='10:00'
+++++[static] name=' '
 ++++[static]
-++++++[text] name='Valentines day'
+++++++[static] name='Valentines day'
diff --git a/content/test/data/accessibility/html/transition-expected-auralinux.txt b/content/test/data/accessibility/html/transition-expected-auralinux.txt
index dc212f2..c1e52b1 100644
--- a/content/test/data/accessibility/html/transition-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/transition-expected-auralinux.txt
@@ -1,4 +1,4 @@
 [document web]
 ++[section]
 ++++[push button] name='GrowButton'
-++++[text] name='Done'
+++++[static] name='Done'
diff --git a/content/test/data/accessibility/html/ul-expected-auralinux.txt b/content/test/data/accessibility/html/ul-expected-auralinux.txt
index 56f58a6..b7367e6 100644
--- a/content/test/data/accessibility/html/ul-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/ul-expected-auralinux.txt
@@ -2,10 +2,10 @@
 ++[list]
 ++++[list item]
 ++++++[static] name='• '
-++++++[text] name='Item 1'
+++++++[static] name='Item 1'
 ++++[list item]
 ++++++[static] name='• '
-++++++[text] name='Item 2'
+++++++[static] name='Item 2'
 ++++[list item]
 ++++++[static] name='• '
-++++++[text] name='Item 3'
+++++++[static] name='Item 3'
diff --git a/content/test/data/accessibility/html/var-expected-auralinux.txt b/content/test/data/accessibility/html/var-expected-auralinux.txt
index 0523b56..27e26c8c 100644
--- a/content/test/data/accessibility/html/var-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/var-expected-auralinux.txt
@@ -1,3 +1,3 @@
 [document web]
 ++[section]
-++++[text] name='Variable'
+++++[static] name='Variable'
diff --git a/content/test/data/accessibility/html/video-controls-expected-auralinux.txt b/content/test/data/accessibility/html/video-controls-expected-auralinux.txt
index 9ed3131..676790f 100644
--- a/content/test/data/accessibility/html/video-controls-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/video-controls-expected-auralinux.txt
@@ -7,7 +7,7 @@
 ++++++++++[tool bar] name='video' description='video' horizontal
 ++++++++++++[tool bar] name='video' description='video' horizontal
 ++++++++++++++[push button] name='play'
-++++++++++++++[text] name='0:00'
+++++++++++++++[static] name='0:00'
 ++++++++++++++[section]
 ++++++++++++++++[section]
 ++++++++++++++++[push button] name='mute'
diff --git a/content/test/data/accessibility/html/wbr-expected-auralinux.txt b/content/test/data/accessibility/html/wbr-expected-auralinux.txt
index 2fef7a07..62ecbbe 100644
--- a/content/test/data/accessibility/html/wbr-expected-auralinux.txt
+++ b/content/test/data/accessibility/html/wbr-expected-auralinux.txt
@@ -1,5 +1,5 @@
 [document web]
 ++[section]
-++++[text] name='Supercali'
-++++[text] name='fragilistic'
-++++[text] name='expialidocious'
+++++[static] name='Supercali'
+++++[static] name='fragilistic'
+++++[static] name='expialidocious'
diff --git a/ui/accessibility/platform/ax_platform_node_auralinux.cc b/ui/accessibility/platform/ax_platform_node_auralinux.cc
index f42dfd7..cb01f356 100644
--- a/ui/accessibility/platform/ax_platform_node_auralinux.cc
+++ b/ui/accessibility/platform/ax_platform_node_auralinux.cc
@@ -2481,8 +2481,7 @@
     case ax::mojom::Role::kImageMap:
       return ATK_ROLE_IMAGE_MAP;
     case ax::mojom::Role::kInlineTextBox:
-      // TODO(jdiggs) This should be ATK_ROLE_STATIC. https://crbug.com/984590
-      return ATK_ROLE_TEXT;
+      return kStaticRole;
     case ax::mojom::Role::kInputTime:
       return ATK_ROLE_DATE_EDITOR;
     case ax::mojom::Role::kLabelText:
@@ -2501,8 +2500,7 @@
     case ax::mojom::Role::kLineBreak:
       // TODO(Accessibility) Having a separate accessible object for line breaks
       // is inconsistent with other implementations. http://crbug.com/873144#c1.
-      // TODO(jdiggs) This should be ATK_ROLE_STATIC. https://crbug.com/984590
-      return ATK_ROLE_TEXT;
+      return kStaticRole;
     case ax::mojom::Role::kLink:
       return ATK_ROLE_LINK;
     case ax::mojom::Role::kList:
@@ -2619,8 +2617,7 @@
         default:
           break;
       }
-      // TODO(jdiggs) This should be ATK_ROLE_STATIC. https://crbug.com/984590
-      return ATK_ROLE_TEXT;
+      return kStaticRole;
     }
     case ax::mojom::Role::kStatus:
       return ATK_ROLE_STATUSBAR;
@@ -3276,7 +3273,7 @@
 bool AXPlatformNodeAuraLinux::EmitsAtkTextEvents() const {
   // If this node is not a static text node, it supports the full AtkText
   // interface.
-  if (GetAtkRole() != ATK_ROLE_TEXT)
+  if (GetAtkRole() != kStaticRole)
     return true;
 
   // If this node has children it is not a static text leaf node and supports