diff --git a/.ci.yaml b/.ci.yaml
index bb7f6e50dd..9f8a46f5d8 100755
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -3015,14 +3015,14 @@ targets:
       task_name: service_extensions_test
     scheduler: luci
 
-  - name: Mac_android smoke_catalina_start_up
+  - name: Mac_android flutter_gallery_mac__start_up
     recipe: devicelab/devicelab_drone
     presubmit: false
     timeout: 60
     properties:
       tags: >
         ["devicelab","android","mac"]
-      task_name: smoke_catalina_start_up
+      task_name: flutter_gallery_mac__start_up
     scheduler: luci
 
   - name: Mac_android textfield_perf__timeline_summary
@@ -3449,14 +3449,14 @@ targets:
       task_name: simple_animation_perf_ios
     scheduler: luci
 
-  - name: Mac_ios smoke_catalina_hot_mode_dev_cycle_ios__benchmark
+  - name: Mac_ios hot_mode_dev_cycle_ios__benchmark
     recipe: devicelab/devicelab_drone
     presubmit: false
     timeout: 60
     properties:
       tags: >
         ["devicelab","ios","mac"]
-      task_name: smoke_catalina_hot_mode_dev_cycle_ios__benchmark
+      task_name: hot_mode_dev_cycle_ios__benchmark
     scheduler: luci
 
   - name: Mac_ios tiles_scroll_perf_ios__timeline_summary
diff --git a/TESTOWNERS b/TESTOWNERS
index 36ec071d6e..ed5528e9cc 100644
--- a/TESTOWNERS
+++ b/TESTOWNERS
@@ -93,6 +93,7 @@
 /dev/devicelab/bin/tasks/fading_child_animation_perf__timeline_summary.dart @zanderso @flutter/engine
 /dev/devicelab/bin/tasks/fast_scroll_large_images__memory.dart @zanderso @flutter/engine
 /dev/devicelab/bin/tasks/flavors_test.dart @zanderso @flutter/tool
+/dev/devicelab/bin/tasks/flutter_gallery_mac__start_up.dart @zanderso @flutter/engine
 /dev/devicelab/bin/tasks/flutter_view__start_up.dart @zanderso @flutter/engine
 /dev/devicelab/bin/tasks/fullscreen_textfield_perf__timeline_summary.dart @zanderso @flutter/engine
 /dev/devicelab/bin/tasks/hello_world_android__compile.dart @zanderso @flutter/tool
@@ -115,7 +116,6 @@
 /dev/devicelab/bin/tasks/platform_view__start_up.dart @zanderso @flutter/engine
 /dev/devicelab/bin/tasks/run_release_test.dart @zanderso @flutter/tool
 /dev/devicelab/bin/tasks/service_extensions_test.dart @zanderso @flutter/tool
-/dev/devicelab/bin/tasks/smoke_catalina_start_up.dart @zanderso @flutter/engine
 /dev/devicelab/bin/tasks/textfield_perf__timeline_summary.dart @zanderso @flutter/engine
 /dev/devicelab/bin/tasks/tiles_scroll_perf__timeline_summary.dart @zanderso @flutter/engine
 
@@ -138,6 +138,7 @@
 /dev/devicelab/bin/tasks/flutter_gallery_ios_sksl_warmup__transition_perf.dart @zanderso @flutter/engine
 /dev/devicelab/bin/tasks/flutter_view_ios__start_up.dart @zanderso @flutter/engine
 /dev/devicelab/bin/tasks/hello_world_ios__compile.dart @zanderso @flutter/engine
+/dev/devicelab/bin/tasks/hot_mode_dev_cycle_ios__benchmark.dart @zanderso @flutter/tool
 /dev/devicelab/bin/tasks/hot_mode_dev_cycle_macos_target__benchmark.dart @zanderso @flutter/tool
 /dev/devicelab/bin/tasks/integration_test_test_ios.dart @zanderso @flutter/engine
 /dev/devicelab/bin/tasks/integration_ui_ios_driver.dart @zanderso @flutter/tool
@@ -161,7 +162,6 @@
 /dev/devicelab/bin/tasks/platform_views_scroll_perf_ios__timeline_summary.dart @zanderso @flutter/engine
 /dev/devicelab/bin/tasks/post_backdrop_filter_perf_ios__timeline_summary.dart @zanderso @flutter/engine
 /dev/devicelab/bin/tasks/simple_animation_perf_ios.dart @zanderso @flutter/engine
-/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle_ios__benchmark.dart @zanderso @flutter/tool
 /dev/devicelab/bin/tasks/tiles_scroll_perf_ios__timeline_summary.dart @zanderso @flutter/engine
 
 ## Mac iOS32 DeviceLab tests
diff --git a/dev/devicelab/bin/tasks/smoke_catalina_start_up.dart b/dev/devicelab/bin/tasks/flutter_gallery_mac__start_up.dart
similarity index 100%
rename from dev/devicelab/bin/tasks/smoke_catalina_start_up.dart
rename to dev/devicelab/bin/tasks/flutter_gallery_mac__start_up.dart
diff --git a/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle_ios__benchmark.dart b/dev/devicelab/bin/tasks/hot_mode_dev_cycle_ios__benchmark.dart
similarity index 100%
rename from dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle_ios__benchmark.dart
rename to dev/devicelab/bin/tasks/hot_mode_dev_cycle_ios__benchmark.dart