--- a/layout/base/tests/marionette/test_accessiblecaret_cursor_mode.py
+++ b/layout/base/tests/marionette/test_accessiblecaret_cursor_mode.py
@@ -32,17 +32,17 @@ class AccessibleCaretCursorModeTestCase(
         self.prefs = {
             self.caret_tested_pref: True,
             self.caret_timeout_ms_pref: 0,
         }
         self.marionette.set_prefs(self.prefs)
         self.actions = Actions(self.marionette)
 
     def open_test_html(self):
-        test_html = self.marionette.absolute_url('test_touchcaret.html')
+        test_html = self.marionette.absolute_url('test_carets_cursor.html')
         self.marionette.navigate(test_html)
 
     @parameterized(_input_id, el_id=_input_id)
     @parameterized(_textarea_id, el_id=_textarea_id)
     @parameterized(_contenteditable_id, el_id=_contenteditable_id)
     def test_move_cursor_to_the_right_by_one_character(self, el_id):
         self.open_test_html()
         el = self.marionette.find_element(By.ID, el_id)

--- a/layout/base/tests/marionette/test_accessiblecaret_selection_mode.py
+++ b/layout/base/tests/marionette/test_accessiblecaret_selection_mode.py
@@ -41,25 +41,25 @@ class AccessibleCaretSelectionModeTestCa
             'layout.word_select.eat_space_to_next_word': False,
             'layout.accessiblecaret.use_long_tap_injector': False,
             self.carets_tested_pref: True,
         }
         self.marionette.set_prefs(self.prefs)
         self.actions = Actions(self.marionette)
 
     def open_test_html(self):
-        test_html = self.marionette.absolute_url('test_selectioncarets.html')
+        test_html = self.marionette.absolute_url('test_carets_selection.html')
         self.marionette.navigate(test_html)
 
     def open_test_html2(self):
-        test_html2 = self.marionette.absolute_url('test_selectioncarets_multipleline.html')
+        test_html2 = self.marionette.absolute_url('test_carets_multipleline.html')
         self.marionette.navigate(test_html2)
 
     def open_test_html_multirange(self):
-        test_html = self.marionette.absolute_url('test_selectioncarets_multiplerange.html')
+        test_html = self.marionette.absolute_url('test_carets_multiplerange.html')
         self.marionette.navigate(test_html)
 
     def word_offset(self, text, ordinal):
         'Get the character offset of the ordinal-th word in text.'
         tokens = re.split(r'(\S+)', text)         # both words and spaces
         spaces = tokens[0::2]                     # collect spaces at odd indices
         words = tokens[1::2]                      # collect word at even indices
 
@@ -434,17 +434,17 @@ class AccessibleCaretSelectionModeTestCa
 
         self.assertEqual(self.to_unix_line_ending(sel.selected_content), 'select')
 
     @skip_if_not_rotatable
     def test_caret_position_after_changing_orientation_of_device(self):
         '''Bug 1094072
         If positions of carets are updated correctly, they should be draggable.
         '''
-        test_html = self.marionette.absolute_url('test_selectioncarets_longtext.html')
+        test_html = self.marionette.absolute_url('test_carets_longtext.html')
         self.marionette.navigate(test_html)
 
         body = self.marionette.find_element(By.ID, 'bd')
         longtext = self.marionette.find_element(By.ID, 'longtext')
 
         # Select word in portrait mode, then change to landscape mode
         self.marionette.set_orientation('portrait')
         self.long_press_on_word(longtext, 12)
@@ -465,17 +465,17 @@ class AccessibleCaretSelectionModeTestCa
 
     def test_select_word_inside_an_iframe(self):
         '''Bug 1088552
         The scroll offset in iframe should be taken into consideration properly.
         In this test, we scroll content in the iframe to the bottom to cause a
         huge offset. If we use the right coordinate system, selection should
         work. Otherwise, it would be hard to trigger select word.
         '''
-        test_html = self.marionette.absolute_url('test_selectioncarets_iframe.html')
+        test_html = self.marionette.absolute_url('test_carets_iframe.html')
         self.marionette.navigate(test_html)
         iframe = self.marionette.find_element(By.ID, 'frame')
 
         # switch to inner iframe and scroll to the bottom
         self.marionette.switch_to_frame(iframe)
         self.marionette.execute_script(
             'document.getElementById("bd").scrollTop += 999')
 

rename from testing/marionette/harness/marionette/www/test_touchcaret.html
rename to testing/marionette/harness/marionette/www/test_carets_cursor.html
--- a/testing/marionette/harness/marionette/www/test_touchcaret.html
+++ b/testing/marionette/harness/marionette/www/test_carets_cursor.html
@@ -1,16 +1,16 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!DOCTYPE html>
 <html id="html">
   <head>
