diff --git a/acceptance/bundle/deployment/bind/pipelines/recreate/out.bind-success.direct.txt b/acceptance/bundle/deployment/bind/pipelines/recreate/out.bind-success.txt
similarity index 100%
rename from acceptance/bundle/deployment/bind/pipelines/recreate/out.bind-success.direct.txt
rename to acceptance/bundle/deployment/bind/pipelines/recreate/out.bind-success.txt
diff --git a/acceptance/bundle/deployment/bind/pipelines/recreate/script b/acceptance/bundle/deployment/bind/pipelines/recreate/script
index aba4cfb97a6..0d22e2cb8af 100644
--- a/acceptance/bundle/deployment/bind/pipelines/recreate/script
+++ b/acceptance/bundle/deployment/bind/pipelines/recreate/script
@@ -9,7 +9,7 @@ trace musterr $CLI bundle deployment bind foo $NEW_PIPELINE_ID &> out.bind-fail.
 print_requests.py '^//import-file/' '^//workspace/'
 
 rm -f out.requests.txt
-trace $CLI bundle deployment bind foo $NEW_PIPELINE_ID --auto-approve &> out.bind-success.$DATABRICKS_BUNDLE_ENGINE.txt
+trace $CLI bundle deployment bind foo $NEW_PIPELINE_ID --auto-approve &> out.bind-success.txt
 trace print_requests.py '^//import-file/' '^//workspace/'
 
 trace $CLI bundle summary -o json | jq .resources > out.summary.json
diff --git a/acceptance/bundle/deployment/bind/pipelines/update/out.bind-success.direct.txt b/acceptance/bundle/deployment/bind/pipelines/update/out.bind-success.direct.txt
deleted file mode 100644
index 6c88a3134b8..00000000000
--- a/acceptance/bundle/deployment/bind/pipelines/update/out.bind-success.direct.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-
->>> [CLI] bundle deployment bind foo [NEW_PIPELINE_ID] --auto-approve
-Updating deployment state...
-Successfully bound pipeline with an id '[NEW_PIPELINE_ID]'
-Run 'bundle deploy' to deploy changes to your workspace
diff --git a/acceptance/bundle/deployment/bind/pipelines/update/out.bind-success.terraform.txt b/acceptance/bundle/deployment/bind/pipelines/update/out.bind-success.terraform.txt
deleted file mode 100644
index 6c88a3134b8..00000000000
--- a/acceptance/bundle/deployment/bind/pipelines/update/out.bind-success.terraform.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-
->>> [CLI] bundle deployment bind foo [NEW_PIPELINE_ID] --auto-approve
-Updating deployment state...
-Successfully bound pipeline with an id '[NEW_PIPELINE_ID]'
-Run 'bundle deploy' to deploy changes to your workspace
diff --git a/acceptance/bundle/deployment/bind/pipelines/recreate/out.bind-success.terraform.txt b/acceptance/bundle/deployment/bind/pipelines/update/out.bind-success.txt
similarity index 100%
rename from acceptance/bundle/deployment/bind/pipelines/recreate/out.bind-success.terraform.txt
rename to acceptance/bundle/deployment/bind/pipelines/update/out.bind-success.txt
diff --git a/acceptance/bundle/deployment/bind/pipelines/update/script b/acceptance/bundle/deployment/bind/pipelines/update/script
index 5d2e487f10c..48a4a1a2b4c 100644
--- a/acceptance/bundle/deployment/bind/pipelines/update/script
+++ b/acceptance/bundle/deployment/bind/pipelines/update/script
@@ -6,7 +6,7 @@ trace musterr $CLI bundle deployment bind foo $NEW_PIPELINE_ID &> out.bind-fail.
 print_requests.py '^//import-file/' '^//workspace/delete'
 
 rm -f out.requests.txt
-trace $CLI bundle deployment bind foo $NEW_PIPELINE_ID --auto-approve &> out.bind-success.$DATABRICKS_BUNDLE_ENGINE.txt
+trace $CLI bundle deployment bind foo $NEW_PIPELINE_ID --auto-approve &> out.bind-success.txt
 print_requests.py '^//import-file/' '^//workspace/delete'
 
 trace $CLI bundle summary -o json > out.summary.json
