diff --git a/build/images/finalize_manifests.py b/build/images/finalize_manifests.py
index 62e456d..ab618bc 100755
--- a/build/images/finalize_manifests.py
+++ b/build/images/finalize_manifests.py
@@ -10,7 +10,7 @@
    "core,misc,test").
  * "auxiliary" manifests
  ** one from the toolchain for the target libraries (libc++ et al)
- ** one from the build-zircon/*-ulib build, which has the Zircon ASan libraries
+ ** one from the Zircon/*-ulib build, which has the Zircon ASan libraries
  ** the unselected parts of the "main" manifests (i.e. Zircon)
 
 It emits final /boot and /system manifests used to make the actual images,
diff --git a/docs/development/testing/nand_testing.md b/docs/development/testing/nand_testing.md
index 1f0dcfc..77b09fb 100644
--- a/docs/development/testing/nand_testing.md
+++ b/docs/development/testing/nand_testing.md
@@ -62,7 +62,7 @@
 `nand-util` can also be used to grab an image of the nand contents:
 
 Note: If a file system is already mounted, unbind will fail, and forcing it to work is
-likely to render the system unusable. Rememer to netboot or use Zedboot as
+likely to render the system unusable. Remember to netboot or use Zedboot as
 needed.
 
 ```shell
@@ -74,7 +74,7 @@
 Transfer the image file to the host:
 
 ```shell
-$ zircon/build-gcc/tools/netcp :/tmp/image /tmp/saved_image_file
+$ out/default.zircon/tools/netcp :/tmp/image /tmp/saved_image_file
 ```
 
 ## Replay
@@ -85,7 +85,7 @@
 
 ```shell
 echo /nand.dmp=/tmp/saved_image_file > /tmp/manifest.txt
-zircon/build-gcc/tools/minfs /tmp/image.dsk create --manifest /tmp/manifest.txt
+out/default.zircon/tools/minfs /tmp/image.dsk create --manifest /tmp/manifest.txt
 fx set bringup.x64
 fx build
 fx qemu -k -- -hda /tmp/image.dsk
diff --git a/docs/development/tracing/ktrace.md b/docs/development/tracing/ktrace.md
index cff28020..3e8b051 100644
--- a/docs/development/tracing/ktrace.md
+++ b/docs/development/tracing/ktrace.md
@@ -65,8 +65,8 @@
 Then copy the file to the development host, and dump it:
 
 ```
-host$ ./out/build-zircon/tools/netcp :/tmp/save.ktrace save.ktrace
-host$ ./out/build-zircon/tools/ktrace-dump save.ktrace > save.dump
+host$ out/default.zircon/tools/netcp :/tmp/save.ktrace save.ktrace
+host$ out/default.zircon/tools/ktrace-dump save.ktrace > save.dump
 ```
 
 The pretty-printed output can be quite voluminous, thus it's recommended
diff --git a/scripts/run-zircon-arm64 b/scripts/run-zircon-arm64
index c4971046..5a6dfd6 100755
--- a/scripts/run-zircon-arm64
+++ b/scripts/run-zircon-arm64
@@ -8,5 +8,4 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-exec $DIR/../zircon/scripts/run-zircon -a arm64 \
-    -o $DIR/../out/build-zircon "$@"
+exec $DIR/../zircon/scripts/run-zircon -a arm64 "$@"
diff --git a/scripts/run-zircon-x86 b/scripts/run-zircon-x86
index 79a42ab..d53a8a4 100755
--- a/scripts/run-zircon-x86
+++ b/scripts/run-zircon-x86
@@ -8,5 +8,4 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-exec $DIR/../zircon/scripts/run-zircon -a x64 \
-    -o $DIR/../out/build-zircon "$@"
+exec $DIR/../zircon/scripts/run-zircon -a x64 "$@"
diff --git a/scripts/simplify_stacktraces b/scripts/simplify_stacktraces
index 608a720..5bf86f3 100755
--- a/scripts/simplify_stacktraces
+++ b/scripts/simplify_stacktraces
@@ -19,9 +19,7 @@
     UNDERLINE = '\033[4m'
 
 def simplify_cpp_file_path(path):
-  path = re.sub(r"^../../out/[^/]+/../../", "", path);
-  path = re.sub(r"^/[\S]+/build-zircon/../../", "", path);
-  return path
+  return re.sub(r"^../../out/[^/]+/../../", "", path)
 
 def simplify_cpp_function_signature(function):
   # To find "core part" to underline, strip out all param lists and templated
diff --git a/scripts/vim/fuchsia.vim b/scripts/vim/fuchsia.vim
index 9af57f7..b636d1e 100644
--- a/scripts/vim/fuchsia.vim
+++ b/scripts/vim/fuchsia.vim
@@ -65,7 +65,7 @@
           \ g:fuchsia_dir . "/*/public/," .
           \ g:fuchsia_build_dir . "," .
           \ g:fuchsia_build_dir . "/gen," .
-          \ g:fuchsia_dir . "/out/build-zircon/*/sysroot/include"
+          \ g:fuchsia_build_dir . "/sdk/exported/zircon_sysroot/arch/*/sysroot/include"
 
     " Make sure Dart files are recognized as such.
     if extension == "dart"
diff --git a/scripts/youcompleteme/ycm_extra_conf.py b/scripts/youcompleteme/ycm_extra_conf.py
index d54e350..cdbec98 100644
--- a/scripts/youcompleteme/ycm_extra_conf.py
+++ b/scripts/youcompleteme/ycm_extra_conf.py
@@ -67,10 +67,14 @@
 
 # Add the sysroot include if we found the zircon project
 if target_cpu:
-  arch_flags = ['-I' + os.path.join(fuchsia_root,
-                                    'out/build-zircon',
-                                    'build-' + target_cpu,
-                                    'sysroot/include')]
+  arch_flags = ['-I' + os.path.join(fuchsia_build,
+                                    'sdk',
+                                    'exported',
+                                    'zircon_sysroot',
+                                    'arch',
+                                    target_cpu,
+                                    'sysroot',
+                                    'include')]
 
 def GetClangCommandFromNinjaForFilename(filename):
   """Returns the command line to build |filename|.
diff --git a/tools/devshell/clean b/tools/devshell/clean
index 3fc922c..14b7594 100755
--- a/tools/devshell/clean
+++ b/tools/devshell/clean
@@ -5,11 +5,6 @@
 
 ### `gn clean` the ZIRCON_BUILDROOT and FUCHSIA_BUILD_DIR
 
-## If FUCHSIA_BUILD_DIR is out/x64, this is simply:
-##   gn clean out/build-zircon
-##   gn clean out/x64
-## It is useful to clean the build directory without having to re-run fx set.
-
 source "$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"/lib/vars.sh || exit $?
 fx-config-read