diff --git a/test/functional/apps/dashboard/_bwc_shared_urls.js b/test/functional/apps/dashboard/bwc_shared_urls.js
similarity index 100%
rename from test/functional/apps/dashboard/_bwc_shared_urls.js
rename to test/functional/apps/dashboard/bwc_shared_urls.js
diff --git a/test/functional/apps/dashboard/_create_and_add_embeddables.js b/test/functional/apps/dashboard/create_and_add_embeddables.js
similarity index 100%
rename from test/functional/apps/dashboard/_create_and_add_embeddables.js
rename to test/functional/apps/dashboard/create_and_add_embeddables.js
diff --git a/test/functional/apps/dashboard/_dashboard_clone.js b/test/functional/apps/dashboard/dashboard_clone.js
similarity index 100%
rename from test/functional/apps/dashboard/_dashboard_clone.js
rename to test/functional/apps/dashboard/dashboard_clone.js
diff --git a/test/functional/apps/dashboard/_dashboard_filter_bar.js b/test/functional/apps/dashboard/dashboard_filter_bar.js
similarity index 100%
rename from test/functional/apps/dashboard/_dashboard_filter_bar.js
rename to test/functional/apps/dashboard/dashboard_filter_bar.js
diff --git a/test/functional/apps/dashboard/_dashboard_filtering.js b/test/functional/apps/dashboard/dashboard_filtering.js
similarity index 100%
rename from test/functional/apps/dashboard/_dashboard_filtering.js
rename to test/functional/apps/dashboard/dashboard_filtering.js
diff --git a/test/functional/apps/dashboard/_dashboard_grid.js b/test/functional/apps/dashboard/dashboard_grid.js
similarity index 100%
rename from test/functional/apps/dashboard/_dashboard_grid.js
rename to test/functional/apps/dashboard/dashboard_grid.js
diff --git a/test/functional/apps/dashboard/_dashboard_listing.js b/test/functional/apps/dashboard/dashboard_listing.js
similarity index 100%
rename from test/functional/apps/dashboard/_dashboard_listing.js
rename to test/functional/apps/dashboard/dashboard_listing.js
diff --git a/test/functional/apps/dashboard/_dashboard_options.js b/test/functional/apps/dashboard/dashboard_options.js
similarity index 100%
rename from test/functional/apps/dashboard/_dashboard_options.js
rename to test/functional/apps/dashboard/dashboard_options.js
diff --git a/test/functional/apps/dashboard/_dashboard_query_bar.js b/test/functional/apps/dashboard/dashboard_query_bar.js
similarity index 100%
rename from test/functional/apps/dashboard/_dashboard_query_bar.js
rename to test/functional/apps/dashboard/dashboard_query_bar.js
diff --git a/test/functional/apps/dashboard/_dashboard_save.js b/test/functional/apps/dashboard/dashboard_save.js
similarity index 100%
rename from test/functional/apps/dashboard/_dashboard_save.js
rename to test/functional/apps/dashboard/dashboard_save.js
diff --git a/test/functional/apps/dashboard/_dashboard_snapshots.js b/test/functional/apps/dashboard/dashboard_snapshots.js
similarity index 100%
rename from test/functional/apps/dashboard/_dashboard_snapshots.js
rename to test/functional/apps/dashboard/dashboard_snapshots.js
diff --git a/test/functional/apps/dashboard/_dashboard_state.js b/test/functional/apps/dashboard/dashboard_state.js
similarity index 100%
rename from test/functional/apps/dashboard/_dashboard_state.js
rename to test/functional/apps/dashboard/dashboard_state.js
diff --git a/test/functional/apps/dashboard/_dashboard_time.js b/test/functional/apps/dashboard/dashboard_time.js
similarity index 100%
rename from test/functional/apps/dashboard/_dashboard_time.js
rename to test/functional/apps/dashboard/dashboard_time.js
diff --git a/test/functional/apps/dashboard/_dashboard_time_picker.js b/test/functional/apps/dashboard/dashboard_time_picker.js
similarity index 100%
rename from test/functional/apps/dashboard/_dashboard_time_picker.js
rename to test/functional/apps/dashboard/dashboard_time_picker.js
diff --git a/test/functional/apps/dashboard/_data_shared_attributes.js b/test/functional/apps/dashboard/data_shared_attributes.js
similarity index 100%
rename from test/functional/apps/dashboard/_data_shared_attributes.js
rename to test/functional/apps/dashboard/data_shared_attributes.js
diff --git a/test/functional/apps/dashboard/_embed_mode.js b/test/functional/apps/dashboard/embed_mode.js
similarity index 100%
rename from test/functional/apps/dashboard/_embed_mode.js
rename to test/functional/apps/dashboard/embed_mode.js
diff --git a/test/functional/apps/dashboard/_embeddable_rendering.js b/test/functional/apps/dashboard/embeddable_rendering.js
similarity index 100%
rename from test/functional/apps/dashboard/_embeddable_rendering.js
rename to test/functional/apps/dashboard/embeddable_rendering.js
diff --git a/test/functional/apps/dashboard/_empty_dashboard.js b/test/functional/apps/dashboard/empty_dashboard.js
similarity index 100%
rename from test/functional/apps/dashboard/_empty_dashboard.js
rename to test/functional/apps/dashboard/empty_dashboard.js
diff --git a/test/functional/apps/dashboard/_full_screen_mode.js b/test/functional/apps/dashboard/full_screen_mode.js
similarity index 100%
rename from test/functional/apps/dashboard/_full_screen_mode.js
rename to test/functional/apps/dashboard/full_screen_mode.js
diff --git a/test/functional/apps/dashboard/index.js b/test/functional/apps/dashboard/index.js
index 6919ffc75eb06..6ddbce1ba6bf2 100644
--- a/test/functional/apps/dashboard/index.js
+++ b/test/functional/apps/dashboard/index.js
@@ -46,18 +46,18 @@ export default function ({ getService, loadTestFile, getPageObjects }) {
       before(loadCurrentData);
       after(unloadCurrentData);
 
-      loadTestFile(require.resolve('./_empty_dashboard'));
-      loadTestFile(require.resolve('./_embeddable_rendering'));
-      loadTestFile(require.resolve('./_create_and_add_embeddables'));
-      loadTestFile(require.resolve('./_time_zones'));
-      loadTestFile(require.resolve('./_dashboard_options'));
-      loadTestFile(require.resolve('./_data_shared_attributes'));
-      loadTestFile(require.resolve('./_embed_mode'));
+      loadTestFile(require.resolve('./empty_dashboard'));
+      loadTestFile(require.resolve('./embeddable_rendering'));
+      loadTestFile(require.resolve('./create_and_add_embeddables'));
+      loadTestFile(require.resolve('./time_zones'));
+      loadTestFile(require.resolve('./dashboard_options'));
+      loadTestFile(require.resolve('./data_shared_attributes'));
+      loadTestFile(require.resolve('./embed_mode'));
 
       // Note: This one must be last because it unloads some data for one of its tests!
       // No, this isn't ideal, but loading/unloading takes so much time and these are all bunched
       // to improve efficiency...
-      loadTestFile(require.resolve('./_dashboard_query_bar'));
+      loadTestFile(require.resolve('./dashboard_query_bar'));
     });
 
     describe('using current data', function () {
@@ -65,13 +65,13 @@ export default function ({ getService, loadTestFile, getPageObjects }) {
       before(loadCurrentData);
       after(unloadCurrentData);
 
-      loadTestFile(require.resolve('./_full_screen_mode'));
-      loadTestFile(require.resolve('./_dashboard_filter_bar'));
-      loadTestFile(require.resolve('./_dashboard_filtering'));
-      loadTestFile(require.resolve('./_panel_expand_toggle'));
-      loadTestFile(require.resolve('./_dashboard_grid'));
-      loadTestFile(require.resolve('./_dashboard_snapshots'));
-      loadTestFile(require.resolve('./_view_edit'));
+      loadTestFile(require.resolve('./full_screen_mode'));
+      loadTestFile(require.resolve('./dashboard_filter_bar'));
+      loadTestFile(require.resolve('./dashboard_filtering'));
+      loadTestFile(require.resolve('./panel_expand_toggle'));
+      loadTestFile(require.resolve('./dashboard_grid'));
+      loadTestFile(require.resolve('./dashboard_snapshots'));
+      loadTestFile(require.resolve('./view_edit'));
     });
 
     // Each of these tests call initTests themselves, the way it was originally written.  The above tests only load
@@ -81,20 +81,20 @@ export default function ({ getService, loadTestFile, getPageObjects }) {
       this.tags('ciGroup4');
       before(() => browser.setWindowSize(1200, 900));
 
-      loadTestFile(require.resolve('./_dashboard_time_picker'));
-      loadTestFile(require.resolve('./_bwc_shared_urls'));
-      loadTestFile(require.resolve('./_panel_controls'));
-      loadTestFile(require.resolve('./_dashboard_state'));
+      loadTestFile(require.resolve('./dashboard_time_picker'));
+      loadTestFile(require.resolve('./bwc_shared_urls'));
+      loadTestFile(require.resolve('./panel_controls'));
+      loadTestFile(require.resolve('./dashboard_state'));
     });
 
     describe('using legacy data', function () {
       this.tags('ciGroup5');
       before(() => browser.setWindowSize(1200, 900));
 
-      loadTestFile(require.resolve('./_dashboard_save'));
-      loadTestFile(require.resolve('./_dashboard_time'));
-      loadTestFile(require.resolve('./_dashboard_listing'));
-      loadTestFile(require.resolve('./_dashboard_clone'));
+      loadTestFile(require.resolve('./dashboard_save'));
+      loadTestFile(require.resolve('./dashboard_time'));
+      loadTestFile(require.resolve('./dashboard_listing'));
+      loadTestFile(require.resolve('./dashboard_clone'));
     });
   });
 }
diff --git a/test/functional/apps/dashboard/_panel_controls.js b/test/functional/apps/dashboard/panel_controls.js
similarity index 100%
rename from test/functional/apps/dashboard/_panel_controls.js
rename to test/functional/apps/dashboard/panel_controls.js
diff --git a/test/functional/apps/dashboard/_panel_expand_toggle.js b/test/functional/apps/dashboard/panel_expand_toggle.js
similarity index 100%
rename from test/functional/apps/dashboard/_panel_expand_toggle.js
rename to test/functional/apps/dashboard/panel_expand_toggle.js
diff --git a/test/functional/apps/dashboard/_time_zones.js b/test/functional/apps/dashboard/time_zones.js
similarity index 100%
rename from test/functional/apps/dashboard/_time_zones.js
rename to test/functional/apps/dashboard/time_zones.js
diff --git a/test/functional/apps/dashboard/_view_edit.js b/test/functional/apps/dashboard/view_edit.js
similarity index 100%
rename from test/functional/apps/dashboard/_view_edit.js
rename to test/functional/apps/dashboard/view_edit.js