diff --git a/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/out.plan_delete.terraform.txt b/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/out.plan_delete.terraform.txt
deleted file mode 100644
index c2e0cdc7d9a..00000000000
--- a/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/out.plan_delete.terraform.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-delete jobs.chain_bottom
-delete jobs.chain_mid
-delete jobs.chain_top
-delete jobs.diamond_bottom
-delete jobs.diamond_left
-delete jobs.diamond_right
-delete jobs.diamond_top
-delete jobs.independent1
-delete jobs.independent2
-delete jobs.multi_child
-delete jobs.multi_parent1
-delete jobs.multi_parent2
-
-Plan: 0 to add, 0 to change, 12 to delete, 0 unchanged
diff --git a/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/out.plan_delete.direct.txt b/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/out.plan_delete.txt
similarity index 100%
rename from acceptance/bundle/resource_deps/job_id_big_graph/delete_all/out.plan_delete.direct.txt
rename to acceptance/bundle/resource_deps/job_id_big_graph/delete_all/out.plan_delete.txt
diff --git a/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/out.plan_sanity.direct.txt b/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/out.plan_sanity.txt
similarity index 100%
rename from acceptance/bundle/resource_deps/job_id_big_graph/delete_all/out.plan_sanity.direct.txt
rename to acceptance/bundle/resource_deps/job_id_big_graph/delete_all/out.plan_sanity.txt
diff --git a/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/script b/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/script
index 4ff07b8b69e..9136c748eee 100644
--- a/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/script
+++ b/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/script
@@ -8,11 +8,11 @@ trace print_requests.py --sort //jobs
 replace_ids.py
 
 # Sanity check plan after deploy
-trace $CLI bundle plan > out.plan_sanity.$DATABRICKS_BUNDLE_ENGINE.txt
+trace $CLI bundle plan > out.plan_sanity.txt
 
 title "Delete all via empty.yml"
 cp empty.yml databricks.yml
-trace $CLI bundle plan > out.plan_delete.$DATABRICKS_BUNDLE_ENGINE.txt
+trace $CLI bundle plan > out.plan_delete.txt
 trace $CLI bundle deploy
 
 trace $CLI bundle destroy --auto-approve
diff --git a/acceptance/bundle/resource_deps/job_id_big_graph/destroy/out.plan_sanity.direct.txt b/acceptance/bundle/resource_deps/job_id_big_graph/destroy/out.plan_sanity.direct.txt
deleted file mode 100644
index 28f35f79666..00000000000
--- a/acceptance/bundle/resource_deps/job_id_big_graph/destroy/out.plan_sanity.direct.txt
+++ /dev/null
@@ -1 +0,0 @@
-Plan: 0 to add, 0 to change, 0 to delete, 12 unchanged
diff --git a/acceptance/bundle/resource_deps/job_id_big_graph/destroy/out.plan_sanity.terraform.txt b/acceptance/bundle/resource_deps/job_id_big_graph/destroy/out.plan_sanity.terraform.txt
deleted file mode 100644
index 28f35f79666..00000000000
--- a/acceptance/bundle/resource_deps/job_id_big_graph/destroy/out.plan_sanity.terraform.txt
+++ /dev/null
@@ -1 +0,0 @@
-Plan: 0 to add, 0 to change, 0 to delete, 12 unchanged
diff --git a/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/out.plan_sanity.terraform.txt b/acceptance/bundle/resource_deps/job_id_big_graph/destroy/out.plan_sanity.txt
similarity index 100%
rename from acceptance/bundle/resource_deps/job_id_big_graph/delete_all/out.plan_sanity.terraform.txt
rename to acceptance/bundle/resource_deps/job_id_big_graph/destroy/out.plan_sanity.txt
diff --git a/acceptance/bundle/resource_deps/job_id_big_graph/destroy/script b/acceptance/bundle/resource_deps/job_id_big_graph/destroy/script
index 090f2bd806f..7e7ec71b1a4 100644
--- a/acceptance/bundle/resource_deps/job_id_big_graph/destroy/script
+++ b/acceptance/bundle/resource_deps/job_id_big_graph/destroy/script
@@ -7,7 +7,7 @@ trace print_requests.py --sort //jobs
 replace_ids.py
 
 # Sanity check plan after deploy
-trace $CLI bundle plan > out.plan_sanity.$DATABRICKS_BUNDLE_ENGINE.txt
+trace $CLI bundle plan > out.plan_sanity.txt
 
 title "Destroy all via bundle destroy"
 trace $CLI bundle destroy --auto-approve
