diff --git a/acceptance/bundle/apps/app_yaml/databricks.yml b/acceptance/bundle/apps/app_yaml/databricks.yml
index 0064e6c6b1..5e46233cea 100644
--- a/acceptance/bundle/apps/app_yaml/databricks.yml
+++ b/acceptance/bundle/apps/app_yaml/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: apps_yaml
-
 resources:
   apps:
     myapp:
diff --git a/acceptance/bundle/apps/app_yaml/out.app.yml.txt b/acceptance/bundle/apps/app_yaml/out.app.yml.txt
index eccd4eb138..6d74c282a2 100644
--- a/acceptance/bundle/apps/app_yaml/out.app.yml.txt
+++ b/acceptance/bundle/apps/app_yaml/out.app.yml.txt
@@ -1,5 +1,5 @@
 {
   "method": "POST",
-  "path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/apps_yaml/default/files/app/app.yml",
+  "path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/app/app.yml",
   "raw_body": "command:\n  - python\n  - app.py\n"
 }
diff --git a/acceptance/bundle/apps/app_yaml/output.txt b/acceptance/bundle/apps/app_yaml/output.txt
index 2a946e5ee1..3221a1059c 100644
--- a/acceptance/bundle/apps/app_yaml/output.txt
+++ b/acceptance/bundle/apps/app_yaml/output.txt
@@ -1,15 +1,15 @@
 
 >>> [CLI] bundle validate
-Name: apps_yaml
+Name: test-bundle
 Target: default
 Workspace:
   User: [USERNAME]
-  Path: /Workspace/Users/[USERNAME]/.bundle/apps_yaml/default
+  Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default
 
 Validation OK!
 
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/apps_yaml/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
diff --git a/acceptance/bundle/apps/app_yaml/script b/acceptance/bundle/apps/app_yaml/script
index 7f8a13dc84..e98f523159 100644
--- a/acceptance/bundle/apps/app_yaml/script
+++ b/acceptance/bundle/apps/app_yaml/script
@@ -1,4 +1,4 @@
 trace $CLI bundle validate
 trace $CLI bundle deploy
-jq 'select(.path | test("/api/2.0/workspace-files/import-file/Workspace/Users/.*/.bundle/apps_yaml/default/files/app/app.yml"))' out.requests.txt | sed 's/\\r//g'  > out.app.yml.txt
+jq 'select(.path | test("app.yml"))' out.requests.txt | sed 's/\\r//g'  > out.app.yml.txt
 rm out.requests.txt
diff --git a/acceptance/bundle/apps/config_section/databricks.yml b/acceptance/bundle/apps/config_section/databricks.yml
index 25ab2f2616..2662d75f00 100644
--- a/acceptance/bundle/apps/config_section/databricks.yml
+++ b/acceptance/bundle/apps/config_section/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: apps_config_section
-
 resources:
   apps:
     myapp:
diff --git a/acceptance/bundle/apps/config_section/out.app.yml.txt b/acceptance/bundle/apps/config_section/out.app.yml.txt
index a3e69351b1..6d74c282a2 100644
--- a/acceptance/bundle/apps/config_section/out.app.yml.txt
+++ b/acceptance/bundle/apps/config_section/out.app.yml.txt
@@ -1,5 +1,5 @@
 {
   "method": "POST",
-  "path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/apps_config_section/default/files/app/app.yml",
+  "path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/app/app.yml",
   "raw_body": "command:\n  - python\n  - app.py\n"
 }
diff --git a/acceptance/bundle/apps/config_section/output.txt b/acceptance/bundle/apps/config_section/output.txt
index 800945278c..8f6de69ad9 100644
--- a/acceptance/bundle/apps/config_section/output.txt
+++ b/acceptance/bundle/apps/config_section/output.txt
@@ -4,16 +4,16 @@ Warning: App config section detected
 
 remove 'config' from app resource 'myapp' section and use app.yml file in the root of this app instead
 
-Name: apps_config_section
+Name: test-bundle
 Target: default
 Workspace:
   User: [USERNAME]
-  Path: /Workspace/Users/[USERNAME]/.bundle/apps_config_section/default
+  Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default
 
 Found 1 warning
 
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/apps_config_section/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
diff --git a/acceptance/bundle/apps/config_section/script b/acceptance/bundle/apps/config_section/script
index 89207c4562..b80cd910c0 100644
--- a/acceptance/bundle/apps/config_section/script
+++ b/acceptance/bundle/apps/config_section/script
@@ -1,4 +1,4 @@
 trace $CLI bundle validate
 trace $CLI bundle deploy
-jq 'select(.path | test("/api/2.0/workspace-files/import-file/Workspace/Users/.*/.bundle/apps_config_section/default/files/app/app.yml"))' out.requests.txt  > out.app.yml.txt
+jq 'select(.path | test("default/files/app/app.yml"))' out.requests.txt  > out.app.yml.txt
 rm out.requests.txt
diff --git a/acceptance/bundle/artifacts/build_and_files/databricks.yml b/acceptance/bundle/artifacts/build_and_files/databricks.yml
index 159d806fb5..70d6152b6d 100644
--- a/acceptance/bundle/artifacts/build_and_files/databricks.yml
+++ b/acceptance/bundle/artifacts/build_and_files/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: build_and_files
-
 artifacts:
   custom:
     build: touch built.txt
diff --git a/acceptance/bundle/artifacts/build_and_files_whl/databricks.yml b/acceptance/bundle/artifacts/build_and_files_whl/databricks.yml
index 8afd2e2313..ac47b1f0f2 100644
--- a/acceptance/bundle/artifacts/build_and_files_whl/databricks.yml
+++ b/acceptance/bundle/artifacts/build_and_files_whl/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: build_and_files_whl
-
 artifacts:
   artifact_with_custom_dist:
     # commenting out 'type: whl' here actually makes 'bundle deploy' to build and upload correct wheel,
diff --git a/acceptance/bundle/artifacts/build_and_files_whl/output.txt b/acceptance/bundle/artifacts/build_and_files_whl/output.txt
index ab465af385..e3ed5dea70 100644
--- a/acceptance/bundle/artifacts/build_and_files_whl/output.txt
+++ b/acceptance/bundle/artifacts/build_and_files_whl/output.txt
@@ -1,10 +1,10 @@
 
 >>> [CLI] bundle validate
-Name: build_and_files_whl
+Name: test-bundle
 Target: default
 Workspace:
   User: [USERNAME]
-  Path: /Workspace/Users/[USERNAME]/.bundle/build_and_files_whl/default
+  Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default
 
 Validation OK!
 
diff --git a/acceptance/bundle/artifacts/glob_exact_whl/databricks.yml b/acceptance/bundle/artifacts/glob_exact_whl/databricks.yml
index 7e6d6b8114..832f8b1d91 100644
--- a/acceptance/bundle/artifacts/glob_exact_whl/databricks.yml
+++ b/acceptance/bundle/artifacts/glob_exact_whl/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: python-wheel
-
 artifacts:
     my_prebuilt_whl:
       type: whl
diff --git a/acceptance/bundle/artifacts/glob_exact_whl/output.txt b/acceptance/bundle/artifacts/glob_exact_whl/output.txt
index e3f050312e..3f292b7a0d 100644
--- a/acceptance/bundle/artifacts/glob_exact_whl/output.txt
+++ b/acceptance/bundle/artifacts/glob_exact_whl/output.txt
@@ -14,7 +14,7 @@
 
 >>> [CLI] bundle deploy
 Uploading prebuilt/other_test_code-0.0.1-py3-none-any.whl...
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/python-wheel/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
diff --git a/acceptance/bundle/artifacts/globs_in_files_in_include/databricks.yml b/acceptance/bundle/artifacts/globs_in_files_in_include/databricks.yml
index 1723173759..65664a48f4 100644
--- a/acceptance/bundle/artifacts/globs_in_files_in_include/databricks.yml
+++ b/acceptance/bundle/artifacts/globs_in_files_in_include/databricks.yml
@@ -1,5 +1,2 @@
-bundle:
-  name: expand_globs
-
 include:
   - resources/artifacts.yml
diff --git a/acceptance/bundle/artifacts/unique_name_libraries/databricks.yml b/acceptance/bundle/artifacts/unique_name_libraries/databricks.yml
index dd13c1918a..930194ed44 100644
--- a/acceptance/bundle/artifacts/unique_name_libraries/databricks.yml
+++ b/acceptance/bundle/artifacts/unique_name_libraries/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: unique_name_libraries
-
 variables:
   cluster:
     default:
diff --git a/acceptance/bundle/artifacts/unique_name_libraries/output.txt b/acceptance/bundle/artifacts/unique_name_libraries/output.txt
index ce3567a023..ca37098f92 100644
--- a/acceptance/bundle/artifacts/unique_name_libraries/output.txt
+++ b/acceptance/bundle/artifacts/unique_name_libraries/output.txt
@@ -4,7 +4,7 @@ Building whl1...
 Building whl2...
 Uploading whl1/dist/my_package-0.0.1-py3-none-any.whl...
 Uploading whl2/dist/my_other_package-0.0.1-py3-none-any.whl...
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/unique_name_libraries/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
diff --git a/acceptance/bundle/artifacts/whl_dbfs/databricks.yml b/acceptance/bundle/artifacts/whl_dbfs/databricks.yml
index fe2723aa6f..78519606f7 100644
--- a/acceptance/bundle/artifacts/whl_dbfs/databricks.yml
+++ b/acceptance/bundle/artifacts/whl_dbfs/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: python-wheel
-
 resources:
   jobs:
     test_job:
diff --git a/acceptance/bundle/artifacts/whl_dbfs/output.txt b/acceptance/bundle/artifacts/whl_dbfs/output.txt
index b385693edb..306de22de1 100644
--- a/acceptance/bundle/artifacts/whl_dbfs/output.txt
+++ b/acceptance/bundle/artifacts/whl_dbfs/output.txt
@@ -1,6 +1,6 @@
 
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/python-wheel/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
diff --git a/acceptance/bundle/artifacts/whl_dynamic/databricks.yml b/acceptance/bundle/artifacts/whl_dynamic/databricks.yml
index c1cb6d137d..3225a9263b 100644
--- a/acceptance/bundle/artifacts/whl_dynamic/databricks.yml
+++ b/acceptance/bundle/artifacts/whl_dynamic/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: python-wheel
-
 artifacts:
   my_test_code:
     type: whl
