diff --git a/recipe_modules/fuchsia_util/api.py b/recipe_modules/fuchsia_util/api.py
index 401afa2..5f805b9 100644
--- a/recipe_modules/fuchsia_util/api.py
+++ b/recipe_modules/fuchsia_util/api.py
@@ -8,8 +8,8 @@
 BUCKET_NAME = 'flutter_infra'
 FUCHSIA_BUCKET_NAME = 'fuchsia'
 FUCHSIA_SDK_CIPD = 'fuchsia/sdk/core/linux-amd64'
-FUCHSIA_IMAGE_NAME = 'generic-x64.tgz'
-FUCHSIA_PACKAGES_ARCHIVE_NAME = 'generic-x64.tar.gz'
+FUCHSIA_IMAGE_NAME = 'qemu-x64.tgz'
+FUCHSIA_PACKAGES_ARCHIVE_NAME = 'qemu-x64.tar.gz'
 FUCHSIA_TEST_SCRIPT_NAME = 'run_fuchsia_tests.sh'
 
 SSH_CONFIG = """
diff --git a/recipe_modules/fuchsia_util/examples/full.expected/basic.json b/recipe_modules/fuchsia_util/examples/full.expected/basic.json
index 75cd28a..41aa7b7 100644
--- a/recipe_modules/fuchsia_util/examples/full.expected/basic.json
+++ b/recipe_modules/fuchsia_util/examples/full.expected/basic.json
@@ -134,7 +134,7 @@
       "RECIPE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "gs://fuchsia/development/FUCHSIA_VERSION/images/generic-x64.tgz",
+      "gs://fuchsia/development/FUCHSIA_VERSION/images/qemu-x64.tgz",
       "[CLEANUP]/tmp_tmp_1"
     ],
     "infra_step": true,
@@ -152,7 +152,7 @@
       "RECIPE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "gs://fuchsia/development/FUCHSIA_VERSION/packages/generic-x64.tar.gz",
+      "gs://fuchsia/development/FUCHSIA_VERSION/packages/qemu-x64.tar.gz",
       "[CLEANUP]/tmp_tmp_1"
     ],
     "infra_step": true,
@@ -408,7 +408,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"flutter_fuchsia_driver_tests\", \"priority\": \"100\", \"service_account\": \"\", \"task_slices\": [{\"expiration_secs\": \"3600\", \"properties\": {\"cas_input_root\": {\"cas_instance\": \"projects/example-cas-server/instances/default_instance\", \"digest\": {\"hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855\", \"size_bytes\": \"0\"}}, \"cipd_input\": {\"packages\": [{\"package_name\": \"flutter/fuchsia_ctl/${platform}\", \"path\": \".\", \"version\": null}]}, \"command\": [\"./run_fuchsia_tests.sh\", \"generic-x64.tgz\"], \"containment\": {\"containment_type\": \"AUTO\"}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"luci.flutter.tests\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"3600\", \"grace_period_secs\": \"30\", \"idempotent\": true, \"io_timeout_secs\": \"3600\", \"outputs\": [], \"relative_cwd\": \"\"}, \"wait_for_capacity\": false}]}]}",
+      "{\"requests\": [{\"name\": \"flutter_fuchsia_driver_tests\", \"priority\": \"100\", \"service_account\": \"\", \"task_slices\": [{\"expiration_secs\": \"3600\", \"properties\": {\"cas_input_root\": {\"cas_instance\": \"projects/example-cas-server/instances/default_instance\", \"digest\": {\"hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855\", \"size_bytes\": \"0\"}}, \"cipd_input\": {\"packages\": [{\"package_name\": \"flutter/fuchsia_ctl/${platform}\", \"path\": \".\", \"version\": null}]}, \"command\": [\"./run_fuchsia_tests.sh\", \"qemu-x64.tgz\"], \"containment\": {\"containment_type\": \"AUTO\"}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"luci.flutter.tests\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"3600\", \"grace_period_secs\": \"30\", \"idempotent\": true, \"io_timeout_secs\": \"3600\", \"outputs\": [], \"relative_cwd\": \"\"}, \"wait_for_capacity\": false}]}]}",
       "-json-output",
       "/path/to/tmp/json"
     ],
@@ -460,7 +460,7 @@
       "@@@STEP_LOG_LINE@json.input@            }, @@@",
       "@@@STEP_LOG_LINE@json.input@            \"command\": [@@@",
       "@@@STEP_LOG_LINE@json.input@              \"./run_fuchsia_tests.sh\", @@@",
-      "@@@STEP_LOG_LINE@json.input@              \"generic-x64.tgz\"@@@",
+      "@@@STEP_LOG_LINE@json.input@              \"qemu-x64.tgz\"@@@",
       "@@@STEP_LOG_LINE@json.input@            ], @@@",
       "@@@STEP_LOG_LINE@json.input@            \"containment\": {@@@",
       "@@@STEP_LOG_LINE@json.input@              \"containment_type\": \"AUTO\"@@@",
diff --git a/recipes/fuchsia/fuchsia.expected/basic.json b/recipes/fuchsia/fuchsia.expected/basic.json
index f3608ae..e5d63c6 100644
--- a/recipes/fuchsia/fuchsia.expected/basic.json
+++ b/recipes/fuchsia/fuchsia.expected/basic.json
@@ -345,7 +345,7 @@
       "RECIPE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "gs://fuchsia/development/FUCHSIA_VERSION/images/generic-x64.tgz",
+      "gs://fuchsia/development/FUCHSIA_VERSION/images/qemu-x64.tgz",
       "[CLEANUP]/tmp_tmp_1"
     ],
     "cwd": "[START_DIR]/flutter",
@@ -381,7 +381,7 @@
       "RECIPE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "gs://fuchsia/development/FUCHSIA_VERSION/packages/generic-x64.tar.gz",
+      "gs://fuchsia/development/FUCHSIA_VERSION/packages/qemu-x64.tar.gz",
       "[CLEANUP]/tmp_tmp_1"
     ],
     "cwd": "[START_DIR]/flutter",
@@ -853,7 +853,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"flutter_fuchsia_driver_tests\", \"priority\": \"100\", \"service_account\": \"\", \"task_slices\": [{\"expiration_secs\": \"3600\", \"properties\": {\"cas_input_root\": {\"cas_instance\": \"projects/example-cas-server/instances/default_instance\", \"digest\": {\"hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855\", \"size_bytes\": \"0\"}}, \"cipd_input\": {\"packages\": [{\"package_name\": \"flutter/fuchsia_ctl/${platform}\", \"path\": \".\", \"version\": \"version:0.0.2\"}]}, \"command\": [\"./run_fuchsia_tests.sh\", \"generic-x64.tgz\"], \"containment\": {\"containment_type\": \"AUTO\"}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"luci.flutter.tests\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"3600\", \"grace_period_secs\": \"30\", \"idempotent\": true, \"io_timeout_secs\": \"3600\", \"outputs\": [], \"relative_cwd\": \"\"}, \"wait_for_capacity\": false}]}]}",
+      "{\"requests\": [{\"name\": \"flutter_fuchsia_driver_tests\", \"priority\": \"100\", \"service_account\": \"\", \"task_slices\": [{\"expiration_secs\": \"3600\", \"properties\": {\"cas_input_root\": {\"cas_instance\": \"projects/example-cas-server/instances/default_instance\", \"digest\": {\"hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855\", \"size_bytes\": \"0\"}}, \"cipd_input\": {\"packages\": [{\"package_name\": \"flutter/fuchsia_ctl/${platform}\", \"path\": \".\", \"version\": \"version:0.0.2\"}]}, \"command\": [\"./run_fuchsia_tests.sh\", \"qemu-x64.tgz\"], \"containment\": {\"containment_type\": \"AUTO\"}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"luci.flutter.tests\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"3600\", \"grace_period_secs\": \"30\", \"idempotent\": true, \"io_timeout_secs\": \"3600\", \"outputs\": [], \"relative_cwd\": \"\"}, \"wait_for_capacity\": false}]}]}",
       "-json-output",
       "/path/to/tmp/json"
     ],
@@ -934,7 +934,7 @@
       "@@@STEP_LOG_LINE@json.input@            }, @@@",
       "@@@STEP_LOG_LINE@json.input@            \"command\": [@@@",
       "@@@STEP_LOG_LINE@json.input@              \"./run_fuchsia_tests.sh\", @@@",
-      "@@@STEP_LOG_LINE@json.input@              \"generic-x64.tgz\"@@@",
+      "@@@STEP_LOG_LINE@json.input@              \"qemu-x64.tgz\"@@@",
       "@@@STEP_LOG_LINE@json.input@            ], @@@",
       "@@@STEP_LOG_LINE@json.input@            \"containment\": {@@@",
       "@@@STEP_LOG_LINE@json.input@              \"containment_type\": \"AUTO\"@@@",