diff --git a/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.terraform.txt
deleted file mode 100644
index 0fd05668156..00000000000
--- a/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.terraform.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
->>> errcode [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Deploying resources...
-Updating deployment state...
-Deployment complete!
diff --git a/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.direct.txt b/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.txt
similarity index 100%
rename from acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.direct.txt
rename to acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.txt
diff --git a/acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy.terraform.txt b/acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy.terraform.txt
deleted file mode 100644
index a60dfafafad..00000000000
--- a/acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy.terraform.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-The following resources will be deleted:
-  delete resources.volumes.bar
-  delete resources.volumes.baz
-  delete resources.volumes.foo
-
-This action will result in the deletion of the following volumes.
-For managed volumes, the files stored in the volume are also deleted from your
-cloud tenant within 30 days. For external volumes, the metadata about the volume
-is removed from the catalog, but the underlying files are not deleted:
-  delete resources.volumes.bar
-  delete resources.volumes.baz
-  delete resources.volumes.foo
-
-All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default
-
-Deleting files...
-Destroy complete!
diff --git a/acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy.direct.txt b/acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy.txt
similarity index 100%
rename from acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy.direct.txt
rename to acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy.txt
diff --git a/acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy_requests.direct.json b/acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy_requests.json
similarity index 100%
rename from acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy_requests.direct.json
rename to acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy_requests.json
diff --git a/acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy_requests.terraform.json b/acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy_requests.terraform.json
deleted file mode 100644
index b7a38b0bbb4..00000000000
--- a/acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy_requests.terraform.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "method": "DELETE",
-  "path": "/api/2.1/unity-catalog/volumes/mycatalog.myschema.bazname"
-}
-{
-  "method": "DELETE",
-  "path": "/api/2.1/unity-catalog/volumes/mycatalog.myschema.fooname"
-}
-{
-  "method": "DELETE",
-  "path": "/api/2.1/unity-catalog/volumes/mycatalog.myschema.mycatalog.myschema.bazname"
-}
-{
-  "method": "GET",
-  "path": "/api/2.1/unity-catalog/volumes/mycatalog.myschema.bazname"
-}
-{
-  "method": "GET",
-  "path": "/api/2.1/unity-catalog/volumes/mycatalog.myschema.fooname"
-}
-{
-  "method": "GET",
-  "path": "/api/2.1/unity-catalog/volumes/mycatalog.myschema.mycatalog.myschema.bazname"
-}
diff --git a/acceptance/bundle/resource_deps/volume_path_contains_id/script b/acceptance/bundle/resource_deps/volume_path_contains_id/script
index 97b2c4d693e..914f75443d2 100644
--- a/acceptance/bundle/resource_deps/volume_path_contains_id/script
+++ b/acceptance/bundle/resource_deps/volume_path_contains_id/script
@@ -1,6 +1,6 @@
 cleanup() {
-    $CLI bundle destroy --auto-approve &> out.destroy.$DATABRICKS_BUNDLE_ENGINE.txt
-    print_requests.py --sort --get //unity &> out.destroy_requests.$DATABRICKS_BUNDLE_ENGINE.json
+    $CLI bundle destroy --auto-approve &> out.destroy.txt
+    print_requests.py --sort --get //unity &> out.destroy_requests.json
 }
 
 trace $CLI bundle validate -o json | jq .resources
@@ -8,7 +8,7 @@ trace $CLI bundle plan
 $CLI bundle plan -o json > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 
 trap cleanup EXIT
-trace errcode $CLI bundle deploy &> out.deploy.$DATABRICKS_BUNDLE_ENGINE.txt
+trace errcode $CLI bundle deploy &> out.deploy.txt
 
 # bar.name is created from baz.id (resolved during deploy), and foo.comment is
 # created with bar.volume_path, whose embedded baz.id reference also resolves
diff --git a/acceptance/bundle/resources/dashboards/change-parent-path/out.plan_after_deploy.terraform.txt b/acceptance/bundle/resources/dashboards/change-parent-path/out.plan_after_deploy.terraform.txt
deleted file mode 100644
index c54c9d511c0..00000000000
--- a/acceptance/bundle/resources/dashboards/change-parent-path/out.plan_after_deploy.terraform.txt
+++ /dev/null
@@ -1 +0,0 @@
-Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
diff --git a/acceptance/bundle/resources/dashboards/change-parent-path/out.plan_after_deploy.direct.txt b/acceptance/bundle/resources/dashboards/change-parent-path/out.plan_after_deploy.txt
similarity index 100%
rename from acceptance/bundle/resources/dashboards/change-parent-path/out.plan_after_deploy.direct.txt
rename to acceptance/bundle/resources/dashboards/change-parent-path/out.plan_after_deploy.txt
diff --git a/acceptance/bundle/resources/dashboards/change-parent-path/script b/acceptance/bundle/resources/dashboards/change-parent-path/script
index 664c6867044..c7eec7eb3ac 100755
--- a/acceptance/bundle/resources/dashboards/change-parent-path/script
+++ b/acceptance/bundle/resources/dashboards/change-parent-path/script
@@ -38,4 +38,4 @@ cat out.requests.txt | \
  jq 'select( (.path | contains("/api/2.0/lakeview/dashboards")) or ((.path == "/api/2.0/workspace/mkdirs") and (.body.path | contains("/default/resources"))))' \
  > out.dashboardrequests.txt
 