diff --git a/acceptance/bundle/artifacts/whl_dynamic/output.txt b/acceptance/bundle/artifacts/whl_dynamic/output.txt
index c8c89968bc..419c92df8d 100644
--- a/acceptance/bundle/artifacts/whl_dynamic/output.txt
+++ b/acceptance/bundle/artifacts/whl_dynamic/output.txt
@@ -23,7 +23,7 @@
 Building my_test_code...
 Uploading .databricks/bundle/default/patched_wheels/my_prebuilt_whl_other_test_code/other_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl...
 Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl...
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/python-wheel/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -64,7 +64,7 @@ my_test_code-0.0.1+[TIMESTAMP_NS].dist-info/RECORD
         "existing_cluster_id": "0717-132531-5opeqon1",
         "libraries": [
           {
-            "whl": "/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
+            "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
           }
         ],
         "python_wheel_task": {
@@ -76,10 +76,10 @@ my_test_code-0.0.1+[TIMESTAMP_NS].dist-info/RECORD
     },
     "libraries": [
       {
-        "whl": "/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
+        "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
       },
       {
-        "whl": "/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/other_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
+        "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
       }
     ],
     "python_wheel_task": {
@@ -92,17 +92,17 @@ my_test_code-0.0.1+[TIMESTAMP_NS].dist-info/RECORD
 
 === Expecting 2 patched wheels to be uploaded
 >>> jq .path
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/other_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/files/my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/files/prebuilt/other_test_code-0.0.1-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/prebuilt/other_test_code-0.0.1-py3-none-any.whl"
 
 === Updating the local wheel and deploying again
 >>> [CLI] bundle deploy
 Building my_test_code...
 Uploading .databricks/bundle/default/patched_wheels/my_prebuilt_whl_other_test_code/other_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl...
 Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl...
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/python-wheel/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -137,7 +137,7 @@ my_test_code-0.0.1+[TIMESTAMP_NS].dist-info/RECORD
         "existing_cluster_id": "0717-132531-5opeqon1",
         "libraries": [
           {
-            "whl": "/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
+            "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
           }
         ],
         "python_wheel_task": {
@@ -149,10 +149,10 @@ my_test_code-0.0.1+[TIMESTAMP_NS].dist-info/RECORD
     },
     "libraries": [
       {
-        "whl": "/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
+        "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
       },
       {
-        "whl": "/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/other_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
+        "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
       }
     ],
     "python_wheel_task": {
@@ -165,6 +165,6 @@ my_test_code-0.0.1+[TIMESTAMP_NS].dist-info/RECORD
 
 === Expecting 2 pached wheels to be uploaded (Bad: it is currently uploaded twice)
 >>> jq .path
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/other_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/files/my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl"
diff --git a/acceptance/bundle/artifacts/whl_explicit/databricks.yml b/acceptance/bundle/artifacts/whl_explicit/databricks.yml
index 45106c0b00..8173a1fedd 100644
--- a/acceptance/bundle/artifacts/whl_explicit/databricks.yml
+++ b/acceptance/bundle/artifacts/whl_explicit/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: python-wheel
-
 artifacts:
     my_test_code:
       type: whl
diff --git a/acceptance/bundle/artifacts/whl_explicit/output.txt b/acceptance/bundle/artifacts/whl_explicit/output.txt
index 66f0e9b589..6c1c06c46e 100644
--- a/acceptance/bundle/artifacts/whl_explicit/output.txt
+++ b/acceptance/bundle/artifacts/whl_explicit/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Building my_test_code...
 Uploading my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl...
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/python-wheel/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -17,7 +17,7 @@ my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl
     "existing_cluster_id": "0717-132531-5opeqon1",
     "libraries": [
       {
-        "whl": "/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
+        "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
       }
     ],
     "python_wheel_task": {
@@ -30,8 +30,8 @@ my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl
 
 === Expecting 1 wheel to be uploaded
 >>> jq .path
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/files/my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl"
 
 === Expecting delete request to artifact_path/.internal folder
 >>> jq -s .[] | select(.path=="/api/2.0/workspace/delete") | select(.body.path | test(".*/artifacts/.internal")) out.requests.txt
@@ -39,7 +39,7 @@ my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl
   "method": "POST",
   "path": "/api/2.0/workspace/delete",
   "body": {
-    "path": "/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal",
+    "path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal",
     "recursive": true
   }
 }
@@ -50,6 +50,6 @@ my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl
   "method": "POST",
   "path": "/api/2.0/workspace/mkdirs",
   "body": {
-    "path": "/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal"
+    "path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal"
   }
 }
diff --git a/acceptance/bundle/artifacts/whl_implicit/databricks.yml b/acceptance/bundle/artifacts/whl_implicit/databricks.yml
index d1d0a4dbd4..61019c57bb 100644
--- a/acceptance/bundle/artifacts/whl_implicit/databricks.yml
+++ b/acceptance/bundle/artifacts/whl_implicit/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: python-wheel
-
 resources:
   jobs:
     test_job:
diff --git a/acceptance/bundle/artifacts/whl_implicit/output.txt b/acceptance/bundle/artifacts/whl_implicit/output.txt
index b220ac86f8..698cc20c51 100644
--- a/acceptance/bundle/artifacts/whl_implicit/output.txt
+++ b/acceptance/bundle/artifacts/whl_implicit/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Building python_artifact...
 Uploading dist/my_test_code-0.0.1-py3-none-any.whl...
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/python-wheel/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -17,7 +17,7 @@ dist/my_test_code-0.0.1-py3-none-any.whl
     "existing_cluster_id": "0717-aaaaa-bbbbbb",
     "libraries": [
       {
-        "whl": "/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
+        "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
       }
     ],
     "python_wheel_task": {
@@ -30,5 +30,5 @@ dist/my_test_code-0.0.1-py3-none-any.whl
 
 === Expecting 1 wheels to be uploaded
 >>> jq .path
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/files/dist/my_test_code-0.0.1-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/dist/my_test_code-0.0.1-py3-none-any.whl"
diff --git a/acceptance/bundle/artifacts/whl_implicit_custom_path/databricks.yml b/acceptance/bundle/artifacts/whl_implicit_custom_path/databricks.yml
index 948bf1558e..fb8999492b 100644
--- a/acceptance/bundle/artifacts/whl_implicit_custom_path/databricks.yml
+++ b/acceptance/bundle/artifacts/whl_implicit_custom_path/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: python-wheel-local
-
 workspace:
   artifact_path: /foo/bar
 
diff --git a/acceptance/bundle/artifacts/whl_implicit_custom_path/output.txt b/acceptance/bundle/artifacts/whl_implicit_custom_path/output.txt
index 690b38c688..71f1bffc1d 100644
--- a/acceptance/bundle/artifacts/whl_implicit_custom_path/output.txt
+++ b/acceptance/bundle/artifacts/whl_implicit_custom_path/output.txt
@@ -1,7 +1,7 @@
 
 >>> [CLI] bundle deploy
 Uploading package/my_test_code-0.0.1-py3-none-any.whl...
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/python-wheel-local/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -14,7 +14,7 @@ package/my_test_code-0.0.1-py3-none-any.whl
 {
   "deployment": {
     "kind": "BUNDLE",
-    "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/python-wheel-local/default/state/metadata.json"
+    "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json"
   },
   "edit_mode": "UI_LOCKED",
   "format": "MULTI_TASK",
@@ -42,5 +42,5 @@ package/my_test_code-0.0.1-py3-none-any.whl
 
 === Expecting 1 wheel to be uploaded
 >>> jq .path
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel-local/default/files/package/my_test_code-0.0.1-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/package/my_test_code-0.0.1-py3-none-any.whl"
 "/api/2.0/workspace-files/import-file/Workspace/foo/bar/.internal/my_test_code-0.0.1-py3-none-any.whl"
diff --git a/acceptance/bundle/artifacts/whl_implicit_notebook/databricks.yml b/acceptance/bundle/artifacts/whl_implicit_notebook/databricks.yml
index 77fd6ad99f..17cceca0d7 100644
--- a/acceptance/bundle/artifacts/whl_implicit_notebook/databricks.yml
+++ b/acceptance/bundle/artifacts/whl_implicit_notebook/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: python-wheel-notebook
-
 resources:
   jobs:
     test_job:
diff --git a/acceptance/bundle/artifacts/whl_implicit_notebook/output.txt b/acceptance/bundle/artifacts/whl_implicit_notebook/output.txt
index 47c0ed464e..c60adc515e 100644
--- a/acceptance/bundle/artifacts/whl_implicit_notebook/output.txt
+++ b/acceptance/bundle/artifacts/whl_implicit_notebook/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Building python_artifact...
 Uploading dist/my_test_code-0.0.1-py3-none-any.whl...
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/python-wheel-notebook/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -17,7 +17,7 @@ dist/my_test_code-0.0.1-py3-none-any.whl
     "existing_cluster_id": "0717-aaaaa-bbbbbb",
     "libraries": [
       {
-        "whl": "/Workspace/Users/[USERNAME]/.bundle/python-wheel-notebook/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
+        "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
       }
     ],
     "notebook_task": {
@@ -29,5 +29,5 @@ dist/my_test_code-0.0.1-py3-none-any.whl
 
 === Expecting 1 wheel to be uploaded
 >>> jq .path
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel-notebook/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel-notebook/default/files/dist/my_test_code-0.0.1-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/dist/my_test_code-0.0.1-py3-none-any.whl"
diff --git a/acceptance/bundle/artifacts/whl_multiple/databricks.yml b/acceptance/bundle/artifacts/whl_multiple/databricks.yml
index 2bfd85abd0..e10933d5b2 100644
--- a/acceptance/bundle/artifacts/whl_multiple/databricks.yml
+++ b/acceptance/bundle/artifacts/whl_multiple/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: python-wheel
-
 artifacts:
     my_test_code:
       type: whl
diff --git a/acceptance/bundle/artifacts/whl_multiple/output.txt b/acceptance/bundle/artifacts/whl_multiple/output.txt
index ce098a69eb..a03025d910 100644
--- a/acceptance/bundle/artifacts/whl_multiple/output.txt
+++ b/acceptance/bundle/artifacts/whl_multiple/output.txt
@@ -4,7 +4,7 @@ Building my_test_code...
 Building my_test_code_2...
 Uploading my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading my_test_code/dist/my_test_code_2-0.0.1-py3-none-any.whl...
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/python-wheel/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -20,10 +20,10 @@ my_test_code/dist/my_test_code_2-0.0.1-py3-none-any.whl
     "existing_cluster_id": "0717-132531-5opeqon1",
     "libraries": [
       {
-        "whl": "/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
+        "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
       },
       {
-        "whl": "/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/my_test_code_2-0.0.1-py3-none-any.whl"
+        "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code_2-0.0.1-py3-none-any.whl"
       }
     ],
     "python_wheel_task": {
@@ -36,7 +36,7 @@ my_test_code/dist/my_test_code_2-0.0.1-py3-none-any.whl
 
 === Expecting 2 wheels to be uploaded
 >>> jq .path
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/my_test_code_2-0.0.1-py3-none-any.whl"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/files/my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/files/my_test_code/dist/my_test_code_2-0.0.1-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code_2-0.0.1-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/my_test_code/dist/my_test_code_2-0.0.1-py3-none-any.whl"
diff --git a/acceptance/bundle/artifacts/whl_prebuilt_multiple/databricks.yml b/acceptance/bundle/artifacts/whl_prebuilt_multiple/databricks.yml
index 4ad0c6afa5..d099684cfb 100644
--- a/acceptance/bundle/artifacts/whl_prebuilt_multiple/databricks.yml
+++ b/acceptance/bundle/artifacts/whl_prebuilt_multiple/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: python-wheel
-
 resources:
   jobs:
     test_job:
diff --git a/acceptance/bundle/artifacts/whl_prebuilt_multiple/output.txt b/acceptance/bundle/artifacts/whl_prebuilt_multiple/output.txt
index c46c1bcea6..4fe390e635 100644
--- a/acceptance/bundle/artifacts/whl_prebuilt_multiple/output.txt
+++ b/acceptance/bundle/artifacts/whl_prebuilt_multiple/output.txt
@@ -6,7 +6,7 @@ dist/my_test_code-0.0.1-py3-none-any.whl
 >>> [CLI] bundle deploy
 Uploading dist/lib/other_test_code-0.0.1-py3-none-any.whl...
 Uploading dist/my_test_code-0.0.1-py3-none-any.whl...
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/python-wheel/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -23,10 +23,10 @@ dist/my_test_code-0.0.1-py3-none-any.whl
     "existing_cluster_id": "0717-132531-5opeqon1",
     "libraries": [
       {
-        "whl": "/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
+        "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
       },
       {
-        "whl": "/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/other_test_code-0.0.1-py3-none-any.whl"
+        "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1-py3-none-any.whl"
       }
     ],
     "python_wheel_task": {
@@ -39,7 +39,7 @@ dist/my_test_code-0.0.1-py3-none-any.whl
 
 === Expecting 2 wheels to be uploaded
 >>> jq .path
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/artifacts/.internal/other_test_code-0.0.1-py3-none-any.whl"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/files/dist/lib/other_test_code-0.0.1-py3-none-any.whl"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/python-wheel/default/files/dist/my_test_code-0.0.1-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/dist/lib/other_test_code-0.0.1-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/dist/my_test_code-0.0.1-py3-none-any.whl"
diff --git a/acceptance/bundle/artifacts/whl_prebuilt_outside/test.toml b/acceptance/bundle/artifacts/whl_prebuilt_outside/test.toml
index a298217f21..53db9644c8 100644
--- a/acceptance/bundle/artifacts/whl_prebuilt_outside/test.toml
+++ b/acceptance/bundle/artifacts/whl_prebuilt_outside/test.toml
@@ -1,3 +1,5 @@
+BundleConfig.default_name = ""
+
 [[Repls]]
 Old = '\\'
 New = '/'
diff --git a/acceptance/bundle/artifacts/whl_prebuilt_outside_dynamic/test.toml b/acceptance/bundle/artifacts/whl_prebuilt_outside_dynamic/test.toml
index a298217f21..53db9644c8 100644
--- a/acceptance/bundle/artifacts/whl_prebuilt_outside_dynamic/test.toml
+++ b/acceptance/bundle/artifacts/whl_prebuilt_outside_dynamic/test.toml
@@ -1,3 +1,5 @@
+BundleConfig.default_name = ""
+
 [[Repls]]
 Old = '\\'
 New = '/'
diff --git a/acceptance/bundle/artifacts/whl_via_environment_key/databricks.yml b/acceptance/bundle/artifacts/whl_via_environment_key/databricks.yml
index 4ca3f91136..bf086e93cc 100644
--- a/acceptance/bundle/artifacts/whl_via_environment_key/databricks.yml
+++ b/acceptance/bundle/artifacts/whl_via_environment_key/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: environment_key
-
 artifacts:
     my_test_code:
       type: whl
diff --git a/acceptance/bundle/artifacts/whl_via_environment_key/output.txt b/acceptance/bundle/artifacts/whl_via_environment_key/output.txt
index 4777d10c33..8afa59e7d8 100644
--- a/acceptance/bundle/artifacts/whl_via_environment_key/output.txt
+++ b/acceptance/bundle/artifacts/whl_via_environment_key/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Building my_test_code...
 Uploading my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl...
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/environment_key/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -15,7 +15,7 @@ my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl
 {
   "deployment": {
     "kind": "BUNDLE",
-    "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/environment_key/default/state/metadata.json"
+    "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json"
   },
   "edit_mode": "UI_LOCKED",
   "environments": [
@@ -24,7 +24,7 @@ my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl
       "spec": {
         "client": "1",
         "dependencies": [
-          "/Workspace/Users/[USERNAME]/.bundle/environment_key/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
+          "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
         ]
       }
     }
@@ -50,5 +50,5 @@ my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl
 
 === Expecting 1 wheel to be uploaded
 >>> jq .path
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/environment_key/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/environment_key/default/files/my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl"
diff --git a/acceptance/bundle/debug/databricks.yml b/acceptance/bundle/debug/databricks.yml
index 2c9dd3c907..e69de29bb2 100644
--- a/acceptance/bundle/debug/databricks.yml
+++ b/acceptance/bundle/debug/databricks.yml
@@ -1,2 +0,0 @@
-bundle:
-  name: debug
diff --git a/acceptance/bundle/debug/out.stderr.txt b/acceptance/bundle/debug/out.stderr.txt
index f959a2a0d3..ea082fac30 100644
--- a/acceptance/bundle/debug/out.stderr.txt
+++ b/acceptance/bundle/debug/out.stderr.txt
@@ -71,7 +71,7 @@
 10:07:59 Debug: ApplyParallel pid=12345 mutator=fast_validate(readonly) mutator=validate:job_cluster_key_defined
 10:07:59 Debug: ApplyParallel pid=12345 mutator=fast_validate(readonly) mutator=validate:job_task_cluster_spec
 10:07:59 Debug: ApplyParallel pid=12345 mutator=fast_validate(readonly) mutator=validate:artifact_paths
-10:07:59 Debug: GET /api/2.0/workspace/get-status?path=/Workspace/Users/[USERNAME]/.bundle/debug/default/files
+10:07:59 Debug: GET /api/2.0/workspace/get-status?path=/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files
 < HTTP/1.1 404 Not Found
 < {
 <   "message": "Workspace path not found"
@@ -79,15 +79,15 @@
 10:07:59 Debug: non-retriable error: Workspace path not found pid=12345 mutator=validate:files_to_sync sdk=true
 10:07:59 Debug: POST /api/2.0/workspace/mkdirs
 > {
->   "path": "/Workspace/Users/[USERNAME]/.bundle/debug/default/files"
+>   "path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files"
 > }
 < HTTP/1.1 200 OK pid=12345 mutator=validate:files_to_sync sdk=true
-10:07:59 Debug: GET /api/2.0/workspace/get-status?path=/Workspace/Users/[USERNAME]/.bundle/debug/default/files
+10:07:59 Debug: GET /api/2.0/workspace/get-status?path=/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files
 < HTTP/1.1 200 OK
 < {
 <   "object_type": "DIRECTORY",
-<   "path": "/Workspace/Users/[USERNAME]/.bundle/debug/default/files"
+<   "path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files"
 < } pid=12345 mutator=validate:files_to_sync sdk=true
-10:07:59 Debug: Path /Workspace/Users/[USERNAME]/.bundle/debug/default/files has type directory (ID: 0) pid=12345 mutator=validate:files_to_sync
+10:07:59 Debug: Path /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files has type directory (ID: 0) pid=12345 mutator=validate:files_to_sync
 10:07:59 Info: completed execution pid=12345 exit_code=0
 10:07:59 Debug: no telemetry logs to upload pid=12345
diff --git a/acceptance/bundle/debug/output.txt b/acceptance/bundle/debug/output.txt
index ed72b360e6..4f189effdf 100644
--- a/acceptance/bundle/debug/output.txt
+++ b/acceptance/bundle/debug/output.txt
@@ -1,7 +1,7 @@
-Name: debug
+Name: test-bundle
 Target: default
 Workspace:
   User: [USERNAME]
-  Path: /Workspace/Users/[USERNAME]/.bundle/debug/default
+  Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default
 
 Validation OK!
diff --git a/acceptance/bundle/deploy/experimental-python/databricks.yml b/acceptance/bundle/deploy/experimental-python/databricks.yml
index 7765176126..e49852ae56 100644
--- a/acceptance/bundle/deploy/experimental-python/databricks.yml
+++ b/acceptance/bundle/deploy/experimental-python/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: my_project
-
 sync: { paths: [] } # dont need to copy files
 
 experimental:
diff --git a/acceptance/bundle/deploy/experimental-python/output.txt b/acceptance/bundle/deploy/experimental-python/output.txt
index 8501899f4e..609d130b6c 100644
--- a/acceptance/bundle/deploy/experimental-python/output.txt
+++ b/acceptance/bundle/deploy/experimental-python/output.txt
@@ -1,6 +1,6 @@
 
 >>> uv run --quiet --with [DATABRICKS_BUNDLES_WHEEL] -- [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -12,7 +12,7 @@ Deployment complete!
     "settings": {
       "deployment": {
         "kind": "BUNDLE",
-        "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/my_project/default/state/metadata.json"
+        "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json"
       },
       "edit_mode": "UI_LOCKED",
       "format": "MULTI_TASK",
@@ -24,7 +24,7 @@ Deployment complete!
       "tasks": [
         {
           "notebook_task": {
-            "notebook_path": "/Workspace/Users/[USERNAME]/.bundle/my_project/default/files/my_notebook"
+            "notebook_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/my_notebook"
           },
           "task_key": "my_notebook"
         }
diff --git a/acceptance/bundle/deploy/fail-on-active-runs/databricks.yml b/acceptance/bundle/deploy/fail-on-active-runs/databricks.yml
index fd2007cd31..931e9b1bf2 100644
--- a/acceptance/bundle/deploy/fail-on-active-runs/databricks.yml
+++ b/acceptance/bundle/deploy/fail-on-active-runs/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: fail-on-active-runs
-
 resources:
   jobs:
     my_job:
diff --git a/acceptance/bundle/deploy/fail-on-active-runs/output.txt b/acceptance/bundle/deploy/fail-on-active-runs/output.txt
index 96c315a0c8..4a43d97ab3 100644
--- a/acceptance/bundle/deploy/fail-on-active-runs/output.txt
+++ b/acceptance/bundle/deploy/fail-on-active-runs/output.txt
@@ -1,6 +1,6 @@
 
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/fail-on-active-runs/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -17,7 +17,7 @@ Exit code: 1
   "method": "POST",
   "path": "/api/2.0/workspace/delete",
   "body": {
-    "path": "/Workspace/Users/[USERNAME]/.bundle/fail-on-active-runs/default/artifacts/.internal",
+    "path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal",
     "recursive": true
   }
 }
diff --git a/acceptance/bundle/deploy/python-notebook/databricks.yml b/acceptance/bundle/deploy/python-notebook/databricks.yml
index c9e9ab89d7..3a399779bc 100644
--- a/acceptance/bundle/deploy/python-notebook/databricks.yml
+++ b/acceptance/bundle/deploy/python-notebook/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: my_project
-
 sync: { paths: [] } # dont need to copy files
 
 resources:
diff --git a/acceptance/bundle/deploy/python-notebook/output.txt b/acceptance/bundle/deploy/python-notebook/output.txt
index 2372664d63..8275196359 100644
--- a/acceptance/bundle/deploy/python-notebook/output.txt
+++ b/acceptance/bundle/deploy/python-notebook/output.txt
@@ -1,6 +1,6 @@
 
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -12,7 +12,7 @@ Deployment complete!
     "settings": {
       "deployment": {
         "kind": "BUNDLE",
-        "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/my_project/default/state/metadata.json"
+        "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json"
       },
       "edit_mode": "UI_LOCKED",
       "format": "MULTI_TASK",
@@ -24,7 +24,7 @@ Deployment complete!
       "tasks": [
         {
           "notebook_task": {
-            "notebook_path": "/Workspace/Users/[USERNAME]/.bundle/my_project/default/files/my_notebook"
+            "notebook_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/my_notebook"
           },
           "task_key": "my_notebook"
         }
diff --git a/acceptance/bundle/deployment/bind/cluster/databricks.yml.tmpl b/acceptance/bundle/deployment/bind/cluster/databricks.yml.tmpl
index c470f3be41..b485983cbf 100644
--- a/acceptance/bundle/deployment/bind/cluster/databricks.yml.tmpl
+++ b/acceptance/bundle/deployment/bind/cluster/databricks.yml.tmpl
@@ -1,6 +1,3 @@
-bundle:
-  name: bind-cluster-test-$UNIQUE_NAME
-
 resources:
   clusters:
     cluster1:
diff --git a/acceptance/bundle/deployment/bind/cluster/output.txt b/acceptance/bundle/deployment/bind/cluster/output.txt
index 64e6aec123..9572504bc9 100644
--- a/acceptance/bundle/deployment/bind/cluster/output.txt
+++ b/acceptance/bundle/deployment/bind/cluster/output.txt
@@ -1,14 +1,4 @@
 
->>> cat databricks.yml
-bundle:
-  name: bind-cluster-test-[UNIQUE_NAME]
-
-resources:
-  clusters:
-    cluster1:
-      cluster_name: "DEFAULT Test Cluster"
-      spark_version: '16.2.x-scala2.12'
-
 >>> [CLI] clusters get [CLUSTER-ID]
 {
   "cluster_name": "DEFAULT Test Cluster"
diff --git a/acceptance/bundle/deployment/bind/cluster/script b/acceptance/bundle/deployment/bind/cluster/script
index a0683a3d8c..3e0f34f7ec 100644
--- a/acceptance/bundle/deployment/bind/cluster/script
+++ b/acceptance/bundle/deployment/bind/cluster/script
@@ -4,7 +4,6 @@ if [ -n "${TEST_DEFAULT_CLUSTER_ID:-}" ]; then
 fi
 export CLUSTER_ID
 envsubst < databricks.yml.tmpl > databricks.yml
-trace cat databricks.yml
 
 trace $CLI clusters get ${CLUSTER_ID} | jq '{cluster_name}'
 
diff --git a/acceptance/bundle/deployment/bind/dashboard/databricks.yml.tmpl b/acceptance/bundle/deployment/bind/dashboard/databricks.yml.tmpl
index 86db67bcd3..eb9508817d 100644
--- a/acceptance/bundle/deployment/bind/dashboard/databricks.yml.tmpl
+++ b/acceptance/bundle/deployment/bind/dashboard/databricks.yml.tmpl
@@ -1,6 +1,3 @@
-bundle:
-  name: bind-dashboard-test-$UNIQUE_NAME
-
 resources:
   dashboards:
     dashboard1:
diff --git a/acceptance/bundle/deployment/bind/dashboard/output.txt b/acceptance/bundle/deployment/bind/dashboard/output.txt
index 080a089137..640f85fc12 100644
--- a/acceptance/bundle/deployment/bind/dashboard/output.txt
+++ b/acceptance/bundle/deployment/bind/dashboard/output.txt
@@ -4,7 +4,7 @@ Updating deployment state...
 Successfully bound dashboard with an id '[DASHBOARD_ID]'. Run 'bundle deploy' to deploy changes to your workspace
 
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/bind-dashboard-test-[UNIQUE_NAME]/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -22,7 +22,7 @@ Deployment complete!
 Updating deployment state...
 
 >>> [CLI] bundle destroy --auto-approve
-All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/bind-dashboard-test-[UNIQUE_NAME]/default
+All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default
 
 Deleting files...
 Destroy complete!
diff --git a/acceptance/bundle/deployment/bind/dashboard/recreation/databricks.yml.tmpl b/acceptance/bundle/deployment/bind/dashboard/recreation/databricks.yml.tmpl
index f30be2b622..849e7a8d30 100644
--- a/acceptance/bundle/deployment/bind/dashboard/recreation/databricks.yml.tmpl
+++ b/acceptance/bundle/deployment/bind/dashboard/recreation/databricks.yml.tmpl
@@ -1,6 +1,3 @@
-bundle:
-  name: bind-dashboard-recreation-test-$UNIQUE_NAME
-
 resources:
   dashboards:
     dashboard1:
diff --git a/acceptance/bundle/deployment/bind/dashboard/recreation/output.txt b/acceptance/bundle/deployment/bind/dashboard/recreation/output.txt
index 7a0b66dbc7..5b58737491 100644
--- a/acceptance/bundle/deployment/bind/dashboard/recreation/output.txt
+++ b/acceptance/bundle/deployment/bind/dashboard/recreation/output.txt
@@ -4,7 +4,7 @@ Updating deployment state...
 Successfully bound dashboard with an id '[DASHBOARD_ID]'. Run 'bundle deploy' to deploy changes to your workspace
 
 >>> errcode [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/bind-dashboard-recreation-test-[UNIQUE_NAME]/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 
 This action will result in the deletion or recreation of the following dashboards.
 This will result in changed IDs and permanent URLs of the dashboards that will be recreated:
@@ -18,7 +18,7 @@ Exit code: 1
 Updating deployment state...
 
 >>> [CLI] bundle deploy --auto-approve
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/bind-dashboard-recreation-test-[UNIQUE_NAME]/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
diff --git a/acceptance/bundle/deployment/bind/experiment/databricks.yml b/acceptance/bundle/deployment/bind/experiment/databricks.yml
index 343b48a0d5..45e32e45df 100644
--- a/acceptance/bundle/deployment/bind/experiment/databricks.yml
+++ b/acceptance/bundle/deployment/bind/experiment/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: bind-ml-experiment-test-$UNIQUE_NAME
-
 resources:
   experiments:
     experiment1:
diff --git a/acceptance/bundle/deployment/bind/experiment/output.txt b/acceptance/bundle/deployment/bind/experiment/output.txt
index 48d2cebd3e..ac57ce8b85 100644
--- a/acceptance/bundle/deployment/bind/experiment/output.txt
+++ b/acceptance/bundle/deployment/bind/experiment/output.txt
@@ -5,7 +5,7 @@
 === Bind experiment: Updating deployment state...
 Successfully bound experiment with an id '[NUMID]'. Run 'bundle deploy' to deploy changes to your workspace
 
-=== Deploy bundle: Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/bind-ml-experiment-test-[UNIQUE_NAME]/default/files...
+=== Deploy bundle: Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -17,7 +17,7 @@ Deployment complete!
 
 === Unbind the experiment: Updating deployment state...
 
-=== Destroy the bundle: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/bind-ml-experiment-test-[UNIQUE_NAME]/default
+=== Destroy the bundle: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default
 
 Deleting files...
 Destroy complete!
diff --git a/acceptance/bundle/deployment/bind/experiment/test.toml b/acceptance/bundle/deployment/bind/experiment/test.toml
index 5f52a75f15..d7e2743263 100644
--- a/acceptance/bundle/deployment/bind/experiment/test.toml
+++ b/acceptance/bundle/deployment/bind/experiment/test.toml
@@ -1,5 +1,6 @@
 Local = true
 Cloud = true
+BundleConfigTarget = "databricks.yml"
 
 [[Repls]]
 Old = "[0-9]{3,}"
diff --git a/acceptance/bundle/deployment/bind/model-serving-endpoint/databricks.yml.tmpl b/acceptance/bundle/deployment/bind/model-serving-endpoint/databricks.yml.tmpl
index 29c2691ed8..0fa173a02f 100644
--- a/acceptance/bundle/deployment/bind/model-serving-endpoint/databricks.yml.tmpl
+++ b/acceptance/bundle/deployment/bind/model-serving-endpoint/databricks.yml.tmpl
@@ -1,6 +1,3 @@
-bundle:
-  name: bind-model-serving-endpoint-test-$UNIQUE_NAME
-
 resources:
   model_serving_endpoints:
     endpoint1:
diff --git a/acceptance/bundle/deployment/bind/model-serving-endpoint/output.txt b/acceptance/bundle/deployment/bind/model-serving-endpoint/output.txt
index f6fdef914b..68bad006e6 100644
--- a/acceptance/bundle/deployment/bind/model-serving-endpoint/output.txt
+++ b/acceptance/bundle/deployment/bind/model-serving-endpoint/output.txt
@@ -1,6 +1,5 @@
 bundle:
-  name: bind-model-serving-endpoint-test-[UNIQUE_NAME]
-
+  name: test-bundle-[UNIQUE_NAME]
 resources:
   model_serving_endpoints:
     endpoint1:
@@ -33,7 +32,7 @@ Updating deployment state...
 Successfully bound model_serving_endpoint with an id 'test-endpoint-[UUID]'. Run 'bundle deploy' to deploy changes to your workspace
 
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/bind-model-serving-endpoint-test-[UNIQUE_NAME]/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -53,7 +52,7 @@ Deployment complete!
 Updating deployment state...
 
 >>> [CLI] bundle destroy --auto-approve
-All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/bind-model-serving-endpoint-test-[UNIQUE_NAME]/default
+All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default
 
 Deleting files...
 Destroy complete!
diff --git a/acceptance/bundle/deployment/bind/registered-model/databricks.yml.tmpl b/acceptance/bundle/deployment/bind/registered-model/databricks.yml.tmpl
index 911b894e55..b40c5fc230 100644
--- a/acceptance/bundle/deployment/bind/registered-model/databricks.yml.tmpl
+++ b/acceptance/bundle/deployment/bind/registered-model/databricks.yml.tmpl
@@ -1,6 +1,3 @@
-bundle:
-  name: bind-registered-model-test-$UNIQUE_NAME
-
 resources:
   registered_models:
     model1:
diff --git a/acceptance/bundle/deployment/bind/registered-model/output.txt b/acceptance/bundle/deployment/bind/registered-model/output.txt
index c27cd4d1d9..4d8c1e7482 100644
--- a/acceptance/bundle/deployment/bind/registered-model/output.txt
+++ b/acceptance/bundle/deployment/bind/registered-model/output.txt
@@ -1,11 +1,10 @@
 bundle:
-  name: bind-registered-model-test-[UNIQUE_NAME]
-
+  name: test-bundle-[UNIQUE_NAME]
 resources:
   registered_models:
     model1:
-      name: test-registered-model-[UUID]
       catalog_name: main
+      name: test-registered-model-[UUID]
       schema_name: test-schema-rmodel-[UUID]
 
 >>> [CLI] schemas create test-schema-rmodel-[UUID] main
@@ -19,7 +18,7 @@ Updating deployment state...
 Successfully bound registered_model with an id 'main.test-schema-rmodel-[UUID].test-registered-model-[UUID]'. Run 'bundle deploy' to deploy changes to your workspace
 
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/bind-registered-model-test-[UNIQUE_NAME]/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -35,7 +34,7 @@ Deployment complete!
 Updating deployment state...
 
 >>> [CLI] bundle destroy --auto-approve
-All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/bind-registered-model-test-[UNIQUE_NAME]/default
+All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default
 
 Deleting files...
 Destroy complete!
diff --git a/acceptance/bundle/deployment/bind/schema/databricks.yml b/acceptance/bundle/deployment/bind/schema/databricks.yml
index aa3f501fe6..47bd0239bb 100644
--- a/acceptance/bundle/deployment/bind/schema/databricks.yml
+++ b/acceptance/bundle/deployment/bind/schema/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: bind-schema-test-$UNIQUE_NAME
-
 resources:
   schemas:
     schema1:
diff --git a/acceptance/bundle/deployment/bind/schema/output.txt b/acceptance/bundle/deployment/bind/schema/output.txt
index abb59c7adf..4023996156 100644
--- a/acceptance/bundle/deployment/bind/schema/output.txt
+++ b/acceptance/bundle/deployment/bind/schema/output.txt
@@ -9,7 +9,7 @@
 === Bind schema: Updating deployment state...
 Successfully bound schema with an id 'main.test-schema-[UUID]'. Run 'bundle deploy' to deploy changes to your workspace
 
-=== Deploy bundle: Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/bind-schema-test-[UNIQUE_NAME]/default/files...
+=== Deploy bundle: Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -22,7 +22,7 @@ Deployment complete!
 
 === Unbind the schema: Updating deployment state...
 
-=== Destroy the bundle: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/bind-schema-test-[UNIQUE_NAME]/default
+=== Destroy the bundle: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default
 
 Deleting files...
 Destroy complete!
diff --git a/acceptance/bundle/deployment/bind/schema/test.toml b/acceptance/bundle/deployment/bind/schema/test.toml
index f5706bb0af..71c7cb0370 100644
--- a/acceptance/bundle/deployment/bind/schema/test.toml
+++ b/acceptance/bundle/deployment/bind/schema/test.toml
@@ -1,3 +1,4 @@
 Local = true
 Cloud = true
 RequiresUnityCatalog = true
+BundleConfigTarget = "databricks.yml"
diff --git a/acceptance/bundle/deployment/bind/test.toml b/acceptance/bundle/deployment/bind/test.toml
new file mode 100644
index 0000000000..5f99440260
--- /dev/null
+++ b/acceptance/bundle/deployment/bind/test.toml
@@ -0,0 +1,2 @@
+BundleConfig.default_name.bundle.name = "test-bundle-$UNIQUE_NAME"
+BundleConfigTarget = "databricks.yml.tmpl"
diff --git a/acceptance/bundle/deployment/bind/volume/databricks.yml.tmpl b/acceptance/bundle/deployment/bind/volume/databricks.yml.tmpl
index 8423f0699b..b38db9e97d 100644
--- a/acceptance/bundle/deployment/bind/volume/databricks.yml.tmpl
+++ b/acceptance/bundle/deployment/bind/volume/databricks.yml.tmpl
@@ -1,6 +1,3 @@
-bundle:
-  name: bind-dashboard-test-$UNIQUE_NAME
-
 resources:
   volumes:
     volume1:
diff --git a/acceptance/bundle/deployment/bind/volume/output.txt b/acceptance/bundle/deployment/bind/volume/output.txt
index 3bce635fbc..b065873604 100644
--- a/acceptance/bundle/deployment/bind/volume/output.txt
+++ b/acceptance/bundle/deployment/bind/volume/output.txt
@@ -11,7 +11,7 @@ Updating deployment state...
 Successfully bound volume with an id 'main.test-schema-[UUID].volume-[UUID]'. Run 'bundle deploy' to deploy changes to your workspace
 
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/bind-dashboard-test-[UNIQUE_NAME]/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -28,7 +28,7 @@ Deployment complete!
 Updating deployment state...
 
 >>> [CLI] bundle destroy --auto-approve
-All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/bind-dashboard-test-[UNIQUE_NAME]/default
+All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default
 
 Deleting files...
 Destroy complete!
diff --git a/acceptance/bundle/deployment/test.toml b/acceptance/bundle/deployment/test.toml
new file mode 100644
index 0000000000..c7c6f58ed6
--- /dev/null
+++ b/acceptance/bundle/deployment/test.toml
@@ -0,0 +1 @@
+Cloud = true
diff --git a/acceptance/bundle/override/clusters/databricks.yml b/acceptance/bundle/override/clusters/databricks.yml
index 14efceec07..ead509b509 100644
--- a/acceptance/bundle/override/clusters/databricks.yml
+++ b/acceptance/bundle/override/clusters/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: clusters
-
 resources:
   clusters:
     foo:
diff --git a/acceptance/bundle/override/job_cluster/databricks.yml b/acceptance/bundle/override/job_cluster/databricks.yml
index d6b7ede4f5..ba7bd8cceb 100644
--- a/acceptance/bundle/override/job_cluster/databricks.yml
+++ b/acceptance/bundle/override/job_cluster/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: override_job_cluster
-
 resources:
   jobs:
     foo:
diff --git a/acceptance/bundle/override/job_cluster/output.txt b/acceptance/bundle/override/job_cluster/output.txt
index cc187eab54..1324f374a3 100644
--- a/acceptance/bundle/override/job_cluster/output.txt
+++ b/acceptance/bundle/override/job_cluster/output.txt
@@ -4,7 +4,7 @@
   "foo": {
     "deployment": {
       "kind": "BUNDLE",
-      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/override_job_cluster/development/state/metadata.json"
+      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/development/state/metadata.json"
     },
     "edit_mode": "UI_LOCKED",
     "format": "MULTI_TASK",
@@ -32,7 +32,7 @@
   "foo": {
     "deployment": {
       "kind": "BUNDLE",
-      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/override_job_cluster/staging/state/metadata.json"
+      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/staging/state/metadata.json"
     },
     "edit_mode": "UI_LOCKED",
     "format": "MULTI_TASK",
diff --git a/acceptance/bundle/override/job_cluster_var/databricks.yml b/acceptance/bundle/override/job_cluster_var/databricks.yml
index 48e68c9265..35fdb34f08 100644
--- a/acceptance/bundle/override/job_cluster_var/databricks.yml
+++ b/acceptance/bundle/override/job_cluster_var/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: override_job_cluster
-
 variables:
   mykey:
     default: key
diff --git a/acceptance/bundle/override/job_cluster_var/output.txt b/acceptance/bundle/override/job_cluster_var/output.txt
index 02c048425a..f47051e1e3 100644
--- a/acceptance/bundle/override/job_cluster_var/output.txt
+++ b/acceptance/bundle/override/job_cluster_var/output.txt
@@ -4,7 +4,7 @@
   "foo": {
     "deployment": {
       "kind": "BUNDLE",
-      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/override_job_cluster/development/state/metadata.json"
+      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/development/state/metadata.json"
     },
     "edit_mode": "UI_LOCKED",
     "format": "MULTI_TASK",
@@ -28,11 +28,11 @@
 }
 
 >>> [CLI] bundle validate -t development
-Name: override_job_cluster
+Name: test-bundle
 Target: development
 Workspace:
   User: [USERNAME]
-  Path: /Workspace/Users/[USERNAME]/.bundle/override_job_cluster/development
+  Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle/development
 
 Validation OK!
 
@@ -41,7 +41,7 @@ Validation OK!
   "foo": {
     "deployment": {
       "kind": "BUNDLE",
-      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/override_job_cluster/staging/state/metadata.json"
+      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/staging/state/metadata.json"
     },
     "edit_mode": "UI_LOCKED",
     "format": "MULTI_TASK",
@@ -65,10 +65,10 @@ Validation OK!
 }
 
 >>> [CLI] bundle validate -t staging
-Name: override_job_cluster
+Name: test-bundle
 Target: staging
 Workspace:
   User: [USERNAME]
-  Path: /Workspace/Users/[USERNAME]/.bundle/override_job_cluster/staging
+  Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle/staging
 
 Validation OK!
diff --git a/acceptance/bundle/override/job_tasks/databricks.yml b/acceptance/bundle/override/job_tasks/databricks.yml
index fd7edafb97..1799538957 100644
--- a/acceptance/bundle/override/job_tasks/databricks.yml
+++ b/acceptance/bundle/override/job_tasks/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: override_job_tasks
-
 resources:
   jobs:
     foo:
diff --git a/acceptance/bundle/override/job_tasks/output.txt b/acceptance/bundle/override/job_tasks/output.txt
index c873437448..418a95e84e 100644
--- a/acceptance/bundle/override/job_tasks/output.txt
+++ b/acceptance/bundle/override/job_tasks/output.txt
@@ -68,11 +68,11 @@ Exit code: 1
 >>> errcode [CLI] bundle validate -t staging
 Error: file test1.py not found
 
-Name: override_job_tasks
+Name: test-bundle
 Target: staging
 Workspace:
   User: [USERNAME]
-  Path: /Workspace/Users/[USERNAME]/.bundle/override_job_tasks/staging
+  Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle/staging
 
 Found 1 error
 
diff --git a/acceptance/bundle/override/pipeline_cluster/databricks.yml b/acceptance/bundle/override/pipeline_cluster/databricks.yml
index 8b48574606..8f448ab361 100644
--- a/acceptance/bundle/override/pipeline_cluster/databricks.yml
+++ b/acceptance/bundle/override/pipeline_cluster/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: override_pipeline_cluster
-
 resources:
   pipelines:
     foo:
diff --git a/acceptance/bundle/override/pipeline_cluster/output.txt b/acceptance/bundle/override/pipeline_cluster/output.txt
index 43e5c72184..dc100a3988 100644
--- a/acceptance/bundle/override/pipeline_cluster/output.txt
+++ b/acceptance/bundle/override/pipeline_cluster/output.txt
@@ -15,7 +15,7 @@
     ],
     "deployment": {
       "kind": "BUNDLE",
-      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/override_pipeline_cluster/development/state/metadata.json"
+      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/development/state/metadata.json"
     },
     "edition": "ADVANCED",
     "name": "job",
@@ -39,7 +39,7 @@
     ],
     "deployment": {
       "kind": "BUNDLE",
-      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/override_pipeline_cluster/staging/state/metadata.json"
+      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/staging/state/metadata.json"
     },
     "edition": "ADVANCED",
     "name": "job",
diff --git a/acceptance/bundle/resources/apps/databricks.yml b/acceptance/bundle/resources/apps/databricks.yml
index a9f2bcf48d..6abbcbbaec 100644
--- a/acceptance/bundle/resources/apps/databricks.yml
+++ b/acceptance/bundle/resources/apps/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: APPS
-
 resources:
   apps:
     myapp:
diff --git a/acceptance/bundle/resources/apps/output.txt b/acceptance/bundle/resources/apps/output.txt
index 8fbbec3baf..02bdeaebe3 100644
--- a/acceptance/bundle/resources/apps/output.txt
+++ b/acceptance/bundle/resources/apps/output.txt
@@ -1,6 +1,6 @@
 
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/APPS/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -20,7 +20,7 @@ apps myapp name='myapp' description='my_app_description'
 >>> update_file.py databricks.yml my_app_description MY_APP_DESCRIPTION
 
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/APPS/default/files...
+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/databricks.yml b/acceptance/bundle/resources/jobs/databricks.yml
index 664ecf4794..2706690424 100644
--- a/acceptance/bundle/resources/jobs/databricks.yml
+++ b/acceptance/bundle/resources/jobs/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: JOBS
-
 resources:
   jobs:
     foo:
diff --git a/acceptance/bundle/resources/jobs/output.txt b/acceptance/bundle/resources/jobs/output.txt
index 8e3dcb607f..e87e36826d 100644
--- a/acceptance/bundle/resources/jobs/output.txt
+++ b/acceptance/bundle/resources/jobs/output.txt
@@ -1,6 +1,6 @@
 
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/JOBS/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -10,7 +10,7 @@ Deployment complete!
   "body": {
     "deployment": {
       "kind": "BUNDLE",
-      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/JOBS/default/state/metadata.json"
+      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json"
     },
     "edit_mode": "UI_LOCKED",
     "format": "MULTI_TASK",
@@ -45,7 +45,7 @@ jobs foo id='1' name='foo'
 >>> update_file.py databricks.yml DAYS HOURS
 
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/JOBS/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -57,7 +57,7 @@ Deployment complete!
     "new_settings": {
       "deployment": {
         "kind": "BUNDLE",
-        "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/JOBS/default/state/metadata.json"
+        "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json"
       },
       "edit_mode": "UI_LOCKED",
       "format": "MULTI_TASK",
diff --git a/acceptance/bundle/resources/schemas/databricks.yml b/acceptance/bundle/resources/schemas/databricks.yml
index 4424b3d696..aa70973fb3 100644
--- a/acceptance/bundle/resources/schemas/databricks.yml
+++ b/acceptance/bundle/resources/schemas/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: schema-test
-
 resources:
   schemas:
     schema1:
diff --git a/acceptance/bundle/resources/schemas/output.txt b/acceptance/bundle/resources/schemas/output.txt
index f2a5fcca9a..84850072ba 100644
--- a/acceptance/bundle/resources/schemas/output.txt
+++ b/acceptance/bundle/resources/schemas/output.txt
@@ -1,6 +1,6 @@
 
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-test/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -21,7 +21,7 @@ schemas schema1 id='main.myschema' name='myschema' catalog_name='main' comment='
 >>> update_file.py databricks.yml COMMENT1 COMMENT2
 
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-test/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
@@ -40,7 +40,7 @@ schemas schema1 id='main.myschema' name='myschema' catalog_name='main' comment='
 >>> update_file.py databricks.yml COMMENT2 COMMENT1
 
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-test/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
diff --git a/acceptance/bundle/run/inline-script/basic/databricks.yml b/acceptance/bundle/run/inline-script/basic/databricks.yml
index 432311dab0..e69de29bb2 100644
--- a/acceptance/bundle/run/inline-script/basic/databricks.yml
+++ b/acceptance/bundle/run/inline-script/basic/databricks.yml
@@ -1,2 +0,0 @@
-bundle:
-  name: foobar
diff --git a/acceptance/bundle/run/inline-script/cwd/databricks.yml b/acceptance/bundle/run/inline-script/cwd/databricks.yml
index 432311dab0..e69de29bb2 100644
--- a/acceptance/bundle/run/inline-script/cwd/databricks.yml
+++ b/acceptance/bundle/run/inline-script/cwd/databricks.yml
@@ -1,2 +0,0 @@
-bundle:
-  name: foobar
diff --git a/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/databricks.yml b/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/databricks.yml
index 5de7d1d968..e65571b90c 100644
--- a/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/databricks.yml
+++ b/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/databricks.yml
@@ -1,5 +1,2 @@
-bundle:
-  name: foobar
-
 workspace:
   profile: someprofile
diff --git a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/databricks.yml b/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/databricks.yml
index 7f808c24b1..277f2d8c64 100644
--- a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/databricks.yml
+++ b/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: foobar
-
 targets:
   pat:
     default: true
diff --git a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/out.requests.txt b/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/out.requests.txt
index 57a637ce0a..8e92777f84 100644
--- a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/out.requests.txt
+++ b/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/out.requests.txt
@@ -25,7 +25,7 @@
   "method": "POST",
   "path": "/api/2.0/workspace/mkdirs",
   "body": {
-    "path": "/Workspace/Users/[USERNAME]/.bundle/foobar/pat/files"
+    "path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/pat/files"
   }
 }
 {
diff --git a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/databricks.yml b/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/databricks.yml
index 7f808c24b1..277f2d8c64 100644
--- a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/databricks.yml
+++ b/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: foobar
-
 targets:
   pat:
     default: true
diff --git a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/out.requests.txt b/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/out.requests.txt
index f4fb08cab2..e37a85ce30 100644
--- a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/out.requests.txt
+++ b/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/out.requests.txt
@@ -43,7 +43,7 @@
   "method": "POST",
   "path": "/api/2.0/workspace/mkdirs",
   "body": {
-    "path": "/Workspace/Users/[USERNAME]/.bundle/foobar/oauth/files"
+    "path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/oauth/files"
   }
 }
 {
diff --git a/acceptance/bundle/run/inline-script/no-auth/databricks.yml b/acceptance/bundle/run/inline-script/no-auth/databricks.yml
index 432311dab0..e69de29bb2 100644
--- a/acceptance/bundle/run/inline-script/no-auth/databricks.yml
+++ b/acceptance/bundle/run/inline-script/no-auth/databricks.yml
@@ -1,2 +0,0 @@
-bundle:
-  name: foobar
diff --git a/acceptance/bundle/run/inline-script/no-bundle/test.toml b/acceptance/bundle/run/inline-script/no-bundle/test.toml
new file mode 100644
index 0000000000..0724077f7e
--- /dev/null
+++ b/acceptance/bundle/run/inline-script/no-bundle/test.toml
@@ -0,0 +1 @@
+BundleConfig.default_name = ""
diff --git a/acceptance/bundle/run/inline-script/no-separator/test.toml b/acceptance/bundle/run/inline-script/no-separator/test.toml
new file mode 100644
index 0000000000..0724077f7e
--- /dev/null
+++ b/acceptance/bundle/run/inline-script/no-separator/test.toml
@@ -0,0 +1 @@
+BundleConfig.default_name = ""
diff --git a/acceptance/bundle/sync/databricks.yml b/acceptance/bundle/sync/databricks.yml
index 068c368ca4..18d46081ce 100644
--- a/acceptance/bundle/sync/databricks.yml
+++ b/acceptance/bundle/sync/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: bundle-sync-test
-
 resources:
   dashboards:
     dashboard1:
diff --git a/acceptance/bundle/sync/dryrun/databricks.yml b/acceptance/bundle/sync/dryrun/databricks.yml
index c164f486a0..55bd6842e9 100644
--- a/acceptance/bundle/sync/dryrun/databricks.yml
+++ b/acceptance/bundle/sync/dryrun/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: bundle-sync-test
-
 resources:
   dashboards:
     dashboard1:
diff --git a/acceptance/bundle/telemetry/deploy-artifact-path-type/databricks.yml b/acceptance/bundle/telemetry/deploy-artifact-path-type/databricks.yml
index 04eb64b07e..921788e65e 100644
--- a/acceptance/bundle/telemetry/deploy-artifact-path-type/databricks.yml
+++ b/acceptance/bundle/telemetry/deploy-artifact-path-type/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: sheep
-
 workspace:
   artifact_path: /Workspace/abc
 
diff --git a/acceptance/bundle/telemetry/deploy-artifact-path-type/output.txt b/acceptance/bundle/telemetry/deploy-artifact-path-type/output.txt
index 2da1ea758f..7789a2513a 100644
--- a/acceptance/bundle/telemetry/deploy-artifact-path-type/output.txt
+++ b/acceptance/bundle/telemetry/deploy-artifact-path-type/output.txt
@@ -1,11 +1,11 @@
 
 >>> [CLI] bundle deploy -t one
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/sheep/one/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/one/files...
 Deploying resources...
 Deployment complete!
 
 >>> [CLI] bundle deploy -t two
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/sheep/two/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/two/files...
 Deploying resources...
 Deployment complete!
 
diff --git a/acceptance/bundle/telemetry/deploy-config-file-count/databricks.yml b/acceptance/bundle/telemetry/deploy-config-file-count/databricks.yml
index 7277cc815b..0d091ea58d 100644
--- a/acceptance/bundle/telemetry/deploy-config-file-count/databricks.yml
+++ b/acceptance/bundle/telemetry/deploy-config-file-count/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: boar
-
 include:
   - a.yml
   - dir/*
diff --git a/acceptance/bundle/telemetry/deploy-config-file-count/output.txt b/acceptance/bundle/telemetry/deploy-config-file-count/output.txt
index a4076d5e46..7fe7e4837b 100644
--- a/acceptance/bundle/telemetry/deploy-config-file-count/output.txt
+++ b/acceptance/bundle/telemetry/deploy-config-file-count/output.txt
@@ -1,6 +1,6 @@
 
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/boar/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Deployment complete!
 
diff --git a/acceptance/bundle/telemetry/deploy-error/test.toml b/acceptance/bundle/telemetry/deploy-error/test.toml
new file mode 100644
index 0000000000..0724077f7e
--- /dev/null
+++ b/acceptance/bundle/telemetry/deploy-error/test.toml
@@ -0,0 +1 @@
+BundleConfig.default_name = ""
diff --git a/acceptance/bundle/telemetry/deploy-mode/databricks.yml b/acceptance/bundle/telemetry/deploy-mode/databricks.yml
index 3bdda641bf..f68e5ad4e6 100644
--- a/acceptance/bundle/telemetry/deploy-mode/databricks.yml
+++ b/acceptance/bundle/telemetry/deploy-mode/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: monkey
-
 targets:
   dev:
     mode: development
diff --git a/acceptance/bundle/telemetry/deploy-mode/output.txt b/acceptance/bundle/telemetry/deploy-mode/output.txt
index 0e8cd1b97c..be91dc2cf4 100644
--- a/acceptance/bundle/telemetry/deploy-mode/output.txt
+++ b/acceptance/bundle/telemetry/deploy-mode/output.txt
@@ -1,11 +1,11 @@
 
 >>> [CLI] bundle deploy -t dev
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/monkey/dev/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev/files...
 Deploying resources...
 Deployment complete!
 
 >>> [CLI] bundle deploy -t prod
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/monkey/prod/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/prod/files...
 Deploying resources...
 Deployment complete!
 Recommendation: target with 'mode: production' should set 'workspace.root_path' to make sure only one copy is deployed
diff --git a/acceptance/bundle/telemetry/deploy-no-uuid/databricks.yml b/acceptance/bundle/telemetry/deploy-no-uuid/databricks.yml
index 6e331b7462..d5e7bc0260 100644
--- a/acceptance/bundle/telemetry/deploy-no-uuid/databricks.yml
+++ b/acceptance/bundle/telemetry/deploy-no-uuid/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: pig
-
 resources:
   jobs:
     job_one:
diff --git a/acceptance/bundle/telemetry/deploy-no-uuid/output.txt b/acceptance/bundle/telemetry/deploy-no-uuid/output.txt
index 68dbc8f273..7f14a3bdd7 100644
--- a/acceptance/bundle/telemetry/deploy-no-uuid/output.txt
+++ b/acceptance/bundle/telemetry/deploy-no-uuid/output.txt
@@ -1,6 +1,6 @@
 
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pig/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
diff --git a/acceptance/bundle/telemetry/deploy-target-count/databricks.yml b/acceptance/bundle/telemetry/deploy-target-count/databricks.yml
index a7628ddc93..95f8e9e61f 100644
--- a/acceptance/bundle/telemetry/deploy-target-count/databricks.yml
+++ b/acceptance/bundle/telemetry/deploy-target-count/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: ox
-
 targets:
   one:
     presets:
diff --git a/acceptance/bundle/telemetry/deploy-target-count/output.txt b/acceptance/bundle/telemetry/deploy-target-count/output.txt
index ddb813c326..3143977774 100644
--- a/acceptance/bundle/telemetry/deploy-target-count/output.txt
+++ b/acceptance/bundle/telemetry/deploy-target-count/output.txt
@@ -1,6 +1,6 @@
 
 >>> [CLI] bundle deploy -t one
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/ox/one/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/one/files...
 Deploying resources...
 Deployment complete!
 
diff --git a/acceptance/bundle/telemetry/deploy-variable-count/databricks.yml b/acceptance/bundle/telemetry/deploy-variable-count/databricks.yml
index 63ec6b82ed..ba0b7d92bd 100644
--- a/acceptance/bundle/telemetry/deploy-variable-count/databricks.yml
+++ b/acceptance/bundle/telemetry/deploy-variable-count/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: chicken
-
 variables:
   v1:
     description: var 1
diff --git a/acceptance/bundle/telemetry/deploy-variable-count/output.txt b/acceptance/bundle/telemetry/deploy-variable-count/output.txt
index b2807fdbe3..044a6d83cd 100644
--- a/acceptance/bundle/telemetry/deploy-variable-count/output.txt
+++ b/acceptance/bundle/telemetry/deploy-variable-count/output.txt
@@ -1,6 +1,6 @@
 
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/chicken/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Deployment complete!
 
diff --git a/acceptance/bundle/telemetry/deploy-whl-artifacts/databricks.yml b/acceptance/bundle/telemetry/deploy-whl-artifacts/databricks.yml
index 2b26a9f3f8..556ec0568e 100644
--- a/acceptance/bundle/telemetry/deploy-whl-artifacts/databricks.yml
+++ b/acceptance/bundle/telemetry/deploy-whl-artifacts/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: deploy-artifacts
-
 variables:
   wrapper:
     default: false
diff --git a/acceptance/bundle/telemetry/deploy-whl-artifacts/output.txt b/acceptance/bundle/telemetry/deploy-whl-artifacts/output.txt
index 4ed4a7ecdf..caf4396bdd 100644
--- a/acceptance/bundle/telemetry/deploy-whl-artifacts/output.txt
+++ b/acceptance/bundle/telemetry/deploy-whl-artifacts/output.txt
@@ -2,14 +2,14 @@
 >>> [CLI] bundle deploy -t one
 Building test...
 Uploading my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl...
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-artifacts/one/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/one/files...
 Deploying resources...
 Deployment complete!
 
 >>> [CLI] bundle deploy -t two
 Building test...
 Uploading .databricks/bundle/two/patched_wheels/test_my_test_code/my_test_code-0.0.1+[TIMESTAMP_NS]-py3-none-any.whl...
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-artifacts/two/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/two/files...
 Deploying resources...
 Deployment complete!
 
diff --git a/acceptance/bundle/telemetry/deploy/databricks.yml b/acceptance/bundle/telemetry/deploy/databricks.yml
index 031b2717cf..8d6bed320b 100644
--- a/acceptance/bundle/telemetry/deploy/databricks.yml
+++ b/acceptance/bundle/telemetry/deploy/databricks.yml
@@ -1,5 +1,4 @@
 bundle:
-  name: rabbit
   uuid: 11111111-2222-3333-4444-555555555555
 
 resources:
diff --git a/acceptance/bundle/telemetry/deploy/output.txt b/acceptance/bundle/telemetry/deploy/output.txt
index a2aac66e4f..7f14a3bdd7 100644
--- a/acceptance/bundle/telemetry/deploy/output.txt
+++ b/acceptance/bundle/telemetry/deploy/output.txt
@@ -1,6 +1,6 @@
 
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/rabbit/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
diff --git a/acceptance/bundle/test.toml b/acceptance/bundle/test.toml
index 127faccc75..c9e5922b88 100644
--- a/acceptance/bundle/test.toml
+++ b/acceptance/bundle/test.toml
@@ -1,6 +1,9 @@
 # The lowest Python version we support. Alternative to "uv run --python 3.10"
 Env.UV_PYTHON = "3.10"
 
+[BundleConfig.default_name]
+bundle.name = "test-bundle"
+
 [[Repls]]
 Old = '1\d{18}'
 New = '[TIMESTAMP_NS]'
diff --git a/acceptance/bundle/trampoline/warning_message_with_new_spark/databricks.yml b/acceptance/bundle/trampoline/warning_message_with_new_spark/databricks.yml
index fa1a05dfbb..4ba0dd8952 100644
--- a/acceptance/bundle/trampoline/warning_message_with_new_spark/databricks.yml
+++ b/acceptance/bundle/trampoline/warning_message_with_new_spark/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: trampoline_warning_message_with_new_spark
-
 targets:
   dev:
     mode: development
diff --git a/acceptance/bundle/trampoline/warning_message_with_new_spark/output.txt b/acceptance/bundle/trampoline/warning_message_with_new_spark/output.txt
index e311ab9fd9..f28d98f301 100644
--- a/acceptance/bundle/trampoline/warning_message_with_new_spark/output.txt
+++ b/acceptance/bundle/trampoline/warning_message_with_new_spark/output.txt
@@ -1,9 +1,9 @@
 
 >>> errcode [CLI] bundle validate
-Name: trampoline_warning_message_with_new_spark
+Name: test-bundle
 Target: dev
 Workspace:
   User: [USERNAME]
-  Path: /Workspace/Users/[USERNAME]/.bundle/trampoline_warning_message_with_new_spark/dev
+  Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev
 
 Validation OK!
diff --git a/acceptance/bundle/validate/dashboard_defaults/databricks.yml b/acceptance/bundle/validate/dashboard_defaults/databricks.yml
index a8179e4661..ae49b035ba 100644
--- a/acceptance/bundle/validate/dashboard_defaults/databricks.yml
+++ b/acceptance/bundle/validate/dashboard_defaults/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: BUNDLE
-
 workspace:
   resource_path: /foo/bar
 
diff --git a/acceptance/bundle/validate/models/missing_name/databricks.yml b/acceptance/bundle/validate/models/missing_name/databricks.yml
index c50607ee39..4e4941777d 100644
--- a/acceptance/bundle/validate/models/missing_name/databricks.yml
+++ b/acceptance/bundle/validate/models/missing_name/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: test-bundle
-
 resources:
   models:
     mymodel: {}
diff --git a/acceptance/bundle/validate/presets_max_concurrent_runs/databricks.yml b/acceptance/bundle/validate/presets_max_concurrent_runs/databricks.yml
index 222a338db3..e77dbca6a5 100644
--- a/acceptance/bundle/validate/presets_max_concurrent_runs/databricks.yml
+++ b/acceptance/bundle/validate/presets_max_concurrent_runs/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: BUNDLE
-
 resources:
   jobs:
     job1:
diff --git a/acceptance/bundle/validate/presets_max_concurrent_runs/output.txt b/acceptance/bundle/validate/presets_max_concurrent_runs/output.txt
index 30fc257f90..3672872d57 100644
--- a/acceptance/bundle/validate/presets_max_concurrent_runs/output.txt
+++ b/acceptance/bundle/validate/presets_max_concurrent_runs/output.txt
@@ -2,7 +2,7 @@
   "job1": {
     "deployment": {
       "kind": "BUNDLE",
-      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/BUNDLE/default/state/metadata.json"
+      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json"
     },
     "edit_mode": "UI_LOCKED",
     "format": "MULTI_TASK",
@@ -16,7 +16,7 @@
   "job2": {
     "deployment": {
       "kind": "BUNDLE",
-      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/BUNDLE/default/state/metadata.json"
+      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json"
     },
     "edit_mode": "UI_LOCKED",
     "format": "MULTI_TASK",
diff --git a/acceptance/bundle/validate/presets_tags/databricks.yml b/acceptance/bundle/validate/presets_tags/databricks.yml
index 84f33f521b..3bf1751d4f 100644
--- a/acceptance/bundle/validate/presets_tags/databricks.yml
+++ b/acceptance/bundle/validate/presets_tags/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: BUNDLE
-
 resources:
   jobs:
     job1:
diff --git a/acceptance/bundle/validate/sync_patterns/databricks.yml b/acceptance/bundle/validate/sync_patterns/databricks.yml
index 9299fe4376..88a28aca4e 100644
--- a/acceptance/bundle/validate/sync_patterns/databricks.yml
+++ b/acceptance/bundle/validate/sync_patterns/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: sync_patterns
-
 sync:
   include:
     - conf/dir/*.yml
diff --git a/acceptance/bundle/validate/sync_patterns/out.sync.txt b/acceptance/bundle/validate/sync_patterns/out.sync.txt
index 447ce4e70c..74cf18222a 100644
--- a/acceptance/bundle/validate/sync_patterns/out.sync.txt
+++ b/acceptance/bundle/validate/sync_patterns/out.sync.txt
@@ -1,4 +1,4 @@
 {
   "method": "POST",
-  "path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/sync_patterns/default/files/conf/dir/test.yml"
+  "path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/conf/dir/test.yml"
 }
diff --git a/acceptance/bundle/validate/sync_patterns/output.txt b/acceptance/bundle/validate/sync_patterns/output.txt
index aab7554a02..b35859d86a 100644
--- a/acceptance/bundle/validate/sync_patterns/output.txt
+++ b/acceptance/bundle/validate/sync_patterns/output.txt
@@ -1,10 +1,10 @@
 
 >>> [CLI] bundle validate
-Name: sync_patterns
+Name: test-bundle
 Target: default
 Workspace:
   User: [USERNAME]
-  Path: /Workspace/Users/[USERNAME]/.bundle/sync_patterns/default
+  Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default
 
 Validation OK!
 
@@ -22,6 +22,6 @@ Validation OK!
 }
 
 >>> [CLI] bundle deploy
-Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/sync_patterns/default/files...
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Deployment complete!
diff --git a/acceptance/bundle/validate/sync_patterns/script b/acceptance/bundle/validate/sync_patterns/script
index a1b8cbf194..d2aae85444 100644
--- a/acceptance/bundle/validate/sync_patterns/script
+++ b/acceptance/bundle/validate/sync_patterns/script
@@ -1,5 +1,5 @@
 trace $CLI bundle validate
 trace $CLI bundle validate -o json | jq '.sync'
 trace $CLI bundle deploy
-jq 'select(.path | test("/api/2.0/workspace-files/import-file/Workspace/Users/.*/.bundle/sync_patterns/default/files/conf/dir/test.yml"))' out.requests.txt  > out.sync.txt
+jq 'select(.path | test("dir/test.yml"))' out.requests.txt  > out.sync.txt
 rm out.requests.txt
diff --git a/acceptance/bundle/validate/volume_defaults/databricks.yml b/acceptance/bundle/validate/volume_defaults/databricks.yml
index d0fa670ab1..5a93e15ec0 100644
--- a/acceptance/bundle/validate/volume_defaults/databricks.yml
+++ b/acceptance/bundle/validate/volume_defaults/databricks.yml
@@ -1,6 +1,3 @@
-bundle:
-  name: BUNDLE
-
 resources:
   volumes:
     v1:
diff --git a/acceptance/bundle/variables/complex/test.toml b/acceptance/bundle/variables/complex/test.toml
new file mode 100644
index 0000000000..cd4e656e05
--- /dev/null
+++ b/acceptance/bundle/variables/complex/test.toml
@@ -0,0 +1,2 @@
+Badness = 'databricks.yml is broken: mapping has duplicate key task_key but "bundle validate" accepts it'
+BundleConfig.default_name = ""
diff --git a/acceptance/bundle/variables/prepend-workspace-var/test.toml b/acceptance/bundle/variables/prepend-workspace-var/test.toml
new file mode 100644
index 0000000000..0724077f7e
--- /dev/null
+++ b/acceptance/bundle/variables/prepend-workspace-var/test.toml
@@ -0,0 +1 @@
+BundleConfig.default_name = ""
diff --git a/acceptance/bundle/volume_path/invalid_file/databricks.yml b/acceptance/bundle/volume_path/invalid_file/databricks.yml
index d1f483758c..0b01e009e9 100644
--- a/acceptance/bundle/volume_path/invalid_file/databricks.yml
+++ b/acceptance/bundle/volume_path/invalid_file/databricks.yml
@@ -1,5 +1,2 @@
-bundle:
-  name: volume_path_test
-
 workspace:
   file_path: "/Volumes/test"
diff --git a/acceptance/bundle/volume_path/invalid_file/output.txt b/acceptance/bundle/volume_path/invalid_file/output.txt
new file mode 100644
index 0000000000..f7a8f746b2
--- /dev/null
+++ b/acceptance/bundle/volume_path/invalid_file/output.txt
@@ -0,0 +1,15 @@
+Error: workspace.file_path /Volumes/test starts with /Volumes. /Volumes can only be used with workspace.artifact_path.
+  at workspace.file_path
+  in databricks.yml:4:14
+
+For more information, see https://docs.databricks.com/aws/en/dev-tools/bundles/settings#workspace
+
+Name: test-bundle
+Target: default
+Workspace:
+  User: [USERNAME]
+  Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default
+
+Found 1 error
+
+Exit code: 1
diff --git a/acceptance/bundle/volume_path/invalid_file/script b/acceptance/bundle/volume_path/invalid_file/script
new file mode 100644
index 0000000000..72555b332a
--- /dev/null
+++ b/acceptance/bundle/volume_path/invalid_file/script
@@ -0,0 +1 @@
+$CLI bundle validate
diff --git a/acceptance/bundle/volume_path/invalid_resource/databricks.yml b/acceptance/bundle/volume_path/invalid_resource/databricks.yml
index 1608f273f1..8952373295 100644
--- a/acceptance/bundle/volume_path/invalid_resource/databricks.yml
+++ b/acceptance/bundle/volume_path/invalid_resource/databricks.yml
@@ -1,5 +1,2 @@
-bundle:
-  name: volume_path_test
-
 workspace:
   resource_path: "/Volumes/test"
diff --git a/acceptance/bundle/volume_path/invalid_resource/output.txt b/acceptance/bundle/volume_path/invalid_resource/output.txt
new file mode 100644
index 0000000000..3a78f581d4
--- /dev/null
+++ b/acceptance/bundle/volume_path/invalid_resource/output.txt
@@ -0,0 +1,15 @@
+Error: workspace.resource_path /Volumes/test starts with /Volumes. /Volumes can only be used with workspace.artifact_path.
+  at workspace.resource_path
+  in databricks.yml:4:18
+
+For more information, see https://docs.databricks.com/aws/en/dev-tools/bundles/settings#workspace
+
+Name: test-bundle
+Target: default
+Workspace:
+  User: [USERNAME]
+  Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default
+
+Found 1 error
+
+Exit code: 1
diff --git a/acceptance/bundle/volume_path/invalid_resource/script b/acceptance/bundle/volume_path/invalid_resource/script
new file mode 100644
index 0000000000..72555b332a
--- /dev/null
+++ b/acceptance/bundle/volume_path/invalid_resource/script
@@ -0,0 +1 @@
+$CLI bundle validate
diff --git a/acceptance/bundle/volume_path/invalid_root/databricks.yml b/acceptance/bundle/volume_path/invalid_root/databricks.yml
index 0bd54f6348..f98ab2e5e1 100644
--- a/acceptance/bundle/volume_path/invalid_root/databricks.yml
+++ b/acceptance/bundle/volume_path/invalid_root/databricks.yml
@@ -1,5 +1,2 @@
-bundle:
-  name: volume_path_test
-
 workspace:
   root_path: "/Volumes/test"
diff --git a/acceptance/bundle/volume_path/invalid_root/output.txt b/acceptance/bundle/volume_path/invalid_root/output.txt
new file mode 100644
index 0000000000..afd92a9d22
--- /dev/null
+++ b/acceptance/bundle/volume_path/invalid_root/output.txt
@@ -0,0 +1,15 @@
+Error: workspace.root_path /Volumes/test starts with /Volumes. /Volumes can only be used with workspace.artifact_path.
+  at workspace.root_path
+  in databricks.yml:4:14
+
+For more information, see https://docs.databricks.com/aws/en/dev-tools/bundles/settings#workspace
+
+Name: test-bundle
+Target: default
+Workspace:
+  User: [USERNAME]
+  Path: /Volumes/test
+
+Found 1 error
+
+Exit code: 1
diff --git a/acceptance/bundle/volume_path/invalid_root/script b/acceptance/bundle/volume_path/invalid_root/script
new file mode 100644
index 0000000000..72555b332a
--- /dev/null
+++ b/acceptance/bundle/volume_path/invalid_root/script
@@ -0,0 +1 @@
+$CLI bundle validate
diff --git a/acceptance/bundle/volume_path/invalid_state/databricks.yml b/acceptance/bundle/volume_path/invalid_state/databricks.yml
index a30be73bda..86755e5586 100644
--- a/acceptance/bundle/volume_path/invalid_state/databricks.yml
+++ b/acceptance/bundle/volume_path/invalid_state/databricks.yml
@@ -1,5 +1,2 @@
-bundle:
-  name: volume_path_test
-
 workspace:
   state_path: "/Volumes/test"
diff --git a/acceptance/bundle/volume_path/invalid_state/output.txt b/acceptance/bundle/volume_path/invalid_state/output.txt
new file mode 100644
index 0000000000..631fdd5fd1
--- /dev/null
+++ b/acceptance/bundle/volume_path/invalid_state/output.txt
@@ -0,0 +1,15 @@
+Error: workspace.state_path /Volumes/test starts with /Volumes. /Volumes can only be used with workspace.artifact_path.
+  at workspace.state_path
+  in databricks.yml:4:15
+
+For more information, see https://docs.databricks.com/aws/en/dev-tools/bundles/settings#workspace
+
+Name: test-bundle
+Target: default
+Workspace:
+  User: [USERNAME]
+  Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default
+
+Found 1 error
+
+Exit code: 1
diff --git a/acceptance/bundle/volume_path/invalid_state/script b/acceptance/bundle/volume_path/invalid_state/script
new file mode 100644
index 0000000000..72555b332a
--- /dev/null
+++ b/acceptance/bundle/volume_path/invalid_state/script
@@ -0,0 +1 @@
+$CLI bundle validate
diff --git a/acceptance/bundle/volume_path/output.txt b/acceptance/bundle/volume_path/output.txt
deleted file mode 100644
index 0a787d4dbc..0000000000
--- a/acceptance/bundle/volume_path/output.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-Name: volume_path_test
-Target: default
-Workspace:
-  User: [USERNAME]
-  Path: /Workspace/Users/[USERNAME]/.bundle/volume_path_test/default
-
-Validation OK!
-
->>> [CLI] bundle validate
-Error: workspace.root_path /Volumes/test starts with /Volumes. /Volumes can only be used with workspace.artifact_path.
-  at workspace.root_path
-  in databricks.yml:5:14
-
-For more information, see https://docs.databricks.com/aws/en/dev-tools/bundles/settings#workspace
-
-Name: volume_path_test
-Target: default
-Workspace:
-  User: [USERNAME]
-  Path: /Volumes/test
-
-Found 1 error
-
-Exit code: 1
-
->>> [CLI] bundle validate
-Error: workspace.file_path /Volumes/test starts with /Volumes. /Volumes can only be used with workspace.artifact_path.
-  at workspace.file_path
-  in databricks.yml:5:14
-
-For more information, see https://docs.databricks.com/aws/en/dev-tools/bundles/settings#workspace
-
-Name: volume_path_test
-Target: default
-Workspace:
-  User: [USERNAME]
-  Path: /Workspace/Users/[USERNAME]/.bundle/volume_path_test/default
-
-Found 1 error
-
-Exit code: 1
-
->>> [CLI] bundle validate
-Error: workspace.state_path /Volumes/test starts with /Volumes. /Volumes can only be used with workspace.artifact_path.
-  at workspace.state_path
-  in databricks.yml:5:15
-
-For more information, see https://docs.databricks.com/aws/en/dev-tools/bundles/settings#workspace
-
-Name: volume_path_test
-Target: default
-Workspace:
-  User: [USERNAME]
-  Path: /Workspace/Users/[USERNAME]/.bundle/volume_path_test/default
-
-Found 1 error
-
-Exit code: 1
-
->>> [CLI] bundle validate
-Error: workspace.resource_path /Volumes/test starts with /Volumes. /Volumes can only be used with workspace.artifact_path.
-  at workspace.resource_path
-  in databricks.yml:5:18
-
-For more information, see https://docs.databricks.com/aws/en/dev-tools/bundles/settings#workspace
-
-Name: volume_path_test
-Target: default
-Workspace:
-  User: [USERNAME]
-  Path: /Workspace/Users/[USERNAME]/.bundle/volume_path_test/default
-
-Found 1 error
-
-Exit code: 1
diff --git a/acceptance/bundle/volume_path/script b/acceptance/bundle/volume_path/script
deleted file mode 100644
index 619af35ebe..0000000000
--- a/acceptance/bundle/volume_path/script
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-set -e
-
-# Test valid artifact path with /Volumes
-export DATABRICKS_BUNDLE_ROOT="valid"
-$CLI bundle validate
-
-# Test invalid root path with /Volumes
-export DATABRICKS_BUNDLE_ROOT="invalid_root"
-errcode trace $CLI bundle validate
-
-# Test invalid file path with /Volumes
-export DATABRICKS_BUNDLE_ROOT="invalid_file"
-errcode trace $CLI bundle validate
-
-# Test invalid state path with /Volumes
-export DATABRICKS_BUNDLE_ROOT="invalid_state"
-errcode trace $CLI bundle validate
-
-# Test invalid resource path with /Volumes
-export DATABRICKS_BUNDLE_ROOT="invalid_resource"
-errcode trace $CLI bundle validate
diff --git a/acceptance/bundle/volume_path/valid/databricks.yml b/acceptance/bundle/volume_path/valid/databricks.yml
index c414ac1693..562d5a2af3 100644
--- a/acceptance/bundle/volume_path/valid/databricks.yml
+++ b/acceptance/bundle/volume_path/valid/databricks.yml
@@ -1,5 +1,2 @@
-bundle:
-  name: volume_path_test
-
 workspace:
   artifact_path: "/Volumes/main/default/artifacts/workspace.artifact_path"
diff --git a/acceptance/bundle/volume_path/valid/output.txt b/acceptance/bundle/volume_path/valid/output.txt
new file mode 100644
index 0000000000..4f189effdf
--- /dev/null
+++ b/acceptance/bundle/volume_path/valid/output.txt
@@ -0,0 +1,7 @@
+Name: test-bundle
+Target: default
+Workspace:
+  User: [USERNAME]
+  Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default
+
+Validation OK!
diff --git a/acceptance/bundle/volume_path/valid/script b/acceptance/bundle/volume_path/valid/script
new file mode 100644
index 0000000000..72555b332a
--- /dev/null
+++ b/acceptance/bundle/volume_path/valid/script
@@ -0,0 +1 @@
+$CLI bundle validate
