--- a/testing/taskcluster/tasks/branches/base_job_flags.yml
+++ b/testing/taskcluster/tasks/branches/base_job_flags.yml
@@ -25,18 +25,18 @@ flags:
     # prefixes.  For example, the first example above would replace "foo-7"
     # with "foobar-7".  Note that a few aliases allowed chunks to be specified
     # without a leading `-`, for example 'mochitest-dt1'. That's no longer
     # supported.
     cppunit: /cppunit.*/
     crashtest: /crashtest.*/
     crashtest-e10s: /crashtest-e10s.*/
     e10s: /.*e10s.*/
-    firefox-ui: /firefox-ui.*/
-    firefox-ui-e10s: /firefox-ui-e10s.*/
+    firefox-ui-functional: /firefox-ui-functional.*/
+    firefox-ui-functional-e10s: /firefox-ui-functional-e10s.*/
     gaia-js-integration: /.*gaia-js-integration.*/
     gtest: /gtest.*/
     jittest: /jittest.*/
     jittests: /jittest.*/
     jsreftest: /jsreftest.*/
     jsreftest-e10s: /jsreftest-e10s.*/
     luciddream: /luciddream.*/
     marionette: /marionette.*/
@@ -110,18 +110,18 @@ flags:
     - macosx64
     - macosx64-st-an
 
   tests:
     - cppunit
     - crashtest
     - crashtest-e10s
     - crashtest-ipc
-    - firefox-ui
-    - firefox-ui-e10s
+    - firefox-ui-functional
+    - firefox-ui-functional-e10s
     - gaia-build
     - gaia-build-unit
     - gaia-js-integration
     - gaia-linter
     - gaia-unit
     - gaia-unit-oop
     - gtest
     - jittests

--- a/testing/taskcluster/tasks/branches/base_jobs.yml
+++ b/testing/taskcluster/tasks/branches/base_jobs.yml
@@ -185,24 +185,24 @@ tests:
       tasks/builds/b2g_emulator_x86_kk_opt.yml:
         task: tasks/tests/b2g_emulator_crashtest.yml
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_crashtest.yml
   crashtest-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_crashtest_e10s.yml
-  firefox-ui:
+  firefox-ui-functional:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_firefox_ui.yml
-  firefox-ui-e10s:
+        task: tasks/tests/fx_linux64_firefox_ui_functional.yml
+  firefox-ui-functional-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_firefox_ui_e10s.yml
+        task: tasks/tests/fx_linux64_firefox_ui_functional_e10s.yml
   gaia-build:
     allowed_build_tasks:
       tasks/builds/mulet_linux.yml:
         task: tasks/tests/mulet_build_test.yml
   gaia-build-unit:
     allowed_build_tasks:
       tasks/builds/mulet_linux.yml:
         task: tasks/tests/mulet_build_unit.yml

--- a/testing/taskcluster/tasks/branches/try/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/try/job_flags.yml
@@ -153,24 +153,24 @@ tests:
   crashtest:
     allowed_build_tasks:
       tasks/builds/dbg_linux64_clobber.yml:
         task: tasks/tests/fx_linux64_crashtest.yml
   crashtest-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64_clobber.yml:
         task: tasks/tests/fx_linux64_crashtest_e10s.yml
-  firefox-ui:
+  firefox-ui-functional:
     allowed_build_tasks:
       tasks/builds/dbg_linux64_clobber.yml:
-        task: tasks/tests/fx_linux64_firefox_ui.yml
-  firefox-ui-e10s:
+        task: tasks/tests/fx_linux64_firefox_ui_functional.yml
+  firefox-ui-functional-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64_clobber.yml:
-        task: tasks/tests/fx_linux64_firefox_ui_e10s.yml
+        task: tasks/tests/fx_linux64_firefox_ui_functional_e10s.yml
   gtest:
     allowed_build_tasks:
       tasks/builds/dbg_linux64_clobber.yml:
         task: tasks/tests/fx_linux64_gtest.yml
   jittests:
     allowed_build_tasks:
       tasks/builds/dbg_linux64_clobber.yml:
         task: tasks/tests/fx_linux64_jittests.yml

rename from testing/taskcluster/tasks/tests/fx_linux64_firefox_ui.yml
rename to testing/taskcluster/tasks/tests/fx_linux64_firefox_ui_functional.yml

rename from testing/taskcluster/tasks/tests/fx_linux64_firefox_ui_e10s.yml
rename to testing/taskcluster/tasks/tests/fx_linux64_firefox_ui_functional_e10s.yml