-$CLI bundle plan > out.plan_after_deploy.$DATABRICKS_BUNDLE_ENGINE.txt
+$CLI bundle plan > out.plan_after_deploy.txt
diff --git a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/out.post.requests.terraform.txt b/acceptance/bundle/resources/dashboards/dataset-catalog-schema/out.post.requests.terraform.txt
deleted file mode 100644
index 49f54fb76f6..00000000000
--- a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/out.post.requests.terraform.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "method": "POST",
-  "path": "/api/2.0/lakeview/dashboards",
-  "q": {
-    "dataset_catalog": "main",
-    "dataset_schema": "default"
-  },
-  "body": {
-    "display_name": "test bundle-deploy-dashboard-dataset [UUID]",
-    "parent_path": "/Workspace/Users/[USERNAME]",
-    "serialized_dashboard": "{\n  \"pages\": [\n    {\n      \"name\": \"test_page\",\n      \"displayName\": \"Test Page\",\n      \"pageType\": \"PAGE_TYPE_CANVAS\"\n    }\n  ],\n  \"datasets\": [\n    {\n      \"name\": \"bf8f76f4\",\n      \"displayName\": \"Test Dataset\",\n      \"queryLines\": [\n        \"SELECT 1\\n\"\n      ],\n      \"catalog\": \"foobar\",\n      \"schema\": \"foobar\"\n    }\n  ]\n}\n",
-    "warehouse_id": "[TEST_DEFAULT_WAREHOUSE_ID]"
-  }
-}
diff --git a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/out.post.requests.direct.txt b/acceptance/bundle/resources/dashboards/dataset-catalog-schema/out.post.requests.txt
similarity index 100%
rename from acceptance/bundle/resources/dashboards/dataset-catalog-schema/out.post.requests.direct.txt
rename to acceptance/bundle/resources/dashboards/dataset-catalog-schema/out.post.requests.txt
diff --git a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/script b/acceptance/bundle/resources/dashboards/dataset-catalog-schema/script
index b147e47f32c..fba98e8dbcc 100755
--- a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/script
+++ b/acceptance/bundle/resources/dashboards/dataset-catalog-schema/script
@@ -48,4 +48,4 @@ cat out.requests.txt | \
  jq 'select(.method == "POST")' | \
  jq 'select(.path | contains("/api/2.0/lakeview/dashboards"))' | \
  jq 'select(.path | contains("/published") | not)' \
- > out.post.requests.$DATABRICKS_BUNDLE_ENGINE.txt
+ > out.post.requests.txt
diff --git a/acceptance/bundle/resources/grants/schemas/duplicate_privileges/out.plan.terraform.txt b/acceptance/bundle/resources/grants/schemas/duplicate_privileges/out.plan.terraform.txt
deleted file mode 100644
index 068a177d51f..00000000000
--- a/acceptance/bundle/resources/grants/schemas/duplicate_privileges/out.plan.terraform.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-
->>> [CLI] bundle plan
-Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
diff --git a/acceptance/bundle/resources/grants/schemas/duplicate_privileges/out.plan.direct.txt b/acceptance/bundle/resources/grants/schemas/duplicate_privileges/out.plan.txt
similarity index 100%
rename from acceptance/bundle/resources/grants/schemas/duplicate_privileges/out.plan.direct.txt
rename to acceptance/bundle/resources/grants/schemas/duplicate_privileges/out.plan.txt
diff --git a/acceptance/bundle/resources/grants/schemas/duplicate_privileges/script b/acceptance/bundle/resources/grants/schemas/duplicate_privileges/script
index 6118156ba56..b1244a4c78c 100644
--- a/acceptance/bundle/resources/grants/schemas/duplicate_privileges/script
+++ b/acceptance/bundle/resources/grants/schemas/duplicate_privileges/script
@@ -9,4 +9,4 @@ trap cleanup EXIT
 # Same privilege listed twice for the same principal in a single entry.
 trace $CLI bundle deploy
 print_requests.py --get //permissions --keep > out.requests.$DATABRICKS_BUNDLE_ENGINE.txt
