--- a/devtools/client/inspector/animation/test/browser.ini
+++ b/devtools/client/inspector/animation/test/browser.ini
@@ -6,22 +6,22 @@ support-files =
   doc_simple_animation.html
   head.js
   !/devtools/client/framework/test/shared-head.js
   !/devtools/client/inspector/test/head.js
   !/devtools/client/inspector/test/shared-head.js
   !/devtools/client/shared/test/test-actor-registry.js
   !/devtools/client/shared/test/test-actor.js
 
-[browser_animation_animation_list_exists.js]
-[browser_animation_animation_list_time_tick.js]
-[browser_animation_AnimationTarget.js]
+[browser_animation_animation-list.js]
+[browser_animation_animation-target.js]
+[browser_animation_animation-timeline-tick.js]
 [browser_animation_empty_on_invalid_nodes.js]
 [browser_animation_inspector_exists.js]
-[browser_animation_SummaryGraph_AnimationName.js]
-[browser_animation_SummaryGraph_compositor.js]
-[browser_animation_SummaryGraph_ComputedTimingPath.js]
-[browser_animation_SummaryGraph_DelaySign.js]
-[browser_animation_SummaryGraph_EndDelaySign.js]
-[browser_animation_SummaryGraph_EffectTimingPath.js]
-[browser_animation_SummaryGraph_NegativeDelayPath.js]
-[browser_animation_SummaryGraph_NegativeEndDelayPath.js]
-[browser_animation_SummaryGraph_tooltip.js]
+[browser_animation_summary-graph_animation-name.js]
+[browser_animation_summary-graph_compositor.js]
+[browser_animation_summary-graph_computed-timing-path.js]
+[browser_animation_summary-graph_delay-sign.js]
+[browser_animation_summary-graph_end-delay-sign.js]
+[browser_animation_summary-graph_effect-timing-path.js]
+[browser_animation_summary-graph_negative-delay-path.js]
+[browser_animation_summary-graph_negative-end-delay-path.js]
+[browser_animation_summary-graph_tooltip.js]

rename from devtools/client/inspector/animation/test/browser_animation_animation_list_exists.js
rename to devtools/client/inspector/animation/test/browser_animation_animation-list.js

rename from devtools/client/inspector/animation/test/browser_animation_AnimationTarget.js
rename to devtools/client/inspector/animation/test/browser_animation_animation-target.js

rename from devtools/client/inspector/animation/test/browser_animation_animation_list_time_tick.js
rename to devtools/client/inspector/animation/test/browser_animation_animation-timeline-tick.js
--- a/devtools/client/inspector/animation/test/browser_animation_animation_list_time_tick.js
+++ b/devtools/client/inspector/animation/test/browser_animation_animation-timeline-tick.js
@@ -1,17 +1,17 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
-// Test for following time tick items.
+// Test for following timeline tick items.
 // * animation list header elements existence
-// * time tick item elements existence
-// * count and label of time tick elements changing by the sidebar width
+// * timeline tick item elements existence
+// * count and label of timeline tick elements changing by the sidebar width
 
 const TimeScale = require("devtools/client/inspector/animation/utils/timescale");
 const { findOptimalTimeInterval } =
   require("devtools/client/inspector/animation/utils/utils");
 
 // Should be kept in sync with TIME_GRADUATION_MIN_SPACING in
 // AnimationTimeTickList component.
 const TIME_GRADUATION_MIN_SPACING = 40;

rename from devtools/client/inspector/animation/test/browser_animation_SummaryGraph_AnimationName.js
rename to devtools/client/inspector/animation/test/browser_animation_summary-graph_animation-name.js

rename from devtools/client/inspector/animation/test/browser_animation_SummaryGraph_compositor.js
rename to devtools/client/inspector/animation/test/browser_animation_summary-graph_compositor.js

rename from devtools/client/inspector/animation/test/browser_animation_SummaryGraph_ComputedTimingPath.js
rename to devtools/client/inspector/animation/test/browser_animation_summary-graph_computed-timing-path.js

rename from devtools/client/inspector/animation/test/browser_animation_SummaryGraph_DelaySign.js
rename to devtools/client/inspector/animation/test/browser_animation_summary-graph_delay-sign.js

rename from devtools/client/inspector/animation/test/browser_animation_SummaryGraph_EffectTimingPath.js
rename to devtools/client/inspector/animation/test/browser_animation_summary-graph_effect-timing-path.js

rename from devtools/client/inspector/animation/test/browser_animation_SummaryGraph_EndDelaySign.js
rename to devtools/client/inspector/animation/test/browser_animation_summary-graph_end-delay-sign.js

rename from devtools/client/inspector/animation/test/browser_animation_SummaryGraph_NegativeDelayPath.js
rename to devtools/client/inspector/animation/test/browser_animation_summary-graph_negative-delay-path.js

rename from devtools/client/inspector/animation/test/browser_animation_SummaryGraph_NegativeEndDelayPath.js
rename to devtools/client/inspector/animation/test/browser_animation_summary-graph_negative-end-delay-path.js