-    <title>Bug 960897: Marionette tests for touch caret</title>
+    <title>Marionette tests for AccessibleCaret in cursor mode</title>
   </head>
   <body>
     <div><input id="input" value="ABCDEFGHI"></div>
     <br />
     <div><textarea name="textarea" id="textarea" rows="4" cols="6">ABCDEFGHI</textarea></div>
     <br />
     <div style="width: 10em; height: 2em; word-wrap: break-word; overflow: auto;" contenteditable="true" id="contenteditable">ABCDEFGHI</div>
   </body>

rename from testing/marionette/harness/marionette/www/test_selectioncarets_iframe.html
rename to testing/marionette/harness/marionette/www/test_carets_iframe.html
--- a/testing/marionette/harness/marionette/www/test_selectioncarets_iframe.html
+++ b/testing/marionette/harness/marionette/www/test_carets_iframe.html
@@ -1,20 +1,20 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!DOCTYPE html>
 <html id="html">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Marionette tests for selection carets (iframe)</title>
+    <title>Marionette tests for AccessibleCaret in selection mode (iframe)</title>
   </head>
   <body>
   <style>
     *
     {
       -moz-user-select:none;
     }
   </style>
-    <iframe id="frame" src="test_selectioncarets_longtext.html" style="width: 10em; height: 8em;"></iframe>
+    <iframe id="frame" src="test_carets_longtext.html" style="width: 10em; height: 8em;"></iframe>
   </body>
 </html>

rename from testing/marionette/harness/marionette/www/test_selectioncarets_longtext.html
rename to testing/marionette/harness/marionette/www/test_carets_longtext.html
--- a/testing/marionette/harness/marionette/www/test_selectioncarets_longtext.html
+++ b/testing/marionette/harness/marionette/www/test_carets_longtext.html
@@ -1,9 +1,9 @@
 <html>
   <head>
-    <title>Bug 1094072: Orientation change test for selection carets positions</title>
+    <title>Bug 1094072: Orientation change test for AccessibleCaret positions</title>
   </head>
   <body id="bd">
   <h3 id="longtext">long long text for orientation change test long long text for orientation change test long long text for orientation change test long long text for orientation change test</h3>
   <div contenteditable="true" id="bottomtext">bottom text</div>
 </body>
 </html>

rename from testing/marionette/harness/marionette/www/test_selectioncarets_multipleline.html
rename to testing/marionette/harness/marionette/www/test_carets_multipleline.html
--- a/testing/marionette/harness/marionette/www/test_selectioncarets_multipleline.html
+++ b/testing/marionette/harness/marionette/www/test_carets_multipleline.html
@@ -1,24 +1,24 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!DOCTYPE html>
 <html id="html">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Bug 1019441: Marionette tests for selection carets (multiple lines)</title>
+    <title>Bug 1019441: Marionette tests for AccessibleCaret (multiple lines)</title>
   </head>
   <body>
   <style>
     *
     {
       -moz-user-select:none;
     }
   </style>
     <div><textarea id="textarea2" style="width: 10em; height: 6em; overflow: auto;">First Line&#13;&#10;&#13;&#10;Second Line&#13;&#10;&#13;&#10;Third Line</textarea></div>
-    <br />
-    <div style="width: 10em; height: 6em; overflow: auto; -moz-user-select:text" id="contenteditable2" contenteditable="true">First Line<br></br>Second Line<br></br>Third Line</div>
-    <br />
-    <div style="width: 10em; height: 6em; overflow: auto; -moz-user-select:text" id="content2">First Line<br></br>Second Line<br></br>Third Line</div>
+    <br>
+    <div style="width: 10em; height: 6em; overflow: auto; -moz-user-select:text" id="contenteditable2" contenteditable="true">First Line<br><br>Second Line<br><br>Third Line</div>
+    <br>
+    <div style="width: 10em; height: 6em; overflow: auto; -moz-user-select:text" id="content2">First Line<br><br>Second Line<br><br>Third Line</div>
   </body>
 </html>

rename from testing/marionette/harness/marionette/www/test_selectioncarets_multiplerange.html
rename to testing/marionette/harness/marionette/www/test_carets_multiplerange.html

rename from testing/marionette/harness/marionette/www/test_selectioncarets.html
rename to testing/marionette/harness/marionette/www/test_carets_selection.html
--- a/testing/marionette/harness/marionette/www/test_selectioncarets.html
+++ b/testing/marionette/harness/marionette/www/test_carets_selection.html
@@ -1,17 +1,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!DOCTYPE html>
 <html id="html">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Bug 1019441: Marionette tests for selection carets</title>
+    <title>Marionette tests for AccessibleCaret in selection mode</title>
   </head>
   <body>
   <style>
   div.block {
     width: 10em;
     height: 4em;
     word-wrap: break-word;
     overflow: auto;