-trace $CLI bundle plan > out.plan.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1
+trace $CLI bundle plan > out.plan.txt 2>&1
diff --git a/acceptance/bundle/resources/grants/schemas/remove_principal/out.grants.terraform.txt b/acceptance/bundle/resources/grants/schemas/remove_principal/out.grants.terraform.txt
deleted file mode 100644
index 0ef2f8e8b73..00000000000
--- a/acceptance/bundle/resources/grants/schemas/remove_principal/out.grants.terraform.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-json.privilege_assignments[].principal = "[USERNAME]";
-json.privilege_assignments[].privileges[] = "CREATE_TABLE";
diff --git a/acceptance/bundle/resources/grants/schemas/remove_principal/out.grants.direct.txt b/acceptance/bundle/resources/grants/schemas/remove_principal/out.grants.txt
similarity index 100%
rename from acceptance/bundle/resources/grants/schemas/remove_principal/out.grants.direct.txt
rename to acceptance/bundle/resources/grants/schemas/remove_principal/out.grants.txt
diff --git a/acceptance/bundle/resources/grants/schemas/remove_principal/script b/acceptance/bundle/resources/grants/schemas/remove_principal/script
index 2730c8ba97b..ca74a621374 100644
--- a/acceptance/bundle/resources/grants/schemas/remove_principal/script
+++ b/acceptance/bundle/resources/grants/schemas/remove_principal/script
@@ -12,7 +12,7 @@ trace $CLI grants get schema main.schema_remove_principal_$UNIQUE_NAME | gron.py
 grep -v 'TO_REMOVE' databricks.yml > tmp.yml && mv tmp.yml databricks.yml
 
 trace $CLI bundle deploy
-trace $CLI grants get schema main.schema_remove_principal_$UNIQUE_NAME | gron.py --noindex | sort_lines.py --repl | contains.py "$CURRENT_USER_NAME" '!deco-test-user@databricks.com' &> out.grants.$DATABRICKS_BUNDLE_ENGINE.txt
+trace $CLI grants get schema main.schema_remove_principal_$UNIQUE_NAME | gron.py --noindex | sort_lines.py --repl | contains.py "$CURRENT_USER_NAME" '!deco-test-user@databricks.com' &> out.grants.txt
 trace $CLI bundle plan
 trace $CLI bundle deploy
 trace $CLI bundle plan
diff --git a/acceptance/bundle/resources/jobs/remote_delete/destroy/out.destroy.terraform.txt b/acceptance/bundle/resources/jobs/remote_delete/destroy/out.destroy.terraform.txt
deleted file mode 100644
index 1cea8f06419..00000000000
--- a/acceptance/bundle/resources/jobs/remote_delete/destroy/out.destroy.terraform.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
->>> errcode [CLI] bundle destroy --auto-approve
-All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default
-
-Deleting files...
-Destroy complete!
diff --git a/acceptance/bundle/resources/jobs/remote_delete/destroy/out.destroy.direct.txt b/acceptance/bundle/resources/jobs/remote_delete/destroy/out.destroy.txt
similarity index 100%
rename from acceptance/bundle/resources/jobs/remote_delete/destroy/out.destroy.direct.txt
rename to acceptance/bundle/resources/jobs/remote_delete/destroy/out.destroy.txt
diff --git a/acceptance/bundle/resources/jobs/remote_delete/destroy/script b/acceptance/bundle/resources/jobs/remote_delete/destroy/script
index f50be749359..e9b3a300431 100644
--- a/acceptance/bundle/resources/jobs/remote_delete/destroy/script
+++ b/acceptance/bundle/resources/jobs/remote_delete/destroy/script
@@ -2,4 +2,4 @@ trace $CLI bundle plan
 trace $CLI bundle deploy
 job_id=`$CLI bundle summary -o json | jq -r .resources.jobs.foo.id`
 trace $CLI jobs delete $job_id