rename from devtools/client/inspector/animation/test/browser_animation_SummaryGraph_tooltip.js
rename to devtools/client/inspector/animation/test/browser_animation_summary-graph_tooltip.js
--- a/devtools/client/inspector/animation/test/browser_animation_SummaryGraph_tooltip.js
+++ b/devtools/client/inspector/animation/test/browser_animation_summary-graph_tooltip.js
@@ -6,194 +6,175 @@
 // Test for existance and content of tooltip on summary graph element.
 
 const TEST_CASES = [
   {
     targetClassName: "cssanimation-normal",
     expectedResult: {
       nameAndType: "cssanimation - CSS Animation",
       duration: "100s",
-      isAllOnCompositor: true,
     },
   },
   {
     targetClassName: "cssanimation-linear",
     expectedResult: {
       nameAndType: "cssanimation - CSS Animation",
       duration: "100s",
       animationTimingFunction: "linear",
-      isAllOnCompositor: true,
     },
   },
   {
     targetClassName: "delay-positive",
     expectedResult: {
       nameAndType: "test-delay-animation - Script Animation",
       delay: "50s",
       duration: "100s",
-      isAllOnCompositor: true,
     },
   },
   {
     targetClassName: "delay-negative",
     expectedResult: {
       nameAndType: "test-negative-delay-animation - Script Animation",
       delay: "-50s",
       duration: "100s",
-      isAllOnCompositor: true,
     },
   },
   {
     targetClassName: "easing-step",
     expectedResult: {
       nameAndType: "Script Animation",
       duration: "100s",
       easing: "steps(2)",
-      isAllOnCompositor: true,
     },
   },
   {
     targetClassName: "enddelay-positive",
     expectedResult: {
       nameAndType: "Script Animation",
       duration: "100s",
       endDelay: "50s",
-      isAllOnCompositor: true,
     },
   },
   {
     targetClassName: "enddelay-negative",
     expectedResult: {
       nameAndType: "Script Animation",
       duration: "100s",
       endDelay: "-50s",
-      isAllOnCompositor: true,
     },
   },
   {
     targetClassName: "enddelay-with-fill-forwards",
     expectedResult: {
       nameAndType: "Script Animation",
       duration: "100s",
       endDelay: "50s",
       fill: "forwards",
-      isAllOnCompositor: true,
     },
   },
   {
     targetClassName: "enddelay-with-iterations-infinity",
     expectedResult: {
       nameAndType: "Script Animation",
       duration: "100s",
       endDelay: "50s",
       iterations: "\u221E",
-      isAllOnCompositor: true,
     },
   },
   {
     targetClassName: "direction-alternate-with-iterations-infinity",
     expectedResult: {
       nameAndType: "Script Animation",
       duration: "100s",
       direction: "alternate",
       iterations: "\u221E",
-      isAllOnCompositor: true,
     },
   },
   {
     targetClassName: "direction-alternate-reverse-with-iterations-infinity",
     expectedResult: {
       nameAndType: "Script Animation",
       duration: "100s",
       direction: "alternate-reverse",
       iterations: "\u221E",
-      isAllOnCompositor: true,
     },
   },
   {
     targetClassName: "direction-reverse-with-iterations-infinity",
     expectedResult: {
       nameAndType: "Script Animation",
       duration: "100s",
       direction: "reverse",
       iterations: "\u221E",
-      isAllOnCompositor: true,
     },
   },
   {
     targetClassName: "fill-backwards",
     expectedResult: {
       nameAndType: "Script Animation",
       duration: "100s",
       fill: "backwards",
-      isAllOnCompositor: true,
     },
   },
   {
     targetClassName: "fill-backwards-with-delay-iterationstart",
     expectedResult: {
       nameAndType: "Script Animation",
       delay: "50s",
       duration: "100s",
       fill: "backwards",
       iterationStart: "0.5",
-      isAllOnCompositor: true,
     },
   },
   {
     targetClassName: "fill-both",
     expectedResult: {
       nameAndType: "Script Animation",
       duration: "100s",
       fill: "both",
-      isAllOnCompositor: true,
     },
   },
   {
     targetClassName: "fill-both-width-delay-iterationstart",
     expectedResult: {
       nameAndType: "Script Animation",
       delay: "50s",
       duration: "100s",
       fill: "both",
       iterationStart: "0.5",
-      isAllOnCompositor: true,
     },
   },
   {
     targetClassName: "fill-forwards",
     expectedResult: {
       nameAndType: "Script Animation",
       duration: "100s",
       fill: "forwards",
-      isAllOnCompositor: true,
     },
   },
   {
     targetClassName: "iterationstart",
     expectedResult: {
       nameAndType: "Script Animation",
       duration: "100s",
       iterationStart: "0.5",
-      isAllOnCompositor: true,
     },
   },
   {
     targetClassName: "no-compositor",
     expectedResult: {
       nameAndType: "Script Animation",
       duration: "100s",
     },
   },
   {
     targetClassName: "keyframes-easing-step",
     expectedResult: {
       nameAndType: "Script Animation",
       duration: "100s",
-      isAllOnCompositor: true,
     },
   },
 ];
 
 add_task(async function () {
   await addTab(URL_ROOT + "doc_multi_timings.html");
 
   const { panel } = await openAnimationInspector();
@@ -219,17 +200,16 @@ add_task(async function () {
       easing,
       endDelay,
       direction,
       duration,
       fill,
       iterations,
       iterationStart,
       nameAndType,
-      isAllOnCompositor,
     } = expectedResult;
 
     ok(tooltip.startsWith(nameAndType), "Tooltip should start with name and type");
 
     if (animationTimingFunction) {
       const expected = `Animation timing function: ${ animationTimingFunction }`;
       ok(tooltip.includes(expected), `Tooltip should include '${ expected }'`);
     } else {
@@ -288,18 +268,10 @@ add_task(async function () {
 
     if (iterationStart) {
       const expected = `Iteration start: ${ iterationStart }`;
       ok(tooltip.includes(expected), `Tooltip should include '${ expected }'`);
     } else {
       ok(!tooltip.includes("Iteration start:"),
          "Tooltip should not include iterationStart");
     }
-
-    if (isAllOnCompositor) {
-      const expected = "All animation properties are optimized";
-      ok(tooltip.includes(expected), `Tooltip should include '${ expected }'`);
-    } else {
-      ok(!tooltip.includes("optimized"),
-         "Tooltip should not include a message for optmization");
-    }
   }
 });