From cb9ac26ecc268591b2e4d551e357aba20c452e1c Mon Sep 17 00:00:00 2001
From: Roland McGrath <mcgrathr@google.com>
Date: Thu, 25 Apr 2019 21:16:11 +0000
Subject: [PATCH] [build] Rename zircon/system/banjo/* directories/targets to
 match library names

The old - names were only ever used because of limitations of the
old Zircon build system, which is no longer an issue.  The target
name in banjo_library() must always match the library name.  For
public Banjo libraries, the directory name matches that name too.

Change-Id: Ifff61436ec7d15eb53dfd21349c4367047e691d4
---
 garnet/bin/scpi/BUILD.gn                      |   2 +-
 garnet/bin/thermd/BUILD.gn                    |   2 +-
 garnet/drivers/gpu/msd-img-rgx/mtk/BUILD.gn   |   4 +-
 garnet/drivers/gpu/msd-intel-gen/src/BUILD.gn |   2 +-
 garnet/drivers/usb_video/BUILD.gn             |   2 +-
 garnet/drivers/video/amlogic-decoder/BUILD.gn |   4 +-
 garnet/drivers/virtual_camera/BUILD.gn        |   4 +-
 .../src/magma_util/platform/zircon/BUILD.gn   |   4 +-
 garnet/lib/magma/src/sys_driver/BUILD.gn      |   4 +-
 garnet/lib/wlan/protocol/BUILD.gn             |   2 +-
 sdk/BUILD.gn                                  |  70 +++++-----
 .../bluetooth/core/bt-host/BUILD.gn           |   2 +-
 .../bluetooth/core/bt-host/hci/BUILD.gn       |   2 +-
 .../bluetooth/hci/atheros/BUILD.gn            |   2 +-
 src/connectivity/bluetooth/hci/fake/BUILD.gn  |   2 +-
 src/connectivity/bluetooth/hci/intel/BUILD.gn |   2 +-
 .../bluetooth/hci/passthrough/BUILD.gn        |   2 +-
 .../bluetooth/profiles/bt-hog/BUILD.gn        |   4 +-
 .../drivers/qmi-fake-transport/BUILD.gn       |   2 +-
 .../drivers/qmi-usb-transport/BUILD.gn        |   4 +-
 .../wlan/drivers/mediatek/ralink/BUILD.gn     |   2 +-
 .../wlan/drivers/realtek/rtl88xx/BUILD.gn     |   2 +-
 .../wlan/drivers/testing/BUILD.gn             |   2 +-
 .../third_party/atheros/ath10k/BUILD.gn       |   2 +-
 .../third_party/broadcom/brcmfmac/BUILD.gn    |  12 +-
 src/connectivity/wlan/drivers/wlan/BUILD.gn   |   5 +-
 zircon/public/gn/BUILDCONFIG.gn               |   2 +-
 zircon/public/gn/banjo.gni                    |  17 +--
 zircon/system/banjo/BUILD.gn                  | 126 +++++++++---------
 .../banjo/ddk-protocol-usb-hci/BUILD.gn       |  19 ---
 .../banjo/{ddk-driver => ddk.driver}/BUILD.gn |   2 +-
 .../{ddk-driver => ddk.driver}/driver.banjo   |   0
 .../{ddk-physiter => ddk.physiter}/BUILD.gn   |   2 +-
 .../phys-iter.banjo                           |   0
 .../BUILD.gn                                  |   2 +-
 .../acpi.banjo                                |   0
 .../BUILD.gn                                  |   2 +-
 .../amlogic-canvas.banjo                      |   0
 .../BUILD.gn                                  |   2 +-
 .../bad-block.banjo                           |   0
 .../BUILD.gn                                  |   4 +-
 .../partition.banjo                           |   0
 .../BUILD.gn                                  |   4 +-
 .../volume.banjo                              |   0
 .../BUILD.gn                                  |   4 +-
 .../block.banjo                               |   0
 .../BUILD.gn                                  |   2 +-
 .../bt-gatt-svc.banjo                         |   0
 .../BUILD.gn                                  |   2 +-
 .../bt-hci.banjo                              |   0
 .../BUILD.gn                                  |   2 +-
 .../camerasensor.banjo                        |   0
 .../BUILD.gn                                  |   2 +-
 .../clock.banjo                               |   0
 .../BUILD.gn                                  |   2 +-
 .../clock-impl.banjo                          |   0
 .../BUILD.gn                                  |   4 +-
 .../composite.banjo                           |   0
 .../BUILD.gn                                  |   4 +-
 .../display-controller.banjo                  |   0
 .../BUILD.gn                                  |   2 +-
 .../dsiimpl.banjo                             |   0
 .../BUILD.gn                                  |   2 +-
 .../ethernet-board.banjo                      |   0
 .../BUILD.gn                                  |   2 +-
 .../ethernet-mac.banjo                        |   0
 .../BUILD.gn                                  |   2 +-
 .../ethernet.banjo                            |   0
 .../BUILD.gn                                  |   2 +-
 .../goldfish-pipe.banjo                       |   0
 .../BUILD.gn                                  |   2 +-
 .../gpio.banjo                                |   0
 .../BUILD.gn                                  |   4 +-
 .../gpio-impl.banjo                           |   0
 .../BUILD.gn                                  |   2 +-
 .../hidbus.banjo                              |   0
 .../BUILD.gn                                  |   2 +-
 .../i2c.banjo                                 |   0
 .../BUILD.gn                                  |   2 +-
 .../i2c-impl.banjo                            |   0
 .../BUILD.gn                                  |   2 +-
 .../intel-gpu-core.banjo                      |   0
 .../BUILD.gn                                  |   2 +-
 .../intel-hda-codec.banjo                     |   0
 .../BUILD.gn                                  |   2 +-
 .../iommu.banjo                               |   0
 .../BUILD.gn                                  |   2 +-
 .../mailbox.banjo                             |   0
 .../BUILD.gn                                  |   4 +-
 .../mipicsi.banjo                             |   0
 .../BUILD.gn                                  |   4 +-
 .../nand.banjo                                |   0
 .../BUILD.gn                                  |   4 +-
 .../pci.banjo                                 |   0
 .../BUILD.gn                                  |   4 +-
 .../pciroot.banjo                             |   0
 .../BUILD.gn                                  |   6 +-
 .../platform-bus.banjo                        |   0
 .../BUILD.gn                                  |   4 +-
 .../platform-device.banjo                     |   0
 .../BUILD.gn                                  |   2 +-
 .../power.banjo                               |   0
 .../BUILD.gn                                  |   4 +-
 .../power-impl.banjo                          |   0
 .../BUILD.gn                                  |   4 +-
 .../rawnand.banjo                             |   0
 .../BUILD.gn                                  |   4 +-
 .../scpi.banjo                                |   0
 .../BUILD.gn                                  |   2 +-
 .../sdhci.banjo                               |   0
 .../BUILD.gn                                  |   2 +-
 .../sdio.banjo                                |   0
 .../BUILD.gn                                  |   2 +-
 .../sdmmc.banjo                               |   0
 .../BUILD.gn                                  |   2 +-
 .../serial.banjo                              |   0
 .../BUILD.gn                                  |   4 +-
 .../serial-impl.banjo                         |   0
 .../BUILD.gn                                  |   2 +-
 .../sysmem.banjo                              |   0
 .../BUILD.gn                                  |   2 +-
 .../test.banjo                                |   0
 .../BUILD.gn                                  |  10 +-
 .../usb-bus.banjo                             |   0
 .../BUILD.gn                                  |   4 +-
 .../usb-composite.banjo                       |   0
 .../BUILD.gn                                  |   8 +-
 .../usb-dci.banjo                             |   0
 .../BUILD.gn                                  |   8 +-
 .../usb-function.banjo                        |   0
 .../banjo/ddk.protocol.usb.hci/BUILD.gn       |  19 +++
 .../usb-hci.banjo                             |   0
 .../BUILD.gn                                  |   2 +-
 .../usb-hub.banjo                             |   0
 .../BUILD.gn                                  |   2 +-
 .../usb-mode-switch.banjo                     |   0
 .../BUILD.gn                                  |   6 +-
 .../usb-request.banjo                         |   0
 .../BUILD.gn                                  |   8 +-
 .../usb.banjo                                 |   0
 .../BUILD.gn                                  |   2 +-
 .../audio.banjo                               |   0
 .../BUILD.gn                                  |   2 +-
 .../block.banjo                               |   0
 .../BUILD.gn                                  |   2 +-
 .../nand.banjo                                |   0
 .../BUILD.gn                                  |   2 +-
 .../scpi.banjo                                |   0
 .../{zircon-hw-pci => zircon.hw.pci}/BUILD.gn |   2 +-
 .../hwpci.banjo                               |   0
 .../BUILD.gn                                  |   2 +-
 .../usb-hub.banjo                             |   0
 .../{zircon-hw-usb => zircon.hw.usb}/BUILD.gn |   2 +-
 .../usb.banjo                                 |   0
 .../BUILD.gn                                  |   2 +-
 .../pci.banjo                                 |   0
 zircon/system/core/devmgr/component/BUILD.gn  |  40 +++---
 zircon/system/core/devmgr/devhost/BUILD.gn    |   2 +-
 .../system/dev/audio/astro-pdm-input/BUILD.gn |   8 +-
 .../dev/audio/astro-tdm-output/BUILD.gn       |   8 +-
 .../system/dev/audio/gauss-pdm-input/BUILD.gn |   2 +-
 zircon/system/dev/audio/gauss-tdm/BUILD.gn    |   6 +-
 .../dev/audio/intel-hda/codecs/qemu/BUILD.gn  |   4 +-
 .../audio/intel-hda/codecs/realtek/BUILD.gn   |   2 +-
 .../dev/audio/intel-hda/controller/BUILD.gn   |   4 +-
 .../dev/audio/mt8167-tdm-input/BUILD.gn       |   8 +-
 .../dev/audio/mt8167-tdm-output/BUILD.gn      |   8 +-
 .../dev/audio/sherlock-pdm-input/BUILD.gn     |   8 +-
 .../dev/audio/sherlock-tdm-output/BUILD.gn    |  10 +-
 zircon/system/dev/audio/usb-audio/BUILD.gn    |   6 +-
 zircon/system/dev/backlight/sg-micro/BUILD.gn |   8 +-
 .../system/dev/backlight/ti-lp8556/BUILD.gn   |   6 +-
 zircon/system/dev/block/ahci/BUILD.gn         |   4 +-
 zircon/system/dev/block/aml-sd-emmc/BUILD.gn  |  10 +-
 zircon/system/dev/block/bootpart/BUILD.gn     |   4 +-
 zircon/system/dev/block/core/BUILD.gn         |   6 +-
 zircon/system/dev/block/ftl/BUILD.gn          |   8 +-
 zircon/system/dev/block/fvm/BUILD.gn          |   6 +-
 zircon/system/dev/block/gpt/BUILD.gn          |   4 +-
 zircon/system/dev/block/hisi-ufs/BUILD.gn     |   6 +-
 zircon/system/dev/block/mbr/BUILD.gn          |   4 +-
 .../system/dev/block/msm8x53-sdhci/BUILD.gn   |   4 +-
 zircon/system/dev/block/mtk-sdmmc/BUILD.gn    |  20 +--
 zircon/system/dev/block/nvme/BUILD.gn         |   4 +-
 zircon/system/dev/block/pci-sdhci/BUILD.gn    |   6 +-
 zircon/system/dev/block/ramdisk/BUILD.gn      |   4 +-
 zircon/system/dev/block/sdhci/BUILD.gn        |   6 +-
 zircon/system/dev/block/sdmmc/BUILD.gn        |   8 +-
 zircon/system/dev/block/ums-function/BUILD.gn |   8 +-
 .../dev/block/usb-mass-storage/BUILD.gn       |   8 +-
 zircon/system/dev/block/zxcrypt/BUILD.gn      |   6 +-
 .../dev/bluetooth/bt-hci-broadcom/BUILD.gn    |   4 +-
 .../dev/bluetooth/bt-hci-mediatek/BUILD.gn    |   8 +-
 .../dev/bluetooth/bt-transport-uart/BUILD.gn  |   4 +-
 .../dev/bluetooth/bt-transport-usb/BUILD.gn   |   8 +-
 zircon/system/dev/board/astro/BUILD.gn        |  14 +-
 zircon/system/dev/board/gauss/BUILD.gn        |  14 +-
 zircon/system/dev/board/hikey960/BUILD.gn     |  18 +--
 .../dev/board/integration-test/BUILD.gn       |   4 +-
 zircon/system/dev/board/machina/BUILD.gn      |   4 +-
 zircon/system/dev/board/msm8x53-som/BUILD.gn  |   2 +-
 zircon/system/dev/board/mt8167s_ref/BUILD.gn  |  12 +-
 zircon/system/dev/board/qemu/BUILD.gn         |   4 +-
 zircon/system/dev/board/sherlock/BUILD.gn     |  18 +--
 zircon/system/dev/board/test/BUILD.gn         |  46 +++----
 zircon/system/dev/board/vim/BUILD.gn          |  16 +--
 zircon/system/dev/board/x86/BUILD.gn          |  14 +-
 zircon/system/dev/bus/pci/BUILD.gn            |  20 +--
 zircon/system/dev/bus/platform/BUILD.gn       |  42 +++---
 zircon/system/dev/bus/virtio/BUILD.gn         |  10 +-
 zircon/system/dev/camera/aml-mipicsi/BUILD.gn |  12 +-
 zircon/system/dev/camera/arm-isp/BUILD.gn     |  18 +--
 zircon/system/dev/camera/imx227/BUILD.gn      |  14 +-
 zircon/system/dev/clk/amlogic-clk/BUILD.gn    |   6 +-
 zircon/system/dev/clk/clock/BUILD.gn          |   4 +-
 zircon/system/dev/clk/hisi-lib/BUILD.gn       |   6 +-
 zircon/system/dev/clk/hisi3660/BUILD.gn       |   6 +-
 zircon/system/dev/clk/msm8x53-clk/BUILD.gn    |  12 +-
 zircon/system/dev/clk/mtk-clk/BUILD.gn        |  10 +-
 zircon/system/dev/codec/alc5514/BUILD.gn      |   4 +-
 zircon/system/dev/codec/max98927/BUILD.gn     |   4 +-
 zircon/system/dev/display/aml-canvas/BUILD.gn |   6 +-
 .../system/dev/display/astro-display/BUILD.gn |  16 +--
 zircon/system/dev/display/display/BUILD.gn    |   4 +-
 zircon/system/dev/display/dsi-dw/BUILD.gn     |  12 +-
 zircon/system/dev/display/dsi-mt/BUILD.gn     |  12 +-
 zircon/system/dev/display/dummy/BUILD.gn      |   4 +-
 .../system/dev/display/hikey-display/BUILD.gn |  24 ++--
 zircon/system/dev/display/intel-i915/BUILD.gn |  10 +-
 zircon/system/dev/display/led2472g/BUILD.gn   |   2 +-
 .../dev/display/mt8167s-display/BUILD.gn      |  10 +-
 zircon/system/dev/display/simple/BUILD.gn     |   8 +-
 .../system/dev/display/vim-display/BUILD.gn   |  14 +-
 .../dev/ethernet/aml-ethernet-s912/BUILD.gn   |  14 +-
 .../system/dev/ethernet/asix-88179/BUILD.gn   |   8 +-
 .../system/dev/ethernet/asix-88772b/BUILD.gn  |   8 +-
 zircon/system/dev/ethernet/dwmac/BUILD.gn     |  18 +--
 zircon/system/dev/ethernet/ethernet/BUILD.gn  |  17 +--
 zircon/system/dev/ethernet/ethertap/BUILD.gn  |   4 +-
 .../dev/ethernet/intel-ethernet/BUILD.gn      |   4 +-
 .../system/dev/ethernet/realtek-8111/BUILD.gn |   4 +-
 .../dev/ethernet/realtek-8211f/BUILD.gn       |   2 +-
 zircon/system/dev/ethernet/rndis/BUILD.gn     |   8 +-
 .../system/dev/ethernet/usb-cdc-ecm/BUILD.gn  |   8 +-
 .../dev/ethernet/usb-cdc-function/BUILD.gn    |   8 +-
 zircon/system/dev/fw/qcom-pil/BUILD.gn        |   4 +-
 zircon/system/dev/gpio/aml-axg-gpio/BUILD.gn  |   8 +-
 zircon/system/dev/gpio/aml-gxl-gpio/BUILD.gn  |   8 +-
 zircon/system/dev/gpio/gpio-test/BUILD.gn     |   6 +-
 zircon/system/dev/gpio/gpio/BUILD.gn          |   4 +-
 zircon/system/dev/gpio/hi3660-gpio/BUILD.gn   |   8 +-
 zircon/system/dev/gpio/mt-8167/BUILD.gn       |  16 +--
 zircon/system/dev/gpio/pl061/BUILD.gn         |   6 +-
 zircon/system/dev/gpio/qcom-gpio/BUILD.gn     |  12 +-
 zircon/system/dev/gpu/aml-gpu/BUILD.gn        |  10 +-
 zircon/system/dev/i2c/aml-i2c/BUILD.gn        |   8 +-
 zircon/system/dev/i2c/dw-i2c/BUILD.gn         |   8 +-
 zircon/system/dev/i2c/i2c/BUILD.gn            |   6 +-
 zircon/system/dev/i2c/intel-i2c/BUILD.gn      |   6 +-
 zircon/system/dev/i2c/mt8167-i2c/BUILD.gn     |   8 +-
 zircon/system/dev/input/bma253/BUILD.gn       |   8 +-
 zircon/system/dev/input/focaltech/BUILD.gn    |  12 +-
 zircon/system/dev/input/goodix/BUILD.gn       |  12 +-
 zircon/system/dev/input/hid-buttons/BUILD.gn  |   8 +-
 zircon/system/dev/input/hid/BUILD.gn          |   2 +-
 zircon/system/dev/input/hidctl/BUILD.gn       |   2 +-
 zircon/system/dev/input/i2c-hid/BUILD.gn      |   4 +-
 zircon/system/dev/input/pc-ps2/BUILD.gn       |   2 +-
 zircon/system/dev/input/usb-hid/BUILD.gn      |   8 +-
 zircon/system/dev/lib/amlogic/BUILD.gn        |   4 +-
 zircon/system/dev/lib/scsi/BUILD.gn           |   8 +-
 zircon/system/dev/lib/usb/BUILD.gn            |  10 +-
 .../dev/light-sensor/ams-light/BUILD.gn       |   8 +-
 .../system/dev/light-sensor/lite-on/BUILD.gn  |   4 +-
 zircon/system/dev/light/gpio-light/BUILD.gn   |   6 +-
 zircon/system/dev/misc/cpu-trace/BUILD.gn     |   2 +-
 zircon/system/dev/misc/goldfish/BUILD.gn      |   4 +-
 zircon/system/dev/misc/test/BUILD.gn          |   2 +-
 zircon/system/dev/misc/tpm/BUILD.gn           |   2 +-
 zircon/system/dev/mlg/usb-harriet/BUILD.gn    |   6 +-
 zircon/system/dev/nand/aml-rawnand/BUILD.gn   |   4 +-
 zircon/system/dev/nand/broker/BUILD.gn        |   2 +-
 zircon/system/dev/nand/broker/test/BUILD.gn   |   2 +-
 zircon/system/dev/nand/nand/BUILD.gn          |   6 +-
 zircon/system/dev/nand/nand/test/BUILD.gn     |  10 +-
 zircon/system/dev/nand/nandpart/BUILD.gn      |   6 +-
 zircon/system/dev/nand/ram-nand/BUILD.gn      |   6 +-
 zircon/system/dev/nand/skip-block/BUILD.gn    |   4 +-
 zircon/system/dev/pci/amlogic-pcie/BUILD.gn   |   6 +-
 .../system/dev/power/msm8x53-power/BUILD.gn   |  12 +-
 zircon/system/dev/power/mtk-power/BUILD.gn    |  10 +-
 zircon/system/dev/power/power/BUILD.gn        |   4 +-
 zircon/system/dev/rtc/nxp/BUILD.gn            |   2 +-
 zircon/system/dev/rtc/pl031-rtc/BUILD.gn      |   2 +-
 zircon/system/dev/scpi/aml-scpi-s912/BUILD.gn |  16 +--
 zircon/system/dev/serial/aml-uart/BUILD.gn    |   8 +-
 zircon/system/dev/serial/ftdi/BUILD.gn        |  10 +-
 .../system/dev/serial/intel-serialio/BUILD.gn |   4 +-
 zircon/system/dev/serial/serial/BUILD.gn      |   4 +-
 zircon/system/dev/sysmem/sysmem/BUILD.gn      |  12 +-
 zircon/system/dev/tee/optee/BUILD.gn          |   2 +-
 zircon/system/dev/test/ddk-test/BUILD.gn      |   6 +-
 zircon/system/dev/test/mock-device/BUILD.gn   |   2 +-
 zircon/system/dev/test/usb/BUILD.gn           |   4 +-
 .../dev/thermal/aml-thermal-s905d2g/BUILD.gn  |  10 +-
 .../dev/thermal/aml-thermal-s912/BUILD.gn     |   6 +-
 .../system/dev/thermal/mtk-thermal/BUILD.gn   |  20 +--
 zircon/system/dev/usb/dwc3/BUILD.gn           |  12 +-
 zircon/system/dev/usb/hikey-usb/BUILD.gn      |   6 +-
 zircon/system/dev/usb/mt-musb-host/BUILD.gn   |   4 +-
 .../dev/usb/mt-musb-peripheral/BUILD.gn       |  14 +-
 zircon/system/dev/usb/usb-bus/BUILD.gn        |  12 +-
 zircon/system/dev/usb/usb-composite/BUILD.gn  |   6 +-
 zircon/system/dev/usb/usb-dfu/BUILD.gn        |   6 +-
 zircon/system/dev/usb/usb-hub/BUILD.gn        |  10 +-
 .../dev/usb/usb-peripheral-test/BUILD.gn      |   6 +-
 zircon/system/dev/usb/usb-peripheral/BUILD.gn |  10 +-
 .../usb/usb-test/flash-programmer/BUILD.gn    |   6 +-
 zircon/system/dev/usb/usb-test/fx3/BUILD.gn   |   6 +-
 .../dev/usb/usb-test/usb-tester/BUILD.gn      |   6 +-
 .../system/dev/usb/usb-virtual-bus/BUILD.gn   |  16 +--
 zircon/system/dev/usb/xhci/BUILD.gn           |  14 +-
 zircon/system/uapp/banjo-dummy/BUILD.gn       |   2 +-
 zircon/system/uapp/usbctl/BUILD.gn            |   2 +-
 zircon/system/ulib/ddk/BUILD.gn               |   2 +-
 zircon/system/ulib/ddktl/BUILD.gn             |  20 +--
 zircon/system/ulib/intel-hda/BUILD.gn         |   2 +-
 zircon/system/ulib/mipi-dsi/BUILD.gn          |   2 +-
 zircon/system/ulib/simplehid/BUILD.gn         |   2 +-
 zircon/system/ulib/zxcrypt/BUILD.gn           |   4 +-
 zircon/system/utest/ethernet/BUILD.gn         |   2 +-
 zircon/system/utest/hid/BUILD.gn              |   2 +-
 .../third_party/dev/ethernet/e1000/BUILD.gn   |   4 +-
 333 files changed, 972 insertions(+), 977 deletions(-)
 delete mode 100644 zircon/system/banjo/ddk-protocol-usb-hci/BUILD.gn
 rename zircon/system/banjo/{ddk-driver => ddk.driver}/BUILD.gn (88%)
 rename zircon/system/banjo/{ddk-driver => ddk.driver}/driver.banjo (100%)
 rename zircon/system/banjo/{ddk-physiter => ddk.physiter}/BUILD.gn (88%)
 rename zircon/system/banjo/{ddk-physiter => ddk.physiter}/phys-iter.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-acpi => ddk.protocol.acpi}/BUILD.gn (86%)
 rename zircon/system/banjo/{ddk-protocol-acpi => ddk.protocol.acpi}/acpi.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-amlogiccanvas => ddk.protocol.amlogiccanvas}/BUILD.gn (84%)
 rename zircon/system/banjo/{ddk-protocol-amlogiccanvas => ddk.protocol.amlogiccanvas}/amlogic-canvas.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-badblock => ddk.protocol.badblock}/BUILD.gn (85%)
 rename zircon/system/banjo/{ddk-protocol-badblock => ddk.protocol.badblock}/bad-block.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-block-partition => ddk.protocol.block.partition}/BUILD.gn (74%)
 rename zircon/system/banjo/{ddk-protocol-block-partition => ddk.protocol.block.partition}/partition.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-block-volume => ddk.protocol.block.volume}/BUILD.gn (74%)
 rename zircon/system/banjo/{ddk-protocol-block-volume => ddk.protocol.block.volume}/volume.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-block => ddk.protocol.block}/BUILD.gn (75%)
 rename zircon/system/banjo/{ddk-protocol-block => ddk.protocol.block}/block.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-bt-gattsvc => ddk.protocol.bt.gattsvc}/BUILD.gn (84%)
 rename zircon/system/banjo/{ddk-protocol-bt-gattsvc => ddk.protocol.bt.gattsvc}/bt-gatt-svc.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-bt-hci => ddk.protocol.bt.hci}/BUILD.gn (85%)
 rename zircon/system/banjo/{ddk-protocol-bt-hci => ddk.protocol.bt.hci}/bt-hci.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-camerasensor => ddk.protocol.camerasensor}/BUILD.gn (84%)
 rename zircon/system/banjo/{ddk-protocol-camerasensor => ddk.protocol.camerasensor}/camerasensor.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-clock => ddk.protocol.clock}/BUILD.gn (86%)
 rename zircon/system/banjo/{ddk-protocol-clock => ddk.protocol.clock}/clock.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-clockimpl => ddk.protocol.clockimpl}/BUILD.gn (85%)
 rename zircon/system/banjo/{ddk-protocol-clockimpl => ddk.protocol.clockimpl}/clock-impl.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-composite => ddk.protocol.composite}/BUILD.gn (77%)
 rename zircon/system/banjo/{ddk-protocol-composite => ddk.protocol.composite}/composite.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-display-controller => ddk.protocol.display.controller}/BUILD.gn (74%)
 rename zircon/system/banjo/{ddk-protocol-display-controller => ddk.protocol.display.controller}/display-controller.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-dsiimpl => ddk.protocol.dsiimpl}/BUILD.gn (85%)
 rename zircon/system/banjo/{ddk-protocol-dsiimpl => ddk.protocol.dsiimpl}/dsiimpl.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-ethernet-board => ddk.protocol.ethernet.board}/BUILD.gn (83%)
 rename zircon/system/banjo/{ddk-protocol-ethernet-board => ddk.protocol.ethernet.board}/ethernet-board.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-ethernet-mac => ddk.protocol.ethernet.mac}/BUILD.gn (84%)
 rename zircon/system/banjo/{ddk-protocol-ethernet-mac => ddk.protocol.ethernet.mac}/ethernet-mac.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-ethernet => ddk.protocol.ethernet}/BUILD.gn (85%)
 rename zircon/system/banjo/{ddk-protocol-ethernet => ddk.protocol.ethernet}/ethernet.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-goldfish-pipe => ddk.protocol.goldfish.pipe}/BUILD.gn (84%)
 rename zircon/system/banjo/{ddk-protocol-goldfish-pipe => ddk.protocol.goldfish.pipe}/goldfish-pipe.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-gpio => ddk.protocol.gpio}/BUILD.gn (86%)
 rename zircon/system/banjo/{ddk-protocol-gpio => ddk.protocol.gpio}/gpio.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-gpioimpl => ddk.protocol.gpioimpl}/BUILD.gn (75%)
 rename zircon/system/banjo/{ddk-protocol-gpioimpl => ddk.protocol.gpioimpl}/gpio-impl.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-hidbus => ddk.protocol.hidbus}/BUILD.gn (85%)
 rename zircon/system/banjo/{ddk-protocol-hidbus => ddk.protocol.hidbus}/hidbus.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-i2c => ddk.protocol.i2c}/BUILD.gn (86%)
 rename zircon/system/banjo/{ddk-protocol-i2c => ddk.protocol.i2c}/i2c.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-i2cimpl => ddk.protocol.i2cimpl}/BUILD.gn (85%)
 rename zircon/system/banjo/{ddk-protocol-i2cimpl => ddk.protocol.i2cimpl}/i2c-impl.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-intelgpucore => ddk.protocol.intelgpucore}/BUILD.gn (84%)
 rename zircon/system/banjo/{ddk-protocol-intelgpucore => ddk.protocol.intelgpucore}/intel-gpu-core.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-intelhda-codec => ddk.protocol.intelhda.codec}/BUILD.gn (83%)
 rename zircon/system/banjo/{ddk-protocol-intelhda-codec => ddk.protocol.intelhda.codec}/intel-hda-codec.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-iommu => ddk.protocol.iommu}/BUILD.gn (86%)
 rename zircon/system/banjo/{ddk-protocol-iommu => ddk.protocol.iommu}/iommu.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-mailbox => ddk.protocol.mailbox}/BUILD.gn (85%)
 rename zircon/system/banjo/{ddk-protocol-mailbox => ddk.protocol.mailbox}/mailbox.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-mipicsi => ddk.protocol.mipicsi}/BUILD.gn (74%)
 rename zircon/system/banjo/{ddk-protocol-mipicsi => ddk.protocol.mipicsi}/mipicsi.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-nand => ddk.protocol.nand}/BUILD.gn (76%)
 rename zircon/system/banjo/{ddk-protocol-nand => ddk.protocol.nand}/nand.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-pci => ddk.protocol.pci}/BUILD.gn (76%)
 rename zircon/system/banjo/{ddk-protocol-pci => ddk.protocol.pci}/pci.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-pciroot => ddk.protocol.pciroot}/BUILD.gn (76%)
 rename zircon/system/banjo/{ddk-protocol-pciroot => ddk.protocol.pciroot}/pciroot.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-platform-bus => ddk.protocol.platform.bus}/BUILD.gn (66%)
 rename zircon/system/banjo/{ddk-protocol-platform-bus => ddk.protocol.platform.bus}/platform-bus.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-platform-device => ddk.protocol.platform.device}/BUILD.gn (76%)
 rename zircon/system/banjo/{ddk-protocol-platform-device => ddk.protocol.platform.device}/platform-device.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-power => ddk.protocol.power}/BUILD.gn (86%)
 rename zircon/system/banjo/{ddk-protocol-power => ddk.protocol.power}/power.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-powerimpl => ddk.protocol.powerimpl}/BUILD.gn (75%)
 rename zircon/system/banjo/{ddk-protocol-powerimpl => ddk.protocol.powerimpl}/power-impl.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-rawnand => ddk.protocol.rawnand}/BUILD.gn (75%)
 rename zircon/system/banjo/{ddk-protocol-rawnand => ddk.protocol.rawnand}/rawnand.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-scpi => ddk.protocol.scpi}/BUILD.gn (76%)
 rename zircon/system/banjo/{ddk-protocol-scpi => ddk.protocol.scpi}/scpi.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-sdhci => ddk.protocol.sdhci}/BUILD.gn (86%)
 rename zircon/system/banjo/{ddk-protocol-sdhci => ddk.protocol.sdhci}/sdhci.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-sdio => ddk.protocol.sdio}/BUILD.gn (86%)
 rename zircon/system/banjo/{ddk-protocol-sdio => ddk.protocol.sdio}/sdio.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-sdmmc => ddk.protocol.sdmmc}/BUILD.gn (86%)
 rename zircon/system/banjo/{ddk-protocol-sdmmc => ddk.protocol.sdmmc}/sdmmc.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-serial => ddk.protocol.serial}/BUILD.gn (85%)
 rename zircon/system/banjo/{ddk-protocol-serial => ddk.protocol.serial}/serial.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-serialimpl => ddk.protocol.serialimpl}/BUILD.gn (75%)
 rename zircon/system/banjo/{ddk-protocol-serialimpl => ddk.protocol.serialimpl}/serial-impl.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-sysmem => ddk.protocol.sysmem}/BUILD.gn (85%)
 rename zircon/system/banjo/{ddk-protocol-sysmem => ddk.protocol.sysmem}/sysmem.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-test => ddk.protocol.test}/BUILD.gn (86%)
 rename zircon/system/banjo/{ddk-protocol-test => ddk.protocol.test}/test.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-usb-bus => ddk.protocol.usb.bus}/BUILD.gn (56%)
 rename zircon/system/banjo/{ddk-protocol-usb-bus => ddk.protocol.usb.bus}/usb-bus.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-usb-composite => ddk.protocol.usb.composite}/BUILD.gn (76%)
 rename zircon/system/banjo/{ddk-protocol-usb-composite => ddk.protocol.usb.composite}/usb-composite.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-usb-dci => ddk.protocol.usb.dci}/BUILD.gn (61%)
 rename zircon/system/banjo/{ddk-protocol-usb-dci => ddk.protocol.usb.dci}/usb-dci.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-usb-function => ddk.protocol.usb.function}/BUILD.gn (61%)
 rename zircon/system/banjo/{ddk-protocol-usb-function => ddk.protocol.usb.function}/usb-function.banjo (100%)
 create mode 100644 zircon/system/banjo/ddk.protocol.usb.hci/BUILD.gn
 rename zircon/system/banjo/{ddk-protocol-usb-hci => ddk.protocol.usb.hci}/usb-hci.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-usb-hub => ddk.protocol.usb.hub}/BUILD.gn (85%)
 rename zircon/system/banjo/{ddk-protocol-usb-hub => ddk.protocol.usb.hub}/usb-hub.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-usb-modeswitch => ddk.protocol.usb.modeswitch}/BUILD.gn (83%)
 rename zircon/system/banjo/{ddk-protocol-usb-modeswitch => ddk.protocol.usb.modeswitch}/usb-mode-switch.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-usb-request => ddk.protocol.usb.request}/BUILD.gn (68%)
 rename zircon/system/banjo/{ddk-protocol-usb-request => ddk.protocol.usb.request}/usb-request.banjo (100%)
 rename zircon/system/banjo/{ddk-protocol-usb => ddk.protocol.usb}/BUILD.gn (61%)
 rename zircon/system/banjo/{ddk-protocol-usb => ddk.protocol.usb}/usb.banjo (100%)
 rename zircon/system/banjo/{zircon-device-audio => zircon.device.audio}/BUILD.gn (85%)
 rename zircon/system/banjo/{zircon-device-audio => zircon.device.audio}/audio.banjo (100%)
 rename zircon/system/banjo/{zircon-device-block => zircon.device.block}/BUILD.gn (85%)
 rename zircon/system/banjo/{zircon-device-block => zircon.device.block}/block.banjo (100%)
 rename zircon/system/banjo/{zircon-device-nand => zircon.device.nand}/BUILD.gn (86%)
 rename zircon/system/banjo/{zircon-device-nand => zircon.device.nand}/nand.banjo (100%)
 rename zircon/system/banjo/{zircon-device-scpi => zircon.device.scpi}/BUILD.gn (86%)
 rename zircon/system/banjo/{zircon-device-scpi => zircon.device.scpi}/scpi.banjo (100%)
 rename zircon/system/banjo/{zircon-hw-pci => zircon.hw.pci}/BUILD.gn (87%)
 rename zircon/system/banjo/{zircon-hw-pci => zircon.hw.pci}/hwpci.banjo (100%)
 rename zircon/system/banjo/{zircon-hw-usb-hub => zircon.hw.usb.hub}/BUILD.gn (86%)
 rename zircon/system/banjo/{zircon-hw-usb-hub => zircon.hw.usb.hub}/usb-hub.banjo (100%)
 rename zircon/system/banjo/{zircon-hw-usb => zircon.hw.usb}/BUILD.gn (87%)
 rename zircon/system/banjo/{zircon-hw-usb => zircon.hw.usb}/usb.banjo (100%)
 rename zircon/system/banjo/{zircon-syscalls-pci => zircon.syscalls.pci}/BUILD.gn (85%)
 rename zircon/system/banjo/{zircon-syscalls-pci => zircon.syscalls.pci}/pci.banjo (100%)

diff --git a/garnet/bin/scpi/BUILD.gn b/garnet/bin/scpi/BUILD.gn
index c8d787eecef..b03adea12a8 100644
--- a/garnet/bin/scpi/BUILD.gn
+++ b/garnet/bin/scpi/BUILD.gn
@@ -16,7 +16,7 @@ source_set("lib") {
     "//sdk/lib/fidl/cpp",
     "//sdk/lib/sys/cpp",
     "//src/lib/fxl",
-    "//zircon/public/banjo/ddk-protocol-scpi",
+    "//zircon/public/banjo/ddk.protocol.scpi",
     "//zircon/public/fidl/fuchsia-hardware-thermal:fuchsia-hardware-thermal_c",
     "//zircon/public/fidl/fuchsia-sysinfo:fuchsia-sysinfo_c",
     "//zircon/public/lib/ddk",
diff --git a/garnet/bin/thermd/BUILD.gn b/garnet/bin/thermd/BUILD.gn
index 4cfe320911a..749693606e1 100644
--- a/garnet/bin/thermd/BUILD.gn
+++ b/garnet/bin/thermd/BUILD.gn
@@ -19,7 +19,7 @@ executable("bin") {
   }
 
   deps = [
-    "//zircon/public/banjo/ddk-protocol-scpi",
+    "//zircon/public/banjo/ddk.protocol.scpi",
     "//zircon/public/fidl/fuchsia-hardware-gpu-clock:fuchsia-hardware-gpu-clock_c_client",
     "//zircon/public/fidl/fuchsia-hardware-thermal:fuchsia-hardware-thermal_c",
     "//zircon/public/fidl/fuchsia-sysinfo:fuchsia-sysinfo_c",
diff --git a/garnet/drivers/gpu/msd-img-rgx/mtk/BUILD.gn b/garnet/drivers/gpu/msd-img-rgx/mtk/BUILD.gn
index e84ea248bac..6e8bff4c744 100644
--- a/garnet/drivers/gpu/msd-img-rgx/mtk/BUILD.gn
+++ b/garnet/drivers/gpu/msd-img-rgx/mtk/BUILD.gn
@@ -17,8 +17,8 @@ driver_module("msd_img_rgx_mtk") {
     "//garnet/lib/magma/src/sys_driver",
     "//sdk/fidl/fuchsia.gpu.magma:fuchsia.gpu.magma_c",
     "//third_party/imgtec-pvr-rgx-km:src",
-    "//zircon/public/banjo/ddk-protocol-clock",
-    "//zircon/public/banjo/ddk-protocol-platform-device",
+    "//zircon/public/banjo/ddk.protocol.clock",
+    "//zircon/public/banjo/ddk.protocol.platform.device",
     "//zircon/public/lib/ddk",
     "//zircon/public/lib/ddktl",
     "//zircon/public/lib/driver",
diff --git a/garnet/drivers/gpu/msd-intel-gen/src/BUILD.gn b/garnet/drivers/gpu/msd-intel-gen/src/BUILD.gn
index 8b944081ff9..7b54c210541 100644
--- a/garnet/drivers/gpu/msd-intel-gen/src/BUILD.gn
+++ b/garnet/drivers/gpu/msd-intel-gen/src/BUILD.gn
@@ -75,7 +75,7 @@ source_set("src") {
   ]
 
   public_deps = [
-    "//zircon/public/banjo/ddk-protocol-intelgpucore",
+    "//zircon/public/banjo/ddk.protocol.intelgpucore",
   ]
 
   defines = []
diff --git a/garnet/drivers/usb_video/BUILD.gn b/garnet/drivers/usb_video/BUILD.gn
index 8e7a60a5a13..5e0121dbae7 100644
--- a/garnet/drivers/usb_video/BUILD.gn
+++ b/garnet/drivers/usb_video/BUILD.gn
@@ -26,7 +26,7 @@ driver_module("usb_video_driver") {
     "//garnet/public/lib/fxl",
     "//sdk/fidl/fuchsia.camera",
     "//sdk/lib/fidl/cpp",
-    "//zircon/public/banjo/ddk-protocol-usb",
+    "//zircon/public/banjo/ddk.protocol.usb",
     "//zircon/public/fidl/fuchsia-hardware-camera:fuchsia-hardware-camera_c",
     "//zircon/public/lib/async-cpp",
     "//zircon/public/lib/async-default",
diff --git a/garnet/drivers/video/amlogic-decoder/BUILD.gn b/garnet/drivers/video/amlogic-decoder/BUILD.gn
index 5d599e7e85c..36f4b220436 100644
--- a/garnet/drivers/video/amlogic-decoder/BUILD.gn
+++ b/garnet/drivers/video/amlogic-decoder/BUILD.gn
@@ -109,8 +109,8 @@ if (target_cpu == "arm64") {
       "local_codec_factory.h",
     ]
     public_deps = [
-      "//zircon/public/banjo/ddk-protocol-amlogiccanvas",
-      "//zircon/public/banjo/ddk-protocol-sysmem",
+      "//zircon/public/banjo/ddk.protocol.amlogiccanvas",
+      "//zircon/public/banjo/ddk.protocol.sysmem",
       "//zircon/public/lib/async-cpp",
       "//zircon/public/lib/async-loop-cpp",
       "//zircon/public/lib/ddk",
diff --git a/garnet/drivers/virtual_camera/BUILD.gn b/garnet/drivers/virtual_camera/BUILD.gn
index 5ccb68891f3..1c9fefdc5f0 100644
--- a/garnet/drivers/virtual_camera/BUILD.gn
+++ b/garnet/drivers/virtual_camera/BUILD.gn
@@ -20,7 +20,8 @@ driver_module("virtual_camera_driver") {
     "//garnet/public/lib/media/timeline:timeline",
     "//sdk/fidl/fuchsia.camera",
     "//sdk/lib/fidl/cpp",
-    "//zircon/public/banjo/ddk-protocol-usb",
+    "//src/lib/fxl",
+    "//zircon/public/banjo/ddk.protocol.usb",
     "//zircon/public/fidl/fuchsia-hardware-camera:fuchsia-hardware-camera_c",
     "//zircon/public/lib/async-cpp",
     "//zircon/public/lib/async-default",
@@ -32,7 +33,6 @@ driver_module("virtual_camera_driver") {
     "//zircon/public/lib/fzl",
     "//zircon/public/lib/sync",
     "//zircon/public/lib/zx",
-    "//src/lib/fxl",
   ]
 
   configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
diff --git a/garnet/lib/magma/src/magma_util/platform/zircon/BUILD.gn b/garnet/lib/magma/src/magma_util/platform/zircon/BUILD.gn
index 923dcb0f5f8..759c56b1997 100644
--- a/garnet/lib/magma/src/magma_util/platform/zircon/BUILD.gn
+++ b/garnet/lib/magma/src/magma_util/platform/zircon/BUILD.gn
@@ -104,8 +104,8 @@ source_set("device") {
     "$zircon_build_root/public/lib/ddk",
     "$zircon_build_root/public/lib/driver",
     "$zircon_build_root/public/lib/zx",
-    "//zircon/public/banjo/ddk-protocol-pci",
-    "//zircon/public/banjo/ddk-protocol-platform-device",
+    "//zircon/public/banjo/ddk.protocol.pci",
+    "//zircon/public/banjo/ddk.protocol.platform.device",
   ]
 }
 
diff --git a/garnet/lib/magma/src/sys_driver/BUILD.gn b/garnet/lib/magma/src/sys_driver/BUILD.gn
index 91a5f97246a..c854cc013b3 100644
--- a/garnet/lib/magma/src/sys_driver/BUILD.gn
+++ b/garnet/lib/magma/src/sys_driver/BUILD.gn
@@ -48,7 +48,7 @@ source_set("entry") {
     "//garnet/lib/magma/src/magma_util/platform:trace",
     "//garnet/lib/magma/src/sys_driver",
     "//sdk/fidl/fuchsia.gpu.magma:fuchsia.gpu.magma_c",
-    "//zircon/public/banjo/ddk-protocol-platform-device",
+    "//zircon/public/banjo/ddk.protocol.platform.device",
     "//zircon/public/lib/ddk",
     "//zircon/public/lib/driver",
     "//zircon/public/lib/zx",
@@ -120,7 +120,7 @@ source_set("test_entry_pdev") {
     "//garnet/lib/magma/src/sys_driver",
     "//garnet/lib/magma/tests/helper:platform_device_helper",
     "//sdk/fidl/fuchsia.gpu.magma:fuchsia.gpu.magma_c",
-    "//zircon/public/banjo/ddk-protocol-platform-device",
+    "//zircon/public/banjo/ddk.protocol.platform.device",
     "//zircon/public/lib/zx",
   ]
 
diff --git a/garnet/lib/wlan/protocol/BUILD.gn b/garnet/lib/wlan/protocol/BUILD.gn
index e35ffe2fac0..9b4f08e8c1c 100644
--- a/garnet/lib/wlan/protocol/BUILD.gn
+++ b/garnet/lib/wlan/protocol/BUILD.gn
@@ -16,7 +16,7 @@ source_set("protocol") {
   public_configs = [ ":wlan_protocol_config" ]
 
   public_deps = [
-    "//zircon/public/banjo/ddk-protocol-ethernet",
+    "//zircon/public/banjo/ddk.protocol.ethernet",
     "//zircon/public/lib/ddk",
   ]
 }
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index a48407ace88..c9577cf54ee 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -60,41 +60,41 @@ sdk("ddk") {
 
   deps = [
     "tools:banjo_sdk($host_toolchain)",
-    "//zircon/public/banjo/ddk-driver:ddk-driver_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-acpi:ddk-protocol-acpi_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-amlogiccanvas:ddk-protocol-amlogiccanvas_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-badblock:ddk-protocol-badblock_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-block:ddk-protocol-block_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-bt-gattsvc:ddk-protocol-bt-gattsvc_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-bt-hci:ddk-protocol-bt-hci_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-clock:ddk-protocol-clock_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-display-controller:ddk-protocol-display-controller_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-ethernet:ddk-protocol-ethernet_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-ethernet-board:ddk-protocol-ethernet-board_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-ethernet-mac:ddk-protocol-ethernet-mac_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-gpio:ddk-protocol-gpio_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-gpioimpl:ddk-protocol-gpioimpl_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-hidbus:ddk-protocol-hidbus_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-i2c:ddk-protocol-i2c_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-i2cimpl:ddk-protocol-i2cimpl_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-intelgpucore:ddk-protocol-intelgpucore_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-intelhda-codec:ddk-protocol-intelhda-codec_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-iommu:ddk-protocol-iommu_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-mailbox:ddk-protocol-mailbox_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-mipicsi:ddk-protocol-mipicsi_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-nand:ddk-protocol-nand_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-pci:ddk-protocol-pci_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-pciroot:ddk-protocol-pciroot_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-platform-bus:ddk-protocol-platform-bus_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-platform-device:ddk-protocol-platform-device_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-rawnand:ddk-protocol-rawnand_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-scpi:ddk-protocol-scpi_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-sdhci:ddk-protocol-sdhci_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-sdio:ddk-protocol-sdio_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-sdmmc:ddk-protocol-sdmmc_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-serial:ddk-protocol-serial_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-serialimpl:ddk-protocol-serialimpl_sdk($banjo_toolchain)",
-    "//zircon/public/banjo/ddk-protocol-test:ddk-protocol-test_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.driver:ddk.driver_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.acpi:ddk.protocol.acpi_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.amlogiccanvas:ddk.protocol.amlogiccanvas_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.badblock:ddk.protocol.badblock_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.block:ddk.protocol.block_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.bt.gattsvc:ddk.protocol.bt.gattsvc_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.bt.hci:ddk.protocol.bt.hci_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.clock:ddk.protocol.clock_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.display.controller:ddk.protocol.display.controller_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.ethernet:ddk.protocol.ethernet_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.ethernet.board:ddk.protocol.ethernet.board_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.ethernet.mac:ddk.protocol.ethernet.mac_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.gpio:ddk.protocol.gpio_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.gpioimpl:ddk.protocol.gpioimpl_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.hidbus:ddk.protocol.hidbus_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.i2c:ddk.protocol.i2c_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.i2cimpl:ddk.protocol.i2cimpl_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.intelgpucore:ddk.protocol.intelgpucore_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.intelhda.codec:ddk.protocol.intelhda.codec_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.iommu:ddk.protocol.iommu_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.mailbox:ddk.protocol.mailbox_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.mipicsi:ddk.protocol.mipicsi_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.nand:ddk.protocol.nand_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.pci:ddk.protocol.pci_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.pciroot:ddk.protocol.pciroot_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.platform.bus:ddk.protocol.platform.bus_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.platform.device:ddk.protocol.platform.device_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.rawnand:ddk.protocol.rawnand_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.scpi:ddk.protocol.scpi_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.sdhci:ddk.protocol.sdhci_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.sdio:ddk.protocol.sdio_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.sdmmc:ddk.protocol.sdmmc_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.serial:ddk.protocol.serial_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.serialimpl:ddk.protocol.serialimpl_sdk($banjo_toolchain)",
+    "//zircon/public/banjo/ddk.protocol.test:ddk.protocol.test_sdk($banjo_toolchain)",
     "//zircon/public/lib/ddk:ddk_sdk",
     "//zircon/public/lib/ddktl:ddktl_sdk",
     "//zircon/public/lib/driver:driver_sdk",
diff --git a/src/connectivity/bluetooth/core/bt-host/BUILD.gn b/src/connectivity/bluetooth/core/bt-host/BUILD.gn
index 5c025b2efeb..231929d336c 100644
--- a/src/connectivity/bluetooth/core/bt-host/BUILD.gn
+++ b/src/connectivity/bluetooth/core/bt-host/BUILD.gn
@@ -56,7 +56,7 @@ source_set("sources") {
     "//sdk/fidl/fuchsia.bluetooth.host:fuchsia.bluetooth.host",
     "//sdk/fidl/fuchsia.bluetooth.le",
     "//src/lib/fxl",
-    "//zircon/public/banjo/ddk-protocol-bt-gattsvc",
+    "//zircon/public/banjo/ddk.protocol.bt.gattsvc",
     "//zircon/public/fidl/fuchsia-hardware-bluetooth:fuchsia-hardware-bluetooth_c",
     "//zircon/public/lib/ddk",
     "//zircon/public/lib/driver",
diff --git a/src/connectivity/bluetooth/core/bt-host/hci/BUILD.gn b/src/connectivity/bluetooth/core/bt-host/hci/BUILD.gn
index 5007a40b5eb..64949bbedc6 100644
--- a/src/connectivity/bluetooth/core/bt-host/hci/BUILD.gn
+++ b/src/connectivity/bluetooth/core/bt-host/hci/BUILD.gn
@@ -64,7 +64,7 @@ static_library("hci") {
     ":definitions",
     "//src/lib/files",
     "//src/lib/fxl",
-    "//zircon/public/banjo/ddk-protocol-bt-hci",
+    "//zircon/public/banjo/ddk.protocol.bt.hci",
     "//zircon/public/fidl/fuchsia-hardware-bluetooth:fuchsia-hardware-bluetooth_c",
     "//zircon/public/fidl/fuchsia-hardware-bluetooth:fuchsia-hardware-bluetooth_c_client",
     "//zircon/public/lib/async-loop-cpp",
diff --git a/src/connectivity/bluetooth/hci/atheros/BUILD.gn b/src/connectivity/bluetooth/hci/atheros/BUILD.gn
index a4474e54d2e..8f6a1b0c8a7 100644
--- a/src/connectivity/bluetooth/hci/atheros/BUILD.gn
+++ b/src/connectivity/bluetooth/hci/atheros/BUILD.gn
@@ -19,7 +19,7 @@ driver_module("driver") {
   deps = [
     "//src/connectivity/bluetooth/core/bt-host/gap",
     "//src/connectivity/bluetooth/core/bt-host/hci",
-    "//zircon/public/banjo/ddk-protocol-usb",
+    "//zircon/public/banjo/ddk.protocol.usb",
     "//zircon/public/fidl/fuchsia-hardware-bluetooth:fuchsia-hardware-bluetooth_c",
     "//zircon/public/lib/ddk",
     "//zircon/public/lib/ddktl",
diff --git a/src/connectivity/bluetooth/hci/fake/BUILD.gn b/src/connectivity/bluetooth/hci/fake/BUILD.gn
index ec096531367..5918b8ec0d8 100644
--- a/src/connectivity/bluetooth/hci/fake/BUILD.gn
+++ b/src/connectivity/bluetooth/hci/fake/BUILD.gn
@@ -18,7 +18,7 @@ driver_module("driver") {
   deps = [
     "//src/connectivity/bluetooth/core/bt-host/hci",
     "//src/connectivity/bluetooth/core/bt-host/testing:fake_controller",
-    "//zircon/public/banjo/ddk-protocol-test",
+    "//zircon/public/banjo/ddk.protocol.test",
     "//zircon/public/fidl/fuchsia-hardware-bluetooth:fuchsia-hardware-bluetooth_c_client",
     "//zircon/public/lib/async-cpp",
     "//zircon/public/lib/async-default",
diff --git a/src/connectivity/bluetooth/hci/intel/BUILD.gn b/src/connectivity/bluetooth/hci/intel/BUILD.gn
index ab674f34d3a..644c8d98e2a 100644
--- a/src/connectivity/bluetooth/hci/intel/BUILD.gn
+++ b/src/connectivity/bluetooth/hci/intel/BUILD.gn
@@ -23,7 +23,7 @@ driver_module("driver") {
   deps = [
     "//src/connectivity/bluetooth/core/bt-host/gap",
     "//src/connectivity/bluetooth/core/bt-host/hci",
-    "//zircon/public/banjo/ddk-protocol-usb",
+    "//zircon/public/banjo/ddk.protocol.usb",
     "//zircon/public/fidl/fuchsia-hardware-bluetooth:fuchsia-hardware-bluetooth_c",
     "//zircon/public/lib/ddk",
     "//zircon/public/lib/ddktl",
diff --git a/src/connectivity/bluetooth/hci/passthrough/BUILD.gn b/src/connectivity/bluetooth/hci/passthrough/BUILD.gn
index 34590195672..ad567fec807 100644
--- a/src/connectivity/bluetooth/hci/passthrough/BUILD.gn
+++ b/src/connectivity/bluetooth/hci/passthrough/BUILD.gn
@@ -13,7 +13,7 @@ driver_module("driver") {
   ]
 
   deps = [
-    "//zircon/public/banjo/ddk-protocol-bt-hci",
+    "//zircon/public/banjo/ddk.protocol.bt.hci",
     "//zircon/public/fidl/fuchsia-hardware-bluetooth:fuchsia-hardware-bluetooth_c",
     "//zircon/public/lib/ddk",
     "//zircon/public/lib/driver",
diff --git a/src/connectivity/bluetooth/profiles/bt-hog/BUILD.gn b/src/connectivity/bluetooth/profiles/bt-hog/BUILD.gn
index b86a41165cb..20c77607acf 100644
--- a/src/connectivity/bluetooth/profiles/bt-hog/BUILD.gn
+++ b/src/connectivity/bluetooth/profiles/bt-hog/BUILD.gn
@@ -15,8 +15,8 @@ driver_module("driver") {
   ]
 
   deps = [
-    "//zircon/public/banjo/ddk-protocol-bt-gattsvc",
-    "//zircon/public/banjo/ddk-protocol-hidbus",
+    "//zircon/public/banjo/ddk.protocol.bt.gattsvc",
+    "//zircon/public/banjo/ddk.protocol.hidbus",
     "//zircon/public/lib/ddk",
     "//zircon/public/lib/driver",
     "//zircon/public/lib/zx",
diff --git a/src/connectivity/telephony/drivers/qmi-fake-transport/BUILD.gn b/src/connectivity/telephony/drivers/qmi-fake-transport/BUILD.gn
index db0fa9567c7..77d42c329b4 100644
--- a/src/connectivity/telephony/drivers/qmi-fake-transport/BUILD.gn
+++ b/src/connectivity/telephony/drivers/qmi-fake-transport/BUILD.gn
@@ -31,7 +31,7 @@ driver_module("fake_driver") {
   ]
 
   deps = [
-    "//zircon/public/banjo/ddk-protocol-test",
+    "//zircon/public/banjo/ddk.protocol.test",
     "//zircon/public/lib/async-cpp",
     "//zircon/public/lib/async-default",
     "//zircon/public/lib/ddk",
diff --git a/src/connectivity/telephony/drivers/qmi-usb-transport/BUILD.gn b/src/connectivity/telephony/drivers/qmi-usb-transport/BUILD.gn
index ff0c802b1f9..0c9e91f3fff 100644
--- a/src/connectivity/telephony/drivers/qmi-usb-transport/BUILD.gn
+++ b/src/connectivity/telephony/drivers/qmi-usb-transport/BUILD.gn
@@ -29,8 +29,8 @@ driver_module("qmi_driver") {
 
   deps = [
     "//garnet/public/lib/fsl",
-    "//zircon/public/banjo/ddk-protocol-ethernet",
-    "//zircon/public/banjo/ddk-protocol-usb",
+    "//zircon/public/banjo/ddk.protocol.ethernet",
+    "//zircon/public/banjo/ddk.protocol.usb",
     "//zircon/public/lib/ddk",
     "//zircon/public/lib/driver",
     "//zircon/public/lib/fit",
diff --git a/src/connectivity/wlan/drivers/mediatek/ralink/BUILD.gn b/src/connectivity/wlan/drivers/mediatek/ralink/BUILD.gn
index 895efe83e64..c3bb646cfb4 100644
--- a/src/connectivity/wlan/drivers/mediatek/ralink/BUILD.gn
+++ b/src/connectivity/wlan/drivers/mediatek/ralink/BUILD.gn
@@ -22,7 +22,7 @@ driver_module("ralink_driver") {
     "//garnet/lib/wlan/protocol",
     "//src/connectivity/wlan/lib/common/cpp:common",
     "//src/connectivity/wlan/lib/mlme/cpp:mlme",
-    "//zircon/public/banjo/ddk-protocol-usb",
+    "//zircon/public/banjo/ddk.protocol.usb",
     "//zircon/public/lib/async-cpp",
     "//zircon/public/lib/async-loop-cpp",
     "//zircon/public/lib/bitmap",
diff --git a/src/connectivity/wlan/drivers/realtek/rtl88xx/BUILD.gn b/src/connectivity/wlan/drivers/realtek/rtl88xx/BUILD.gn
index dbf31bb123b..76d8075981a 100644
--- a/src/connectivity/wlan/drivers/realtek/rtl88xx/BUILD.gn
+++ b/src/connectivity/wlan/drivers/realtek/rtl88xx/BUILD.gn
@@ -29,7 +29,7 @@ driver_module("rtl88xx_driver") {
   deps = [
     "//garnet/lib/wlan/protocol",
     "//src/connectivity/wlan/lib/common/cpp:common",
-    "//zircon/public/banjo/ddk-protocol-usb",
+    "//zircon/public/banjo/ddk.protocol.usb",
     "//zircon/public/lib/ddk",
     "//zircon/public/lib/driver",
     "//zircon/public/lib/fbl",
diff --git a/src/connectivity/wlan/drivers/testing/BUILD.gn b/src/connectivity/wlan/drivers/testing/BUILD.gn
index 7043649f744..e50d88d3577 100644
--- a/src/connectivity/wlan/drivers/testing/BUILD.gn
+++ b/src/connectivity/wlan/drivers/testing/BUILD.gn
@@ -25,7 +25,7 @@ driver_module("wlanphy-testdev") {
     "//garnet/lib/wlan/protocol",
     "//src/connectivity/wlan/drivers/lib",
     "//src/connectivity/wlan/lib/common/cpp:common",
-    "//zircon/public/banjo/ddk-protocol-sdio",
+    "//zircon/public/banjo/ddk.protocol.sdio",
     "//zircon/public/lib/async-cpp",
     "//zircon/public/lib/async-loop-cpp",
     "//zircon/public/lib/ddk",
diff --git a/src/connectivity/wlan/drivers/third_party/atheros/ath10k/BUILD.gn b/src/connectivity/wlan/drivers/third_party/atheros/ath10k/BUILD.gn
index 67f67dc2f2f..b263358e9d7 100644
--- a/src/connectivity/wlan/drivers/third_party/atheros/ath10k/BUILD.gn
+++ b/src/connectivity/wlan/drivers/third_party/atheros/ath10k/BUILD.gn
@@ -70,7 +70,7 @@ driver_module("ath10k_driver") {
 
   deps = [
     "//garnet/lib/wlan/protocol",
-    "//zircon/public/banjo/ddk-protocol-pci",
+    "//zircon/public/banjo/ddk.protocol.pci",
     "//zircon/public/lib/ddk",
     "//zircon/public/lib/driver",
     "//zircon/public/lib/sync",
diff --git a/src/connectivity/wlan/drivers/third_party/broadcom/brcmfmac/BUILD.gn b/src/connectivity/wlan/drivers/third_party/broadcom/brcmfmac/BUILD.gn
index c28ee86adf1..6f20cebd0d3 100644
--- a/src/connectivity/wlan/drivers/third_party/broadcom/brcmfmac/BUILD.gn
+++ b/src/connectivity/wlan/drivers/third_party/broadcom/brcmfmac/BUILD.gn
@@ -89,12 +89,12 @@ source_set("brcmfmac_srcs") {
 
   deps = [
     "//garnet/lib/wlan/protocol",
-    "//zircon/public/banjo/ddk-protocol-composite",
-    "//zircon/public/banjo/ddk-protocol-ethernet",
-    "//zircon/public/banjo/ddk-protocol-gpio",
-    "//zircon/public/banjo/ddk-protocol-pci",
-    "//zircon/public/banjo/ddk-protocol-sdio",
-    "//zircon/public/banjo/ddk-protocol-usb",
+    "//zircon/public/banjo/ddk.protocol.composite",
+    "//zircon/public/banjo/ddk.protocol.ethernet",
+    "//zircon/public/banjo/ddk.protocol.gpio",
+    "//zircon/public/banjo/ddk.protocol.pci",
+    "//zircon/public/banjo/ddk.protocol.sdio",
+    "//zircon/public/banjo/ddk.protocol.usb",
     "//zircon/public/lib/async-loop",
     "//zircon/public/lib/broadcom",
     "//zircon/public/lib/ddk",
diff --git a/src/connectivity/wlan/drivers/wlan/BUILD.gn b/src/connectivity/wlan/drivers/wlan/BUILD.gn
index f68e9e32df8..195124feb97 100644
--- a/src/connectivity/wlan/drivers/wlan/BUILD.gn
+++ b/src/connectivity/wlan/drivers/wlan/BUILD.gn
@@ -29,7 +29,7 @@ driver_module("wlan_driver") {
     "//garnet/public/lib/component/cpp:environment_services",
     "//garnet/public/lib/svc/cpp",
     "//src/connectivity/wlan/lib/mlme/cpp:mlme",
-    "//zircon/public/banjo/ddk-protocol-ethernet",
+    "//zircon/public/banjo/ddk.protocol.ethernet",
     "//zircon/public/lib/ddk",
     "//zircon/public/lib/ddktl",
     "//zircon/public/lib/driver",
@@ -65,7 +65,8 @@ executable("wlan_minstrel_unittest") {
     "//zircon/public/lib/fbl",
   ]
 
-  configs += [ "//src/connectivity/wlan/lib/mlme/cpp/tests:wlan_mlme_tests_config" ]
+  configs +=
+      [ "//src/connectivity/wlan/lib/mlme/cpp/tests:wlan_mlme_tests_config" ]
 }
 
 test_package("wlan_drivers_tests") {
diff --git a/zircon/public/gn/BUILDCONFIG.gn b/zircon/public/gn/BUILDCONFIG.gn
index 4184d885165..b5503478d31 100644
--- a/zircon/public/gn/BUILDCONFIG.gn
+++ b/zircon/public/gn/BUILDCONFIG.gn
@@ -449,7 +449,7 @@ template("library") {
             } else {
               if (get_path_info(get_label_info(dep, "dir"), "dir") ==
                   "$zx/system/banjo") {
-                dep = get_path_info(get_label_info(dep, "dir"), "name")
+                dep = get_path_info(get_label_info(dep, "dir"), "file")
                 deps += [ "//zircon/public/banjo/$dep" ]
               } else if (get_label_info(dep, "name") == "static" ||
                          get_label_info(dep, "name") == "shared") {
diff --git a/zircon/public/gn/banjo.gni b/zircon/public/gn/banjo.gni
index 1589297e7c4..b883471fc45 100644
--- a/zircon/public/gn/banjo.gni
+++ b/zircon/public/gn/banjo.gni
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# TODO(mcgrathr): This is heavily based on banjo.gni though they don't
+# TODO(mcgrathr): This is heavily based on fidl.gni though they don't
 # share much code.  Try to converge these more in the future.
 
 import("$zx/public/gn/fidl/fidlc.gni")
@@ -93,10 +93,7 @@ template("banjo_library") {
 
   banjo_target = target_name
 
-  # TODO(mcgrathr): temporary until everything is renamed with . names
-  banjo_library_name = string_replace(banjo_target, "-", ".")
-
-  banjo_path = string_replace(banjo_library_name, ".", "/")
+  banjo_path = string_replace(banjo_target, ".", "/")
   banjo_name = string_replace(banjo_path, "ddk/protocol/", "")
 
   # Collect the dependencies on other Banjo libraries, and canonicalize them.
@@ -139,7 +136,7 @@ template("banjo_library") {
 
         # TODO(BLD-353): temporary hack
         assert(banjo_target ==
-               get_path_info(get_label_info(":$banjo_target", "dir"), "name"))
+               get_path_info(get_label_info(":$banjo_target", "dir"), "file"))
         legacy_barrier = []
         legacy_dirs = [ "banjo/$banjo_target" ]
         legacy_targets = [
@@ -147,9 +144,9 @@ template("banjo_library") {
             import = "//build/banjo/banjo.gni"
             target_name = banjo_target
 
-            # The ddk-protocol prefix is magic: without it, you're a
+            # The ddk.protocol. prefix is magic: without it, you're a
             # banjo_dummy() target; with it, you're a banjo() target.
-            if (string_replace(banjo_target, "ddk-protocol-", "") ==
+            if (string_replace(banjo_target, "ddk.protocol.", "") ==
                 banjo_target) {
               target_type = "banjo_dummy"
             } else {
@@ -157,7 +154,7 @@ template("banjo_library") {
             }
 
             # These all become the parameters to banjo() or banjo_dummy().
-            name = banjo_library_name
+            name = banjo_target
             sdk_category = "partner"
             sources = []
             foreach(file, invoker.sources) {
@@ -169,7 +166,7 @@ template("banjo_library") {
             if (defined(invoker.public_deps)) {
               foreach(label, invoker.public_deps) {
                 assert(get_label_info(label, "name") ==
-                           get_path_info(get_label_info(label, "dir"), "name"),
+                           get_path_info(get_label_info(label, "dir"), "file"),
                        "banjo_library(\"$banjo_target\") deps " +
                            get_label_info(label, "label_no_toolchain"))
                 deps +=
diff --git a/zircon/system/banjo/BUILD.gn b/zircon/system/banjo/BUILD.gn
index ee44729486f..9dee731221e 100644
--- a/zircon/system/banjo/BUILD.gn
+++ b/zircon/system/banjo/BUILD.gn
@@ -7,68 +7,68 @@
 
 group("banjo") {
   deps = [
-    "ddk-driver",
-    "ddk-physiter",
-    "ddk-protocol-acpi",
-    "ddk-protocol-amlogiccanvas",
-    "ddk-protocol-badblock",
-    "ddk-protocol-block",
-    "ddk-protocol-block-partition",
-    "ddk-protocol-block-volume",
-    "ddk-protocol-bt-gattsvc",
-    "ddk-protocol-bt-hci",
-    "ddk-protocol-camerasensor",
-    "ddk-protocol-clock",
-    "ddk-protocol-clockimpl",
-    "ddk-protocol-composite",
-    "ddk-protocol-display-controller",
-    "ddk-protocol-dsiimpl",
-    "ddk-protocol-ethernet",
-    "ddk-protocol-ethernet-board",
-    "ddk-protocol-ethernet-mac",
-    "ddk-protocol-goldfish-pipe",
-    "ddk-protocol-gpio",
-    "ddk-protocol-gpioimpl",
-    "ddk-protocol-hidbus",
-    "ddk-protocol-i2c",
-    "ddk-protocol-i2cimpl",
-    "ddk-protocol-intelgpucore",
-    "ddk-protocol-intelhda-codec",
-    "ddk-protocol-iommu",
-    "ddk-protocol-mailbox",
-    "ddk-protocol-mipicsi",
-    "ddk-protocol-nand",
-    "ddk-protocol-pci",
-    "ddk-protocol-pciroot",
-    "ddk-protocol-platform-bus",
-    "ddk-protocol-platform-device",
-    "ddk-protocol-power",
-    "ddk-protocol-powerimpl",
-    "ddk-protocol-rawnand",
-    "ddk-protocol-scpi",
-    "ddk-protocol-sdhci",
-    "ddk-protocol-sdio",
-    "ddk-protocol-sdmmc",
-    "ddk-protocol-serial",
-    "ddk-protocol-serialimpl",
-    "ddk-protocol-sysmem",
-    "ddk-protocol-test",
-    "ddk-protocol-usb",
-    "ddk-protocol-usb-bus",
-    "ddk-protocol-usb-composite",
-    "ddk-protocol-usb-dci",
-    "ddk-protocol-usb-function",
-    "ddk-protocol-usb-hci",
-    "ddk-protocol-usb-hub",
-    "ddk-protocol-usb-modeswitch",
-    "ddk-protocol-usb-request",
-    "zircon-device-audio",
-    "zircon-device-block",
-    "zircon-device-nand",
-    "zircon-device-scpi",
-    "zircon-hw-pci",
-    "zircon-hw-usb",
-    "zircon-hw-usb-hub",
-    "zircon-syscalls-pci",
+    "ddk.driver",
+    "ddk.physiter",
+    "ddk.protocol.acpi",
+    "ddk.protocol.amlogiccanvas",
+    "ddk.protocol.badblock",
+    "ddk.protocol.block",
+    "ddk.protocol.block.partition",
+    "ddk.protocol.block.volume",
+    "ddk.protocol.bt.gattsvc",
+    "ddk.protocol.bt.hci",
+    "ddk.protocol.camerasensor",
+    "ddk.protocol.clock",
+    "ddk.protocol.clockimpl",
+    "ddk.protocol.composite",
+    "ddk.protocol.display.controller",
+    "ddk.protocol.dsiimpl",
+    "ddk.protocol.ethernet",
+    "ddk.protocol.ethernet.board",
+    "ddk.protocol.ethernet.mac",
+    "ddk.protocol.goldfish.pipe",
+    "ddk.protocol.gpio",
+    "ddk.protocol.gpioimpl",
+    "ddk.protocol.hidbus",
+    "ddk.protocol.i2c",
+    "ddk.protocol.i2cimpl",
+    "ddk.protocol.intelgpucore",
+    "ddk.protocol.intelhda.codec",
+    "ddk.protocol.iommu",
+    "ddk.protocol.mailbox",
+    "ddk.protocol.mipicsi",
+    "ddk.protocol.nand",
+    "ddk.protocol.pci",
+    "ddk.protocol.pciroot",
+    "ddk.protocol.platform.bus",
+    "ddk.protocol.platform.device",
+    "ddk.protocol.power",
+    "ddk.protocol.powerimpl",
+    "ddk.protocol.rawnand",
+    "ddk.protocol.scpi",
+    "ddk.protocol.sdhci",
+    "ddk.protocol.sdio",
+    "ddk.protocol.sdmmc",
+    "ddk.protocol.serial",
+    "ddk.protocol.serialimpl",
+    "ddk.protocol.sysmem",
+    "ddk.protocol.test",
+    "ddk.protocol.usb",
+    "ddk.protocol.usb.bus",
+    "ddk.protocol.usb.composite",
+    "ddk.protocol.usb.dci",
+    "ddk.protocol.usb.function",
+    "ddk.protocol.usb.hci",
+    "ddk.protocol.usb.hub",
+    "ddk.protocol.usb.modeswitch",
+    "ddk.protocol.usb.request",
+    "zircon.device.audio",
+    "zircon.device.block",
+    "zircon.device.nand",
+    "zircon.device.scpi",
+    "zircon.hw.pci",
+    "zircon.hw.usb",
+    "zircon.hw.usb.hub",
+    "zircon.syscalls.pci",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-usb-hci/BUILD.gn b/zircon/system/banjo/ddk-protocol-usb-hci/BUILD.gn
deleted file mode 100644
index c9e78f6bc7c..00000000000
--- a/zircon/system/banjo/ddk-protocol-usb-hci/BUILD.gn
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2019 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("$zx/public/gn/banjo.gni")
-
-banjo_library("ddk-protocol-usb-hci") {
-  sources = [
-    "usb-hci.banjo",
-  ]
-  public_deps = [
-    "$zx/system/banjo/ddk-physiter",
-    "$zx/system/banjo/ddk-protocol-usb-bus",
-    "$zx/system/banjo/ddk-protocol-usb-hub",
-    "$zx/system/banjo/ddk-protocol-usb-request",
-    "$zx/system/banjo/zircon-hw-usb",
-    "$zx/system/banjo/zircon-hw-usb-hub",
-  ]
-}
diff --git a/zircon/system/banjo/ddk-driver/BUILD.gn b/zircon/system/banjo/ddk.driver/BUILD.gn
similarity index 88%
rename from zircon/system/banjo/ddk-driver/BUILD.gn
rename to zircon/system/banjo/ddk.driver/BUILD.gn
index e2a9c0fd2d2..c26d9f685ef 100644
--- a/zircon/system/banjo/ddk-driver/BUILD.gn
+++ b/zircon/system/banjo/ddk.driver/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-driver") {
+banjo_library("ddk.driver") {
   sources = [
     "driver.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-driver/driver.banjo b/zircon/system/banjo/ddk.driver/driver.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-driver/driver.banjo
rename to zircon/system/banjo/ddk.driver/driver.banjo
diff --git a/zircon/system/banjo/ddk-physiter/BUILD.gn b/zircon/system/banjo/ddk.physiter/BUILD.gn
similarity index 88%
rename from zircon/system/banjo/ddk-physiter/BUILD.gn
rename to zircon/system/banjo/ddk.physiter/BUILD.gn
index 5a805c57de1..8682a7fa9f8 100644
--- a/zircon/system/banjo/ddk-physiter/BUILD.gn
+++ b/zircon/system/banjo/ddk.physiter/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-physiter") {
+banjo_library("ddk.physiter") {
   sources = [
     "phys-iter.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-physiter/phys-iter.banjo b/zircon/system/banjo/ddk.physiter/phys-iter.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-physiter/phys-iter.banjo
rename to zircon/system/banjo/ddk.physiter/phys-iter.banjo
diff --git a/zircon/system/banjo/ddk-protocol-acpi/BUILD.gn b/zircon/system/banjo/ddk.protocol.acpi/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/ddk-protocol-acpi/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.acpi/BUILD.gn
index 13912f273d4..f0c85609543 100644
--- a/zircon/system/banjo/ddk-protocol-acpi/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.acpi/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-acpi") {
+banjo_library("ddk.protocol.acpi") {
   sources = [
     "acpi.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-acpi/acpi.banjo b/zircon/system/banjo/ddk.protocol.acpi/acpi.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-acpi/acpi.banjo
rename to zircon/system/banjo/ddk.protocol.acpi/acpi.banjo
diff --git a/zircon/system/banjo/ddk-protocol-amlogiccanvas/BUILD.gn b/zircon/system/banjo/ddk.protocol.amlogiccanvas/BUILD.gn
similarity index 84%
rename from zircon/system/banjo/ddk-protocol-amlogiccanvas/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.amlogiccanvas/BUILD.gn
index df4494b2029..106af37e0d2 100644
--- a/zircon/system/banjo/ddk-protocol-amlogiccanvas/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.amlogiccanvas/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-amlogiccanvas") {
+banjo_library("ddk.protocol.amlogiccanvas") {
   sources = [
     "amlogic-canvas.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-amlogiccanvas/amlogic-canvas.banjo b/zircon/system/banjo/ddk.protocol.amlogiccanvas/amlogic-canvas.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-amlogiccanvas/amlogic-canvas.banjo
rename to zircon/system/banjo/ddk.protocol.amlogiccanvas/amlogic-canvas.banjo
diff --git a/zircon/system/banjo/ddk-protocol-badblock/BUILD.gn b/zircon/system/banjo/ddk.protocol.badblock/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/ddk-protocol-badblock/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.badblock/BUILD.gn
index a79eed49430..1fea1275831 100644
--- a/zircon/system/banjo/ddk-protocol-badblock/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.badblock/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-badblock") {
+banjo_library("ddk.protocol.badblock") {
   sources = [
     "bad-block.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-badblock/bad-block.banjo b/zircon/system/banjo/ddk.protocol.badblock/bad-block.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-badblock/bad-block.banjo
rename to zircon/system/banjo/ddk.protocol.badblock/bad-block.banjo
diff --git a/zircon/system/banjo/ddk-protocol-block-partition/BUILD.gn b/zircon/system/banjo/ddk.protocol.block.partition/BUILD.gn
similarity index 74%
rename from zircon/system/banjo/ddk-protocol-block-partition/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.block.partition/BUILD.gn
index 42eb07b74d9..ff7d637ae35 100644
--- a/zircon/system/banjo/ddk-protocol-block-partition/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.block.partition/BUILD.gn
@@ -4,11 +4,11 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-block-partition") {
+banjo_library("ddk.protocol.block.partition") {
   sources = [
     "partition.banjo",
   ]
   public_deps = [
-    "$zx/system/banjo/zircon-device-block",
+    "$zx/system/banjo/zircon.device.block",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-block-partition/partition.banjo b/zircon/system/banjo/ddk.protocol.block.partition/partition.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-block-partition/partition.banjo
rename to zircon/system/banjo/ddk.protocol.block.partition/partition.banjo
diff --git a/zircon/system/banjo/ddk-protocol-block-volume/BUILD.gn b/zircon/system/banjo/ddk.protocol.block.volume/BUILD.gn
similarity index 74%
rename from zircon/system/banjo/ddk-protocol-block-volume/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.block.volume/BUILD.gn
index 7e3c327dcea..688e63b3943 100644
--- a/zircon/system/banjo/ddk-protocol-block-volume/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.block.volume/BUILD.gn
@@ -4,11 +4,11 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-block-volume") {
+banjo_library("ddk.protocol.block.volume") {
   sources = [
     "volume.banjo",
   ]
   public_deps = [
-    "$zx/system/banjo/zircon-device-block",
+    "$zx/system/banjo/zircon.device.block",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-block-volume/volume.banjo b/zircon/system/banjo/ddk.protocol.block.volume/volume.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-block-volume/volume.banjo
rename to zircon/system/banjo/ddk.protocol.block.volume/volume.banjo
diff --git a/zircon/system/banjo/ddk-protocol-block/BUILD.gn b/zircon/system/banjo/ddk.protocol.block/BUILD.gn
similarity index 75%
rename from zircon/system/banjo/ddk-protocol-block/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.block/BUILD.gn
index 10dc54bdb2c..31f384fa3c1 100644
--- a/zircon/system/banjo/ddk-protocol-block/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.block/BUILD.gn
@@ -4,11 +4,11 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-block") {
+banjo_library("ddk.protocol.block") {
   sources = [
     "block.banjo",
   ]
   public_deps = [
-    "$zx/system/banjo/zircon-device-block",
+    "$zx/system/banjo/zircon.device.block",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-block/block.banjo b/zircon/system/banjo/ddk.protocol.block/block.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-block/block.banjo
rename to zircon/system/banjo/ddk.protocol.block/block.banjo
diff --git a/zircon/system/banjo/ddk-protocol-bt-gattsvc/BUILD.gn b/zircon/system/banjo/ddk.protocol.bt.gattsvc/BUILD.gn
similarity index 84%
rename from zircon/system/banjo/ddk-protocol-bt-gattsvc/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.bt.gattsvc/BUILD.gn
index 42a31907458..b83bb6e1968 100644
--- a/zircon/system/banjo/ddk-protocol-bt-gattsvc/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.bt.gattsvc/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-bt-gattsvc") {
+banjo_library("ddk.protocol.bt.gattsvc") {
   sources = [
     "bt-gatt-svc.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-bt-gattsvc/bt-gatt-svc.banjo b/zircon/system/banjo/ddk.protocol.bt.gattsvc/bt-gatt-svc.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-bt-gattsvc/bt-gatt-svc.banjo
rename to zircon/system/banjo/ddk.protocol.bt.gattsvc/bt-gatt-svc.banjo
diff --git a/zircon/system/banjo/ddk-protocol-bt-hci/BUILD.gn b/zircon/system/banjo/ddk.protocol.bt.hci/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/ddk-protocol-bt-hci/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.bt.hci/BUILD.gn
index 988eba4b5f6..f9078290883 100644
--- a/zircon/system/banjo/ddk-protocol-bt-hci/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.bt.hci/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-bt-hci") {
+banjo_library("ddk.protocol.bt.hci") {
   sources = [
     "bt-hci.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-bt-hci/bt-hci.banjo b/zircon/system/banjo/ddk.protocol.bt.hci/bt-hci.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-bt-hci/bt-hci.banjo
rename to zircon/system/banjo/ddk.protocol.bt.hci/bt-hci.banjo
diff --git a/zircon/system/banjo/ddk-protocol-camerasensor/BUILD.gn b/zircon/system/banjo/ddk.protocol.camerasensor/BUILD.gn
similarity index 84%
rename from zircon/system/banjo/ddk-protocol-camerasensor/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.camerasensor/BUILD.gn
index 4465f24662e..2982333671d 100644
--- a/zircon/system/banjo/ddk-protocol-camerasensor/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.camerasensor/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-camerasensor") {
+banjo_library("ddk.protocol.camerasensor") {
   sources = [
     "camerasensor.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-camerasensor/camerasensor.banjo b/zircon/system/banjo/ddk.protocol.camerasensor/camerasensor.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-camerasensor/camerasensor.banjo
rename to zircon/system/banjo/ddk.protocol.camerasensor/camerasensor.banjo
diff --git a/zircon/system/banjo/ddk-protocol-clock/BUILD.gn b/zircon/system/banjo/ddk.protocol.clock/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/ddk-protocol-clock/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.clock/BUILD.gn
index d66a288661a..f1fe683e378 100644
--- a/zircon/system/banjo/ddk-protocol-clock/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.clock/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-clock") {
+banjo_library("ddk.protocol.clock") {
   sources = [
     "clock.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-clock/clock.banjo b/zircon/system/banjo/ddk.protocol.clock/clock.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-clock/clock.banjo
rename to zircon/system/banjo/ddk.protocol.clock/clock.banjo
diff --git a/zircon/system/banjo/ddk-protocol-clockimpl/BUILD.gn b/zircon/system/banjo/ddk.protocol.clockimpl/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/ddk-protocol-clockimpl/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.clockimpl/BUILD.gn
index fd4b9af8626..81b6299571c 100644
--- a/zircon/system/banjo/ddk-protocol-clockimpl/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.clockimpl/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-clockimpl") {
+banjo_library("ddk.protocol.clockimpl") {
   sources = [
     "clock-impl.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-clockimpl/clock-impl.banjo b/zircon/system/banjo/ddk.protocol.clockimpl/clock-impl.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-clockimpl/clock-impl.banjo
rename to zircon/system/banjo/ddk.protocol.clockimpl/clock-impl.banjo
diff --git a/zircon/system/banjo/ddk-protocol-composite/BUILD.gn b/zircon/system/banjo/ddk.protocol.composite/BUILD.gn
similarity index 77%
rename from zircon/system/banjo/ddk-protocol-composite/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.composite/BUILD.gn
index 4f0f86319af..002c2618d66 100644
--- a/zircon/system/banjo/ddk-protocol-composite/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.composite/BUILD.gn
@@ -4,12 +4,12 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-composite") {
+banjo_library("ddk.protocol.composite") {
   sources = [
     "composite.banjo",
   ]
 
   public_deps = [
-    "$zx/system/banjo/ddk-driver",
+    "$zx/system/banjo/ddk.driver",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-composite/composite.banjo b/zircon/system/banjo/ddk.protocol.composite/composite.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-composite/composite.banjo
rename to zircon/system/banjo/ddk.protocol.composite/composite.banjo
diff --git a/zircon/system/banjo/ddk-protocol-display-controller/BUILD.gn b/zircon/system/banjo/ddk.protocol.display.controller/BUILD.gn
similarity index 74%
rename from zircon/system/banjo/ddk-protocol-display-controller/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.display.controller/BUILD.gn
index e24a79e7bf5..1d20a7af98d 100644
--- a/zircon/system/banjo/ddk-protocol-display-controller/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.display.controller/BUILD.gn
@@ -4,11 +4,11 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-display-controller") {
+banjo_library("ddk.protocol.display.controller") {
   sources = [
     "display-controller.banjo",
   ]
   public_deps = [
-    "$zx/system/banjo/zircon-device-audio",
+    "$zx/system/banjo/zircon.device.audio",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-display-controller/display-controller.banjo b/zircon/system/banjo/ddk.protocol.display.controller/display-controller.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-display-controller/display-controller.banjo
rename to zircon/system/banjo/ddk.protocol.display.controller/display-controller.banjo
diff --git a/zircon/system/banjo/ddk-protocol-dsiimpl/BUILD.gn b/zircon/system/banjo/ddk.protocol.dsiimpl/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/ddk-protocol-dsiimpl/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.dsiimpl/BUILD.gn
index af7d886b778..e051d94dcee 100644
--- a/zircon/system/banjo/ddk-protocol-dsiimpl/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.dsiimpl/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-dsiimpl") {
+banjo_library("ddk.protocol.dsiimpl") {
   sources = [
     "dsiimpl.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-dsiimpl/dsiimpl.banjo b/zircon/system/banjo/ddk.protocol.dsiimpl/dsiimpl.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-dsiimpl/dsiimpl.banjo
rename to zircon/system/banjo/ddk.protocol.dsiimpl/dsiimpl.banjo
diff --git a/zircon/system/banjo/ddk-protocol-ethernet-board/BUILD.gn b/zircon/system/banjo/ddk.protocol.ethernet.board/BUILD.gn
similarity index 83%
rename from zircon/system/banjo/ddk-protocol-ethernet-board/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.ethernet.board/BUILD.gn
index 238cacd07db..1be502b3d79 100644
--- a/zircon/system/banjo/ddk-protocol-ethernet-board/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.ethernet.board/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-ethernet-board") {
+banjo_library("ddk.protocol.ethernet.board") {
   sources = [
     "ethernet-board.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-ethernet-board/ethernet-board.banjo b/zircon/system/banjo/ddk.protocol.ethernet.board/ethernet-board.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-ethernet-board/ethernet-board.banjo
rename to zircon/system/banjo/ddk.protocol.ethernet.board/ethernet-board.banjo
diff --git a/zircon/system/banjo/ddk-protocol-ethernet-mac/BUILD.gn b/zircon/system/banjo/ddk.protocol.ethernet.mac/BUILD.gn
similarity index 84%
rename from zircon/system/banjo/ddk-protocol-ethernet-mac/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.ethernet.mac/BUILD.gn
index f12a191d0ae..64957f04cd9 100644
--- a/zircon/system/banjo/ddk-protocol-ethernet-mac/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.ethernet.mac/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-ethernet-mac") {
+banjo_library("ddk.protocol.ethernet.mac") {
   sources = [
     "ethernet-mac.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-ethernet-mac/ethernet-mac.banjo b/zircon/system/banjo/ddk.protocol.ethernet.mac/ethernet-mac.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-ethernet-mac/ethernet-mac.banjo
rename to zircon/system/banjo/ddk.protocol.ethernet.mac/ethernet-mac.banjo
diff --git a/zircon/system/banjo/ddk-protocol-ethernet/BUILD.gn b/zircon/system/banjo/ddk.protocol.ethernet/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/ddk-protocol-ethernet/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.ethernet/BUILD.gn
index 560b58cc7c2..8270ec70e97 100644
--- a/zircon/system/banjo/ddk-protocol-ethernet/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.ethernet/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-ethernet") {
+banjo_library("ddk.protocol.ethernet") {
   sources = [
     "ethernet.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-ethernet/ethernet.banjo b/zircon/system/banjo/ddk.protocol.ethernet/ethernet.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-ethernet/ethernet.banjo
rename to zircon/system/banjo/ddk.protocol.ethernet/ethernet.banjo
diff --git a/zircon/system/banjo/ddk-protocol-goldfish-pipe/BUILD.gn b/zircon/system/banjo/ddk.protocol.goldfish.pipe/BUILD.gn
similarity index 84%
rename from zircon/system/banjo/ddk-protocol-goldfish-pipe/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.goldfish.pipe/BUILD.gn
index 0027066d5f1..c5142919b8e 100644
--- a/zircon/system/banjo/ddk-protocol-goldfish-pipe/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.goldfish.pipe/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-goldfish-pipe") {
+banjo_library("ddk.protocol.goldfish.pipe") {
   sources = [
     "goldfish-pipe.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-goldfish-pipe/goldfish-pipe.banjo b/zircon/system/banjo/ddk.protocol.goldfish.pipe/goldfish-pipe.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-goldfish-pipe/goldfish-pipe.banjo
rename to zircon/system/banjo/ddk.protocol.goldfish.pipe/goldfish-pipe.banjo
diff --git a/zircon/system/banjo/ddk-protocol-gpio/BUILD.gn b/zircon/system/banjo/ddk.protocol.gpio/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/ddk-protocol-gpio/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.gpio/BUILD.gn
index c2199ae5ea4..bf91a33b461 100644
--- a/zircon/system/banjo/ddk-protocol-gpio/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.gpio/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-gpio") {
+banjo_library("ddk.protocol.gpio") {
   sources = [
     "gpio.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-gpio/gpio.banjo b/zircon/system/banjo/ddk.protocol.gpio/gpio.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-gpio/gpio.banjo
rename to zircon/system/banjo/ddk.protocol.gpio/gpio.banjo
diff --git a/zircon/system/banjo/ddk-protocol-gpioimpl/BUILD.gn b/zircon/system/banjo/ddk.protocol.gpioimpl/BUILD.gn
similarity index 75%
rename from zircon/system/banjo/ddk-protocol-gpioimpl/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.gpioimpl/BUILD.gn
index 7e5f888e7a6..edc8b25773c 100644
--- a/zircon/system/banjo/ddk-protocol-gpioimpl/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.gpioimpl/BUILD.gn
@@ -4,11 +4,11 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-gpioimpl") {
+banjo_library("ddk.protocol.gpioimpl") {
   sources = [
     "gpio-impl.banjo",
   ]
   public_deps = [
-    "$zx/system/banjo/ddk-protocol-gpio",
+    "$zx/system/banjo/ddk.protocol.gpio",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-gpioimpl/gpio-impl.banjo b/zircon/system/banjo/ddk.protocol.gpioimpl/gpio-impl.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-gpioimpl/gpio-impl.banjo
rename to zircon/system/banjo/ddk.protocol.gpioimpl/gpio-impl.banjo
diff --git a/zircon/system/banjo/ddk-protocol-hidbus/BUILD.gn b/zircon/system/banjo/ddk.protocol.hidbus/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/ddk-protocol-hidbus/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.hidbus/BUILD.gn
index 55bb89ef486..5636e868c57 100644
--- a/zircon/system/banjo/ddk-protocol-hidbus/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.hidbus/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-hidbus") {
+banjo_library("ddk.protocol.hidbus") {
   sources = [
     "hidbus.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-hidbus/hidbus.banjo b/zircon/system/banjo/ddk.protocol.hidbus/hidbus.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-hidbus/hidbus.banjo
rename to zircon/system/banjo/ddk.protocol.hidbus/hidbus.banjo
diff --git a/zircon/system/banjo/ddk-protocol-i2c/BUILD.gn b/zircon/system/banjo/ddk.protocol.i2c/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/ddk-protocol-i2c/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.i2c/BUILD.gn
index cdc9b0fd136..6a0166efed7 100644
--- a/zircon/system/banjo/ddk-protocol-i2c/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.i2c/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-i2c") {
+banjo_library("ddk.protocol.i2c") {
   sources = [
     "i2c.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-i2c/i2c.banjo b/zircon/system/banjo/ddk.protocol.i2c/i2c.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-i2c/i2c.banjo
rename to zircon/system/banjo/ddk.protocol.i2c/i2c.banjo
diff --git a/zircon/system/banjo/ddk-protocol-i2cimpl/BUILD.gn b/zircon/system/banjo/ddk.protocol.i2cimpl/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/ddk-protocol-i2cimpl/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.i2cimpl/BUILD.gn
index 15df57f6ad8..da67876efe8 100644
--- a/zircon/system/banjo/ddk-protocol-i2cimpl/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.i2cimpl/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-i2cimpl") {
+banjo_library("ddk.protocol.i2cimpl") {
   sources = [
     "i2c-impl.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-i2cimpl/i2c-impl.banjo b/zircon/system/banjo/ddk.protocol.i2cimpl/i2c-impl.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-i2cimpl/i2c-impl.banjo
rename to zircon/system/banjo/ddk.protocol.i2cimpl/i2c-impl.banjo
diff --git a/zircon/system/banjo/ddk-protocol-intelgpucore/BUILD.gn b/zircon/system/banjo/ddk.protocol.intelgpucore/BUILD.gn
similarity index 84%
rename from zircon/system/banjo/ddk-protocol-intelgpucore/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.intelgpucore/BUILD.gn
index d4ff6ffba20..aafb9affdc0 100644
--- a/zircon/system/banjo/ddk-protocol-intelgpucore/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.intelgpucore/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-intelgpucore") {
+banjo_library("ddk.protocol.intelgpucore") {
   sources = [
     "intel-gpu-core.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-intelgpucore/intel-gpu-core.banjo b/zircon/system/banjo/ddk.protocol.intelgpucore/intel-gpu-core.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-intelgpucore/intel-gpu-core.banjo
rename to zircon/system/banjo/ddk.protocol.intelgpucore/intel-gpu-core.banjo
diff --git a/zircon/system/banjo/ddk-protocol-intelhda-codec/BUILD.gn b/zircon/system/banjo/ddk.protocol.intelhda.codec/BUILD.gn
similarity index 83%
rename from zircon/system/banjo/ddk-protocol-intelhda-codec/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.intelhda.codec/BUILD.gn
index 5e9abdf4c2f..0e8371fb80a 100644
--- a/zircon/system/banjo/ddk-protocol-intelhda-codec/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.intelhda.codec/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-intelhda-codec") {
+banjo_library("ddk.protocol.intelhda.codec") {
   sources = [
     "intel-hda-codec.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-intelhda-codec/intel-hda-codec.banjo b/zircon/system/banjo/ddk.protocol.intelhda.codec/intel-hda-codec.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-intelhda-codec/intel-hda-codec.banjo
rename to zircon/system/banjo/ddk.protocol.intelhda.codec/intel-hda-codec.banjo
diff --git a/zircon/system/banjo/ddk-protocol-iommu/BUILD.gn b/zircon/system/banjo/ddk.protocol.iommu/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/ddk-protocol-iommu/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.iommu/BUILD.gn
index d5a93fc97f1..2876f47906d 100644
--- a/zircon/system/banjo/ddk-protocol-iommu/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.iommu/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-iommu") {
+banjo_library("ddk.protocol.iommu") {
   sources = [
     "iommu.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-iommu/iommu.banjo b/zircon/system/banjo/ddk.protocol.iommu/iommu.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-iommu/iommu.banjo
rename to zircon/system/banjo/ddk.protocol.iommu/iommu.banjo
diff --git a/zircon/system/banjo/ddk-protocol-mailbox/BUILD.gn b/zircon/system/banjo/ddk.protocol.mailbox/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/ddk-protocol-mailbox/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.mailbox/BUILD.gn
index 460bc623ad3..b16230aaa8e 100644
--- a/zircon/system/banjo/ddk-protocol-mailbox/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.mailbox/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-mailbox") {
+banjo_library("ddk.protocol.mailbox") {
   sources = [
     "mailbox.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-mailbox/mailbox.banjo b/zircon/system/banjo/ddk.protocol.mailbox/mailbox.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-mailbox/mailbox.banjo
rename to zircon/system/banjo/ddk.protocol.mailbox/mailbox.banjo
diff --git a/zircon/system/banjo/ddk-protocol-mipicsi/BUILD.gn b/zircon/system/banjo/ddk.protocol.mipicsi/BUILD.gn
similarity index 74%
rename from zircon/system/banjo/ddk-protocol-mipicsi/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.mipicsi/BUILD.gn
index e8c591f0a1e..0ba175f8c58 100644
--- a/zircon/system/banjo/ddk-protocol-mipicsi/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.mipicsi/BUILD.gn
@@ -4,11 +4,11 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-mipicsi") {
+banjo_library("ddk.protocol.mipicsi") {
   sources = [
     "mipicsi.banjo",
   ]
   public_deps = [
-    "$zx/system/banjo/ddk-protocol-camerasensor",
+    "$zx/system/banjo/ddk.protocol.camerasensor",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-mipicsi/mipicsi.banjo b/zircon/system/banjo/ddk.protocol.mipicsi/mipicsi.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-mipicsi/mipicsi.banjo
rename to zircon/system/banjo/ddk.protocol.mipicsi/mipicsi.banjo
diff --git a/zircon/system/banjo/ddk-protocol-nand/BUILD.gn b/zircon/system/banjo/ddk.protocol.nand/BUILD.gn
similarity index 76%
rename from zircon/system/banjo/ddk-protocol-nand/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.nand/BUILD.gn
index 8ff1307799b..2fa7087dcfc 100644
--- a/zircon/system/banjo/ddk-protocol-nand/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.nand/BUILD.gn
@@ -4,11 +4,11 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-nand") {
+banjo_library("ddk.protocol.nand") {
   sources = [
     "nand.banjo",
   ]
   public_deps = [
-    "$zx/system/banjo/zircon-device-nand",
+    "$zx/system/banjo/zircon.device.nand",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-nand/nand.banjo b/zircon/system/banjo/ddk.protocol.nand/nand.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-nand/nand.banjo
rename to zircon/system/banjo/ddk.protocol.nand/nand.banjo
diff --git a/zircon/system/banjo/ddk-protocol-pci/BUILD.gn b/zircon/system/banjo/ddk.protocol.pci/BUILD.gn
similarity index 76%
rename from zircon/system/banjo/ddk-protocol-pci/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.pci/BUILD.gn
index 105bafd9a92..5cb829e473e 100644
--- a/zircon/system/banjo/ddk-protocol-pci/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.pci/BUILD.gn
@@ -4,11 +4,11 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-pci") {
+banjo_library("ddk.protocol.pci") {
   sources = [
     "pci.banjo",
   ]
   public_deps = [
-    "$zx/system/banjo/zircon-syscalls-pci",
+    "$zx/system/banjo/zircon.syscalls.pci",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-pci/pci.banjo b/zircon/system/banjo/ddk.protocol.pci/pci.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-pci/pci.banjo
rename to zircon/system/banjo/ddk.protocol.pci/pci.banjo
diff --git a/zircon/system/banjo/ddk-protocol-pciroot/BUILD.gn b/zircon/system/banjo/ddk.protocol.pciroot/BUILD.gn
similarity index 76%
rename from zircon/system/banjo/ddk-protocol-pciroot/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.pciroot/BUILD.gn
index 30123f62460..13bfb44b526 100644
--- a/zircon/system/banjo/ddk-protocol-pciroot/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.pciroot/BUILD.gn
@@ -4,11 +4,11 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-pciroot") {
+banjo_library("ddk.protocol.pciroot") {
   sources = [
     "pciroot.banjo",
   ]
   public_deps = [
-    "$zx/system/banjo/zircon-hw-pci",
+    "$zx/system/banjo/zircon.hw.pci",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-pciroot/pciroot.banjo b/zircon/system/banjo/ddk.protocol.pciroot/pciroot.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-pciroot/pciroot.banjo
rename to zircon/system/banjo/ddk.protocol.pciroot/pciroot.banjo
diff --git a/zircon/system/banjo/ddk-protocol-platform-bus/BUILD.gn b/zircon/system/banjo/ddk.protocol.platform.bus/BUILD.gn
similarity index 66%
rename from zircon/system/banjo/ddk-protocol-platform-bus/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.platform.bus/BUILD.gn
index 0a0ea4d2dfe..8247624d58c 100644
--- a/zircon/system/banjo/ddk-protocol-platform-bus/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.platform.bus/BUILD.gn
@@ -4,12 +4,12 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-platform-bus") {
+banjo_library("ddk.protocol.platform.bus") {
   sources = [
     "platform-bus.banjo",
   ]
   public_deps = [
-    "$zx/system/banjo/ddk-driver",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.driver",
+    "$zx/system/banjo/ddk.protocol.platform.device",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-platform-bus/platform-bus.banjo b/zircon/system/banjo/ddk.protocol.platform.bus/platform-bus.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-platform-bus/platform-bus.banjo
rename to zircon/system/banjo/ddk.protocol.platform.bus/platform-bus.banjo
diff --git a/zircon/system/banjo/ddk-protocol-platform-device/BUILD.gn b/zircon/system/banjo/ddk.protocol.platform.device/BUILD.gn
similarity index 76%
rename from zircon/system/banjo/ddk-protocol-platform-device/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.platform.device/BUILD.gn
index f82ca331ef9..abf121a2401 100644
--- a/zircon/system/banjo/ddk-protocol-platform-device/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.platform.device/BUILD.gn
@@ -4,11 +4,11 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-platform-device") {
+banjo_library("ddk.protocol.platform.device") {
   sources = [
     "platform-device.banjo",
   ]
   public_deps = [
-    "$zx/system/banjo/ddk-driver",
+    "$zx/system/banjo/ddk.driver",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-platform-device/platform-device.banjo b/zircon/system/banjo/ddk.protocol.platform.device/platform-device.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-platform-device/platform-device.banjo
rename to zircon/system/banjo/ddk.protocol.platform.device/platform-device.banjo
diff --git a/zircon/system/banjo/ddk-protocol-power/BUILD.gn b/zircon/system/banjo/ddk.protocol.power/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/ddk-protocol-power/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.power/BUILD.gn
index 6a78090082e..858b2b68405 100644
--- a/zircon/system/banjo/ddk-protocol-power/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.power/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-power") {
+banjo_library("ddk.protocol.power") {
   sources = [
     "power.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-power/power.banjo b/zircon/system/banjo/ddk.protocol.power/power.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-power/power.banjo
rename to zircon/system/banjo/ddk.protocol.power/power.banjo
diff --git a/zircon/system/banjo/ddk-protocol-powerimpl/BUILD.gn b/zircon/system/banjo/ddk.protocol.powerimpl/BUILD.gn
similarity index 75%
rename from zircon/system/banjo/ddk-protocol-powerimpl/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.powerimpl/BUILD.gn
index df29ce515c7..e5ef53ebea5 100644
--- a/zircon/system/banjo/ddk-protocol-powerimpl/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.powerimpl/BUILD.gn
@@ -4,11 +4,11 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-powerimpl") {
+banjo_library("ddk.protocol.powerimpl") {
   sources = [
     "power-impl.banjo",
   ]
   public_deps = [
-    "$zx/system/banjo/ddk-protocol-power",
+    "$zx/system/banjo/ddk.protocol.power",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-powerimpl/power-impl.banjo b/zircon/system/banjo/ddk.protocol.powerimpl/power-impl.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-powerimpl/power-impl.banjo
rename to zircon/system/banjo/ddk.protocol.powerimpl/power-impl.banjo
diff --git a/zircon/system/banjo/ddk-protocol-rawnand/BUILD.gn b/zircon/system/banjo/ddk.protocol.rawnand/BUILD.gn
similarity index 75%
rename from zircon/system/banjo/ddk-protocol-rawnand/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.rawnand/BUILD.gn
index e69f2ae4516..c2d50bf3c39 100644
--- a/zircon/system/banjo/ddk-protocol-rawnand/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.rawnand/BUILD.gn
@@ -4,11 +4,11 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-rawnand") {
+banjo_library("ddk.protocol.rawnand") {
   sources = [
     "rawnand.banjo",
   ]
   public_deps = [
-    "$zx/system/banjo/zircon-device-nand",
+    "$zx/system/banjo/zircon.device.nand",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-rawnand/rawnand.banjo b/zircon/system/banjo/ddk.protocol.rawnand/rawnand.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-rawnand/rawnand.banjo
rename to zircon/system/banjo/ddk.protocol.rawnand/rawnand.banjo
diff --git a/zircon/system/banjo/ddk-protocol-scpi/BUILD.gn b/zircon/system/banjo/ddk.protocol.scpi/BUILD.gn
similarity index 76%
rename from zircon/system/banjo/ddk-protocol-scpi/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.scpi/BUILD.gn
index 285efb598bb..8705842b2a1 100644
--- a/zircon/system/banjo/ddk-protocol-scpi/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.scpi/BUILD.gn
@@ -4,11 +4,11 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-scpi") {
+banjo_library("ddk.protocol.scpi") {
   sources = [
     "scpi.banjo",
   ]
   public_deps = [
-    "$zx/system/banjo/zircon-device-scpi",
+    "$zx/system/banjo/zircon.device.scpi",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-scpi/scpi.banjo b/zircon/system/banjo/ddk.protocol.scpi/scpi.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-scpi/scpi.banjo
rename to zircon/system/banjo/ddk.protocol.scpi/scpi.banjo
diff --git a/zircon/system/banjo/ddk-protocol-sdhci/BUILD.gn b/zircon/system/banjo/ddk.protocol.sdhci/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/ddk-protocol-sdhci/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.sdhci/BUILD.gn
index 04f2920f40b..61e91024d5f 100644
--- a/zircon/system/banjo/ddk-protocol-sdhci/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.sdhci/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-sdhci") {
+banjo_library("ddk.protocol.sdhci") {
   sources = [
     "sdhci.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-sdhci/sdhci.banjo b/zircon/system/banjo/ddk.protocol.sdhci/sdhci.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-sdhci/sdhci.banjo
rename to zircon/system/banjo/ddk.protocol.sdhci/sdhci.banjo
diff --git a/zircon/system/banjo/ddk-protocol-sdio/BUILD.gn b/zircon/system/banjo/ddk.protocol.sdio/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/ddk-protocol-sdio/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.sdio/BUILD.gn
index 4923cdd7ffb..1c35e690e37 100644
--- a/zircon/system/banjo/ddk-protocol-sdio/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.sdio/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-sdio") {
+banjo_library("ddk.protocol.sdio") {
   sources = [
     "sdio.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-sdio/sdio.banjo b/zircon/system/banjo/ddk.protocol.sdio/sdio.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-sdio/sdio.banjo
rename to zircon/system/banjo/ddk.protocol.sdio/sdio.banjo
diff --git a/zircon/system/banjo/ddk-protocol-sdmmc/BUILD.gn b/zircon/system/banjo/ddk.protocol.sdmmc/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/ddk-protocol-sdmmc/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.sdmmc/BUILD.gn
index 0957cc4a691..d26f51d7261 100644
--- a/zircon/system/banjo/ddk-protocol-sdmmc/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.sdmmc/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-sdmmc") {
+banjo_library("ddk.protocol.sdmmc") {
   sources = [
     "sdmmc.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-sdmmc/sdmmc.banjo b/zircon/system/banjo/ddk.protocol.sdmmc/sdmmc.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-sdmmc/sdmmc.banjo
rename to zircon/system/banjo/ddk.protocol.sdmmc/sdmmc.banjo
diff --git a/zircon/system/banjo/ddk-protocol-serial/BUILD.gn b/zircon/system/banjo/ddk.protocol.serial/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/ddk-protocol-serial/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.serial/BUILD.gn
index 1b6ecd48092..92d77ac7640 100644
--- a/zircon/system/banjo/ddk-protocol-serial/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.serial/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-serial") {
+banjo_library("ddk.protocol.serial") {
   sources = [
     "serial.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-serial/serial.banjo b/zircon/system/banjo/ddk.protocol.serial/serial.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-serial/serial.banjo
rename to zircon/system/banjo/ddk.protocol.serial/serial.banjo
diff --git a/zircon/system/banjo/ddk-protocol-serialimpl/BUILD.gn b/zircon/system/banjo/ddk.protocol.serialimpl/BUILD.gn
similarity index 75%
rename from zircon/system/banjo/ddk-protocol-serialimpl/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.serialimpl/BUILD.gn
index b8ba656d0d8..ab0c503064a 100644
--- a/zircon/system/banjo/ddk-protocol-serialimpl/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.serialimpl/BUILD.gn
@@ -4,11 +4,11 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-serialimpl") {
+banjo_library("ddk.protocol.serialimpl") {
   sources = [
     "serial-impl.banjo",
   ]
   public_deps = [
-    "$zx/system/banjo/ddk-protocol-serial",
+    "$zx/system/banjo/ddk.protocol.serial",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-serialimpl/serial-impl.banjo b/zircon/system/banjo/ddk.protocol.serialimpl/serial-impl.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-serialimpl/serial-impl.banjo
rename to zircon/system/banjo/ddk.protocol.serialimpl/serial-impl.banjo
diff --git a/zircon/system/banjo/ddk-protocol-sysmem/BUILD.gn b/zircon/system/banjo/ddk.protocol.sysmem/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/ddk-protocol-sysmem/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.sysmem/BUILD.gn
index 8a4f798d768..1b0f9d90ab6 100644
--- a/zircon/system/banjo/ddk-protocol-sysmem/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.sysmem/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-sysmem") {
+banjo_library("ddk.protocol.sysmem") {
   sources = [
     "sysmem.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-sysmem/sysmem.banjo b/zircon/system/banjo/ddk.protocol.sysmem/sysmem.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-sysmem/sysmem.banjo
rename to zircon/system/banjo/ddk.protocol.sysmem/sysmem.banjo
diff --git a/zircon/system/banjo/ddk-protocol-test/BUILD.gn b/zircon/system/banjo/ddk.protocol.test/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/ddk-protocol-test/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.test/BUILD.gn
index 36f9785108c..7b56486d07d 100644
--- a/zircon/system/banjo/ddk-protocol-test/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.test/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-test") {
+banjo_library("ddk.protocol.test") {
   sources = [
     "test.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-test/test.banjo b/zircon/system/banjo/ddk.protocol.test/test.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-test/test.banjo
rename to zircon/system/banjo/ddk.protocol.test/test.banjo
diff --git a/zircon/system/banjo/ddk-protocol-usb-bus/BUILD.gn b/zircon/system/banjo/ddk.protocol.usb.bus/BUILD.gn
similarity index 56%
rename from zircon/system/banjo/ddk-protocol-usb-bus/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.usb.bus/BUILD.gn
index 1433ee85e06..8147848c339 100644
--- a/zircon/system/banjo/ddk-protocol-usb-bus/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.usb.bus/BUILD.gn
@@ -4,14 +4,14 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-usb-bus") {
+banjo_library("ddk.protocol.usb.bus") {
   sources = [
     "usb-bus.banjo",
   ]
   public_deps = [
-    "$zx/system/banjo/ddk-driver",
-    "$zx/system/banjo/ddk-protocol-usb-hub",
-    "$zx/system/banjo/zircon-hw-usb",
-    "$zx/system/banjo/zircon-hw-usb-hub",
+    "$zx/system/banjo/ddk.driver",
+    "$zx/system/banjo/ddk.protocol.usb.hub",
+    "$zx/system/banjo/zircon.hw.usb",
+    "$zx/system/banjo/zircon.hw.usb.hub",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-usb-bus/usb-bus.banjo b/zircon/system/banjo/ddk.protocol.usb.bus/usb-bus.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-usb-bus/usb-bus.banjo
rename to zircon/system/banjo/ddk.protocol.usb.bus/usb-bus.banjo
diff --git a/zircon/system/banjo/ddk-protocol-usb-composite/BUILD.gn b/zircon/system/banjo/ddk.protocol.usb.composite/BUILD.gn
similarity index 76%
rename from zircon/system/banjo/ddk-protocol-usb-composite/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.usb.composite/BUILD.gn
index bc201bdecb4..b1570cb6a86 100644
--- a/zircon/system/banjo/ddk-protocol-usb-composite/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.usb.composite/BUILD.gn
@@ -4,11 +4,11 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-usb-composite") {
+banjo_library("ddk.protocol.usb.composite") {
   sources = [
     "usb-composite.banjo",
   ]
   public_deps = [
-    "$zx/system/banjo/zircon-hw-usb",
+    "$zx/system/banjo/zircon.hw.usb",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-usb-composite/usb-composite.banjo b/zircon/system/banjo/ddk.protocol.usb.composite/usb-composite.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-usb-composite/usb-composite.banjo
rename to zircon/system/banjo/ddk.protocol.usb.composite/usb-composite.banjo
diff --git a/zircon/system/banjo/ddk-protocol-usb-dci/BUILD.gn b/zircon/system/banjo/ddk.protocol.usb.dci/BUILD.gn
similarity index 61%
rename from zircon/system/banjo/ddk-protocol-usb-dci/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.usb.dci/BUILD.gn
index 2d317bad2e2..dd481fa4ad0 100644
--- a/zircon/system/banjo/ddk-protocol-usb-dci/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.usb.dci/BUILD.gn
@@ -4,13 +4,13 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-usb-dci") {
+banjo_library("ddk.protocol.usb.dci") {
   sources = [
     "usb-dci.banjo",
   ]
   public_deps = [
-    "$zx/system/banjo/ddk-physiter",
-    "$zx/system/banjo/ddk-protocol-usb-request",
-    "$zx/system/banjo/zircon-hw-usb",
+    "$zx/system/banjo/ddk.physiter",
+    "$zx/system/banjo/ddk.protocol.usb.request",
+    "$zx/system/banjo/zircon.hw.usb",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-usb-dci/usb-dci.banjo b/zircon/system/banjo/ddk.protocol.usb.dci/usb-dci.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-usb-dci/usb-dci.banjo
rename to zircon/system/banjo/ddk.protocol.usb.dci/usb-dci.banjo
diff --git a/zircon/system/banjo/ddk-protocol-usb-function/BUILD.gn b/zircon/system/banjo/ddk.protocol.usb.function/BUILD.gn
similarity index 61%
rename from zircon/system/banjo/ddk-protocol-usb-function/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.usb.function/BUILD.gn
index eeec664a9aa..90315995a96 100644
--- a/zircon/system/banjo/ddk-protocol-usb-function/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.usb.function/BUILD.gn
@@ -4,13 +4,13 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-usb-function") {
+banjo_library("ddk.protocol.usb.function") {
   sources = [
     "usb-function.banjo",
   ]
   public_deps = [
-    "$zx/system/banjo/ddk-physiter",
-    "$zx/system/banjo/ddk-protocol-usb-request",
-    "$zx/system/banjo/zircon-hw-usb",
+    "$zx/system/banjo/ddk.physiter",
+    "$zx/system/banjo/ddk.protocol.usb.request",
+    "$zx/system/banjo/zircon.hw.usb",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-usb-function/usb-function.banjo b/zircon/system/banjo/ddk.protocol.usb.function/usb-function.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-usb-function/usb-function.banjo
rename to zircon/system/banjo/ddk.protocol.usb.function/usb-function.banjo
diff --git a/zircon/system/banjo/ddk.protocol.usb.hci/BUILD.gn b/zircon/system/banjo/ddk.protocol.usb.hci/BUILD.gn
new file mode 100644
index 00000000000..f4308f5f8b2
--- /dev/null
+++ b/zircon/system/banjo/ddk.protocol.usb.hci/BUILD.gn
@@ -0,0 +1,19 @@
+# Copyright 2019 The Fuchsia Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("$zx/public/gn/banjo.gni")
+
+banjo_library("ddk.protocol.usb.hci") {
+  sources = [
+    "usb-hci.banjo",
+  ]
+  public_deps = [
+    "$zx/system/banjo/ddk.physiter",
+    "$zx/system/banjo/ddk.protocol.usb.bus",
+    "$zx/system/banjo/ddk.protocol.usb.hub",
+    "$zx/system/banjo/ddk.protocol.usb.request",
+    "$zx/system/banjo/zircon.hw.usb",
+    "$zx/system/banjo/zircon.hw.usb.hub",
+  ]
+}
diff --git a/zircon/system/banjo/ddk-protocol-usb-hci/usb-hci.banjo b/zircon/system/banjo/ddk.protocol.usb.hci/usb-hci.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-usb-hci/usb-hci.banjo
rename to zircon/system/banjo/ddk.protocol.usb.hci/usb-hci.banjo
diff --git a/zircon/system/banjo/ddk-protocol-usb-hub/BUILD.gn b/zircon/system/banjo/ddk.protocol.usb.hub/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/ddk-protocol-usb-hub/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.usb.hub/BUILD.gn
index d162379562f..41b173ef13a 100644
--- a/zircon/system/banjo/ddk-protocol-usb-hub/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.usb.hub/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-usb-hub") {
+banjo_library("ddk.protocol.usb.hub") {
   sources = [
     "usb-hub.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-usb-hub/usb-hub.banjo b/zircon/system/banjo/ddk.protocol.usb.hub/usb-hub.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-usb-hub/usb-hub.banjo
rename to zircon/system/banjo/ddk.protocol.usb.hub/usb-hub.banjo
diff --git a/zircon/system/banjo/ddk-protocol-usb-modeswitch/BUILD.gn b/zircon/system/banjo/ddk.protocol.usb.modeswitch/BUILD.gn
similarity index 83%
rename from zircon/system/banjo/ddk-protocol-usb-modeswitch/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.usb.modeswitch/BUILD.gn
index e35706d0686..f463136bd84 100644
--- a/zircon/system/banjo/ddk-protocol-usb-modeswitch/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.usb.modeswitch/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-usb-modeswitch") {
+banjo_library("ddk.protocol.usb.modeswitch") {
   sources = [
     "usb-mode-switch.banjo",
   ]
diff --git a/zircon/system/banjo/ddk-protocol-usb-modeswitch/usb-mode-switch.banjo b/zircon/system/banjo/ddk.protocol.usb.modeswitch/usb-mode-switch.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-usb-modeswitch/usb-mode-switch.banjo
rename to zircon/system/banjo/ddk.protocol.usb.modeswitch/usb-mode-switch.banjo
diff --git a/zircon/system/banjo/ddk-protocol-usb-request/BUILD.gn b/zircon/system/banjo/ddk.protocol.usb.request/BUILD.gn
similarity index 68%
rename from zircon/system/banjo/ddk-protocol-usb-request/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.usb.request/BUILD.gn
index c70b8f4e77f..da8600036ce 100644
--- a/zircon/system/banjo/ddk-protocol-usb-request/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.usb.request/BUILD.gn
@@ -4,12 +4,12 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-usb-request") {
+banjo_library("ddk.protocol.usb.request") {
   sources = [
     "usb-request.banjo",
   ]
   public_deps = [
-    "$zx/system/banjo/ddk-physiter",
-    "$zx/system/banjo/zircon-hw-usb",
+    "$zx/system/banjo/ddk.physiter",
+    "$zx/system/banjo/zircon.hw.usb",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-usb-request/usb-request.banjo b/zircon/system/banjo/ddk.protocol.usb.request/usb-request.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-usb-request/usb-request.banjo
rename to zircon/system/banjo/ddk.protocol.usb.request/usb-request.banjo
diff --git a/zircon/system/banjo/ddk-protocol-usb/BUILD.gn b/zircon/system/banjo/ddk.protocol.usb/BUILD.gn
similarity index 61%
rename from zircon/system/banjo/ddk-protocol-usb/BUILD.gn
rename to zircon/system/banjo/ddk.protocol.usb/BUILD.gn
index 6ac6af66570..3fa1af50cc8 100644
--- a/zircon/system/banjo/ddk-protocol-usb/BUILD.gn
+++ b/zircon/system/banjo/ddk.protocol.usb/BUILD.gn
@@ -4,13 +4,13 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("ddk-protocol-usb") {
+banjo_library("ddk.protocol.usb") {
   sources = [
     "usb.banjo",
   ]
   public_deps = [
-    "$zx/system/banjo/ddk-physiter",
-    "$zx/system/banjo/ddk-protocol-usb-request",
-    "$zx/system/banjo/zircon-hw-usb",
+    "$zx/system/banjo/ddk.physiter",
+    "$zx/system/banjo/ddk.protocol.usb.request",
+    "$zx/system/banjo/zircon.hw.usb",
   ]
 }
diff --git a/zircon/system/banjo/ddk-protocol-usb/usb.banjo b/zircon/system/banjo/ddk.protocol.usb/usb.banjo
similarity index 100%
rename from zircon/system/banjo/ddk-protocol-usb/usb.banjo
rename to zircon/system/banjo/ddk.protocol.usb/usb.banjo
diff --git a/zircon/system/banjo/zircon-device-audio/BUILD.gn b/zircon/system/banjo/zircon.device.audio/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/zircon-device-audio/BUILD.gn
rename to zircon/system/banjo/zircon.device.audio/BUILD.gn
index 4a8e59061a5..c3c4daa8d4f 100644
--- a/zircon/system/banjo/zircon-device-audio/BUILD.gn
+++ b/zircon/system/banjo/zircon.device.audio/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("zircon-device-audio") {
+banjo_library("zircon.device.audio") {
   sources = [
     "audio.banjo",
   ]
diff --git a/zircon/system/banjo/zircon-device-audio/audio.banjo b/zircon/system/banjo/zircon.device.audio/audio.banjo
similarity index 100%
rename from zircon/system/banjo/zircon-device-audio/audio.banjo
rename to zircon/system/banjo/zircon.device.audio/audio.banjo
diff --git a/zircon/system/banjo/zircon-device-block/BUILD.gn b/zircon/system/banjo/zircon.device.block/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/zircon-device-block/BUILD.gn
rename to zircon/system/banjo/zircon.device.block/BUILD.gn
index 458befc9321..f6c94d5824b 100644
--- a/zircon/system/banjo/zircon-device-block/BUILD.gn
+++ b/zircon/system/banjo/zircon.device.block/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("zircon-device-block") {
+banjo_library("zircon.device.block") {
   sources = [
     "block.banjo",
   ]
diff --git a/zircon/system/banjo/zircon-device-block/block.banjo b/zircon/system/banjo/zircon.device.block/block.banjo
similarity index 100%
rename from zircon/system/banjo/zircon-device-block/block.banjo
rename to zircon/system/banjo/zircon.device.block/block.banjo
diff --git a/zircon/system/banjo/zircon-device-nand/BUILD.gn b/zircon/system/banjo/zircon.device.nand/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/zircon-device-nand/BUILD.gn
rename to zircon/system/banjo/zircon.device.nand/BUILD.gn
index 9fe2b8cd8cd..8dbfa020f36 100644
--- a/zircon/system/banjo/zircon-device-nand/BUILD.gn
+++ b/zircon/system/banjo/zircon.device.nand/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("zircon-device-nand") {
+banjo_library("zircon.device.nand") {
   sources = [
     "nand.banjo",
   ]
diff --git a/zircon/system/banjo/zircon-device-nand/nand.banjo b/zircon/system/banjo/zircon.device.nand/nand.banjo
similarity index 100%
rename from zircon/system/banjo/zircon-device-nand/nand.banjo
rename to zircon/system/banjo/zircon.device.nand/nand.banjo
diff --git a/zircon/system/banjo/zircon-device-scpi/BUILD.gn b/zircon/system/banjo/zircon.device.scpi/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/zircon-device-scpi/BUILD.gn
rename to zircon/system/banjo/zircon.device.scpi/BUILD.gn
index 77763142a76..611ececf68a 100644
--- a/zircon/system/banjo/zircon-device-scpi/BUILD.gn
+++ b/zircon/system/banjo/zircon.device.scpi/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("zircon-device-scpi") {
+banjo_library("zircon.device.scpi") {
   sources = [
     "scpi.banjo",
   ]
diff --git a/zircon/system/banjo/zircon-device-scpi/scpi.banjo b/zircon/system/banjo/zircon.device.scpi/scpi.banjo
similarity index 100%
rename from zircon/system/banjo/zircon-device-scpi/scpi.banjo
rename to zircon/system/banjo/zircon.device.scpi/scpi.banjo
diff --git a/zircon/system/banjo/zircon-hw-pci/BUILD.gn b/zircon/system/banjo/zircon.hw.pci/BUILD.gn
similarity index 87%
rename from zircon/system/banjo/zircon-hw-pci/BUILD.gn
rename to zircon/system/banjo/zircon.hw.pci/BUILD.gn
index 526b507ae28..c70efc2ab59 100644
--- a/zircon/system/banjo/zircon-hw-pci/BUILD.gn
+++ b/zircon/system/banjo/zircon.hw.pci/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("zircon-hw-pci") {
+banjo_library("zircon.hw.pci") {
   sources = [
     "hwpci.banjo",
   ]
diff --git a/zircon/system/banjo/zircon-hw-pci/hwpci.banjo b/zircon/system/banjo/zircon.hw.pci/hwpci.banjo
similarity index 100%
rename from zircon/system/banjo/zircon-hw-pci/hwpci.banjo
rename to zircon/system/banjo/zircon.hw.pci/hwpci.banjo
diff --git a/zircon/system/banjo/zircon-hw-usb-hub/BUILD.gn b/zircon/system/banjo/zircon.hw.usb.hub/BUILD.gn
similarity index 86%
rename from zircon/system/banjo/zircon-hw-usb-hub/BUILD.gn
rename to zircon/system/banjo/zircon.hw.usb.hub/BUILD.gn
index 59cc515e42d..d6164cc5392 100644
--- a/zircon/system/banjo/zircon-hw-usb-hub/BUILD.gn
+++ b/zircon/system/banjo/zircon.hw.usb.hub/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("zircon-hw-usb-hub") {
+banjo_library("zircon.hw.usb.hub") {
   sources = [
     "usb-hub.banjo",
   ]
diff --git a/zircon/system/banjo/zircon-hw-usb-hub/usb-hub.banjo b/zircon/system/banjo/zircon.hw.usb.hub/usb-hub.banjo
similarity index 100%
rename from zircon/system/banjo/zircon-hw-usb-hub/usb-hub.banjo
rename to zircon/system/banjo/zircon.hw.usb.hub/usb-hub.banjo
diff --git a/zircon/system/banjo/zircon-hw-usb/BUILD.gn b/zircon/system/banjo/zircon.hw.usb/BUILD.gn
similarity index 87%
rename from zircon/system/banjo/zircon-hw-usb/BUILD.gn
rename to zircon/system/banjo/zircon.hw.usb/BUILD.gn
index 73e78e4b9a7..26c8eb3cb34 100644
--- a/zircon/system/banjo/zircon-hw-usb/BUILD.gn
+++ b/zircon/system/banjo/zircon.hw.usb/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("zircon-hw-usb") {
+banjo_library("zircon.hw.usb") {
   sources = [
     "usb.banjo",
   ]
diff --git a/zircon/system/banjo/zircon-hw-usb/usb.banjo b/zircon/system/banjo/zircon.hw.usb/usb.banjo
similarity index 100%
rename from zircon/system/banjo/zircon-hw-usb/usb.banjo
rename to zircon/system/banjo/zircon.hw.usb/usb.banjo
diff --git a/zircon/system/banjo/zircon-syscalls-pci/BUILD.gn b/zircon/system/banjo/zircon.syscalls.pci/BUILD.gn
similarity index 85%
rename from zircon/system/banjo/zircon-syscalls-pci/BUILD.gn
rename to zircon/system/banjo/zircon.syscalls.pci/BUILD.gn
index b576bf7ca03..2ce6a7de478 100644
--- a/zircon/system/banjo/zircon-syscalls-pci/BUILD.gn
+++ b/zircon/system/banjo/zircon.syscalls.pci/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("$zx/public/gn/banjo.gni")
 
-banjo_library("zircon-syscalls-pci") {
+banjo_library("zircon.syscalls.pci") {
   sources = [
     "pci.banjo",
   ]
diff --git a/zircon/system/banjo/zircon-syscalls-pci/pci.banjo b/zircon/system/banjo/zircon.syscalls.pci/pci.banjo
similarity index 100%
rename from zircon/system/banjo/zircon-syscalls-pci/pci.banjo
rename to zircon/system/banjo/zircon.syscalls.pci/pci.banjo
diff --git a/zircon/system/core/devmgr/component/BUILD.gn b/zircon/system/core/devmgr/component/BUILD.gn
index 6fab0fc661a..fbd09bba645 100644
--- a/zircon/system/core/devmgr/component/BUILD.gn
+++ b/zircon/system/core/devmgr/component/BUILD.gn
@@ -10,16 +10,16 @@ driver("component") {
     ":component.proxy",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-amlogiccanvas",
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-ethernet-board",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-mipicsi",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-power",
-    "$zx/system/banjo/ddk-protocol-sysmem",
-    "$zx/system/banjo/ddk-protocol-usb-modeswitch",
+    "$zx/system/banjo/ddk.protocol.amlogiccanvas",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.ethernet.board",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.mipicsi",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.power",
+    "$zx/system/banjo/ddk.protocol.sysmem",
+    "$zx/system/banjo/ddk.protocol.usb.modeswitch",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
@@ -35,16 +35,16 @@ driver("component.proxy") {
     "component-proxy.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-amlogiccanvas",
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-ethernet-board",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-mipicsi",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-power",
-    "$zx/system/banjo/ddk-protocol-sysmem",
-    "$zx/system/banjo/ddk-protocol-usb-modeswitch",
+    "$zx/system/banjo/ddk.protocol.amlogiccanvas",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.ethernet.board",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.mipicsi",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.power",
+    "$zx/system/banjo/ddk.protocol.sysmem",
+    "$zx/system/banjo/ddk.protocol.usb.modeswitch",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
diff --git a/zircon/system/core/devmgr/devhost/BUILD.gn b/zircon/system/core/devmgr/devhost/BUILD.gn
index e04dc350c4b..3660c415568 100644
--- a/zircon/system/core/devmgr/devhost/BUILD.gn
+++ b/zircon/system/core/devmgr/devhost/BUILD.gn
@@ -29,7 +29,7 @@ library("driver") {
   ]
   configs += [ "$zx/public/gn/config:visibility_hidden" ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-composite",
+    "$zx/system/banjo/ddk.protocol.composite",
     "$zx/system/fidl/fuchsia-device:c",
     "$zx/system/fidl/fuchsia-device-manager:c",
     "$zx/system/fidl/fuchsia-io:c",
diff --git a/zircon/system/dev/audio/astro-pdm-input/BUILD.gn b/zircon/system/dev/audio/astro-pdm-input/BUILD.gn
index 23c12b78aa7..a5ac4a1b3ce 100644
--- a/zircon/system/dev/audio/astro-pdm-input/BUILD.gn
+++ b/zircon/system/dev/audio/astro-pdm-input/BUILD.gn
@@ -7,10 +7,10 @@ driver("astro-pdm-input") {
     "audio-stream-in.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/audio/lib/simple-audio-stream",
     "$zx/system/dev/lib/amlogic",
     "$zx/system/dev/lib/mmio",
diff --git a/zircon/system/dev/audio/astro-tdm-output/BUILD.gn b/zircon/system/dev/audio/astro-tdm-output/BUILD.gn
index a20f01646c7..4dca6d2cc5d 100644
--- a/zircon/system/dev/audio/astro-tdm-output/BUILD.gn
+++ b/zircon/system/dev/audio/astro-tdm-output/BUILD.gn
@@ -8,10 +8,10 @@ driver("astro-tdm-output") {
     "tas27xx.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-composite",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.composite",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/audio/lib/simple-audio-stream",
     "$zx/system/dev/lib/amlogic",
     "$zx/system/dev/lib/mmio",
diff --git a/zircon/system/dev/audio/gauss-pdm-input/BUILD.gn b/zircon/system/dev/audio/gauss-pdm-input/BUILD.gn
index 3996098923b..471fca438d2 100644
--- a/zircon/system/dev/audio/gauss-pdm-input/BUILD.gn
+++ b/zircon/system/dev/audio/gauss-pdm-input/BUILD.gn
@@ -12,7 +12,7 @@ driver("gauss-pdm-input") {
     "vmo_helper.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/fidl/fuchsia-hardware-audio:c",
     "$zx/system/ulib/audio-driver-proto",
     "$zx/system/ulib/audio-proto-utils",
diff --git a/zircon/system/dev/audio/gauss-tdm/BUILD.gn b/zircon/system/dev/audio/gauss-tdm/BUILD.gn
index ea3490ca5ee..c40366e0933 100644
--- a/zircon/system/dev/audio/gauss-tdm/BUILD.gn
+++ b/zircon/system/dev/audio/gauss-tdm/BUILD.gn
@@ -9,9 +9,9 @@ driver("gauss-tdm") {
     "tas57xx.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-composite",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.composite",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/lib/amlogic",
     "$zx/system/dev/lib/mmio",
     "$zx/system/fidl/fuchsia-hardware-audio:c",
diff --git a/zircon/system/dev/audio/intel-hda/codecs/qemu/BUILD.gn b/zircon/system/dev/audio/intel-hda/codecs/qemu/BUILD.gn
index 78250ff467b..b6e4aaaeb90 100644
--- a/zircon/system/dev/audio/intel-hda/codecs/qemu/BUILD.gn
+++ b/zircon/system/dev/audio/intel-hda/codecs/qemu/BUILD.gn
@@ -15,8 +15,8 @@ driver("qemu-audio") {
     "qemu-stream.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-intelhda-codec",
-    "$zx/system/banjo/ddk-protocol-pci",
+    "$zx/system/banjo/ddk.protocol.intelhda.codec",
+    "$zx/system/banjo/ddk.protocol.pci",
     "$zx/system/ulib/audio-driver-proto",
     "$zx/system/ulib/audio-proto-utils",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/audio/intel-hda/codecs/realtek/BUILD.gn b/zircon/system/dev/audio/intel-hda/codecs/realtek/BUILD.gn
index c6550e32d1d..87f044096c8 100644
--- a/zircon/system/dev/audio/intel-hda/codecs/realtek/BUILD.gn
+++ b/zircon/system/dev/audio/intel-hda/codecs/realtek/BUILD.gn
@@ -9,7 +9,7 @@ driver("realtek") {
     "realtek-stream.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-pci",
+    "$zx/system/banjo/ddk.protocol.pci",
     "$zx/system/ulib/audio-driver-proto",
     "$zx/system/ulib/audio-proto-utils",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/audio/intel-hda/controller/BUILD.gn b/zircon/system/dev/audio/intel-hda/controller/BUILD.gn
index 611be395b70..e51309b8ef4 100644
--- a/zircon/system/dev/audio/intel-hda/controller/BUILD.gn
+++ b/zircon/system/dev/audio/intel-hda/controller/BUILD.gn
@@ -35,8 +35,8 @@ driver("controller") {
     "utils.h",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-intelhda-codec",
-    "$zx/system/banjo/ddk-protocol-pci",
+    "$zx/system/banjo/ddk.protocol.intelhda.codec",
+    "$zx/system/banjo/ddk.protocol.pci",
     "$zx/system/fidl/fuchsia-hardware-intel-hda:c",
     "$zx/system/ulib/audio-driver-proto",
     "$zx/system/ulib/audio-proto-utils",
diff --git a/zircon/system/dev/audio/mt8167-tdm-input/BUILD.gn b/zircon/system/dev/audio/mt8167-tdm-input/BUILD.gn
index 944167e11b8..107130dd215 100644
--- a/zircon/system/dev/audio/mt8167-tdm-input/BUILD.gn
+++ b/zircon/system/dev/audio/mt8167-tdm-input/BUILD.gn
@@ -8,10 +8,10 @@ driver("mt8167-tdm-input") {
     "tlv320adc.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-composite",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.composite",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/audio/lib/simple-audio-stream",
     "$zx/system/dev/lib/mmio",
     "$zx/system/dev/lib/mt8167",
diff --git a/zircon/system/dev/audio/mt8167-tdm-output/BUILD.gn b/zircon/system/dev/audio/mt8167-tdm-output/BUILD.gn
index fbcf042e54d..d30cec8332d 100644
--- a/zircon/system/dev/audio/mt8167-tdm-output/BUILD.gn
+++ b/zircon/system/dev/audio/mt8167-tdm-output/BUILD.gn
@@ -9,10 +9,10 @@ driver("mt8167-tdm-output") {
     "tas5805.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-composite",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.composite",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/audio/lib/simple-audio-stream",
     "$zx/system/dev/lib/mmio",
     "$zx/system/dev/lib/mt8167",
diff --git a/zircon/system/dev/audio/sherlock-pdm-input/BUILD.gn b/zircon/system/dev/audio/sherlock-pdm-input/BUILD.gn
index 62b56a37183..62a82068b20 100644
--- a/zircon/system/dev/audio/sherlock-pdm-input/BUILD.gn
+++ b/zircon/system/dev/audio/sherlock-pdm-input/BUILD.gn
@@ -8,10 +8,10 @@ driver("sherlock-pdm-input") {
     "binding.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/audio/lib/simple-audio-stream",
     "$zx/system/dev/lib/amlogic",
     "$zx/system/dev/lib/mmio",
diff --git a/zircon/system/dev/audio/sherlock-tdm-output/BUILD.gn b/zircon/system/dev/audio/sherlock-tdm-output/BUILD.gn
index 8e7191ab5d7..bff7bfd7424 100644
--- a/zircon/system/dev/audio/sherlock-tdm-output/BUILD.gn
+++ b/zircon/system/dev/audio/sherlock-tdm-output/BUILD.gn
@@ -9,11 +9,11 @@ driver("sherlock-tdm-output") {
     "tas5760.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-composite",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.composite",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/audio/lib/codec-interface",
     "$zx/system/dev/audio/lib/simple-audio-stream",
     "$zx/system/dev/lib/amlogic",
diff --git a/zircon/system/dev/audio/usb-audio/BUILD.gn b/zircon/system/dev/audio/usb-audio/BUILD.gn
index f8bc101b4a9..04ca93ed687 100644
--- a/zircon/system/dev/audio/usb-audio/BUILD.gn
+++ b/zircon/system/dev/audio/usb-audio/BUILD.gn
@@ -17,9 +17,9 @@ driver("usb-audio") {
     "usb-midi-source.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-composite",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.composite",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/usb",
     "$zx/system/fidl/fuchsia-hardware-audio:c",
     "$zx/system/ulib/audio-driver-proto",
diff --git a/zircon/system/dev/backlight/sg-micro/BUILD.gn b/zircon/system/dev/backlight/sg-micro/BUILD.gn
index f3ce1a014d6..57a8cff77c4 100644
--- a/zircon/system/dev/backlight/sg-micro/BUILD.gn
+++ b/zircon/system/dev/backlight/sg-micro/BUILD.gn
@@ -7,9 +7,9 @@ driver("sg-micro") {
     "sgm37603a.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-composite",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
+    "$zx/system/banjo/ddk.protocol.composite",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
     "$zx/system/dev/lib/mmio",
     "$zx/system/fidl/fuchsia-hardware-backlight:c",
     "$zx/system/ulib/ddk",
@@ -30,7 +30,7 @@ test("sgm37603a-test") {
     "sgm37603a.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-composite",
+    "$zx/system/banjo/ddk.protocol.composite",
     "$zx/system/dev/lib/mock-i2c",
     "$zx/system/fidl/fuchsia-hardware-backlight:c",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/backlight/ti-lp8556/BUILD.gn b/zircon/system/dev/backlight/ti-lp8556/BUILD.gn
index b855728584c..e5e8799e4aa 100644
--- a/zircon/system/dev/backlight/ti-lp8556/BUILD.gn
+++ b/zircon/system/dev/backlight/ti-lp8556/BUILD.gn
@@ -7,9 +7,9 @@ driver("ti-lp8556") {
     "ti-lp8556.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/fidl/fuchsia-hardware-backlight:c",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/block/ahci/BUILD.gn b/zircon/system/dev/block/ahci/BUILD.gn
index 9d5bcfcb915..43e510b9b8a 100644
--- a/zircon/system/dev/block/ahci/BUILD.gn
+++ b/zircon/system/dev/block/ahci/BUILD.gn
@@ -8,8 +8,8 @@ driver("ahci") {
     "sata.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-block",
-    "$zx/system/banjo/ddk-protocol-pci",
+    "$zx/system/banjo/ddk.protocol.block",
+    "$zx/system/banjo/ddk.protocol.pci",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/pretty",
     "$zx/system/ulib/sync",
diff --git a/zircon/system/dev/block/aml-sd-emmc/BUILD.gn b/zircon/system/dev/block/aml-sd-emmc/BUILD.gn
index 0ed61270bc9..3470c2b348b 100644
--- a/zircon/system/dev/block/aml-sd-emmc/BUILD.gn
+++ b/zircon/system/dev/block/aml-sd-emmc/BUILD.gn
@@ -7,11 +7,11 @@ driver("aml-sd-emmc") {
     "aml-sd-emmc.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-block",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-sdmmc",
+    "$zx/system/banjo/ddk.protocol.block",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.sdmmc",
     "$zx/system/dev/lib/amlogic",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/block/bootpart/BUILD.gn b/zircon/system/dev/block/bootpart/BUILD.gn
index e783429fd00..c5ee354e36c 100644
--- a/zircon/system/dev/block/bootpart/BUILD.gn
+++ b/zircon/system/dev/block/bootpart/BUILD.gn
@@ -7,8 +7,8 @@ driver("bootpart") {
     "bootpart.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-block",
-    "$zx/system/banjo/ddk-protocol-block-partition",
+    "$zx/system/banjo/ddk.protocol.block",
+    "$zx/system/banjo/ddk.protocol.block.partition",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/sync",
     "$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/block/core/BUILD.gn b/zircon/system/dev/block/core/BUILD.gn
index 2f3c80aec6c..4e44a937d08 100644
--- a/zircon/system/dev/block/core/BUILD.gn
+++ b/zircon/system/dev/block/core/BUILD.gn
@@ -11,9 +11,9 @@ driver("core") {
     "txn-group.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-block",
-    "$zx/system/banjo/ddk-protocol-block-partition",
-    "$zx/system/banjo/ddk-protocol-block-volume",
+    "$zx/system/banjo/ddk.protocol.block",
+    "$zx/system/banjo/ddk.protocol.block.partition",
+    "$zx/system/banjo/ddk.protocol.block.volume",
     "$zx/system/fidl/fuchsia-hardware-block:c",
     "$zx/system/fidl/fuchsia-hardware-block-partition:c",
     "$zx/system/fidl/fuchsia-hardware-block-volume:c",
diff --git a/zircon/system/dev/block/ftl/BUILD.gn b/zircon/system/dev/block/ftl/BUILD.gn
index 6e1e03cb401..1ffe7fd08d0 100644
--- a/zircon/system/dev/block/ftl/BUILD.gn
+++ b/zircon/system/dev/block/ftl/BUILD.gn
@@ -24,10 +24,10 @@ source_set("common") {
     "oob_doubler.cpp",
   ]
   public_deps = [
-    "$zx/system/banjo/ddk-protocol-badblock",
-    "$zx/system/banjo/ddk-protocol-block",
-    "$zx/system/banjo/ddk-protocol-block-partition",
-    "$zx/system/banjo/ddk-protocol-nand",
+    "$zx/system/banjo/ddk.protocol.badblock",
+    "$zx/system/banjo/ddk.protocol.block",
+    "$zx/system/banjo/ddk.protocol.block.partition",
+    "$zx/system/banjo/ddk.protocol.nand",
     "$zx/system/fidl/fuchsia-hardware-block:c",
     "$zx/system/fidl/fuchsia-hardware-nand:c",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/block/fvm/BUILD.gn b/zircon/system/dev/block/fvm/BUILD.gn
index ca2ccc41183..0e8abd8ec48 100644
--- a/zircon/system/dev/block/fvm/BUILD.gn
+++ b/zircon/system/dev/block/fvm/BUILD.gn
@@ -18,9 +18,9 @@ source_set("shared") {
     "vpartition.cpp",
   ]
   public_deps = [
-    "$zx/system/banjo/ddk-protocol-block",
-    "$zx/system/banjo/ddk-protocol-block-partition",
-    "$zx/system/banjo/ddk-protocol-block-volume",
+    "$zx/system/banjo/ddk.protocol.block",
+    "$zx/system/banjo/ddk.protocol.block.partition",
+    "$zx/system/banjo/ddk.protocol.block.volume",
     "$zx/system/fidl/fuchsia-hardware-block:c",
     "$zx/system/fidl/fuchsia-hardware-block-partition:c",
     "$zx/system/fidl/fuchsia-hardware-block-volume:c",
diff --git a/zircon/system/dev/block/gpt/BUILD.gn b/zircon/system/dev/block/gpt/BUILD.gn
index 6f4026c1426..eec80ca09fb 100644
--- a/zircon/system/dev/block/gpt/BUILD.gn
+++ b/zircon/system/dev/block/gpt/BUILD.gn
@@ -7,8 +7,8 @@ driver("gpt") {
     "gpt.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-block",
-    "$zx/system/banjo/ddk-protocol-block-partition",
+    "$zx/system/banjo/ddk.protocol.block",
+    "$zx/system/banjo/ddk.protocol.block.partition",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/sync",
     "$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/block/hisi-ufs/BUILD.gn b/zircon/system/dev/block/hisi-ufs/BUILD.gn
index 4b7fddec28e..547a6c2f868 100644
--- a/zircon/system/dev/block/hisi-ufs/BUILD.gn
+++ b/zircon/system/dev/block/hisi-ufs/BUILD.gn
@@ -8,9 +8,9 @@ driver("hisi-ufs") {
     "ufs-common.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-block",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.block",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/zircon",
   ]
diff --git a/zircon/system/dev/block/mbr/BUILD.gn b/zircon/system/dev/block/mbr/BUILD.gn
index 5bc3b7c1107..0e7d3d1e797 100644
--- a/zircon/system/dev/block/mbr/BUILD.gn
+++ b/zircon/system/dev/block/mbr/BUILD.gn
@@ -7,8 +7,8 @@ driver("mbr") {
     "mbr.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-block",
-    "$zx/system/banjo/ddk-protocol-block-partition",
+    "$zx/system/banjo/ddk.protocol.block",
+    "$zx/system/banjo/ddk.protocol.block.partition",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/gpt",
     "$zx/system/ulib/sync",
diff --git a/zircon/system/dev/block/msm8x53-sdhci/BUILD.gn b/zircon/system/dev/block/msm8x53-sdhci/BUILD.gn
index 21d7e682e6d..09c2dc1c731 100644
--- a/zircon/system/dev/block/msm8x53-sdhci/BUILD.gn
+++ b/zircon/system/dev/block/msm8x53-sdhci/BUILD.gn
@@ -7,8 +7,8 @@ driver("msm8x53-sdhci") {
     "msm8x53-sdhci.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-sdhci",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.sdhci",
     "$zx/system/dev/lib/mmio",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/block/mtk-sdmmc/BUILD.gn b/zircon/system/dev/block/mtk-sdmmc/BUILD.gn
index a795102ea5b..c5f2b917241 100644
--- a/zircon/system/dev/block/mtk-sdmmc/BUILD.gn
+++ b/zircon/system/dev/block/mtk-sdmmc/BUILD.gn
@@ -7,11 +7,11 @@ driver("mtk-sdmmc") {
     "mtk-sdmmc.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-block",
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-sdmmc",
+    "$zx/system/banjo/ddk.protocol.block",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.sdmmc",
     "$zx/system/dev/lib/mmio",
     "$zx/system/dev/lib/mt8167",
     "$zx/system/ulib/ddk",
@@ -33,11 +33,11 @@ test("mtk-sdmmc-test") {
     "mtk-sdmmc.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-block",
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-sdmmc",
+    "$zx/system/banjo/ddk.protocol.block",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.sdmmc",
     "$zx/system/dev/lib/mock-mmio-reg",
     "$zx/system/dev/lib/mt8167",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/block/nvme/BUILD.gn b/zircon/system/dev/block/nvme/BUILD.gn
index 55a069f0efd..5b91d742903 100644
--- a/zircon/system/dev/block/nvme/BUILD.gn
+++ b/zircon/system/dev/block/nvme/BUILD.gn
@@ -7,8 +7,8 @@ driver("nvme") {
     "nvme.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-block",
-    "$zx/system/banjo/ddk-protocol-pci",
+    "$zx/system/banjo/ddk.protocol.block",
+    "$zx/system/banjo/ddk.protocol.pci",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/sync",
     "$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/block/pci-sdhci/BUILD.gn b/zircon/system/dev/block/pci-sdhci/BUILD.gn
index 89442cf33d1..af8cf611546 100644
--- a/zircon/system/dev/block/pci-sdhci/BUILD.gn
+++ b/zircon/system/dev/block/pci-sdhci/BUILD.gn
@@ -7,9 +7,9 @@ driver("pci-sdhci") {
     "pci-sdhci.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-block",
-    "$zx/system/banjo/ddk-protocol-pci",
-    "$zx/system/banjo/ddk-protocol-sdhci",
+    "$zx/system/banjo/ddk.protocol.block",
+    "$zx/system/banjo/ddk.protocol.pci",
+    "$zx/system/banjo/ddk.protocol.sdhci",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/sync",
     "$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/block/ramdisk/BUILD.gn b/zircon/system/dev/block/ramdisk/BUILD.gn
index 2c2095219eb..fc041e7da8d 100644
--- a/zircon/system/dev/block/ramdisk/BUILD.gn
+++ b/zircon/system/dev/block/ramdisk/BUILD.gn
@@ -8,8 +8,8 @@ driver("ramdisk") {
     "ramdisk.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-block",
-    "$zx/system/banjo/ddk-protocol-block-partition",
+    "$zx/system/banjo/ddk.protocol.block",
+    "$zx/system/banjo/ddk.protocol.block.partition",
     "$zx/system/dev/lib/operation",
     "$zx/system/fidl/fuchsia-hardware-ramdisk:c",
     "$zx/system/fidl/fuchsia-io:c",
diff --git a/zircon/system/dev/block/sdhci/BUILD.gn b/zircon/system/dev/block/sdhci/BUILD.gn
index 29a2638d0ac..877459d61b5 100644
--- a/zircon/system/dev/block/sdhci/BUILD.gn
+++ b/zircon/system/dev/block/sdhci/BUILD.gn
@@ -7,9 +7,9 @@ driver("sdhci") {
     "sdhci.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-block",
-    "$zx/system/banjo/ddk-protocol-sdhci",
-    "$zx/system/banjo/ddk-protocol-sdmmc",
+    "$zx/system/banjo/ddk.protocol.block",
+    "$zx/system/banjo/ddk.protocol.sdhci",
+    "$zx/system/banjo/ddk.protocol.sdmmc",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/pretty",
     "$zx/system/ulib/sync",
diff --git a/zircon/system/dev/block/sdmmc/BUILD.gn b/zircon/system/dev/block/sdmmc/BUILD.gn
index 957e038933b..fc236a2c067 100644
--- a/zircon/system/dev/block/sdmmc/BUILD.gn
+++ b/zircon/system/dev/block/sdmmc/BUILD.gn
@@ -12,10 +12,10 @@ driver("sdmmc") {
     "sdmmc-root-device.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-block",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-sdio",
-    "$zx/system/banjo/ddk-protocol-sdmmc",
+    "$zx/system/banjo/ddk.protocol.block",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.sdio",
+    "$zx/system/banjo/ddk.protocol.sdmmc",
     "$zx/system/dev/lib/operation",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/block/ums-function/BUILD.gn b/zircon/system/dev/block/ums-function/BUILD.gn
index d33efbc2b9d..cbaf2231437 100644
--- a/zircon/system/dev/block/ums-function/BUILD.gn
+++ b/zircon/system/dev/block/ums-function/BUILD.gn
@@ -7,10 +7,10 @@ driver("ums-function") {
     "ums-function.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-block",
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-function",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.block",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.function",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/usb",
     "$zx/system/fidl/fuchsia-hardware-usb-peripheral-block:c",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/block/usb-mass-storage/BUILD.gn b/zircon/system/dev/block/usb-mass-storage/BUILD.gn
index ef5d293523e..1e76d83125f 100644
--- a/zircon/system/dev/block/usb-mass-storage/BUILD.gn
+++ b/zircon/system/dev/block/usb-mass-storage/BUILD.gn
@@ -17,10 +17,10 @@ source_set("block") {
     "block.cpp",
   ]
   public_deps = [
-    "$zx/system/banjo/ddk-protocol-block",
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-composite",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.block",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.composite",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/usb",
     "$zx/system/fidl/fuchsia-hardware-usb-virtual-bus:c",
     "$zx/system/ulib/async-loop",
diff --git a/zircon/system/dev/block/zxcrypt/BUILD.gn b/zircon/system/dev/block/zxcrypt/BUILD.gn
index c74f6fedec9..50b5d08ab23 100644
--- a/zircon/system/dev/block/zxcrypt/BUILD.gn
+++ b/zircon/system/dev/block/zxcrypt/BUILD.gn
@@ -13,9 +13,9 @@ driver("zxcrypt") {
   ]
   configs += [ "$zx/public/gn/config:integer-paranoia" ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-block",
-    "$zx/system/banjo/ddk-protocol-block-partition",
-    "$zx/system/banjo/ddk-protocol-block-volume",
+    "$zx/system/banjo/ddk.protocol.block",
+    "$zx/system/banjo/ddk.protocol.block.partition",
+    "$zx/system/banjo/ddk.protocol.block.volume",
     "$zx/system/fidl/fuchsia-hardware-zxcrypt:c",
     "$zx/system/ulib/bitmap",
     "$zx/system/ulib/crypto",
diff --git a/zircon/system/dev/bluetooth/bt-hci-broadcom/BUILD.gn b/zircon/system/dev/bluetooth/bt-hci-broadcom/BUILD.gn
index dc2a9e71316..f32dba42938 100644
--- a/zircon/system/dev/bluetooth/bt-hci-broadcom/BUILD.gn
+++ b/zircon/system/dev/bluetooth/bt-hci-broadcom/BUILD.gn
@@ -9,8 +9,8 @@ driver("bt-hci-broadcom") {
     "bt-hci-broadcom.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-bt-hci",
-    "$zx/system/banjo/ddk-protocol-serial",
+    "$zx/system/banjo/ddk.protocol.bt.hci",
+    "$zx/system/banjo/ddk.protocol.serial",
     "$zx/system/fidl/fuchsia-hardware-bluetooth:c",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/fidl",
diff --git a/zircon/system/dev/bluetooth/bt-hci-mediatek/BUILD.gn b/zircon/system/dev/bluetooth/bt-hci-mediatek/BUILD.gn
index 6d0a6a8f58f..c7d4538671c 100644
--- a/zircon/system/dev/bluetooth/bt-hci-mediatek/BUILD.gn
+++ b/zircon/system/dev/bluetooth/bt-hci-mediatek/BUILD.gn
@@ -9,8 +9,8 @@ driver("bt-hci-mediatek") {
     "bt-hci-mediatek.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-bt-hci",
-    "$zx/system/banjo/ddk-protocol-sdio",
+    "$zx/system/banjo/ddk.protocol.bt.hci",
+    "$zx/system/banjo/ddk.protocol.sdio",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
@@ -38,8 +38,8 @@ test("bt-hci-mediatek-test") {
     "bt-hci-mediatek.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-bt-hci",
-    "$zx/system/banjo/ddk-protocol-sdio",
+    "$zx/system/banjo/ddk.protocol.bt.hci",
+    "$zx/system/banjo/ddk.protocol.sdio",
     "$zx/system/dev/lib/mock-sdio",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/bluetooth/bt-transport-uart/BUILD.gn b/zircon/system/dev/bluetooth/bt-transport-uart/BUILD.gn
index 63c490693aa..55aeecd6b59 100644
--- a/zircon/system/dev/bluetooth/bt-transport-uart/BUILD.gn
+++ b/zircon/system/dev/bluetooth/bt-transport-uart/BUILD.gn
@@ -7,8 +7,8 @@ driver("bt-transport-uart") {
     "bt-transport-uart.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-bt-hci",
-    "$zx/system/banjo/ddk-protocol-serial",
+    "$zx/system/banjo/ddk.protocol.bt.hci",
+    "$zx/system/banjo/ddk.protocol.serial",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/sync",
     "$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/bluetooth/bt-transport-usb/BUILD.gn b/zircon/system/dev/bluetooth/bt-transport-usb/BUILD.gn
index 74f77e7f7d6..0e128aed9ab 100644
--- a/zircon/system/dev/bluetooth/bt-transport-usb/BUILD.gn
+++ b/zircon/system/dev/bluetooth/bt-transport-usb/BUILD.gn
@@ -7,10 +7,10 @@ driver("bt-transport-usb") {
     "bt-transport-usb.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-bt-hci",
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-composite",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.bt.hci",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.composite",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/usb",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/sync",
diff --git a/zircon/system/dev/board/astro/BUILD.gn b/zircon/system/dev/board/astro/BUILD.gn
index 9b2c427e7b0..de7eb78f2d0 100644
--- a/zircon/system/dev/board/astro/BUILD.gn
+++ b/zircon/system/dev/board/astro/BUILD.gn
@@ -24,13 +24,13 @@ driver("astro") {
     "astro.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-gpioimpl",
-    "$zx/system/banjo/ddk-protocol-iommu",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-scpi",
-    "$zx/system/banjo/ddk-protocol-serial",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.gpioimpl",
+    "$zx/system/banjo/ddk.protocol.iommu",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.scpi",
+    "$zx/system/banjo/ddk.protocol.serial",
     "$zx/system/dev/lib/amlogic",
     "$zx/system/dev/lib/broadcom",
     "$zx/system/dev/lib/focaltech",
diff --git a/zircon/system/dev/board/gauss/BUILD.gn b/zircon/system/dev/board/gauss/BUILD.gn
index 0f0f7eb1d4a..526dc60ab4b 100644
--- a/zircon/system/dev/board/gauss/BUILD.gn
+++ b/zircon/system/dev/board/gauss/BUILD.gn
@@ -15,11 +15,11 @@ driver("gauss") {
     "gauss.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-gpioimpl",
-    "$zx/system/banjo/ddk-protocol-iommu",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.gpioimpl",
+    "$zx/system/banjo/ddk.protocol.iommu",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/lib/amlogic",
     "$zx/system/dev/pci/designware",
     "$zx/system/ulib/ddk",
@@ -36,8 +36,8 @@ driver("gauss-i2c-test") {
     "gauss-i2c-test.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/sync",
     "$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/board/hikey960/BUILD.gn b/zircon/system/dev/board/hikey960/BUILD.gn
index 993f701352c..39d6648fa23 100644
--- a/zircon/system/dev/board/hikey960/BUILD.gn
+++ b/zircon/system/dev/board/hikey960/BUILD.gn
@@ -14,13 +14,13 @@ driver("hikey960") {
     "hikey960.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-gpioimpl",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-iommu",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-usb-modeswitch",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.gpioimpl",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.iommu",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.usb.modeswitch",
     "$zx/system/dev/lib/hi3660",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/sync",
@@ -38,8 +38,8 @@ driver("hi3660-i2c-test") {
     "hikey960-i2c-test.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/sync",
     "$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/board/integration-test/BUILD.gn b/zircon/system/dev/board/integration-test/BUILD.gn
index 40b7743f50b..1ef1a7fbfee 100644
--- a/zircon/system/dev/board/integration-test/BUILD.gn
+++ b/zircon/system/dev/board/integration-test/BUILD.gn
@@ -8,8 +8,8 @@ driver("integration-test") {
     "test.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/board/machina/BUILD.gn b/zircon/system/dev/board/machina/BUILD.gn
index 5ef6f3ceb60..85bea361e15 100644
--- a/zircon/system/dev/board/machina/BUILD.gn
+++ b/zircon/system/dev/board/machina/BUILD.gn
@@ -8,8 +8,8 @@ driver("machina") {
     "machina.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/zircon",
   ]
diff --git a/zircon/system/dev/board/msm8x53-som/BUILD.gn b/zircon/system/dev/board/msm8x53-som/BUILD.gn
index 903fe520811..27de5c1f31d 100644
--- a/zircon/system/dev/board/msm8x53-som/BUILD.gn
+++ b/zircon/system/dev/board/msm8x53-som/BUILD.gn
@@ -12,7 +12,7 @@ driver("msm8x53-som") {
     "msm8x53.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-platform-bus",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
     "$zx/system/dev/lib/msm8x53",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/board/mt8167s_ref/BUILD.gn b/zircon/system/dev/board/mt8167s_ref/BUILD.gn
index 669db5a601f..1961ef3b550 100644
--- a/zircon/system/dev/board/mt8167s_ref/BUILD.gn
+++ b/zircon/system/dev/board/mt8167s_ref/BUILD.gn
@@ -23,12 +23,12 @@ driver("mt8167s_ref") {
     "mt8167.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-clockimpl",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-gpioimpl",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-scpi",
+    "$zx/system/banjo/ddk.protocol.clockimpl",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.gpioimpl",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.scpi",
     "$zx/system/dev/lib/focaltech",
     "$zx/system/dev/lib/mmio",
     "$zx/system/dev/lib/mt8167",
diff --git a/zircon/system/dev/board/qemu/BUILD.gn b/zircon/system/dev/board/qemu/BUILD.gn
index eae72c86977..6ef24f1363b 100644
--- a/zircon/system/dev/board/qemu/BUILD.gn
+++ b/zircon/system/dev/board/qemu/BUILD.gn
@@ -8,8 +8,8 @@ driver("qemu") {
     "qemu-sysmem.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/zircon",
   ]
diff --git a/zircon/system/dev/board/sherlock/BUILD.gn b/zircon/system/dev/board/sherlock/BUILD.gn
index 307ed522917..e8f8dcdfbbe 100644
--- a/zircon/system/dev/board/sherlock/BUILD.gn
+++ b/zircon/system/dev/board/sherlock/BUILD.gn
@@ -26,15 +26,15 @@ driver("sherlock") {
     "sherlock.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-gpioimpl",
-    "$zx/system/banjo/ddk-protocol-clockimpl",
-    "$zx/system/banjo/ddk-protocol-iommu",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-scpi",
-    "$zx/system/banjo/ddk-protocol-serial",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.clockimpl",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.gpioimpl",
+    "$zx/system/banjo/ddk.protocol.iommu",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.scpi",
+    "$zx/system/banjo/ddk.protocol.serial",
     "$zx/system/dev/lib/amlogic",
     "$zx/system/dev/lib/broadcom",
     "$zx/system/dev/lib/focaltech",
diff --git a/zircon/system/dev/board/test/BUILD.gn b/zircon/system/dev/board/test/BUILD.gn
index 3fa7c5b70cd..8e26f16ad25 100644
--- a/zircon/system/dev/board/test/BUILD.gn
+++ b/zircon/system/dev/board/test/BUILD.gn
@@ -35,8 +35,8 @@ driver("test-board") {
     "test.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
@@ -50,10 +50,10 @@ driver("test-gpio") {
     "test/gpio.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-gpioimpl",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.gpioimpl",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
@@ -68,10 +68,10 @@ driver("test-power") {
     "test/power.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-power",
-    "$zx/system/banjo/ddk-protocol-powerimpl",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.power",
+    "$zx/system/banjo/ddk.protocol.powerimpl",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
@@ -86,10 +86,10 @@ driver("test-clock") {
     "test/clock.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-clockimpl",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.clockimpl",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
@@ -104,10 +104,10 @@ driver("test-i2c") {
     "test/i2c.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-i2cimpl",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.i2cimpl",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
@@ -123,11 +123,11 @@ foreach(driver, simple_drivers) {
       "test/$driver.c",
     ]
     deps = [
-      "$zx/system/banjo/ddk-protocol-clock",
-      "$zx/system/banjo/ddk-protocol-composite",
-      "$zx/system/banjo/ddk-protocol-gpio",
-      "$zx/system/banjo/ddk-protocol-platform-device",
-      "$zx/system/banjo/ddk-protocol-power",
+      "$zx/system/banjo/ddk.protocol.clock",
+      "$zx/system/banjo/ddk.protocol.composite",
+      "$zx/system/banjo/ddk.protocol.gpio",
+      "$zx/system/banjo/ddk.protocol.platform.device",
+      "$zx/system/banjo/ddk.protocol.power",
       "$zx/system/ulib/ddk",
       "$zx/system/ulib/sync",
       "$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/board/vim/BUILD.gn b/zircon/system/dev/board/vim/BUILD.gn
index 471a1fc9531..c41be7468f9 100644
--- a/zircon/system/dev/board/vim/BUILD.gn
+++ b/zircon/system/dev/board/vim/BUILD.gn
@@ -22,14 +22,14 @@ driver("vim") {
     "vim.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-ethernet",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-gpioimpl",
-    "$zx/system/banjo/ddk-protocol-iommu",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-scpi",
-    "$zx/system/banjo/ddk-protocol-serial",
+    "$zx/system/banjo/ddk.protocol.ethernet",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.gpioimpl",
+    "$zx/system/banjo/ddk.protocol.iommu",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.scpi",
+    "$zx/system/banjo/ddk.protocol.serial",
     "$zx/system/dev/lib/amlogic",
     "$zx/system/dev/lib/broadcom",
     "$zx/system/dev/lib/mmio",
diff --git a/zircon/system/dev/board/x86/BUILD.gn b/zircon/system/dev/board/x86/BUILD.gn
index 3174d099a3f..b107837c999 100644
--- a/zircon/system/dev/board/x86/BUILD.gn
+++ b/zircon/system/dev/board/x86/BUILD.gn
@@ -61,13 +61,13 @@ driver("platform-bus-x86") {
   }
   configs += [ ":config" ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-acpi",
-    "$zx/system/banjo/ddk-protocol-hidbus",
-    "$zx/system/banjo/ddk-protocol-pciroot",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-scpi",
-    "$zx/system/banjo/ddk-protocol-sysmem",
+    "$zx/system/banjo/ddk.protocol.acpi",
+    "$zx/system/banjo/ddk.protocol.hidbus",
+    "$zx/system/banjo/ddk.protocol.pciroot",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.scpi",
+    "$zx/system/banjo/ddk.protocol.sysmem",
     "$zx/system/fidl/fuchsia-hardware-power:c",
     "$zx/system/fidl/fuchsia-hardware-thermal:c",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/bus/pci/BUILD.gn b/zircon/system/dev/bus/pci/BUILD.gn
index fb8232389e4..1bd5d45c3f8 100644
--- a/zircon/system/dev/bus/pci/BUILD.gn
+++ b/zircon/system/dev/bus/pci/BUILD.gn
@@ -27,8 +27,8 @@ source_set("user_pci") {
     "upstream_node.cpp",
   ]
   public_deps = [
-    "$zx/system/banjo/ddk-protocol-pci",
-    "$zx/system/banjo/ddk-protocol-pciroot",
+    "$zx/system/banjo/ddk.protocol.pci",
+    "$zx/system/banjo/ddk.protocol.pciroot",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
@@ -53,10 +53,10 @@ driver("bus-pci") {
       "kpci/kpci.c",
     ]
     deps = [
-      "$zx/system/banjo/ddk-protocol-pci",
-      "$zx/system/banjo/ddk-protocol-pciroot",
-      "$zx/system/banjo/ddk-protocol-platform-device",
-      "$zx/system/banjo/ddk-protocol-sysmem",
+      "$zx/system/banjo/ddk.protocol.pci",
+      "$zx/system/banjo/ddk.protocol.pciroot",
+      "$zx/system/banjo/ddk.protocol.platform.device",
+      "$zx/system/banjo/ddk.protocol.sysmem",
       "$zx/system/ulib/ddk",
       "$zx/system/ulib/zircon",
     ]
@@ -68,10 +68,10 @@ driver("bus-pci.proxy") {
     "kpci/proxy.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-pci",
-    "$zx/system/banjo/ddk-protocol-pciroot",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-sysmem",
+    "$zx/system/banjo/ddk.protocol.pci",
+    "$zx/system/banjo/ddk.protocol.pciroot",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.sysmem",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/zircon",
   ]
diff --git a/zircon/system/dev/bus/platform/BUILD.gn b/zircon/system/dev/bus/platform/BUILD.gn
index 07b6f392d34..b0c88c08941 100644
--- a/zircon/system/dev/bus/platform/BUILD.gn
+++ b/zircon/system/dev/bus/platform/BUILD.gn
@@ -20,18 +20,18 @@ driver("platform-bus") {
     "platform-protocol-device.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-amlogiccanvas",
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-clockimpl",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-gpioimpl",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-i2cimpl",
-    "$zx/system/banjo/ddk-protocol-iommu",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-powerimpl",
-    "$zx/system/banjo/ddk-protocol-sysmem",
+    "$zx/system/banjo/ddk.protocol.amlogiccanvas",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.clockimpl",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.gpioimpl",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.i2cimpl",
+    "$zx/system/banjo/ddk.protocol.iommu",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.powerimpl",
+    "$zx/system/banjo/ddk.protocol.sysmem",
     "$zx/system/fidl/fuchsia-boot:c",
     "$zx/system/fidl/fuchsia-sysinfo:c",
     "$zx/system/ulib/ddk",
@@ -51,15 +51,15 @@ driver("platform-bus.proxy") {
     "platform-proxy.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-amlogiccanvas",
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-gpioimpl",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-i2cimpl",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-sysmem",
+    "$zx/system/banjo/ddk.protocol.amlogiccanvas",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.gpioimpl",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.i2cimpl",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.sysmem",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/bus/virtio/BUILD.gn b/zircon/system/dev/bus/virtio/BUILD.gn
index aa00b5e6f9e..b00cb469fc2 100644
--- a/zircon/system/dev/bus/virtio/BUILD.gn
+++ b/zircon/system/dev/bus/virtio/BUILD.gn
@@ -20,9 +20,9 @@ driver("virtio") {
   ]
   deps = [
     ":common",
-    "$zx/system/banjo/ddk-protocol-display-controller",
-    "$zx/system/banjo/ddk-protocol-ethernet",
-    "$zx/system/banjo/ddk-protocol-hidbus",
+    "$zx/system/banjo/ddk.protocol.display.controller",
+    "$zx/system/banjo/ddk.protocol.ethernet",
+    "$zx/system/banjo/ddk.protocol.hidbus",
     "$zx/system/fidl/fuchsia-hardware-pty:c",
     "$zx/system/fidl/fuchsia-hardware-vsock:c",
     "$zx/system/ulib/hid",
@@ -37,8 +37,8 @@ source_set("common") {
     "scsi.cpp",
   ]
   public_deps = [
-    "$zx/system/banjo/ddk-protocol-block",
-    "$zx/system/banjo/ddk-protocol-pci",
+    "$zx/system/banjo/ddk.protocol.block",
+    "$zx/system/banjo/ddk.protocol.pci",
     "$zx/system/dev/lib/mmio",
     "$zx/system/dev/lib/scsi",
     "$zx/system/ulib/async:async-cpp",
diff --git a/zircon/system/dev/camera/aml-mipicsi/BUILD.gn b/zircon/system/dev/camera/aml-mipicsi/BUILD.gn
index 440fcbe6c7a..3c18369587d 100644
--- a/zircon/system/dev/camera/aml-mipicsi/BUILD.gn
+++ b/zircon/system/dev/camera/aml-mipicsi/BUILD.gn
@@ -9,12 +9,12 @@ driver("aml-mipicsi") {
     "aml-mipi.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-mipicsi",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.mipicsi",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/lib/amlogic",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/camera/arm-isp/BUILD.gn b/zircon/system/dev/camera/arm-isp/BUILD.gn
index 0728b21695b..f28abeb56fe 100644
--- a/zircon/system/dev/camera/arm-isp/BUILD.gn
+++ b/zircon/system/dev/camera/arm-isp/BUILD.gn
@@ -12,15 +12,15 @@ driver("arm-isp") {
     "stats-mgr.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-camerasensor",
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-composite",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-mipicsi",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-sysmem",
+    "$zx/system/banjo/ddk.protocol.camerasensor",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.composite",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.mipicsi",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.sysmem",
     "$zx/system/dev/lib/mmio",
     "$zx/system/fidl/fuchsia-hardware-camera:c",
     "$zx/system/fidl/fuchsia-sysmem:c",
diff --git a/zircon/system/dev/camera/imx227/BUILD.gn b/zircon/system/dev/camera/imx227/BUILD.gn
index ae8c46b111f..f87b1cf8f72 100644
--- a/zircon/system/dev/camera/imx227/BUILD.gn
+++ b/zircon/system/dev/camera/imx227/BUILD.gn
@@ -7,13 +7,13 @@ driver("imx227") {
     "imx227.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-composite",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-mipicsi",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.composite",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.mipicsi",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/lib/mmio",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/clk/amlogic-clk/BUILD.gn b/zircon/system/dev/clk/amlogic-clk/BUILD.gn
index dd295d8849b..0d48722ea5a 100644
--- a/zircon/system/dev/clk/amlogic-clk/BUILD.gn
+++ b/zircon/system/dev/clk/amlogic-clk/BUILD.gn
@@ -7,9 +7,9 @@ driver("amlogic-clk") {
     "aml-clk.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-clockimpl",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.clockimpl",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/lib/amlogic",
     "$zx/system/dev/lib/mmio",
     "$zx/system/fidl/fuchsia-hardware-clock:c",
diff --git a/zircon/system/dev/clk/clock/BUILD.gn b/zircon/system/dev/clk/clock/BUILD.gn
index f0d65df2232..10eb46f356f 100644
--- a/zircon/system/dev/clk/clock/BUILD.gn
+++ b/zircon/system/dev/clk/clock/BUILD.gn
@@ -7,8 +7,8 @@ driver("clock") {
     "clock.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-clockimpl",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.clockimpl",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/clk/hisi-lib/BUILD.gn b/zircon/system/dev/clk/hisi-lib/BUILD.gn
index 0de25ed3a9e..7d290e69a9e 100644
--- a/zircon/system/dev/clk/hisi-lib/BUILD.gn
+++ b/zircon/system/dev/clk/hisi-lib/BUILD.gn
@@ -12,9 +12,9 @@ library("hisi-lib") {
     "hisi-clk.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-clockimpl",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.clockimpl",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/driver",
diff --git a/zircon/system/dev/clk/hisi3660/BUILD.gn b/zircon/system/dev/clk/hisi3660/BUILD.gn
index 656a69f940f..0d8faad2327 100644
--- a/zircon/system/dev/clk/hisi3660/BUILD.gn
+++ b/zircon/system/dev/clk/hisi3660/BUILD.gn
@@ -7,9 +7,9 @@ driver("hisi3660") {
     "hisi3660-clk.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-clockimpl",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.clockimpl",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/clk/hisi-lib",
     "$zx/system/dev/lib/hi3660",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/clk/msm8x53-clk/BUILD.gn b/zircon/system/dev/clk/msm8x53-clk/BUILD.gn
index 9e9113f2f19..e4cf2109a0d 100644
--- a/zircon/system/dev/clk/msm8x53-clk/BUILD.gn
+++ b/zircon/system/dev/clk/msm8x53-clk/BUILD.gn
@@ -7,12 +7,12 @@ driver("msm8x53-clk") {
     "msm8x53-clk.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-clockimpl",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.clockimpl",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/lib/mmio",
     "$zx/system/dev/lib/msm8x53",
     "$zx/system/fidl/fuchsia-hardware-clock:c",
diff --git a/zircon/system/dev/clk/mtk-clk/BUILD.gn b/zircon/system/dev/clk/mtk-clk/BUILD.gn
index e4a8dd866a3..1aebfc29660 100644
--- a/zircon/system/dev/clk/mtk-clk/BUILD.gn
+++ b/zircon/system/dev/clk/mtk-clk/BUILD.gn
@@ -7,11 +7,11 @@ driver("mtk-clk") {
     "mtk-clk.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-clockimpl",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.clockimpl",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/lib/mmio",
     "$zx/system/dev/lib/mt8167",
     "$zx/system/fidl/fuchsia-hardware-clock:c",
diff --git a/zircon/system/dev/codec/alc5514/BUILD.gn b/zircon/system/dev/codec/alc5514/BUILD.gn
index 281cd2b0e0b..e5f5a0d4ae3 100644
--- a/zircon/system/dev/codec/alc5514/BUILD.gn
+++ b/zircon/system/dev/codec/alc5514/BUILD.gn
@@ -8,8 +8,8 @@ driver("alc5514") {
     "binding.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-pci",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.pci",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/codec/max98927/BUILD.gn b/zircon/system/dev/codec/max98927/BUILD.gn
index 024cef4ad0c..a51a80a4d16 100644
--- a/zircon/system/dev/codec/max98927/BUILD.gn
+++ b/zircon/system/dev/codec/max98927/BUILD.gn
@@ -8,8 +8,8 @@ driver("max98927") {
     "max98927.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-pci",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.pci",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/display/aml-canvas/BUILD.gn b/zircon/system/dev/display/aml-canvas/BUILD.gn
index af810269aa7..35b0f977612 100644
--- a/zircon/system/dev/display/aml-canvas/BUILD.gn
+++ b/zircon/system/dev/display/aml-canvas/BUILD.gn
@@ -7,9 +7,9 @@ driver("aml-canvas") {
     "aml-canvas.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-amlogiccanvas",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.amlogiccanvas",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/zircon",
   ]
diff --git a/zircon/system/dev/display/astro-display/BUILD.gn b/zircon/system/dev/display/astro-display/BUILD.gn
index a7f56587d51..a72b1713c7a 100644
--- a/zircon/system/dev/display/astro-display/BUILD.gn
+++ b/zircon/system/dev/display/astro-display/BUILD.gn
@@ -13,14 +13,14 @@ driver("astro-display") {
     "vpu.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-amlogiccanvas",
-    "$zx/system/banjo/ddk-protocol-composite",
-    "$zx/system/banjo/ddk-protocol-display-controller",
-    "$zx/system/banjo/ddk-protocol-dsiimpl",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-sysmem",
+    "$zx/system/banjo/ddk.protocol.amlogiccanvas",
+    "$zx/system/banjo/ddk.protocol.composite",
+    "$zx/system/banjo/ddk.protocol.display.controller",
+    "$zx/system/banjo/ddk.protocol.dsiimpl",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.sysmem",
     "$zx/system/dev/lib/mmio",
     "$zx/system/fidl/fuchsia-sysmem:c",
     "$zx/system/ulib/bitmap",
diff --git a/zircon/system/dev/display/display/BUILD.gn b/zircon/system/dev/display/display/BUILD.gn
index 5417b8a7b02..7977819c443 100644
--- a/zircon/system/dev/display/display/BUILD.gn
+++ b/zircon/system/dev/display/display/BUILD.gn
@@ -10,8 +10,8 @@ driver("display") {
     "image.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-display-controller",
-    "$zx/system/banjo/ddk-protocol-i2cimpl",
+    "$zx/system/banjo/ddk.protocol.display.controller",
+    "$zx/system/banjo/ddk.protocol.i2cimpl",
     "$zx/system/dev/lib/mmio",
     "$zx/system/fidl/fuchsia-hardware-display:c",
     "$zx/system/fidl/fuchsia-sysmem:c",
diff --git a/zircon/system/dev/display/dsi-dw/BUILD.gn b/zircon/system/dev/display/dsi-dw/BUILD.gn
index 59ddfa5ebc5..bff2715180c 100644
--- a/zircon/system/dev/display/dsi-dw/BUILD.gn
+++ b/zircon/system/dev/display/dsi-dw/BUILD.gn
@@ -7,12 +7,12 @@ driver("dsi-dw") {
     "dsi-dw.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-dsiimpl",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-sysmem",
+    "$zx/system/banjo/ddk.protocol.dsiimpl",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.sysmem",
     "$zx/system/dev/lib/mmio",
     "$zx/system/fidl/fuchsia-sysmem:c",
     "$zx/system/ulib/bitmap",
diff --git a/zircon/system/dev/display/dsi-mt/BUILD.gn b/zircon/system/dev/display/dsi-mt/BUILD.gn
index 5eda88090f0..890bc923ffd 100644
--- a/zircon/system/dev/display/dsi-mt/BUILD.gn
+++ b/zircon/system/dev/display/dsi-mt/BUILD.gn
@@ -7,12 +7,12 @@ driver("dsi-mt") {
     "dsi-mt.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-dsiimpl",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-sysmem",
+    "$zx/system/banjo/ddk.protocol.dsiimpl",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.sysmem",
     "$zx/system/dev/lib/mmio",
     "$zx/system/fidl/fuchsia-sysmem:c",
     "$zx/system/ulib/bitmap",
diff --git a/zircon/system/dev/display/dummy/BUILD.gn b/zircon/system/dev/display/dummy/BUILD.gn
index ef75300fa6b..fe4006e7407 100644
--- a/zircon/system/dev/display/dummy/BUILD.gn
+++ b/zircon/system/dev/display/dummy/BUILD.gn
@@ -7,8 +7,8 @@ driver("dummy") {
     "dummy-display.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-display-controller",
-    "$zx/system/banjo/ddk-protocol-sysmem",
+    "$zx/system/banjo/ddk.protocol.display.controller",
+    "$zx/system/banjo/ddk.protocol.sysmem",
     "$zx/system/fidl/fuchsia-sysmem:c",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/display/hikey-display/BUILD.gn b/zircon/system/dev/display/hikey-display/BUILD.gn
index 3b450c59347..c2c83cb445f 100644
--- a/zircon/system/dev/display/hikey-display/BUILD.gn
+++ b/zircon/system/dev/display/hikey-display/BUILD.gn
@@ -4,30 +4,30 @@
 
 driver("hikey-display") {
   sources = [
-    "ddk-interface.cpp",
-    "hi3660-dsi.cpp",
     "adv7533.cpp",
+    "ddk-interface.cpp",
     "edid.cpp",
+    "hi3660-dsi.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-display-controller",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-dsiimpl",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-sysmem",
+    "$zx/system/banjo/ddk.protocol.display.controller",
+    "$zx/system/banjo/ddk.protocol.dsiimpl",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.sysmem",
+    "$zx/system/dev/lib/mmio",
     "$zx/system/fidl/fuchsia-sysmem:c",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
+    "$zx/system/ulib/edid",
     "$zx/system/ulib/fbl",
+    "$zx/system/ulib/hwreg",
+    "$zx/system/ulib/mipi-dsi",
     "$zx/system/ulib/pretty",
     "$zx/system/ulib/sync",
     "$zx/system/ulib/zircon",
     "$zx/system/ulib/zx",
     "$zx/system/ulib/zxcpp",
-    "$zx/system/ulib/hwreg",
-    "$zx/system/dev/lib/mmio",
-    "$zx/system/ulib/mipi-dsi",
-    "$zx/system/ulib/edid",
   ]
 }
diff --git a/zircon/system/dev/display/intel-i915/BUILD.gn b/zircon/system/dev/display/intel-i915/BUILD.gn
index 248b32c4cd2..03823e67208 100644
--- a/zircon/system/dev/display/intel-i915/BUILD.gn
+++ b/zircon/system/dev/display/intel-i915/BUILD.gn
@@ -17,11 +17,11 @@ driver("intel-i915") {
     "power.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-display-controller",
-    "$zx/system/banjo/ddk-protocol-i2cimpl",
-    "$zx/system/banjo/ddk-protocol-intelgpucore",
-    "$zx/system/banjo/ddk-protocol-pci",
-    "$zx/system/banjo/ddk-protocol-sysmem",
+    "$zx/system/banjo/ddk.protocol.display.controller",
+    "$zx/system/banjo/ddk.protocol.i2cimpl",
+    "$zx/system/banjo/ddk.protocol.intelgpucore",
+    "$zx/system/banjo/ddk.protocol.pci",
+    "$zx/system/banjo/ddk.protocol.sysmem",
     "$zx/system/dev/lib/mmio",
     "$zx/system/fidl/fuchsia-hardware-backlight:c",
     "$zx/system/fidl/fuchsia-sysmem:c",
diff --git a/zircon/system/dev/display/led2472g/BUILD.gn b/zircon/system/dev/display/led2472g/BUILD.gn
index 95904131c59..c60024f6afa 100644
--- a/zircon/system/dev/display/led2472g/BUILD.gn
+++ b/zircon/system/dev/display/led2472g/BUILD.gn
@@ -13,7 +13,7 @@ driver("vim-led2472g") {
     "led2472g.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-i2c",
+    "$zx/system/banjo/ddk.protocol.i2c",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/sync",
     "$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/display/mt8167s-display/BUILD.gn b/zircon/system/dev/display/mt8167s-display/BUILD.gn
index 6e065c3523e..4a94081484c 100644
--- a/zircon/system/dev/display/mt8167s-display/BUILD.gn
+++ b/zircon/system/dev/display/mt8167s-display/BUILD.gn
@@ -17,11 +17,11 @@ driver("mt8167s-display") {
     "ovl.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-composite",
-    "$zx/system/banjo/ddk-protocol-display-controller",
-    "$zx/system/banjo/ddk-protocol-dsiimpl",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-sysmem",
+    "$zx/system/banjo/ddk.protocol.composite",
+    "$zx/system/banjo/ddk.protocol.display.controller",
+    "$zx/system/banjo/ddk.protocol.dsiimpl",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.sysmem",
     "$zx/system/dev/lib/mmio",
     "$zx/system/fidl/fuchsia-sysmem:c",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/display/simple/BUILD.gn b/zircon/system/dev/display/simple/BUILD.gn
index 0ef44145115..8c0e5bbcdd8 100644
--- a/zircon/system/dev/display/simple/BUILD.gn
+++ b/zircon/system/dev/display/simple/BUILD.gn
@@ -8,8 +8,8 @@ source_set("shared") {
     "simple-display.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-display-controller",
-    "$zx/system/banjo/ddk-protocol-pci",
+    "$zx/system/banjo/ddk.protocol.display.controller",
+    "$zx/system/banjo/ddk.protocol.pci",
     "$zx/system/dev/lib/mmio",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
@@ -37,8 +37,8 @@ foreach(driver, simple_drivers) {
     ]
     deps = [
       ":shared",
-      "$zx/system/banjo/ddk-protocol-display-controller",
-      "$zx/system/banjo/ddk-protocol-pci",
+      "$zx/system/banjo/ddk.protocol.display.controller",
+      "$zx/system/banjo/ddk.protocol.pci",
       "$zx/system/ulib/ddk",
     ]
   }
diff --git a/zircon/system/dev/display/vim-display/BUILD.gn b/zircon/system/dev/display/vim-display/BUILD.gn
index 613f6fd6c95..4994bd96739 100644
--- a/zircon/system/dev/display/vim-display/BUILD.gn
+++ b/zircon/system/dev/display/vim-display/BUILD.gn
@@ -15,13 +15,13 @@ driver("vim-display") {
     "vpp.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-amlogiccanvas",
-    "$zx/system/banjo/ddk-protocol-composite",
-    "$zx/system/banjo/ddk-protocol-display-controller",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2cimpl",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-sysmem",
+    "$zx/system/banjo/ddk.protocol.amlogiccanvas",
+    "$zx/system/banjo/ddk.protocol.composite",
+    "$zx/system/banjo/ddk.protocol.display.controller",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2cimpl",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.sysmem",
     "$zx/system/dev/audio/lib/simple-audio-stream",
     "$zx/system/dev/lib/amlogic",
     "$zx/system/dev/lib/mmio",
diff --git a/zircon/system/dev/ethernet/aml-ethernet-s912/BUILD.gn b/zircon/system/dev/ethernet/aml-ethernet-s912/BUILD.gn
index 3446420f365..cbceff1aecb 100644
--- a/zircon/system/dev/ethernet/aml-ethernet-s912/BUILD.gn
+++ b/zircon/system/dev/ethernet/aml-ethernet-s912/BUILD.gn
@@ -7,13 +7,13 @@ driver("aml-ethernet-s912") {
     "aml-ethernet.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-composite",
-    "$zx/system/banjo/ddk-protocol-ethernet",
-    "$zx/system/banjo/ddk-protocol-ethernet-board",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.composite",
+    "$zx/system/banjo/ddk.protocol.ethernet",
+    "$zx/system/banjo/ddk.protocol.ethernet.board",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/lib/amlogic",
     "$zx/system/dev/lib/mmio",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/ethernet/asix-88179/BUILD.gn b/zircon/system/dev/ethernet/asix-88179/BUILD.gn
index 77c0f773af6..70ae64dd4c0 100644
--- a/zircon/system/dev/ethernet/asix-88179/BUILD.gn
+++ b/zircon/system/dev/ethernet/asix-88179/BUILD.gn
@@ -7,10 +7,10 @@ driver("asix-88179") {
     "asix-88179.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-ethernet",
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-composite",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.ethernet",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.composite",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/usb",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/pretty",
diff --git a/zircon/system/dev/ethernet/asix-88772b/BUILD.gn b/zircon/system/dev/ethernet/asix-88772b/BUILD.gn
index a6660825579..6cd6a8b3c48 100644
--- a/zircon/system/dev/ethernet/asix-88772b/BUILD.gn
+++ b/zircon/system/dev/ethernet/asix-88772b/BUILD.gn
@@ -7,10 +7,10 @@ driver("asix-88772b") {
     "asix-88772b.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-ethernet",
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-composite",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.ethernet",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.composite",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/usb",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/sync",
diff --git a/zircon/system/dev/ethernet/dwmac/BUILD.gn b/zircon/system/dev/ethernet/dwmac/BUILD.gn
index 6c89eb63607..73f40372282 100644
--- a/zircon/system/dev/ethernet/dwmac/BUILD.gn
+++ b/zircon/system/dev/ethernet/dwmac/BUILD.gn
@@ -9,15 +9,15 @@ driver("dwmac") {
     "pinned-buffer.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-composite",
-    "$zx/system/banjo/ddk-protocol-ethernet",
-    "$zx/system/banjo/ddk-protocol-ethernet-board",
-    "$zx/system/banjo/ddk-protocol-ethernet-mac",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-test",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.composite",
+    "$zx/system/banjo/ddk.protocol.ethernet",
+    "$zx/system/banjo/ddk.protocol.ethernet.board",
+    "$zx/system/banjo/ddk.protocol.ethernet.mac",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.test",
     "$zx/system/dev/lib/mmio",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/ethernet/ethernet/BUILD.gn b/zircon/system/dev/ethernet/ethernet/BUILD.gn
index 7226cd33ead..0362ad4dd1b 100644
--- a/zircon/system/dev/ethernet/ethernet/BUILD.gn
+++ b/zircon/system/dev/ethernet/ethernet/BUILD.gn
@@ -11,33 +11,30 @@ declare_args() {
 driver("ethernet") {
   # TODO(puneetha) This is used to temporarily enable building with the C driver
   # before cpp driver is stabilized
-  if(ethernet_c) {
+  if (ethernet_c) {
     sources = [
-      "ethernet.c"
+      "ethernet.c",
     ]
     deps = [
-      "$zx/system/banjo/ddk-protocol-ethernet",
+      "$zx/system/banjo/ddk.protocol.ethernet",
       "$zx/system/fidl/fuchsia-hardware-ethernet:c",
       "$zx/system/ulib/ddk",
       "$zx/system/ulib/fidl",
       "$zx/system/ulib/zircon",
     ]
-  }
-  # cpp driver is default unless specified during fx set with
-  # --args="zircon_extra_args = { ethernet_c=true }"
-  else {
+  } else {
     sources = [
-      "ethernet.cpp"
+      "ethernet.cpp",
     ]
     deps = [
-      "$zx/system/banjo/ddk-protocol-ethernet",
+      "$zx/system/banjo/ddk.protocol.ethernet",
       "$zx/system/fidl/fuchsia-hardware-ethernet:c",
       "$zx/system/ulib/ddk",
       "$zx/system/ulib/ddktl",
       "$zx/system/ulib/fbl",
-      "$zx/system/ulib/fzl",
       "$zx/system/ulib/fidl",
       "$zx/system/ulib/fidl-utils",
+      "$zx/system/ulib/fzl",
       "$zx/system/ulib/zircon",
     ]
   }
diff --git a/zircon/system/dev/ethernet/ethertap/BUILD.gn b/zircon/system/dev/ethernet/ethertap/BUILD.gn
index 314a0e8474c..06aa5950f5f 100644
--- a/zircon/system/dev/ethernet/ethertap/BUILD.gn
+++ b/zircon/system/dev/ethernet/ethertap/BUILD.gn
@@ -8,8 +8,8 @@ driver("ethertap") {
     "ethertap.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-ethernet",
-    "$zx/system/banjo/ddk-protocol-test",
+    "$zx/system/banjo/ddk.protocol.ethernet",
+    "$zx/system/banjo/ddk.protocol.test",
     "$zx/system/fidl/fuchsia-hardware-ethernet:c",
     "$zx/system/fidl/fuchsia-hardware-ethertap:c",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/ethernet/intel-ethernet/BUILD.gn b/zircon/system/dev/ethernet/intel-ethernet/BUILD.gn
index 78baf154ed1..a148df75b1c 100644
--- a/zircon/system/dev/ethernet/intel-ethernet/BUILD.gn
+++ b/zircon/system/dev/ethernet/intel-ethernet/BUILD.gn
@@ -10,8 +10,8 @@ driver("intel-ethernet") {
     "ie.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-ethernet",
-    "$zx/system/banjo/ddk-protocol-pci",
+    "$zx/system/banjo/ddk.protocol.ethernet",
+    "$zx/system/banjo/ddk.protocol.pci",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/zircon",
   ]
diff --git a/zircon/system/dev/ethernet/realtek-8111/BUILD.gn b/zircon/system/dev/ethernet/realtek-8111/BUILD.gn
index c1cb4cae440..cc269949169 100644
--- a/zircon/system/dev/ethernet/realtek-8111/BUILD.gn
+++ b/zircon/system/dev/ethernet/realtek-8111/BUILD.gn
@@ -9,8 +9,8 @@ driver("realtek-8111") {
     "rtl8111.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-ethernet",
-    "$zx/system/banjo/ddk-protocol-pci",
+    "$zx/system/banjo/ddk.protocol.ethernet",
+    "$zx/system/banjo/ddk.protocol.pci",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/zircon",
   ]
diff --git a/zircon/system/dev/ethernet/realtek-8211f/BUILD.gn b/zircon/system/dev/ethernet/realtek-8211f/BUILD.gn
index df11fd55676..7f1511e7810 100644
--- a/zircon/system/dev/ethernet/realtek-8211f/BUILD.gn
+++ b/zircon/system/dev/ethernet/realtek-8211f/BUILD.gn
@@ -8,7 +8,7 @@ driver("realtek-8211f") {
     "rtl8211f.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-ethernet-mac",
+    "$zx/system/banjo/ddk.protocol.ethernet.mac",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/ethernet/rndis/BUILD.gn b/zircon/system/dev/ethernet/rndis/BUILD.gn
index d915127938f..1d0073eeee0 100644
--- a/zircon/system/dev/ethernet/rndis/BUILD.gn
+++ b/zircon/system/dev/ethernet/rndis/BUILD.gn
@@ -7,10 +7,10 @@ driver("rndis") {
     "rndishost.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-ethernet",
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-composite",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.ethernet",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.composite",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/usb",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/ethernet/usb-cdc-ecm/BUILD.gn b/zircon/system/dev/ethernet/usb-cdc-ecm/BUILD.gn
index 8ea8be31232..f40cbb230a3 100644
--- a/zircon/system/dev/ethernet/usb-cdc-ecm/BUILD.gn
+++ b/zircon/system/dev/ethernet/usb-cdc-ecm/BUILD.gn
@@ -7,10 +7,10 @@ driver("usb-cdc-ecm") {
     "usb-cdc-ecm.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-ethernet",
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-composite",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.ethernet",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.composite",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/usb",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/pretty",
diff --git a/zircon/system/dev/ethernet/usb-cdc-function/BUILD.gn b/zircon/system/dev/ethernet/usb-cdc-function/BUILD.gn
index e889f19d5ae..2a7ef701ab0 100644
--- a/zircon/system/dev/ethernet/usb-cdc-function/BUILD.gn
+++ b/zircon/system/dev/ethernet/usb-cdc-function/BUILD.gn
@@ -7,10 +7,10 @@ driver("usb-cdc-function") {
     "cdc-eth-function.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-ethernet",
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-function",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.ethernet",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.function",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/usb",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/fw/qcom-pil/BUILD.gn b/zircon/system/dev/fw/qcom-pil/BUILD.gn
index 0bbef09c175..1b87698598c 100644
--- a/zircon/system/dev/fw/qcom-pil/BUILD.gn
+++ b/zircon/system/dev/fw/qcom-pil/BUILD.gn
@@ -10,8 +10,8 @@ driver("qcom-pil") {
     "qcom-pil.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/lib/qcom",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/gpio/aml-axg-gpio/BUILD.gn b/zircon/system/dev/gpio/aml-axg-gpio/BUILD.gn
index b5f3f8b7091..54c67cfdd27 100644
--- a/zircon/system/dev/gpio/aml-axg-gpio/BUILD.gn
+++ b/zircon/system/dev/gpio/aml-axg-gpio/BUILD.gn
@@ -7,10 +7,10 @@ driver("aml-axg-gpio") {
     "aml-axg-gpio.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-gpioimpl",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.gpioimpl",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/lib/amlogic",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/sync",
diff --git a/zircon/system/dev/gpio/aml-gxl-gpio/BUILD.gn b/zircon/system/dev/gpio/aml-gxl-gpio/BUILD.gn
index c0cd295f387..87d48c2ff98 100644
--- a/zircon/system/dev/gpio/aml-gxl-gpio/BUILD.gn
+++ b/zircon/system/dev/gpio/aml-gxl-gpio/BUILD.gn
@@ -7,10 +7,10 @@ driver("aml-gxl-gpio") {
     "aml-gxl-gpio.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-gpioimpl",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.gpioimpl",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/lib/amlogic",
     "$zx/system/dev/lib/mmio",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/gpio/gpio-test/BUILD.gn b/zircon/system/dev/gpio/gpio-test/BUILD.gn
index 3722bd9ffd9..b2de1a1b4ef 100644
--- a/zircon/system/dev/gpio/gpio-test/BUILD.gn
+++ b/zircon/system/dev/gpio/gpio-test/BUILD.gn
@@ -8,9 +8,9 @@ driver("gpio-test") {
     "gpio-test.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-gpioimpl",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.gpioimpl",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/gpio/gpio/BUILD.gn b/zircon/system/dev/gpio/gpio/BUILD.gn
index 904b6975e62..b89f2f75a99 100644
--- a/zircon/system/dev/gpio/gpio/BUILD.gn
+++ b/zircon/system/dev/gpio/gpio/BUILD.gn
@@ -7,8 +7,8 @@ driver("gpio") {
     "gpio.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-gpioimpl",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.gpioimpl",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/gpio/hi3660-gpio/BUILD.gn b/zircon/system/dev/gpio/hi3660-gpio/BUILD.gn
index 4d1459e1bc8..07251b6581e 100644
--- a/zircon/system/dev/gpio/hi3660-gpio/BUILD.gn
+++ b/zircon/system/dev/gpio/hi3660-gpio/BUILD.gn
@@ -7,10 +7,10 @@ driver("hi3660-gpio") {
     "hi3660-gpio.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-gpioimpl",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.gpioimpl",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/gpio/pl061",
     "$zx/system/dev/lib/hi3660",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/gpio/mt-8167/BUILD.gn b/zircon/system/dev/gpio/mt-8167/BUILD.gn
index 544cb95cf5d..dbfcbd5c562 100644
--- a/zircon/system/dev/gpio/mt-8167/BUILD.gn
+++ b/zircon/system/dev/gpio/mt-8167/BUILD.gn
@@ -8,10 +8,10 @@ driver("mt-8167") {
     "mt8167-gpio.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-gpioimpl",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.gpioimpl",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/lib/mmio",
     "$zx/system/dev/lib/mt8167",
     "$zx/system/ulib/ddk",
@@ -31,10 +31,10 @@ test("mtk-gpio") {
     "mt8167-gpio.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-gpioimpl",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.gpioimpl",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/lib/fake_ddk",
     "$zx/system/dev/lib/mock-mmio-reg",
     "$zx/system/dev/lib/mt8167",
diff --git a/zircon/system/dev/gpio/pl061/BUILD.gn b/zircon/system/dev/gpio/pl061/BUILD.gn
index 90708a3cc2a..853c8b3ac3d 100644
--- a/zircon/system/dev/gpio/pl061/BUILD.gn
+++ b/zircon/system/dev/gpio/pl061/BUILD.gn
@@ -7,9 +7,9 @@ library("pl061") {
     "pl061.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-gpioimpl",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.gpioimpl",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/driver",
     "$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/gpio/qcom-gpio/BUILD.gn b/zircon/system/dev/gpio/qcom-gpio/BUILD.gn
index 127e9e4214a..ee010bc7838 100644
--- a/zircon/system/dev/gpio/qcom-gpio/BUILD.gn
+++ b/zircon/system/dev/gpio/qcom-gpio/BUILD.gn
@@ -8,9 +8,9 @@ driver("qcom-gpio") {
     "qcom-gpio.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-gpioimpl",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.gpioimpl",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/lib/mmio",
     "$zx/system/ulib/bitmap",
     "$zx/system/ulib/ddk",
@@ -28,9 +28,9 @@ test("qcom-gpio-test") {
     "qcom-gpio.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-gpioimpl",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.gpioimpl",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/lib/fake_ddk",
     "$zx/system/dev/lib/mock-mmio-reg",
     "$zx/system/ulib/bitmap",
diff --git a/zircon/system/dev/gpu/aml-gpu/BUILD.gn b/zircon/system/dev/gpu/aml-gpu/BUILD.gn
index 22b48266859..0c3fc659a42 100644
--- a/zircon/system/dev/gpu/aml-gpu/BUILD.gn
+++ b/zircon/system/dev/gpu/aml-gpu/BUILD.gn
@@ -8,11 +8,11 @@ driver("aml-gpu") {
     "aml-s905d2g.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-iommu",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-scpi",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.iommu",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.scpi",
     "$zx/system/dev/lib/amlogic",
     "$zx/system/fidl/fuchsia-hardware-gpu-clock:c",
     "$zx/system/fidl/fuchsia-hardware-thermal:c",
diff --git a/zircon/system/dev/i2c/aml-i2c/BUILD.gn b/zircon/system/dev/i2c/aml-i2c/BUILD.gn
index f1ef3059feb..08cd9dab539 100644
--- a/zircon/system/dev/i2c/aml-i2c/BUILD.gn
+++ b/zircon/system/dev/i2c/aml-i2c/BUILD.gn
@@ -7,10 +7,10 @@ driver("aml-i2c") {
     "aml-i2c.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-i2cimpl",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.i2cimpl",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/sync",
     "$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/i2c/dw-i2c/BUILD.gn b/zircon/system/dev/i2c/dw-i2c/BUILD.gn
index e02842b7ffa..ef0a04e2d6d 100644
--- a/zircon/system/dev/i2c/dw-i2c/BUILD.gn
+++ b/zircon/system/dev/i2c/dw-i2c/BUILD.gn
@@ -7,10 +7,10 @@ driver("dw-i2c") {
     "dw-i2c.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-i2cimpl",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.i2cimpl",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/sync",
     "$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/i2c/i2c/BUILD.gn b/zircon/system/dev/i2c/i2c/BUILD.gn
index 32048fd90e3..f8e2ffe7880 100644
--- a/zircon/system/dev/i2c/i2c/BUILD.gn
+++ b/zircon/system/dev/i2c/i2c/BUILD.gn
@@ -4,13 +4,13 @@
 
 driver("i2c") {
   sources = [
-    "i2c.cpp",
     "i2c-bus.cpp",
     "i2c-child.cpp",
+    "i2c.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-i2cimpl",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.i2cimpl",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/i2c/intel-i2c/BUILD.gn b/zircon/system/dev/i2c/intel-i2c/BUILD.gn
index ef018240af8..bfb1beae556 100644
--- a/zircon/system/dev/i2c/intel-i2c/BUILD.gn
+++ b/zircon/system/dev/i2c/intel-i2c/BUILD.gn
@@ -8,9 +8,9 @@ driver("intel-i2c") {
     "intel-i2c-slave.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-i2cimpl",
-    "$zx/system/banjo/ddk-protocol-pci",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.i2cimpl",
+    "$zx/system/banjo/ddk.protocol.pci",
     "$zx/system/fidl/fuchsia-hardware-i2c:c",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/sync",
diff --git a/zircon/system/dev/i2c/mt8167-i2c/BUILD.gn b/zircon/system/dev/i2c/mt8167-i2c/BUILD.gn
index 789986283ea..acbf23229aa 100644
--- a/zircon/system/dev/i2c/mt8167-i2c/BUILD.gn
+++ b/zircon/system/dev/i2c/mt8167-i2c/BUILD.gn
@@ -7,10 +7,10 @@ driver("mt8167-i2c") {
     "mt8167-i2c.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-i2cimpl",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.i2cimpl",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/lib/mmio",
     "$zx/system/dev/lib/mt8167",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/input/bma253/BUILD.gn b/zircon/system/dev/input/bma253/BUILD.gn
index 57e9c0ea6b5..48d62ab5c11 100644
--- a/zircon/system/dev/input/bma253/BUILD.gn
+++ b/zircon/system/dev/input/bma253/BUILD.gn
@@ -7,10 +7,10 @@ driver("bma253") {
     "bma253.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-hidbus",
-    "$zx/system/banjo/ddk-protocol-i2c",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.hidbus",
+    "$zx/system/banjo/ddk.protocol.i2c",
     "$zx/system/dev/lib/mmio",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/input/focaltech/BUILD.gn b/zircon/system/dev/input/focaltech/BUILD.gn
index 445e729211a..8b757f56d3b 100644
--- a/zircon/system/dev/input/focaltech/BUILD.gn
+++ b/zircon/system/dev/input/focaltech/BUILD.gn
@@ -7,12 +7,12 @@ driver("focaltech") {
     "ft_device.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-composite",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-hidbus",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-test",
+    "$zx/system/banjo/ddk.protocol.composite",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.hidbus",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.test",
     "$zx/system/dev/lib/focaltech",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/input/goodix/BUILD.gn b/zircon/system/dev/input/goodix/BUILD.gn
index 0eb7c078498..b7623cf55a1 100644
--- a/zircon/system/dev/input/goodix/BUILD.gn
+++ b/zircon/system/dev/input/goodix/BUILD.gn
@@ -7,12 +7,12 @@ driver("goodix") {
     "gt92xx.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-composite",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-hidbus",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.composite",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.hidbus",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/lib/mmio",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/input/hid-buttons/BUILD.gn b/zircon/system/dev/input/hid-buttons/BUILD.gn
index 3944e3c2464..4d095d0d2af 100644
--- a/zircon/system/dev/input/hid-buttons/BUILD.gn
+++ b/zircon/system/dev/input/hid-buttons/BUILD.gn
@@ -8,10 +8,10 @@ driver("hid-buttons") {
     "hid-buttons.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-hidbus",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.hidbus",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/fidl/fuchsia-device-manager:c",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/input/hid/BUILD.gn b/zircon/system/dev/input/hid/BUILD.gn
index fe41ff8aa92..73115f57c74 100644
--- a/zircon/system/dev/input/hid/BUILD.gn
+++ b/zircon/system/dev/input/hid/BUILD.gn
@@ -9,7 +9,7 @@ driver("hid") {
     "hid.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-hidbus",
+    "$zx/system/banjo/ddk.protocol.hidbus",
     "$zx/system/fidl/fuchsia-hardware-input:c",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/input/hidctl/BUILD.gn b/zircon/system/dev/input/hidctl/BUILD.gn
index 73ab325cb5d..8bfaa026d69 100644
--- a/zircon/system/dev/input/hidctl/BUILD.gn
+++ b/zircon/system/dev/input/hidctl/BUILD.gn
@@ -8,7 +8,7 @@ driver("hidctl") {
     "hidctl.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-hidbus",
+    "$zx/system/banjo/ddk.protocol.hidbus",
     "$zx/system/fidl/fuchsia-hardware-hidctl:c",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/input/i2c-hid/BUILD.gn b/zircon/system/dev/input/i2c-hid/BUILD.gn
index ac068e9a835..3a6bebe6856 100644
--- a/zircon/system/dev/input/i2c-hid/BUILD.gn
+++ b/zircon/system/dev/input/i2c-hid/BUILD.gn
@@ -7,8 +7,8 @@ driver("i2c-hid") {
     "i2c-hid.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-hidbus",
-    "$zx/system/banjo/ddk-protocol-i2c",
+    "$zx/system/banjo/ddk.protocol.hidbus",
+    "$zx/system/banjo/ddk.protocol.i2c",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/hid",
     "$zx/system/ulib/sync",
diff --git a/zircon/system/dev/input/pc-ps2/BUILD.gn b/zircon/system/dev/input/pc-ps2/BUILD.gn
index 735640946a8..59ae8c36d60 100644
--- a/zircon/system/dev/input/pc-ps2/BUILD.gn
+++ b/zircon/system/dev/input/pc-ps2/BUILD.gn
@@ -9,7 +9,7 @@ driver("pc-ps2") {
     "i8042.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-hidbus",
+    "$zx/system/banjo/ddk.protocol.hidbus",
     "$zx/system/fidl/fuchsia-hardware-input:c",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/hid",
diff --git a/zircon/system/dev/input/usb-hid/BUILD.gn b/zircon/system/dev/input/usb-hid/BUILD.gn
index 76906f69162..0caaae37a4d 100644
--- a/zircon/system/dev/input/usb-hid/BUILD.gn
+++ b/zircon/system/dev/input/usb-hid/BUILD.gn
@@ -7,10 +7,10 @@ driver("usb-hid") {
     "usb-hid.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-hidbus",
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-composite",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.hidbus",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.composite",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/usb",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/pretty",
diff --git a/zircon/system/dev/lib/amlogic/BUILD.gn b/zircon/system/dev/lib/amlogic/BUILD.gn
index 7075bbe9f1b..f02ac6b39c1 100644
--- a/zircon/system/dev/lib/amlogic/BUILD.gn
+++ b/zircon/system/dev/lib/amlogic/BUILD.gn
@@ -13,8 +13,8 @@ library("amlogic") {
     "s905d2-pll-rates.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/lib/mmio",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/lib/scsi/BUILD.gn b/zircon/system/dev/lib/scsi/BUILD.gn
index f4de6bb7c83..e7ee42a03b9 100644
--- a/zircon/system/dev/lib/scsi/BUILD.gn
+++ b/zircon/system/dev/lib/scsi/BUILD.gn
@@ -5,13 +5,13 @@
 library("scsi") {
   sdk_headers = [
     "scsi/scsilib.h",
-    "scsi/scsilib_controller.h"
+    "scsi/scsilib_controller.h",
   ]
   sources = [
-    "scsilib.cpp"
+    "scsilib.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-block",
+    "$zx/system/banjo/ddk.protocol.block",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/driver",
@@ -29,7 +29,7 @@ test("scsilib-disk-test") {
   ]
   deps = [
     ":scsi",
-    "$zx/system/banjo/ddk-protocol-block",
+    "$zx/system/banjo/ddk.protocol.block",
     "$zx/system/dev/lib/fake-bti",
     "$zx/system/dev/lib/fake_ddk",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/lib/usb/BUILD.gn b/zircon/system/dev/lib/usb/BUILD.gn
index 18c46e880f7..0d05fb2d861 100644
--- a/zircon/system/dev/lib/usb/BUILD.gn
+++ b/zircon/system/dev/lib/usb/BUILD.gn
@@ -21,9 +21,9 @@ library("usb") {
     "$zx/system/dev/lib/operation:headers",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-composite",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.composite",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
   ]
@@ -35,8 +35,8 @@ test("usb-wrapper-test") {
   ]
   deps = [
     ":usb",
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-composite",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.composite",
     "$zx/system/dev/lib/fake-bti",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/light-sensor/ams-light/BUILD.gn b/zircon/system/dev/light-sensor/ams-light/BUILD.gn
index 1db4379c59e..0b92db5eb7c 100644
--- a/zircon/system/dev/light-sensor/ams-light/BUILD.gn
+++ b/zircon/system/dev/light-sensor/ams-light/BUILD.gn
@@ -7,10 +7,10 @@ driver("ams-light") {
     "tcs3400.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-composite",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-hidbus",
-    "$zx/system/banjo/ddk-protocol-i2c",
+    "$zx/system/banjo/ddk.protocol.composite",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.hidbus",
+    "$zx/system/banjo/ddk.protocol.i2c",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/light-sensor/lite-on/BUILD.gn b/zircon/system/dev/light-sensor/lite-on/BUILD.gn
index 56eb2ff1ffd..767891d6517 100644
--- a/zircon/system/dev/light-sensor/lite-on/BUILD.gn
+++ b/zircon/system/dev/light-sensor/lite-on/BUILD.gn
@@ -8,8 +8,8 @@ driver("lite-on") {
     "ltr-578als.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-hidbus",
-    "$zx/system/banjo/ddk-protocol-i2c",
+    "$zx/system/banjo/ddk.protocol.hidbus",
+    "$zx/system/banjo/ddk.protocol.i2c",
     "$zx/system/dev/lib/mmio",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/light/gpio-light/BUILD.gn b/zircon/system/dev/light/gpio-light/BUILD.gn
index 30739f53199..2622014da2c 100644
--- a/zircon/system/dev/light/gpio-light/BUILD.gn
+++ b/zircon/system/dev/light/gpio-light/BUILD.gn
@@ -7,9 +7,9 @@ driver("gpio-light") {
     "gpio-light.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-gpioimpl",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.gpioimpl",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/fidl/fuchsia-hardware-light:c",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/misc/cpu-trace/BUILD.gn b/zircon/system/dev/misc/cpu-trace/BUILD.gn
index aa91d50488e..170a712719b 100644
--- a/zircon/system/dev/misc/cpu-trace/BUILD.gn
+++ b/zircon/system/dev/misc/cpu-trace/BUILD.gn
@@ -18,7 +18,7 @@ driver("cpu-trace") {
   }
 
   deps = [
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/misc/goldfish/BUILD.gn b/zircon/system/dev/misc/goldfish/BUILD.gn
index 979b69aae85..b83a3a548c0 100644
--- a/zircon/system/dev/misc/goldfish/BUILD.gn
+++ b/zircon/system/dev/misc/goldfish/BUILD.gn
@@ -8,8 +8,8 @@ driver("goldfish") {
     "pipe-device.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-acpi",
-    "$zx/system/banjo/ddk-protocol-goldfish-pipe",
+    "$zx/system/banjo/ddk.protocol.acpi",
+    "$zx/system/banjo/ddk.protocol.goldfish.pipe",
     "$zx/system/dev/lib/mmio",
     "$zx/system/fidl/fuchsia-hardware-goldfish-pipe:c",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/misc/test/BUILD.gn b/zircon/system/dev/misc/test/BUILD.gn
index 94c201c156f..951cb86feb0 100644
--- a/zircon/system/dev/misc/test/BUILD.gn
+++ b/zircon/system/dev/misc/test/BUILD.gn
@@ -7,7 +7,7 @@ driver("test") {
     "test.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-test",
+    "$zx/system/banjo/ddk.protocol.test",
     "$zx/system/fidl/fuchsia-device-test:c",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/misc/tpm/BUILD.gn b/zircon/system/dev/misc/tpm/BUILD.gn
index 94e723b7031..b72ee0ae1ad 100644
--- a/zircon/system/dev/misc/tpm/BUILD.gn
+++ b/zircon/system/dev/misc/tpm/BUILD.gn
@@ -13,7 +13,7 @@ driver("tpm") {
     "tpm.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-i2c",
+    "$zx/system/banjo/ddk.protocol.i2c",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/explicit-memory",
diff --git a/zircon/system/dev/mlg/usb-harriet/BUILD.gn b/zircon/system/dev/mlg/usb-harriet/BUILD.gn
index 6ba39a6159c..d0f2ad49e8a 100644
--- a/zircon/system/dev/mlg/usb-harriet/BUILD.gn
+++ b/zircon/system/dev/mlg/usb-harriet/BUILD.gn
@@ -7,9 +7,9 @@ driver("usb-harriet") {
     "usb-harriet.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-composite",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.composite",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/usb",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/nand/aml-rawnand/BUILD.gn b/zircon/system/dev/nand/aml-rawnand/BUILD.gn
index f71ba61285e..2c172ce89f2 100644
--- a/zircon/system/dev/nand/aml-rawnand/BUILD.gn
+++ b/zircon/system/dev/nand/aml-rawnand/BUILD.gn
@@ -8,8 +8,8 @@ driver("aml-rawnand") {
     "onfi.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-rawnand",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.rawnand",
     "$zx/system/dev/lib/amlogic",
     "$zx/system/fidl/fuchsia-hardware-nand:c",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/nand/broker/BUILD.gn b/zircon/system/dev/nand/broker/BUILD.gn
index 7e385f30a46..a747a983e4b 100644
--- a/zircon/system/dev/nand/broker/BUILD.gn
+++ b/zircon/system/dev/nand/broker/BUILD.gn
@@ -13,7 +13,7 @@ driver("nand-broker") {
     "broker.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-nand",
+    "$zx/system/banjo/ddk.protocol.nand",
     "$zx/system/fidl/fuchsia-hardware-nand:c",
     "$zx/system/fidl/fuchsia-nand:c",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/nand/broker/test/BUILD.gn b/zircon/system/dev/nand/broker/test/BUILD.gn
index 8a298bf930f..f987c692ca3 100644
--- a/zircon/system/dev/nand/broker/test/BUILD.gn
+++ b/zircon/system/dev/nand/broker/test/BUILD.gn
@@ -19,7 +19,7 @@ source_set("common") {
     "parent.cpp",
   ]
   public_deps = [
-    "$zx/system/banjo/ddk-protocol-nand",
+    "$zx/system/banjo/ddk.protocol.nand",
     "$zx/system/fidl/fuchsia-device:c",
     "$zx/system/fidl/fuchsia-hardware-nand:c",
     "$zx/system/fidl/fuchsia-nand:c",
diff --git a/zircon/system/dev/nand/nand/BUILD.gn b/zircon/system/dev/nand/nand/BUILD.gn
index 7b4214047c7..7b246caf7fc 100644
--- a/zircon/system/dev/nand/nand/BUILD.gn
+++ b/zircon/system/dev/nand/nand/BUILD.gn
@@ -7,9 +7,9 @@ driver("nand") {
     "nand.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-nand",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-rawnand",
+    "$zx/system/banjo/ddk.protocol.nand",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.rawnand",
     "$zx/system/dev/lib/operation",
     "$zx/system/fidl/fuchsia-hardware-nand:c",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/nand/nand/test/BUILD.gn b/zircon/system/dev/nand/nand/test/BUILD.gn
index d7598f1ed1d..fc5f4627e06 100644
--- a/zircon/system/dev/nand/nand/test/BUILD.gn
+++ b/zircon/system/dev/nand/nand/test/BUILD.gn
@@ -16,8 +16,8 @@ test("nand-unittest") {
   include_dirs = [ ".." ]
   deps = [
     ":common",
-    "$zx/system/banjo/ddk-protocol-nand",
-    "$zx/system/banjo/ddk-protocol-rawnand",
+    "$zx/system/banjo/ddk.protocol.nand",
+    "$zx/system/banjo/ddk.protocol.rawnand",
     "$zx/system/dev/lib/fake_ddk",
     "$zx/system/dev/lib/operation",
     "$zx/system/ulib/ddk",
@@ -38,9 +38,9 @@ source_set("common") {
     "../nand.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-nand",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-rawnand",
+    "$zx/system/banjo/ddk.protocol.nand",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.rawnand",
     "$zx/system/dev/lib/operation",
     "$zx/system/fidl/fuchsia-hardware-nand:c",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/nand/nandpart/BUILD.gn b/zircon/system/dev/nand/nandpart/BUILD.gn
index 7eac876f60b..68a802ad6c7 100644
--- a/zircon/system/dev/nand/nandpart/BUILD.gn
+++ b/zircon/system/dev/nand/nandpart/BUILD.gn
@@ -11,8 +11,8 @@ driver("nandpart") {
     "nandpart.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-badblock",
-    "$zx/system/banjo/ddk-protocol-nand",
+    "$zx/system/banjo/ddk.protocol.badblock",
+    "$zx/system/banjo/ddk.protocol.nand",
     "$zx/system/dev/lib/operation",
     "$zx/system/fidl/fuchsia-hardware-nand:c",
     "$zx/system/ulib/ddk",
@@ -37,7 +37,7 @@ test("nandpart-test") {
   include_dirs = [ "." ]
   defines = [ "TEST" ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-nand",
+    "$zx/system/banjo/ddk.protocol.nand",
     "$zx/system/fidl/fuchsia-hardware-nand:c",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/nand/ram-nand/BUILD.gn b/zircon/system/dev/nand/ram-nand/BUILD.gn
index 8861cf09b34..9979b8fc0f8 100644
--- a/zircon/system/dev/nand/ram-nand/BUILD.gn
+++ b/zircon/system/dev/nand/ram-nand/BUILD.gn
@@ -9,7 +9,7 @@ driver("ram-nand") {
   ]
   deps = [
     ":common",
-    "$zx/system/banjo/ddk-protocol-nand",
+    "$zx/system/banjo/ddk.protocol.nand",
     "$zx/system/fidl/fuchsia-hardware-nand:c",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
@@ -28,7 +28,7 @@ source_set("common") {
     "ram-nand.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-nand",
+    "$zx/system/banjo/ddk.protocol.nand",
     "$zx/system/fidl/fuchsia-hardware-nand:c",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
@@ -45,7 +45,7 @@ test("ram-nand-test") {
   include_dirs = [ "." ]
   deps = [
     ":common",
-    "$zx/system/banjo/ddk-protocol-nand",
+    "$zx/system/banjo/ddk.protocol.nand",
     "$zx/system/dev/lib/fake_ddk",
     "$zx/system/fidl/fuchsia-hardware-nand:c",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/nand/skip-block/BUILD.gn b/zircon/system/dev/nand/skip-block/BUILD.gn
index d4afaf56dbc..4ad07bd1e29 100644
--- a/zircon/system/dev/nand/skip-block/BUILD.gn
+++ b/zircon/system/dev/nand/skip-block/BUILD.gn
@@ -9,8 +9,8 @@ driver("skip-block") {
   ]
   deps = [
     ":common",
-    "$zx/system/banjo/ddk-protocol-badblock",
-    "$zx/system/banjo/ddk-protocol-nand",
+    "$zx/system/banjo/ddk.protocol.badblock",
+    "$zx/system/banjo/ddk.protocol.nand",
     "$zx/system/dev/lib/operation",
     "$zx/system/fidl/fuchsia-hardware-nand:c",
     "$zx/system/fidl/fuchsia-hardware-skipblock:c",
diff --git a/zircon/system/dev/pci/amlogic-pcie/BUILD.gn b/zircon/system/dev/pci/amlogic-pcie/BUILD.gn
index 374ca40d39c..1f03b9ddec6 100644
--- a/zircon/system/dev/pci/amlogic-pcie/BUILD.gn
+++ b/zircon/system/dev/pci/amlogic-pcie/BUILD.gn
@@ -9,9 +9,9 @@ driver("amlogic-pcie") {
     "aml-pcie.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/lib/amlogic",
     "$zx/system/dev/lib/mmio",
     "$zx/system/dev/pci/designware",
diff --git a/zircon/system/dev/power/msm8x53-power/BUILD.gn b/zircon/system/dev/power/msm8x53-power/BUILD.gn
index 52fe8dbdffd..a97f7a7703f 100644
--- a/zircon/system/dev/power/msm8x53-power/BUILD.gn
+++ b/zircon/system/dev/power/msm8x53-power/BUILD.gn
@@ -7,9 +7,9 @@ driver("msm8x53-power") {
     "msm8x53-power.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-powerimpl",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.powerimpl",
     "$zx/system/dev/lib/mmio",
     "$zx/system/dev/lib/msm8x53",
     "$zx/system/ulib/ddk",
@@ -32,9 +32,9 @@ test("msm8x53-power-test") {
     "msm8x53-power.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-powerimpl",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.powerimpl",
     "$zx/system/dev/lib/mock-mmio-reg",
     "$zx/system/dev/lib/msm8x53",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/power/mtk-power/BUILD.gn b/zircon/system/dev/power/mtk-power/BUILD.gn
index 1ada10f68d6..3a26efa340b 100644
--- a/zircon/system/dev/power/mtk-power/BUILD.gn
+++ b/zircon/system/dev/power/mtk-power/BUILD.gn
@@ -7,11 +7,11 @@ driver("mtk-power") {
     "mtk-power.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-powerimpl",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.powerimpl",
     "$zx/system/dev/lib/mmio",
     "$zx/system/dev/lib/mt8167",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/power/power/BUILD.gn b/zircon/system/dev/power/power/BUILD.gn
index 42a24f016a4..bf0276ba924 100644
--- a/zircon/system/dev/power/power/BUILD.gn
+++ b/zircon/system/dev/power/power/BUILD.gn
@@ -7,8 +7,8 @@ driver("power") {
     "power.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-power",
-    "$zx/system/banjo/ddk-protocol-powerimpl",
+    "$zx/system/banjo/ddk.protocol.power",
+    "$zx/system/banjo/ddk.protocol.powerimpl",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/rtc/nxp/BUILD.gn b/zircon/system/dev/rtc/nxp/BUILD.gn
index 3cabff52f9e..99fd925d43f 100644
--- a/zircon/system/dev/rtc/nxp/BUILD.gn
+++ b/zircon/system/dev/rtc/nxp/BUILD.gn
@@ -7,7 +7,7 @@ driver("nxp") {
     "pcf8563-rtc.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-i2c",
+    "$zx/system/banjo/ddk.protocol.i2c",
     "$zx/system/fidl/fuchsia-hardware-rtc:c",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/rtc/pl031-rtc/BUILD.gn b/zircon/system/dev/rtc/pl031-rtc/BUILD.gn
index a043a86e384..9e477651776 100644
--- a/zircon/system/dev/rtc/pl031-rtc/BUILD.gn
+++ b/zircon/system/dev/rtc/pl031-rtc/BUILD.gn
@@ -7,7 +7,7 @@ driver("pl031-rtc") {
     "pl031-rtc.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/fidl/fuchsia-hardware-rtc:c",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/rtc",
diff --git a/zircon/system/dev/scpi/aml-scpi-s912/BUILD.gn b/zircon/system/dev/scpi/aml-scpi-s912/BUILD.gn
index 953451cde41..92d745e2b09 100644
--- a/zircon/system/dev/scpi/aml-scpi-s912/BUILD.gn
+++ b/zircon/system/dev/scpi/aml-scpi-s912/BUILD.gn
@@ -14,12 +14,12 @@ driver("aml-scpi-s912.mailbox") {
     "aml-mailbox.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-mailbox",
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.mailbox",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/lib/mmio",
     "$zx/system/fidl/fuchsia-hardware-thermal:c",
     "$zx/system/ulib/ddk",
@@ -36,8 +36,8 @@ driver("scpi") {
     "aml-scpi.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-mailbox",
-    "$zx/system/banjo/ddk-protocol-scpi",
+    "$zx/system/banjo/ddk.protocol.mailbox",
+    "$zx/system/banjo/ddk.protocol.scpi",
     "$zx/system/fidl/fuchsia-hardware-thermal:c",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/serial/aml-uart/BUILD.gn b/zircon/system/dev/serial/aml-uart/BUILD.gn
index bef0835c9dc..f421e38ab16 100644
--- a/zircon/system/dev/serial/aml-uart/BUILD.gn
+++ b/zircon/system/dev/serial/aml-uart/BUILD.gn
@@ -8,10 +8,10 @@ driver("aml-uart") {
     "binding.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-serial",
-    "$zx/system/banjo/ddk-protocol-serialimpl",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.serial",
+    "$zx/system/banjo/ddk.protocol.serialimpl",
     "$zx/system/dev/lib/amlogic",
     "$zx/system/dev/lib/mmio",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/serial/ftdi/BUILD.gn b/zircon/system/dev/serial/ftdi/BUILD.gn
index 2aafcc993bf..13917ad57e6 100644
--- a/zircon/system/dev/serial/ftdi/BUILD.gn
+++ b/zircon/system/dev/serial/ftdi/BUILD.gn
@@ -7,11 +7,11 @@ driver("ftdi") {
     "ftdi.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-serial",
-    "$zx/system/banjo/ddk-protocol-serialimpl",
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-composite",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.serial",
+    "$zx/system/banjo/ddk.protocol.serialimpl",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.composite",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/usb",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/serial/intel-serialio/BUILD.gn b/zircon/system/dev/serial/intel-serialio/BUILD.gn
index fba5c3d95dd..a2b28f73f47 100644
--- a/zircon/system/dev/serial/intel-serialio/BUILD.gn
+++ b/zircon/system/dev/serial/intel-serialio/BUILD.gn
@@ -12,8 +12,8 @@ driver("intel-serialio") {
   ]
   include_dirs = [ "intel-serialio-include" ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-pci",
-    "$zx/system/banjo/ddk-protocol-serial",
+    "$zx/system/banjo/ddk.protocol.pci",
+    "$zx/system/banjo/ddk.protocol.serial",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/zircon",
   ]
diff --git a/zircon/system/dev/serial/serial/BUILD.gn b/zircon/system/dev/serial/serial/BUILD.gn
index ec489869d7c..7d205be55b9 100644
--- a/zircon/system/dev/serial/serial/BUILD.gn
+++ b/zircon/system/dev/serial/serial/BUILD.gn
@@ -7,8 +7,8 @@ driver("serial") {
     "serial.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-serial",
-    "$zx/system/banjo/ddk-protocol-serialimpl",
+    "$zx/system/banjo/ddk.protocol.serial",
+    "$zx/system/banjo/ddk.protocol.serialimpl",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/sync",
     "$zx/system/ulib/zircon",
diff --git a/zircon/system/dev/sysmem/sysmem/BUILD.gn b/zircon/system/dev/sysmem/sysmem/BUILD.gn
index 4ae7e7a7561..95421b29373 100644
--- a/zircon/system/dev/sysmem/sysmem/BUILD.gn
+++ b/zircon/system/dev/sysmem/sysmem/BUILD.gn
@@ -17,9 +17,9 @@ driver("sysmem") {
     "usage_pixel_format_cost.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-sysmem",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.sysmem",
     "$zx/system/fidl/fuchsia-sysmem:c",
     "$zx/system/ulib/async:async-cpp",
     "$zx/system/ulib/async-loop:async-loop-cpp",
@@ -46,9 +46,9 @@ test("sysmem-unittest") {
   ]
   include_dirs = [ "." ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-platform-bus",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-sysmem",
+    "$zx/system/banjo/ddk.protocol.platform.bus",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.sysmem",
     "$zx/system/dev/lib/fake_ddk",
     "$zx/system/fidl/fuchsia-sysmem:c",
     "$zx/system/ulib/async:async-cpp",
diff --git a/zircon/system/dev/tee/optee/BUILD.gn b/zircon/system/dev/tee/optee/BUILD.gn
index b5dfd3cf24a..a0316c23c81 100644
--- a/zircon/system/dev/tee/optee/BUILD.gn
+++ b/zircon/system/dev/tee/optee/BUILD.gn
@@ -12,7 +12,7 @@ driver("optee") {
     "util.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/dev/lib/mmio",
     "$zx/system/fidl/fuchsia-hardware-tee:c",
     "$zx/system/fidl/fuchsia-tee-manager:c",
diff --git a/zircon/system/dev/test/ddk-test/BUILD.gn b/zircon/system/dev/test/ddk-test/BUILD.gn
index d50402fe70b..bba3c1da22b 100644
--- a/zircon/system/dev/test/ddk-test/BUILD.gn
+++ b/zircon/system/dev/test/ddk-test/BUILD.gn
@@ -10,9 +10,9 @@ test_driver("ddk-test") {
     "usb-request-test.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-test",
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.test",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/fake-bti",
     "$zx/system/dev/lib/usb",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/test/mock-device/BUILD.gn b/zircon/system/dev/test/mock-device/BUILD.gn
index e72b050aad6..4702174c2be 100644
--- a/zircon/system/dev/test/mock-device/BUILD.gn
+++ b/zircon/system/dev/test/mock-device/BUILD.gn
@@ -12,7 +12,7 @@ if (current_toolchain != default_toolchain) {
     ]
     deps = [
       ":fuchsia.device.mock.c",
-      "$zx/system/banjo/ddk-protocol-test",
+      "$zx/system/banjo/ddk.protocol.test",
       "$zx/system/ulib/ddk",
       "$zx/system/ulib/ddktl",
       "$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/test/usb/BUILD.gn b/zircon/system/dev/test/usb/BUILD.gn
index bb77d1938a8..3391442e2e6 100644
--- a/zircon/system/dev/test/usb/BUILD.gn
+++ b/zircon/system/dev/test/usb/BUILD.gn
@@ -17,8 +17,8 @@ test("usb-unittest") {
     "usb-request-test.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/fake-bti",
     "$zx/system/dev/lib/fake_ddk",
     "$zx/system/dev/lib/usb",
diff --git a/zircon/system/dev/thermal/aml-thermal-s905d2g/BUILD.gn b/zircon/system/dev/thermal/aml-thermal-s905d2g/BUILD.gn
index d320c2bd137..df01bfba1a0 100644
--- a/zircon/system/dev/thermal/aml-thermal-s905d2g/BUILD.gn
+++ b/zircon/system/dev/thermal/aml-thermal-s905d2g/BUILD.gn
@@ -12,11 +12,11 @@ driver("aml-thermal-s905d2g") {
     "aml-voltage.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-scpi",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.scpi",
     "$zx/system/dev/lib/amlogic",
     "$zx/system/dev/lib/mmio",
     "$zx/system/fidl/fuchsia-hardware-thermal:c",
diff --git a/zircon/system/dev/thermal/aml-thermal-s912/BUILD.gn b/zircon/system/dev/thermal/aml-thermal-s912/BUILD.gn
index d3f2bda700e..0ca39c15301 100644
--- a/zircon/system/dev/thermal/aml-thermal-s912/BUILD.gn
+++ b/zircon/system/dev/thermal/aml-thermal-s912/BUILD.gn
@@ -7,9 +7,9 @@ driver("aml-thermal-s912") {
     "aml-thermal.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-composite",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-scpi",
+    "$zx/system/banjo/ddk.protocol.composite",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.scpi",
     "$zx/system/dev/lib/amlogic",
     "$zx/system/fidl/fuchsia-hardware-thermal:c",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/thermal/mtk-thermal/BUILD.gn b/zircon/system/dev/thermal/mtk-thermal/BUILD.gn
index 40c60bd3e6b..903d8d84505 100644
--- a/zircon/system/dev/thermal/mtk-thermal/BUILD.gn
+++ b/zircon/system/dev/thermal/mtk-thermal/BUILD.gn
@@ -7,11 +7,11 @@ driver("mtk-thermal") {
     "mtk-thermal.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-scpi",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.scpi",
     "$zx/system/dev/lib/mmio",
     "$zx/system/dev/lib/mt8167",
     "$zx/system/fidl/fuchsia-hardware-thermal:c",
@@ -34,11 +34,11 @@ test("mtk-thermal-test") {
     "mtk-thermal.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-scpi",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.scpi",
     "$zx/system/dev/lib/mock-mmio-reg",
     "$zx/system/dev/lib/mt8167",
     "$zx/system/fidl/fuchsia-hardware-thermal:c",
diff --git a/zircon/system/dev/usb/dwc3/BUILD.gn b/zircon/system/dev/usb/dwc3/BUILD.gn
index aa9ea395eb7..0a6bc4a08cd 100644
--- a/zircon/system/dev/usb/dwc3/BUILD.gn
+++ b/zircon/system/dev/usb/dwc3/BUILD.gn
@@ -11,12 +11,12 @@ driver("dwc3") {
     "dwc3.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-composite",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-dci",
-    "$zx/system/banjo/ddk-protocol-usb-modeswitch",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.composite",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.dci",
+    "$zx/system/banjo/ddk.protocol.usb.modeswitch",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/mmio",
     "$zx/system/dev/lib/usb",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/usb/hikey-usb/BUILD.gn b/zircon/system/dev/usb/hikey-usb/BUILD.gn
index e1ddfb212b4..28716337675 100644
--- a/zircon/system/dev/usb/hikey-usb/BUILD.gn
+++ b/zircon/system/dev/usb/hikey-usb/BUILD.gn
@@ -7,9 +7,9 @@ driver("hikey-usb") {
     "hikey-usb.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-usb-modeswitch",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.usb.modeswitch",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/usb/mt-musb-host/BUILD.gn b/zircon/system/dev/usb/mt-musb-host/BUILD.gn
index d597aeeb878..9a8c3c15b7e 100644
--- a/zircon/system/dev/usb/mt-musb-host/BUILD.gn
+++ b/zircon/system/dev/usb/mt-musb-host/BUILD.gn
@@ -12,8 +12,8 @@ driver("mt-musb-host") {
     "usb-transaction.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-usb-bus",
-    "$zx/system/banjo/ddk-protocol-usb-hci",
+    "$zx/system/banjo/ddk.protocol.usb.bus",
+    "$zx/system/banjo/ddk.protocol.usb.hci",
     "$zx/system/dev/lib/mmio",
     "$zx/system/dev/lib/mt8167",
     "$zx/system/dev/lib/usb",
diff --git a/zircon/system/dev/usb/mt-musb-peripheral/BUILD.gn b/zircon/system/dev/usb/mt-musb-peripheral/BUILD.gn
index c32000dc768..65d0c367c52 100644
--- a/zircon/system/dev/usb/mt-musb-peripheral/BUILD.gn
+++ b/zircon/system/dev/usb/mt-musb-peripheral/BUILD.gn
@@ -7,13 +7,13 @@ driver("mt-musb-peripheral") {
     "mt-usb.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-clock",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-dci",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.clock",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.dci",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/mmio",
     "$zx/system/dev/lib/mt8167",
     "$zx/system/dev/lib/operation",
diff --git a/zircon/system/dev/usb/usb-bus/BUILD.gn b/zircon/system/dev/usb/usb-bus/BUILD.gn
index bb4c5bf75b9..11bd789af84 100644
--- a/zircon/system/dev/usb/usb-bus/BUILD.gn
+++ b/zircon/system/dev/usb/usb-bus/BUILD.gn
@@ -8,12 +8,12 @@ driver("usb-bus") {
     "usb-device.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-bus",
-    "$zx/system/banjo/ddk-protocol-usb-composite",
-    "$zx/system/banjo/ddk-protocol-usb-hci",
-    "$zx/system/banjo/ddk-protocol-usb-hub",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.bus",
+    "$zx/system/banjo/ddk.protocol.usb.composite",
+    "$zx/system/banjo/ddk.protocol.usb.hci",
+    "$zx/system/banjo/ddk.protocol.usb.hub",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/usb",
     "$zx/system/fidl/fuchsia-hardware-usb-device:c",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/usb/usb-composite/BUILD.gn b/zircon/system/dev/usb/usb-composite/BUILD.gn
index 3ecb17773a5..d3d77b09fc3 100644
--- a/zircon/system/dev/usb/usb-composite/BUILD.gn
+++ b/zircon/system/dev/usb/usb-composite/BUILD.gn
@@ -8,9 +8,9 @@ driver("usb-composite") {
     "usb-interface.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-composite",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.composite",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/usb",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/usb/usb-dfu/BUILD.gn b/zircon/system/dev/usb/usb-dfu/BUILD.gn
index 43c3e38dabf..930f2853cb8 100644
--- a/zircon/system/dev/usb/usb-dfu/BUILD.gn
+++ b/zircon/system/dev/usb/usb-dfu/BUILD.gn
@@ -7,9 +7,9 @@ driver("usb-dfu") {
     "usb-dfu.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-composite",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.composite",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/usb",
     "$zx/system/fidl/fuchsia-hardware-usb-fwloader:c",
     "$zx/system/fidl/fuchsia-mem:c",
diff --git a/zircon/system/dev/usb/usb-hub/BUILD.gn b/zircon/system/dev/usb/usb-hub/BUILD.gn
index 23b83e8119f..fb83a01a238 100644
--- a/zircon/system/dev/usb/usb-hub/BUILD.gn
+++ b/zircon/system/dev/usb/usb-hub/BUILD.gn
@@ -7,11 +7,11 @@ driver("usb-hub") {
     "usb-hub.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-bus",
-    "$zx/system/banjo/ddk-protocol-usb-composite",
-    "$zx/system/banjo/ddk-protocol-usb-hub",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.bus",
+    "$zx/system/banjo/ddk.protocol.usb.composite",
+    "$zx/system/banjo/ddk.protocol.usb.hub",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/usb",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/sync",
diff --git a/zircon/system/dev/usb/usb-peripheral-test/BUILD.gn b/zircon/system/dev/usb/usb-peripheral-test/BUILD.gn
index 95ffd2f0ebe..aaaf1dbfd09 100644
--- a/zircon/system/dev/usb/usb-peripheral-test/BUILD.gn
+++ b/zircon/system/dev/usb/usb-peripheral-test/BUILD.gn
@@ -8,9 +8,9 @@ if (is_fuchsia) {
       "driver.cpp",
     ]
     deps = [
-      "$zx/system/banjo/ddk-protocol-usb",
-      "$zx/system/banjo/ddk-protocol-usb-function",
-      "$zx/system/banjo/ddk-protocol-usb-request",
+      "$zx/system/banjo/ddk.protocol.usb",
+      "$zx/system/banjo/ddk.protocol.usb.function",
+      "$zx/system/banjo/ddk.protocol.usb.request",
       "$zx/system/dev/lib/usb",
       "$zx/system/ulib/ddk",
       "$zx/system/ulib/fbl",
diff --git a/zircon/system/dev/usb/usb-peripheral/BUILD.gn b/zircon/system/dev/usb/usb-peripheral/BUILD.gn
index 648ea7cf5a3..c4e12a86f7d 100644
--- a/zircon/system/dev/usb/usb-peripheral/BUILD.gn
+++ b/zircon/system/dev/usb/usb-peripheral/BUILD.gn
@@ -8,11 +8,11 @@ driver("usb-peripheral") {
     "usb-peripheral.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-dci",
-    "$zx/system/banjo/ddk-protocol-usb-function",
-    "$zx/system/banjo/ddk-protocol-usb-modeswitch",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.dci",
+    "$zx/system/banjo/ddk.protocol.usb.function",
+    "$zx/system/banjo/ddk.protocol.usb.modeswitch",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/usb",
     "$zx/system/fidl/fuchsia-hardware-usb-peripheral:c",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/usb/usb-test/flash-programmer/BUILD.gn b/zircon/system/dev/usb/usb-test/flash-programmer/BUILD.gn
index 1a1ce118209..a25c0b0ba72 100644
--- a/zircon/system/dev/usb/usb-test/flash-programmer/BUILD.gn
+++ b/zircon/system/dev/usb/usb-test/flash-programmer/BUILD.gn
@@ -11,9 +11,9 @@ driver("flash-programmer") {
     "flash-programmer.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-composite",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.composite",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/usb",
     "$zx/system/fidl/fuchsia-hardware-usb-fwloader:c",
     "$zx/system/fidl/fuchsia-mem:c",
diff --git a/zircon/system/dev/usb/usb-test/fx3/BUILD.gn b/zircon/system/dev/usb/usb-test/fx3/BUILD.gn
index 3445302cb24..7a6fb7c5d05 100644
--- a/zircon/system/dev/usb/usb-test/fx3/BUILD.gn
+++ b/zircon/system/dev/usb/usb-test/fx3/BUILD.gn
@@ -10,9 +10,9 @@ driver("fx3") {  # TODO: test_driver?
     "fx3.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-composite",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.composite",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/usb",
     "$zx/system/fidl/fuchsia-hardware-usb-fwloader:c",
     "$zx/system/fidl/fuchsia-mem:c",
diff --git a/zircon/system/dev/usb/usb-test/usb-tester/BUILD.gn b/zircon/system/dev/usb/usb-test/usb-tester/BUILD.gn
index e1d0a170665..da848394945 100644
--- a/zircon/system/dev/usb/usb-test/usb-tester/BUILD.gn
+++ b/zircon/system/dev/usb/usb-test/usb-tester/BUILD.gn
@@ -8,9 +8,9 @@ driver("usb-tester") {  # TODO: test_driver?
     "usb-tester.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-composite",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.composite",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/usb",
     "$zx/system/fidl/fuchsia-hardware-usb-tester:c",
     "$zx/system/ulib/ddktl",
diff --git a/zircon/system/dev/usb/usb-virtual-bus/BUILD.gn b/zircon/system/dev/usb/usb-virtual-bus/BUILD.gn
index 6ed40b70482..ecb35901b73 100644
--- a/zircon/system/dev/usb/usb-virtual-bus/BUILD.gn
+++ b/zircon/system/dev/usb/usb-virtual-bus/BUILD.gn
@@ -9,14 +9,14 @@ driver("usb-virtual-bus") {
     "usb-virtual-host.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-bus",
-    "$zx/system/banjo/ddk-protocol-usb-dci",
-    "$zx/system/banjo/ddk-protocol-usb-function",
-    "$zx/system/banjo/ddk-protocol-usb-hci",
-    "$zx/system/banjo/ddk-protocol-usb-hub",
-    "$zx/system/banjo/ddk-protocol-usb-modeswitch",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.bus",
+    "$zx/system/banjo/ddk.protocol.usb.dci",
+    "$zx/system/banjo/ddk.protocol.usb.function",
+    "$zx/system/banjo/ddk.protocol.usb.hci",
+    "$zx/system/banjo/ddk.protocol.usb.hub",
+    "$zx/system/banjo/ddk.protocol.usb.modeswitch",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/usb",
     "$zx/system/fidl/fuchsia-hardware-usb-virtual-bus:c",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/dev/usb/xhci/BUILD.gn b/zircon/system/dev/usb/xhci/BUILD.gn
index ef6b4a66a3d..cd83ba1ffcd 100644
--- a/zircon/system/dev/usb/xhci/BUILD.gn
+++ b/zircon/system/dev/usb/xhci/BUILD.gn
@@ -16,13 +16,13 @@ driver("xhci") {
     "xhci.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-pci",
-    "$zx/system/banjo/ddk-protocol-platform-device",
-    "$zx/system/banjo/ddk-protocol-usb",
-    "$zx/system/banjo/ddk-protocol-usb-bus",
-    "$zx/system/banjo/ddk-protocol-usb-hci",
-    "$zx/system/banjo/ddk-protocol-usb-hub",
-    "$zx/system/banjo/ddk-protocol-usb-request",
+    "$zx/system/banjo/ddk.protocol.pci",
+    "$zx/system/banjo/ddk.protocol.platform.device",
+    "$zx/system/banjo/ddk.protocol.usb",
+    "$zx/system/banjo/ddk.protocol.usb.bus",
+    "$zx/system/banjo/ddk.protocol.usb.hci",
+    "$zx/system/banjo/ddk.protocol.usb.hub",
+    "$zx/system/banjo/ddk.protocol.usb.request",
     "$zx/system/dev/lib/usb",
     "$zx/system/fidl/fuchsia-usb-debug:c",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/uapp/banjo-dummy/BUILD.gn b/zircon/system/uapp/banjo-dummy/BUILD.gn
index 949e4a2019f..d8eeb6e4a97 100644
--- a/zircon/system/uapp/banjo-dummy/BUILD.gn
+++ b/zircon/system/uapp/banjo-dummy/BUILD.gn
@@ -7,7 +7,7 @@ executable("banjo-dummy") {
     "main.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-bt-gattsvc",
+    "$zx/system/banjo/ddk.protocol.bt.gattsvc",
     "$zx/system/ulib/zircon",
   ]
 }
diff --git a/zircon/system/uapp/usbctl/BUILD.gn b/zircon/system/uapp/usbctl/BUILD.gn
index c2b553ee336..6a3287b4335 100644
--- a/zircon/system/uapp/usbctl/BUILD.gn
+++ b/zircon/system/uapp/usbctl/BUILD.gn
@@ -7,7 +7,7 @@ executable("usbctl") {
     "usbctl.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-usb-modeswitch",
+    "$zx/system/banjo/ddk.protocol.usb.modeswitch",
     "$zx/system/fidl/fuchsia-hardware-usb-peripheral:c",
     "$zx/system/fidl/fuchsia-hardware-usb-virtual-bus:c",
     "$zx/system/ulib/fdio",
diff --git a/zircon/system/ulib/ddk/BUILD.gn b/zircon/system/ulib/ddk/BUILD.gn
index a83fd12da0c..b898e604bec 100644
--- a/zircon/system/ulib/ddk/BUILD.gn
+++ b/zircon/system/ulib/ddk/BUILD.gn
@@ -57,7 +57,7 @@ library("ddk") {
     #"$zx/system/ulib/trace:headers",
 
     # <ddk/protocol/i2c-lib.h> has #include <ddk/protocol/i2c.h>.
-    "$zx/system/banjo/ddk-protocol-i2c",
+    "$zx/system/banjo/ddk.protocol.i2c",
 
     # <ddk/protocol/i2c-lib.h> has #include <lib/sync/completion.h>.
     "$zx/system/ulib/sync:headers",
diff --git a/zircon/system/ulib/ddktl/BUILD.gn b/zircon/system/ulib/ddktl/BUILD.gn
index 6d2749a7239..0e8674ea822 100644
--- a/zircon/system/ulib/ddktl/BUILD.gn
+++ b/zircon/system/ulib/ddktl/BUILD.gn
@@ -16,16 +16,16 @@ library("ddktl") {
   ]
   public_deps = [
     # <ddktl/pdev.h> has #include <ddktl/protocol/clock.h>.
-    "$zx/system/banjo/ddk-protocol-clock",
+    "$zx/system/banjo/ddk.protocol.clock",
 
     # <ddktl/pdev.h> has #include <ddktl/protocol/gpio.h>.
-    "$zx/system/banjo/ddk-protocol-gpio",
+    "$zx/system/banjo/ddk.protocol.gpio",
 
     # <ddktl/pdev.h> has #include <ddktl/protocol/power.h>.
-    "$zx/system/banjo/ddk-protocol-power",
+    "$zx/system/banjo/ddk.protocol.power",
 
     # <ddktl/pdev.h> has #include <ddktl/protocol/platform/device.h>.
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.platform.device",
 
     # <ddktl/device-internal.h> has #include <fbl/macros.h>.
     "$zx/system/ulib/fbl:headers",
@@ -38,10 +38,10 @@ library("ddktl") {
   ]
   configs += [ "$zx/public/gn/config:visibility_hidden" ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-ethernet",
-    "$zx/system/banjo/ddk-protocol-gpio",
-    "$zx/system/banjo/ddk-protocol-i2c",
-    "$zx/system/banjo/ddk-protocol-platform-device",
+    "$zx/system/banjo/ddk.protocol.ethernet",
+    "$zx/system/banjo/ddk.protocol.gpio",
+    "$zx/system/banjo/ddk.protocol.i2c",
+    "$zx/system/banjo/ddk.protocol.platform.device",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/fbl",
     "$zx/system/ulib/sync",
@@ -59,8 +59,8 @@ test_driver("ddktl-test") {
     "test/ethernet-tests.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-ethernet",
-    "$zx/system/banjo/ddk-protocol-test",
+    "$zx/system/banjo/ddk.protocol.ethernet",
+    "$zx/system/banjo/ddk.protocol.test",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/ddktl",
     "$zx/system/ulib/fbl",
diff --git a/zircon/system/ulib/intel-hda/BUILD.gn b/zircon/system/ulib/intel-hda/BUILD.gn
index 6b7536534d3..6bd5dc15fdc 100644
--- a/zircon/system/ulib/intel-hda/BUILD.gn
+++ b/zircon/system/ulib/intel-hda/BUILD.gn
@@ -12,7 +12,7 @@ library("intel-hda") {
   configs += [ "$zx/public/gn/config:visibility_hidden" ]
   public_deps = [
     # <intel-hda/codec-utils/stream-base.h> has #include <ddk/protocol/intelhda/codec.h>.
-    "$zx/system/banjo/ddk-protocol-intelhda-codec",
+    "$zx/system/banjo/ddk.protocol.intelhda.codec",
     "$zx/system/fidl/fuchsia-hardware-audio:c",
   ]
   deps = [
diff --git a/zircon/system/ulib/mipi-dsi/BUILD.gn b/zircon/system/ulib/mipi-dsi/BUILD.gn
index e09e6ee5851..2900a4c7a2d 100644
--- a/zircon/system/ulib/mipi-dsi/BUILD.gn
+++ b/zircon/system/ulib/mipi-dsi/BUILD.gn
@@ -8,6 +8,6 @@ library("mipi-dsi") {
   ]
   configs += [ "$zx/public/gn/config:visibility_hidden" ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-dsiimpl",
+    "$zx/system/banjo/ddk.protocol.dsiimpl",
   ]
 }
diff --git a/zircon/system/ulib/simplehid/BUILD.gn b/zircon/system/ulib/simplehid/BUILD.gn
index d5b12f8aa6a..193f2164132 100644
--- a/zircon/system/ulib/simplehid/BUILD.gn
+++ b/zircon/system/ulib/simplehid/BUILD.gn
@@ -6,7 +6,7 @@ library("simplehid") {
   sources = []
   public_deps = [
     # <lib/simplehid/simplehid.h> has #include <ddktl/protocol/hidbus.h>.
-    "$zx/system/banjo/ddk-protocol-hidbus",
+    "$zx/system/banjo/ddk.protocol.hidbus",
   ]
   deps = [
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/ulib/zxcrypt/BUILD.gn b/zircon/system/ulib/zxcrypt/BUILD.gn
index 9a0578c58be..11e3a354588 100644
--- a/zircon/system/ulib/zxcrypt/BUILD.gn
+++ b/zircon/system/ulib/zxcrypt/BUILD.gn
@@ -18,8 +18,8 @@ library("zxcrypt") {
   ]
   configs += [ "$zx/public/gn/config:integer-paranoia" ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-block",
-    "$zx/system/banjo/ddk-protocol-block-volume",
+    "$zx/system/banjo/ddk.protocol.block",
+    "$zx/system/banjo/ddk.protocol.block.volume",
     "$zx/system/fidl/fuchsia-device:c",
     "$zx/system/fidl/fuchsia-hardware-block:c",
     "$zx/system/fidl/fuchsia-hardware-block-volume:c",
diff --git a/zircon/system/utest/ethernet/BUILD.gn b/zircon/system/utest/ethernet/BUILD.gn
index 7971ab767c4..cb9da94af5d 100644
--- a/zircon/system/utest/ethernet/BUILD.gn
+++ b/zircon/system/utest/ethernet/BUILD.gn
@@ -7,7 +7,7 @@ test("ethernet") {
     "ethernet.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-ethernet",
+    "$zx/system/banjo/ddk.protocol.ethernet",
     "$zx/system/fidl/fuchsia-hardware-ethernet:c",
     "$zx/system/fidl/fuchsia-hardware-ethertap:c",
     "$zx/system/ulib/ddk",
diff --git a/zircon/system/utest/hid/BUILD.gn b/zircon/system/utest/hid/BUILD.gn
index 844f2747c56..18cbb7ccba1 100644
--- a/zircon/system/utest/hid/BUILD.gn
+++ b/zircon/system/utest/hid/BUILD.gn
@@ -29,7 +29,7 @@ test("hid-parse-size") {
     "hid-parse-test.cpp",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-hidbus",
+    "$zx/system/banjo/ddk.protocol.hidbus",
     "$zx/system/fidl/fuchsia-hardware-input:c",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/driver",
diff --git a/zircon/third_party/dev/ethernet/e1000/BUILD.gn b/zircon/third_party/dev/ethernet/e1000/BUILD.gn
index a8bbee813ed..955fb45a76b 100644
--- a/zircon/third_party/dev/ethernet/e1000/BUILD.gn
+++ b/zircon/third_party/dev/ethernet/e1000/BUILD.gn
@@ -24,8 +24,8 @@ driver("e1000") {
     "fuchsia.c",
   ]
   deps = [
-    "$zx/system/banjo/ddk-protocol-ethernet",
-    "$zx/system/banjo/ddk-protocol-pci",
+    "$zx/system/banjo/ddk.protocol.ethernet",
+    "$zx/system/banjo/ddk.protocol.pci",
     "$zx/system/ulib/ddk",
     "$zx/system/ulib/zircon",
   ]
-- 
GitLab