-trace errcode $CLI bundle destroy --auto-approve &> out.destroy.$DATABRICKS_BUNDLE_ENGINE.txt
+trace errcode $CLI bundle destroy --auto-approve &> out.destroy.txt
diff --git a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.terraform.txt b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.terraform.txt
deleted file mode 100644
index 0a628d4cb69..00000000000
--- a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.terraform.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
->>> [CLI] bundle deploy --auto-approve
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Deploying resources...
-Updating deployment state...
-Deployment complete!
diff --git a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.direct.txt b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.txt
similarity index 100%
rename from acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.direct.txt
rename to acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.txt
diff --git a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/script b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/script
index 2b032406a00..d62cfc1ccc1 100644
--- a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/script
+++ b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/script
@@ -10,7 +10,7 @@ cp empty.yml databricks.yml
 # Drain requests recorded so far; only requests made after the config removal matter below.
 print_requests.py --get // &> LOG.requests_setup
 trace $CLI bundle plan &> out.plan_removed.$DATABRICKS_BUNDLE_ENGINE.txt
-trace $CLI bundle deploy --auto-approve &> out.deploy_removed.$DATABRICKS_BUNDLE_ENGINE.txt
+trace $CLI bundle deploy --auto-approve &> out.deploy_removed.txt
 
 title "Plan and deploy again, then summary"
 trace $CLI bundle plan
diff --git a/acceptance/bundle/resources/model_serving_endpoints/basic/out.first-requests.terraform.txt b/acceptance/bundle/resources/model_serving_endpoints/basic/out.first-requests.terraform.txt
deleted file mode 100644
index ff4ff00fb8e..00000000000
--- a/acceptance/bundle/resources/model_serving_endpoints/basic/out.first-requests.terraform.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-json[0].method = "POST";
-json[0].path = "/api/2.0/serving-endpoints";
-json[0].body.name = "[ENDPOINT_NAME_1]";
-json[1].method = "PUT";
-json[1].path = "/api/2.0/permissions/serving-endpoints/[ENDPOINT_ID_1]";
-json[1].body.access_control_list[0].permission_level = "CAN_MANAGE";
-json[1].body.access_control_list[0].service_principal_name = "[USERNAME]";
-json[1].body.access_control_list[1].permission_level = "CAN_VIEW";
-json[1].body.access_control_list[1].user_name = "deco-test-user@databricks.com";
diff --git a/acceptance/bundle/resources/model_serving_endpoints/basic/out.first-requests.direct.txt b/acceptance/bundle/resources/model_serving_endpoints/basic/out.first-requests.txt
similarity index 100%
rename from acceptance/bundle/resources/model_serving_endpoints/basic/out.first-requests.direct.txt
rename to acceptance/bundle/resources/model_serving_endpoints/basic/out.first-requests.txt
diff --git a/acceptance/bundle/resources/model_serving_endpoints/basic/script b/acceptance/bundle/resources/model_serving_endpoints/basic/script
index 3fc875f5f58..0cb04b45dfe 100755
--- a/acceptance/bundle/resources/model_serving_endpoints/basic/script
+++ b/acceptance/bundle/resources/model_serving_endpoints/basic/script
@@ -19,7 +19,7 @@ trace $CLI bundle deploy
 # Sort access_control_list: the terraform engine stores it as a set whose order
 # depends on the (unmasked) principal value, so it differs between the local fake
 # SP and the real cloud SP. Sorting makes the recorded request stable across both.
-print_requests.py //serving-endpoints | gron.py --sort-arrays access_control_list > out.first-requests.$DATABRICKS_BUNDLE_ENGINE.txt
+print_requests.py //serving-endpoints | gron.py --sort-arrays access_control_list > out.first-requests.txt
 
 echo "$ENDPOINT_NAME:ENDPOINT_NAME_1" >> ACC_REPLS
 
diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/out.first-get.direct.json b/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/out.first-get.json
similarity index 100%
rename from acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/out.first-get.direct.json
rename to acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/out.first-get.json
diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/out.first-get.terraform.json b/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/out.first-get.terraform.json
deleted file mode 100644
index f74ee879216..00000000000
--- a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/out.first-get.terraform.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "route_optimized": false,
-  "id": "[UUID]"
-}
diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/script b/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/script
index fec000b7e18..67454fd8320 100755
--- a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/script
+++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/script
@@ -11,7 +11,7 @@ trace $CLI bundle deploy
 
 ENDPOINT_ID=$($CLI bundle summary -o json | jq -r '.resources.model_serving_endpoints.test_endpoint.id')
 echo "$ENDPOINT_ID:ORIGINAL_ENDPOINT_ID" >> ACC_REPLS
-trace $CLI serving-endpoints get "${ENDPOINT_ID}" | jq '{route_optimized, id}' > out.first-get.$DATABRICKS_BUNDLE_ENGINE.json
+trace $CLI serving-endpoints get "${ENDPOINT_ID}" | jq '{route_optimized, id}' > out.first-get.json
 
 print_requests.py //serving-endpoints > out.first-requests.$DATABRICKS_BUNDLE_ENGINE.json
 
diff --git a/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.terraform.txt b/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.terraform.txt
deleted file mode 100644
index a2a2a872e76..00000000000
--- a/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.terraform.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
->>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/num-workers-zero/default/files...
-Deploying resources...
-Updating deployment state...
-Deployment complete!
diff --git a/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.direct.txt b/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.txt
similarity index 100%
rename from acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.direct.txt
rename to acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.txt
diff --git a/acceptance/bundle/resources/pipelines/num-workers-zero/script b/acceptance/bundle/resources/pipelines/num-workers-zero/script
index a33c1771e96..69063834383 100644
--- a/acceptance/bundle/resources/pipelines/num-workers-zero/script
+++ b/acceptance/bundle/resources/pipelines/num-workers-zero/script
@@ -1,3 +1,3 @@
-trace $CLI bundle deploy > out.deploy.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1
+trace $CLI bundle deploy > out.deploy.txt 2>&1
 trace errcode jq -s '.[] | select(.method == "POST" and (.path | contains("/pipelines")))' out.requests.txt > out.requests.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1
 rm out.requests.txt
diff --git a/acceptance/bundle/resources/postgres_branches/replace_existing/out.destroy.terraform.txt b/acceptance/bundle/resources/postgres_branches/replace_existing/out.destroy.terraform.txt
deleted file mode 100644
index 03109f9364d..00000000000
--- a/acceptance/bundle/resources/postgres_branches/replace_existing/out.destroy.terraform.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-The following resources will be deleted:
-  delete resources.postgres_branches.production
-  delete resources.postgres_projects.my_project
-
-This action will result in the deletion of the following Lakebase projects along with
-all their branches, databases, and endpoints. All data stored in them will be permanently lost:
-  delete resources.postgres_projects.my_project
-
-This action will result in the deletion of the following Lakebase branches.
-All data stored in them will be permanently lost:
-  delete resources.postgres_branches.production
-
-All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-replace-branch-[UNIQUE_NAME]/default
-
-Deleting files...
-Destroy complete!
diff --git a/acceptance/bundle/resources/postgres_branches/replace_existing/out.destroy.direct.txt b/acceptance/bundle/resources/postgres_branches/replace_existing/out.destroy.txt
similarity index 100%
rename from acceptance/bundle/resources/postgres_branches/replace_existing/out.destroy.direct.txt
rename to acceptance/bundle/resources/postgres_branches/replace_existing/out.destroy.txt
diff --git a/acceptance/bundle/resources/postgres_branches/replace_existing/script b/acceptance/bundle/resources/postgres_branches/replace_existing/script
index fca839a4b78..d64adec24ab 100644
--- a/acceptance/bundle/resources/postgres_branches/replace_existing/script
+++ b/acceptance/bundle/resources/postgres_branches/replace_existing/script
@@ -23,6 +23,6 @@ trace print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,
 # output is captured so regressions in either engine's destroy flow show
 # up in the diff.
 title "bundle destroy"
-$CLI bundle destroy --auto-approve > out.destroy.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1 || true
+$CLI bundle destroy --auto-approve > out.destroy.txt 2>&1 || true
 
 trace print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.destroy.$DATABRICKS_BUNDLE_ENGINE.json
diff --git a/acceptance/bundle/resources/postgres_endpoints/replace_existing/out.destroy.terraform.txt b/acceptance/bundle/resources/postgres_endpoints/replace_existing/out.destroy.terraform.txt
deleted file mode 100644
index 2ac6d613c05..00000000000
--- a/acceptance/bundle/resources/postgres_endpoints/replace_existing/out.destroy.terraform.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-The following resources will be deleted:
-  delete resources.postgres_branches.develop
-  delete resources.postgres_endpoints.primary
-  delete resources.postgres_projects.my_project
-
-This action will result in the deletion of the following Lakebase projects along with
-all their branches, databases, and endpoints. All data stored in them will be permanently lost:
-  delete resources.postgres_projects.my_project
-
-This action will result in the deletion of the following Lakebase branches.
-All data stored in them will be permanently lost:
-  delete resources.postgres_branches.develop
-
-All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-replace-endpoint-[UNIQUE_NAME]/default
-
-Deleting files...
-Destroy complete!
diff --git a/acceptance/bundle/resources/postgres_endpoints/replace_existing/out.destroy.direct.txt b/acceptance/bundle/resources/postgres_endpoints/replace_existing/out.destroy.txt
similarity index 100%
rename from acceptance/bundle/resources/postgres_endpoints/replace_existing/out.destroy.direct.txt
rename to acceptance/bundle/resources/postgres_endpoints/replace_existing/out.destroy.txt
diff --git a/acceptance/bundle/resources/postgres_endpoints/replace_existing/script b/acceptance/bundle/resources/postgres_endpoints/replace_existing/script
index 7c6978468db..4c88b1f8f18 100644
--- a/acceptance/bundle/resources/postgres_endpoints/replace_existing/script
+++ b/acceptance/bundle/resources/postgres_endpoints/replace_existing/script
@@ -25,6 +25,6 @@ trace print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,
 # endpoint. Per-engine output is captured so regressions in either
 # engine's destroy flow show up in the diff.
 title "bundle destroy"
-$CLI bundle destroy --auto-approve > out.destroy.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1 || true
+$CLI bundle destroy --auto-approve > out.destroy.txt 2>&1 || true
 
 trace print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.destroy.$DATABRICKS_BUNDLE_ENGINE.json
diff --git a/acceptance/bundle/resources/quality_monitors/create/out.deploy.terraform.txt b/acceptance/bundle/resources/quality_monitors/create/out.deploy.terraform.txt
deleted file mode 100644
index af5c31de3b1..00000000000
--- a/acceptance/bundle/resources/quality_monitors/create/out.deploy.terraform.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
->>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default/files...
-Deploying resources...
-Updating deployment state...
-Deployment complete!
diff --git a/acceptance/bundle/resources/quality_monitors/create/out.deploy.direct.txt b/acceptance/bundle/resources/quality_monitors/create/out.deploy.txt
similarity index 100%
rename from acceptance/bundle/resources/quality_monitors/create/out.deploy.direct.txt
rename to acceptance/bundle/resources/quality_monitors/create/out.deploy.txt
diff --git a/acceptance/bundle/resources/quality_monitors/create/script b/acceptance/bundle/resources/quality_monitors/create/script
index 78c7853b264..97f6ce6a843 100644
--- a/acceptance/bundle/resources/quality_monitors/create/script
+++ b/acceptance/bundle/resources/quality_monitors/create/script
@@ -20,7 +20,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 trace $CLI bundle plan -o json > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
 
 rm out.requests.txt
-trace $CLI bundle deploy &> out.deploy.$DATABRICKS_BUNDLE_ENGINE.txt
+trace $CLI bundle deploy &> out.deploy.txt
 trace print_requests.py '^//import-file/' '^//workspace/' '^//telemetry-ext' > out.deploy.requests.json
 
 # store state to ensure we have table_name there
diff --git a/acceptance/bundle/telemetry/deploy-whl-artifacts/out.drymigrate.terraform.txt b/acceptance/bundle/telemetry/deploy-whl-artifacts/out.drymigrate.terraform.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/acceptance/bundle/telemetry/deploy-whl-artifacts/out.drymigrate.direct.txt b/acceptance/bundle/telemetry/deploy-whl-artifacts/out.drymigrate.txt
similarity index 100%
rename from acceptance/bundle/telemetry/deploy-whl-artifacts/out.drymigrate.direct.txt
rename to acceptance/bundle/telemetry/deploy-whl-artifacts/out.drymigrate.txt
diff --git a/acceptance/bundle/telemetry/deploy-whl-artifacts/script b/acceptance/bundle/telemetry/deploy-whl-artifacts/script
index b1ee8772a64..fbe35a7a41f 100644
--- a/acceptance/bundle/telemetry/deploy-whl-artifacts/script
+++ b/acceptance/bundle/telemetry/deploy-whl-artifacts/script
@@ -9,6 +9,6 @@ trace $CLI bundle deploy -t two
 # Common bool_values are engine-agnostic; the terraform-only direct_drymigrate_*
 # entries go to a per-engine file so output.txt stays shared.
 trace print_telemetry_bool_values | grep -v direct_drymigrate
-print_telemetry_bool_values | grep direct_drymigrate > out.drymigrate.$DATABRICKS_BUNDLE_ENGINE.txt || true
+print_telemetry_bool_values | grep direct_drymigrate > out.drymigrate.txt || true
 
 rm out.requests.txt