diff --git a/system/banjo/ddk-physiter/phys-iter.banjo b/system/banjo/ddk-physiter/phys-iter.banjo
deleted file mode 100644
index 49537fd..0000000
--- a/system/banjo/ddk-physiter/phys-iter.banjo
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2018 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.
-
-library ddk.physiter;
-
-[repr = "C"]
-struct PhysIterSgEntry {
-    /// length starting at the scatter gather entry offset, must be non zero
-    usize length;
-    /// offset relative to the buffer's vmo_offset
-    usize offset;
-};
diff --git a/system/banjo/ddk-physiter/rules.mk b/system/banjo/ddk-physiter/rules.mk
deleted file mode 100644
index 2815172..0000000
--- a/system/banjo/ddk-physiter/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2018 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.
-
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
-MODULE := $(LOCAL_DIR)
-
-MODULE_TYPE := banjo
-
-MODULE_PACKAGE := banjo
-
-MODULE_BANJO_LIBRARY := ddk.physiter
-
-MODULE_BANJO_NAME := physiter
-
-MODULE_SRCS += $(LOCAL_DIR)/phys-iter.banjo
-
-include make/module.mk
-
diff --git a/system/banjo/ddk-protocol-amlogiccanvas/amlogic-canvas.banjo b/system/banjo/ddk-protocol-amlogiccanvas/amlogic-canvas.banjo
deleted file mode 100644
index 1115df4..0000000
--- a/system/banjo/ddk-protocol-amlogiccanvas/amlogic-canvas.banjo
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2018 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.
-
-library ddk.protocol.amlogiccanvas;
-
-using zx;
-
-struct CanvasInfo {
-    uint32 height;
-    uint32 stride_bytes;
-    uint32 wrap;
-    uint32 blkmode;
-    uint32 endianness;
-};
-
-[Layout = "ddk-protocol", DefaultProtocol]
-interface Canvas {
-    /// Configures a canvas.
-    /// Adds a framebuffer to the canvas lookup table.
-    Config(handle<vmo> vmo, usize offset, CanvasInfo info) -> (zx.status s, uint8 canvas_idx);
-    /// Frees up a canvas.
-    Free(uint8 canvas_idx) -> (zx.status s);
-};
diff --git a/system/banjo/ddk-protocol-amlogiccanvas/rules.mk b/system/banjo/ddk-protocol-amlogiccanvas/rules.mk
deleted file mode 100644
index fe0110e..0000000
--- a/system/banjo/ddk-protocol-amlogiccanvas/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2018 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.
-
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
-MODULE := $(LOCAL_DIR)
-
-MODULE_TYPE := banjo
-
-MODULE_PACKAGE := banjo
-
-MODULE_BANJO_LIBRARY := ddk.protocol.amlogiccanvas
-
-MODULE_BANJO_NAME := amlogiccanvas
-
-MODULE_SRCS += $(LOCAL_DIR)/amlogic-canvas.banjo
-
-include make/module.mk
diff --git a/system/banjo/ddk-protocol-badblock/bad-block.banjo b/system/banjo/ddk-protocol-badblock/bad-block.banjo
deleted file mode 100644
index 6e1e733..0000000
--- a/system/banjo/ddk-protocol-badblock/bad-block.banjo
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2018 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.
-
-library ddk.protocol.badblock;
-
-using zx;
-
-[Layout = "ddk-protocol"]
-interface BadBlock {
-    /// Fills in |bad_blocks| with a list of bad blocks, up until
-    /// |bad_blocks_count|. The order of blocks is undefined.
-    /// |bad_blocks_actual| will be filled in with the actual number of bad
-    /// blocks. It is recommended to first make call with |bad_blocks_count|
-    /// equal to 0 in order to determine how large the |bad_blocks| is.
-    GetBadBlockList() -> (zx.status s, vector<uint32> bad_blocks);
-
-    /// Sets |block| as bad. If block is already marked bad, it has no effect.
-    MarkBlockBad(uint32 block) -> (zx.status s);
-};
diff --git a/system/banjo/ddk-protocol-badblock/rules.mk b/system/banjo/ddk-protocol-badblock/rules.mk
deleted file mode 100644
index 86001ed..0000000
--- a/system/banjo/ddk-protocol-badblock/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2018 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.
-
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
-MODULE := $(LOCAL_DIR)
-
-MODULE_TYPE := banjo
-
-MODULE_PACKAGE := banjo
-
-MODULE_BANJO_LIBRARY := ddk.protocol.badblock
-
-MODULE_BANJO_NAME := badblock
-
-MODULE_SRCS += $(LOCAL_DIR)/bad-block.banjo
-
-include make/module.mk
diff --git a/system/banjo/ddk-protocol-bt-gattsvc/bt-gatt-svc.banjo b/system/banjo/ddk-protocol-bt-gattsvc/bt-gatt-svc.banjo
deleted file mode 100644
index a189562..0000000
--- a/system/banjo/ddk-protocol-bt-gattsvc/bt-gatt-svc.banjo
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright 2018 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.
-
-library ddk.protocol.bt.gattsvc;
-
-using zx;
-
-//using BtGattId = uint64;
-enum BtGattId : uint64 {
-};
-
-struct BtGattUuid {
-    array<uint8>:16 bytes;
-};
-
-/// ATT protocol error codes.
-enum BtGattErr : uint8 {
-    NO_ERROR = 0x00;
-    INVALID_HANDLE = 0x01;
-    READ_NOT_PERMITTED = 0x02;
-    WRITE_NOT_PERMITTED = 0x03;
-    INVALID_PDU = 0x04;
-    INSUFFICIENT_AUTHENTICATION = 0x05;
-    REQUEST_NOT_SUPPORTED = 0x06;
-    INVALID_OFFSET = 0x07;
-    INSUFFICIENT_AUTHORIZATION = 0x08;
-    PREPARE_QUEUE_FULL = 0x09;
-    ATTRIBUTE_NOT_FOUND = 0x0A;
-    ATTRIBUTENOTLONG = 0x0B;
-    INSUFFICIENT_ENCRYPTION_KEY_SIZE = 0x0C;
-    INVALID_ATTRIBUTE_VALUE_LENGTH = 0x0D;
-    UNLIKELY_ERROR = 0x0E;
-    INSUFFICIENT_ENCRYPTION = 0x0F;
-    UNSUPPORTED_GROUP_TYPE = 0x10;
-    INSUFFICIENT_RESOURCES = 0x11;
-};
-
-/// Represents the status of a GATT operation.
-struct BtGattStatus {
-    /// Represents errors reported by the host (i.e. not over ATT).
-    zx.status status;
-
-    /// ATT protocol error.
-    BtGattErr att_ecode;
-};
-
-/// Possible values for the characteristic properties bitfield.
-enum BtGattChrPropr : uint8 {
-    BROADCAST = 0x01;
-    READ = 0x02;
-    WRITE_WITHOUT_RESPONSE = 0x04;
-    WRITE = 0x08;
-    NOTIFY = 0x10;
-    INDICATE = 0x20;
-    AUTHENTICATED_SIGNED_WRITES = 0x40;
-    EXTENDED_PROPERTIES = 0x80;
-};
-
-enum BtGattChrExtProp : uint16 {
-    RELIABLE_WRITE = 0x0100;
-    WRITABLE_AUXILIARIES = 0x0200;
-};
-
-/// Represents a GATT characteristic descriptor.
-struct BtGattDescriptor {
-    BtGattId id;
-    BtGattUuid type;
-};
-
-/// Represents a GATT characteristic.
-struct BtGattChr {
-    BtGattId id;
-    BtGattUuid type;
-
-    /// The bitmask of characteristic properties. The |extended_properties| field
-    /// is populated if the "Characteristic Extended Properties" descriptor is
-    /// present.
-    ///
-    /// See enums |BtGattChrProp| and |BtGattChrExtProp| for possible bit values.
-    uint8 properties;
-    uint16 extended_properties;
-
-    vector<BtGattDescriptor>? descriptor;
-};
-
-/// Value change notification callback of the |EnableNotifications| function.
-[Layout = "ddk-callback"]
-interface BtGattNotificationValue {
-    Callback(BtGattId id, vector<voidptr> value) -> ();
-};
-
-[Layout = "ddk-protocol"]
-interface BtGattSvc {
-    /// Connects to and starts characteristic discovery on the remote service.
-    ///
-    /// |status| will contain the result of the characteristic discovery procedure if it was
-    /// initiated by |connect|. The service will be ready to receive further requests once this
-    /// has been called successfully and the |status| callback has been called with success.
-    [Async]
-    Connect() -> (BtGattStatus status, vector<BtGattChr> characteristic);
-
-    /// Stops this service and unregisters previously registered callbacks.
-    Stop() -> ();
-
-    /// Reads the value of the characteristic with the given ID.
-    [Async]
-    ReadCharacteristic(BtGattId id) -> (BtGattStatus status, BtGattId id, vector<voidptr> value);
-
-    /// Reads the long value of the characteristic with the given ID.
-    [Async]
-    ReadLongCharacteristic(BtGattId id, uint16 offset, usize max_bytes)
-                     -> (BtGattStatus status, BtGattId id, vector<voidptr> value);
-
-    [Async]
-    WriteCharacteristic(BtGattId id, vector<voidptr> buf) -> (BtGattStatus status, BtGattId id);
-
-    /// Enables notifications from the characteristic with the given ID. Returns
-    /// `ZX_ERR_BAD_STATE` if the service has not been started yet.
-    ///
-    /// Returns `ZX_ERR_SHOULD_WAIT` if this request is already in progress.
-    ///
-    /// The async callback will be called to asynchronously report the result
-    /// of this operation.
-    [Async]
-    EnableNotifications(BtGattId id, BtGattNotificationValue value_cb)
-                     -> (BtGattStatus status, BtGattId id);
-};
diff --git a/system/banjo/ddk-protocol-bt-gattsvc/rules.mk b/system/banjo/ddk-protocol-bt-gattsvc/rules.mk
deleted file mode 100644
index 9d78026..0000000
--- a/system/banjo/ddk-protocol-bt-gattsvc/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2018 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.
-
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
-MODULE := $(LOCAL_DIR)
-
-MODULE_TYPE := banjo
-
-MODULE_PACKAGE := banjo
-
-MODULE_BANJO_LIBRARY := ddk.protocol.bt.gattsvc
-
-MODULE_BANJO_NAME := gattsvc
-
-MODULE_SRCS += $(LOCAL_DIR)/bt-gatt-svc.banjo
-
-include make/module.mk
diff --git a/system/banjo/ddk-protocol-gpioimpl/gpio-impl.banjo b/system/banjo/ddk-protocol-gpioimpl/gpio-impl.banjo
deleted file mode 100644
index 990b784..0000000
--- a/system/banjo/ddk-protocol-gpioimpl/gpio-impl.banjo
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2018 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.
-
-library ddk.protocol.gpioimpl;
-
-using ddk.protocol.gpio;
-using zx;
-
-[Layout = "ddk-protocol", DefaultProtocol, HandleWrappers]
-interface GpioImpl {
-    /// Configures a GPIO for input.
-    ConfigIn(uint32 index, uint32 flags) -> (zx.status s);
-    /// Configures a GPIO for output.
-    ConfigOut(uint32 index, uint8 initial_value) -> (zx.status s);
-    /// Configures the GPIO pin for an alternate function (I2C, SPI, etc)
-    /// the interpretation of "function" is platform dependent.
-    SetAltFunction(uint32 index, uint64 function) -> (zx.status s);
-    /// Reads the current value of a GPIO (0 or 1).
-    Read(uint32 index) -> (zx.status s, uint8 value);
-    /// Sets the current value of the GPIO (any non-zero value maps to 1).
-    Write(uint32 index, uint8 value) -> (zx.status s);
-    /// Gets an interrupt object pertaining to a particular GPIO pin.
-    GetInterrupt(uint32 index, uint32 flags) -> (zx.status s, handle<interrupt> irq);
-    /// Release the interrupt.
-    ReleaseInterrupt(uint32 index) -> (zx.status s);
-    /// Set GPIO polarity.
-    SetPolarity(uint32 index, ddk.protocol.gpio.GpioPolarity polarity) -> (zx.status s);
-};
diff --git a/system/banjo/ddk-protocol-gpioimpl/rules.mk b/system/banjo/ddk-protocol-gpioimpl/rules.mk
deleted file mode 100644
index 561537d..0000000
--- a/system/banjo/ddk-protocol-gpioimpl/rules.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2018 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.
-
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
-MODULE := $(LOCAL_DIR)
-
-MODULE_TYPE := banjo
-
-MODULE_PACKAGE := banjo
-
-MODULE_BANJO_LIBRARY := ddk.protocol.gpioimpl
-
-MODULE_BANJO_NAME := gpioimpl
-
-MODULE_BANJO_DEPS := system/banjo/ddk-protocol-gpio
-
-MODULE_SRCS += $(LOCAL_DIR)/gpio-impl.banjo
-
-include make/module.mk
diff --git a/system/banjo/ddk-protocol-i2cimpl/i2c-impl.banjo b/system/banjo/ddk-protocol-i2cimpl/i2c-impl.banjo
deleted file mode 100644
index caeb33c..0000000
--- a/system/banjo/ddk-protocol-i2cimpl/i2c-impl.banjo
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2018 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.
-
-library ddk.protocol.i2cimpl;
-
-using zx;
-
-/// See `Transact` below for usage.
-struct I2cImplOp {
-    uint16 address;
-    vector<voidptr>? data;
-    bool is_read;
-    bool stop;
-};
-
-/// Low-level protocol for i2c drivers.
-[Layout = "ddk-protocol", DefaultProtocol]
-interface I2cImpl {
-    GetBusCount() -> (uint32 count);
-    GetMaxTransferSize(uint32 bus_id) -> (zx.status s, usize size);
-    /// Sets the bitrate for the i2c bus in KHz units.
-    SetBitrate(uint32 bus_id, uint32 bitrate) -> (zx.status s);
-    /// |Transact| assumes that all ops buf are not null.
-    /// |Transact| assumes that all ops length are not zero.
-    /// |Transact| assumes that at least the last op has stop set to true.
-    Transact(uint32 bus_id, vector<I2cImplOp> op) -> (zx.status status);
-};
diff --git a/system/banjo/ddk-protocol-i2cimpl/rules.mk b/system/banjo/ddk-protocol-i2cimpl/rules.mk
deleted file mode 100644
index fc608cd..0000000
--- a/system/banjo/ddk-protocol-i2cimpl/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2018 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.
-
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
-MODULE := $(LOCAL_DIR)
-
-MODULE_TYPE := banjo
-
-MODULE_PACKAGE := banjo
-
-MODULE_BANJO_LIBRARY := ddk.protocol.i2cimpl
-
-MODULE_BANJO_NAME := i2cimpl
-
-MODULE_SRCS += $(LOCAL_DIR)/i2c-impl.banjo
-
-include make/module.mk
diff --git a/system/banjo/ddk-protocol-intelgpucore/intel-gpu-core.banjo b/system/banjo/ddk-protocol-intelgpucore/intel-gpu-core.banjo
deleted file mode 100644
index 4c96a37..0000000
--- a/system/banjo/ddk-protocol-intelgpucore/intel-gpu-core.banjo
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2018 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.
-
-library ddk.protocol.intelgpucore;
-
-using zx;
-
-const uint32 IMAGE_TYPE_X_TILED = 1;
-const uint32 IMAGE_TYPE_Y_LEGACY_TILED = 2;
-const uint32 IMAGE_TYPE_YF_TILED = 3;
-
-[Layout="ddk-callback"]
-interface ZxIntelGpuCoreInterrupt {
-    Callback(uint32 master_interrupt_control) -> ();
-};
-
-[Layout="ddk-protocol"]
-interface ZxIntelGpuCore {
-    /// Reads 16 bits from pci config space; returned in |value_out|.
-    ReadPciConfig16(uint16 addr) -> (zx.status s, uint16 value);
-
-    /// Maps the given |pci_bar|; address returned in |addr_out|, size in bytes returned in
-    /// |size_out|.
-    MapPciMmio(uint32 pci_bar) -> (zx.status s, vector<voidptr>? buf);
-
-    /// Unmaps the given |pci_bar|.
-    UnmapPciMmio(uint32 pci_bar) -> (zx.status s);
-
-    /// Returns a bus transaction initiator.
-    GetPciBti(uint32 index) -> (zx.status s, handle<bti> bti);
-
-    /// Registers the given |callback| to be invoked with parameter |data| when an interrupt occurs
-    /// matching |interrupt_mask|.
-    RegisterInterruptCallback(ZxIntelGpuCoreInterrupt callback,
-                                 uint32 interrupt_mask) -> (zx.status s);
-
-    /// Un-registers a previously registered interrupt callback.
-    UnregisterInterruptCallback() -> (zx.status s);
-
-    /// Returns the size of the GTT (global translation table) in bytes.
-    GttGetSize() -> (uint64 size);
-
-    /// Allocates a region of the GTT of the given |page_count|, returning the page-aligned virtual
-    /// address in |addr_out|.
-    GttAlloc(uint64 page_count) -> (zx.status s, uint64 addr);
-
-    /// Frees the GTT allocation given by |addr|.
-    GttFree(uint64 addr) -> (zx.status s);
-
-    /// Clears the page table entries for the GTT allocation given by |addr|.
-    GttClear(uint64 addr) -> (zx.status s);
-
-    /// Inserts page tables entries for the GTT allocation given by |addr| for the vmo represented by
-    /// handle |buffer|, at the given |page_offset| and |page_count|. Takes ownership of |buffer|.
-    GttInsert(uint64 addr, handle<vmo> buffer, uint64 page_offset,
-                  uint64 page_count) -> (zx.status s);
-};
diff --git a/system/banjo/ddk-protocol-intelgpucore/rules.mk b/system/banjo/ddk-protocol-intelgpucore/rules.mk
deleted file mode 100644
index 39ca9e0..0000000
--- a/system/banjo/ddk-protocol-intelgpucore/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2018 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.
-
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
-MODULE := $(LOCAL_DIR)
-
-MODULE_TYPE := banjo
-
-MODULE_PACKAGE := banjo
-
-MODULE_BANJO_LIBRARY := ddk.protocol.intelgpucore
-
-MODULE_BANJO_NAME := intelgpucore
-
-MODULE_SRCS += $(LOCAL_DIR)/intel-gpu-core.banjo
-
-include make/module.mk
diff --git a/system/banjo/ddk-protocol-intelhda-codec/intel-hda-codec.banjo b/system/banjo/ddk-protocol-intelhda-codec/intel-hda-codec.banjo
deleted file mode 100644
index f57aa25..0000000
--- a/system/banjo/ddk-protocol-intelhda-codec/intel-hda-codec.banjo
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2018 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.
-
-library ddk.protocol.intelhda.codec;
-
-using zx;
-
-[Layout = "ddk-protocol"]
-interface IhdaCodec {
-    /// Fetch a zx_handle_t to a channel which can be used to communicate with the codec device.
-    GetDriverChannel() -> (zx.status s, handle<channel> channel);
-};
diff --git a/system/banjo/ddk-protocol-intelhda-codec/rules.mk b/system/banjo/ddk-protocol-intelhda-codec/rules.mk
deleted file mode 100644
index c26f7ce..0000000
--- a/system/banjo/ddk-protocol-intelhda-codec/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2018 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.
-
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
-MODULE := $(LOCAL_DIR)
-
-MODULE_TYPE := banjo
-
-MODULE_PACKAGE := banjo
-
-MODULE_BANJO_LIBRARY := ddk.protocol.intelhda.codec
-
-MODULE_BANJO_NAME := intelhda/codec
-
-MODULE_SRCS += $(LOCAL_DIR)/intel-hda-codec.banjo
-
-include make/module.mk
diff --git a/system/banjo/ddk-protocol-intelhda-dsp/intel-hda-dsp.banjo b/system/banjo/ddk-protocol-intelhda-dsp/intel-hda-dsp.banjo
deleted file mode 100644
index 5dbfb17..0000000
--- a/system/banjo/ddk-protocol-intelhda-dsp/intel-hda-dsp.banjo
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2018 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.
-
-library ddk.protocol.intelhda.dsp;
-
-using zx;
-
-const string MD_KEY_NHLT = "NHLT";
-
-struct ZxPcieDeviceInfo {
-};
-
-[Layout = "ddk-callback"]
-interface IhdaDspIrq {
-    Callback() -> ();
-};
-
-[Layout = "ddk-protocol"]
-interface IhdaDsp {
-    /// Fetch the parent HDA controller's PCI device info.
-    GetDevInfo() -> (ZxPcieDeviceInfo out);
-
-    /// Fetch a VMO that represents the BAR holding the Audio DSP registers.
-    GetMmio() -> (zx.status s, handle<vmo> vmo, usize size);
-
-    /// Fetch a handle to our bus transaction initiator.
-    GetBti() -> (zx.status s, handle<bti> bti);
-
-    /// Enables DSP
-    Enable() -> ();
-
-    /// Disable DSP
-    Disable() -> ();
-
-    /// Enables DSP interrupts and set a callback to be invoked when an interrupt is
-    /// raised.
-    /// Returns `ZX_ERR_ALREADY_EXISTS` if a callback is already set.
-    IrqEnable(IhdaDspIrq callback) -> (zx.status s);
-
-    /// Disable DSP interrupts and clears the callback.
-    IrqDisable() -> ();
-};
diff --git a/system/banjo/ddk-protocol-intelhda-dsp/rules.mk b/system/banjo/ddk-protocol-intelhda-dsp/rules.mk
deleted file mode 100644
index b0c00ba..0000000
--- a/system/banjo/ddk-protocol-intelhda-dsp/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2018 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.
-
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
-MODULE := $(LOCAL_DIR)
-
-MODULE_TYPE := banjo
-
-MODULE_PACKAGE := banjo
-
-MODULE_BANJO_LIBRARY := ddk.protocol.intelhda.dsp
-
-MODULE_BANJO_NAME := intelhda/dsp
-
-MODULE_SRCS += $(LOCAL_DIR)/intel-hda-dsp.banjo
-
-include make/module.mk
diff --git a/system/banjo/ddk-protocol-serialimpl/rules.mk b/system/banjo/ddk-protocol-serialimpl/rules.mk
deleted file mode 100644
index 12fd53b..0000000
--- a/system/banjo/ddk-protocol-serialimpl/rules.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2018 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.
-
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
-MODULE := $(LOCAL_DIR)
-
-MODULE_TYPE := banjo
-
-MODULE_PACKAGE := banjo
-
-MODULE_BANJO_LIBRARY := ddk.protocol.serialimpl
-
-MODULE_BANJO_NAME := serialimpl
-
-MODULE_BANJO_DEPS := system/banjo/ddk-protocol-serial
-
-MODULE_SRCS += $(LOCAL_DIR)/serial-impl.banjo
-
-include make/module.mk
diff --git a/system/banjo/ddk-protocol-serialimpl/serial-impl.banjo b/system/banjo/ddk-protocol-serialimpl/serial-impl.banjo
deleted file mode 100644
index 273616f..0000000
--- a/system/banjo/ddk-protocol-serialimpl/serial-impl.banjo
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2018 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.
-
-library ddk.protocol.serialimpl;
-
-using zx;
-using ddk.protocol.serial;
-
-enum SerialState : uint32 {
-    READABLE = 0x1;
-    WRITABLE = 0x2;
-};
-
-/// Callback for notification of readable/writeable state changes
-/// This may be called from an interrupt thread it should just signal another thread
-/// and return as soon as possible. In particular, it may not be safe to make protocol calls
-/// from these callbacks.
-[Layout = "ddk-callback"]
-interface SerialNotify {
-    Callback(SerialState state) -> ();
-};
-
-[Layout = "ddk-protocol", DefaultProtocol]
-interface SerialImpl {
-    GetInfo() -> (zx.status s, ddk.protocol.serial.SerialPortInfo info);
-    /// Configures the given serial port.
-    Config(uint32 baud_rate, uint32 flags) -> (zx.status s);
-    Enable(bool enable) -> (zx.status s);
-    Read() -> (zx.status s, vector<voidptr> buf);
-    Write(vector<voidptr> buf) -> (zx.status s, usize actual);
-    SetNotifyCallback(SerialNotify cb) -> (zx.status s);
-};
diff --git a/system/banjo/ddk-protocol-usb-dci/rules.mk b/system/banjo/ddk-protocol-usb-dci/rules.mk
index cdea26c..c75dcbb 100644
--- a/system/banjo/ddk-protocol-usb-dci/rules.mk
+++ b/system/banjo/ddk-protocol-usb-dci/rules.mk
@@ -15,7 +15,7 @@
 MODULE_BANJO_NAME := usb/dci
 
 MODULE_BANJO_DEPS := \
-    system/banjo/ddk-physiter \
+    system/banjo/ddk-phys-iter \
     system/banjo/zircon-hw-usb \
     system/banjo/ddk-protocol-usb-request \
 
diff --git a/system/banjo/ddk-protocol-usb-function/rules.mk b/system/banjo/ddk-protocol-usb-function/rules.mk
index f006f1f..4ace376 100644
--- a/system/banjo/ddk-protocol-usb-function/rules.mk
+++ b/system/banjo/ddk-protocol-usb-function/rules.mk
@@ -15,7 +15,7 @@
 MODULE_BANJO_NAME := usb/function
 
 MODULE_BANJO_DEPS := \
-    system/banjo/ddk-physiter \
+    system/banjo/ddk-phys-iter \
     system/banjo/zircon-hw-usb \
     system/banjo/ddk-protocol-usb-request \
 
diff --git a/system/banjo/ddk-protocol-usb-hci/rules.mk b/system/banjo/ddk-protocol-usb-hci/rules.mk
index 4ab4056..ce8178c 100644
--- a/system/banjo/ddk-protocol-usb-hci/rules.mk
+++ b/system/banjo/ddk-protocol-usb-hci/rules.mk
@@ -16,7 +16,7 @@
 
 MODULE_BANJO_DEPS := \
     system/banjo/ddk-driver \
-    system/banjo/ddk-physiter \
+    system/banjo/ddk-phys-iter \
     system/banjo/zircon-hw-usb \
     system/banjo/zircon-hw-usb-hub \
     system/banjo/ddk-protocol-usb-request \
diff --git a/system/banjo/ddk-protocol-usb-modeswitch/rules.mk b/system/banjo/ddk-protocol-usb-modeswitch/rules.mk
deleted file mode 100644
index 17841fa..0000000
--- a/system/banjo/ddk-protocol-usb-modeswitch/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2018 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.
-
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
-MODULE := $(LOCAL_DIR)
-
-MODULE_TYPE := banjo
-
-MODULE_PACKAGE := banjo
-
-MODULE_BANJO_LIBRARY := ddk.protocol.usb.modeswitch
-
-MODULE_BANJO_NAME := usb/modeswitch
-
-MODULE_SRCS += $(LOCAL_DIR)/usb-mode-switch.banjo
-
-include make/module.mk
-
diff --git a/system/banjo/ddk-protocol-usb-modeswitch/usb-mode-switch.banjo b/system/banjo/ddk-protocol-usb-modeswitch/usb-mode-switch.banjo
deleted file mode 100644
index 5fec535..0000000
--- a/system/banjo/ddk-protocol-usb-modeswitch/usb-mode-switch.banjo
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2018 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.
-
-library ddk.protocol.usb.modeswitch;
-
-using zx;
-
-/// Values for `SetMode`.
-enum UsbMode : uint32 {
-    NONE = 0;
-    HOST = 1;
-    PERIPHERAL = 2;
-    OTG = 3;
-};
-
-[Layout = "ddk-protocol", DefaultProtocol]
-interface UsbModeSwitch {
-    /// Sets the current USB mode.
-    SetMode(UsbMode mode) -> (zx.status s);
-};
diff --git a/system/banjo/ddk-protocol-usb-request/rules.mk b/system/banjo/ddk-protocol-usb-request/rules.mk
index 5afa4f4..9d9c889 100644
--- a/system/banjo/ddk-protocol-usb-request/rules.mk
+++ b/system/banjo/ddk-protocol-usb-request/rules.mk
@@ -15,7 +15,7 @@
 MODULE_BANJO_NAME := usb/request
 
 MODULE_BANJO_DEPS := \
-    system/banjo/ddk-physiter \
+    system/banjo/ddk-phys-iter \
     system/banjo/zircon-hw-usb \
 
 MODULE_SRCS += $(LOCAL_DIR)/usb-request.banjo
diff --git a/system/banjo/ddk-protocol-usb/rules.mk b/system/banjo/ddk-protocol-usb/rules.mk
index f3977d7..05b19a5 100644
--- a/system/banjo/ddk-protocol-usb/rules.mk
+++ b/system/banjo/ddk-protocol-usb/rules.mk
@@ -15,7 +15,7 @@
 MODULE_BANJO_NAME := usb
 
 MODULE_BANJO_DEPS := \
-    system/banjo/ddk-physiter \
+    system/banjo/ddk-phys-iter \
     system/banjo/zircon-hw-usb \
     system/banjo/ddk-protocol-usb-request \
 
diff --git a/system/dev/audio/intel-hda/codecs/qemu/rules.mk b/system/dev/audio/intel-hda/codecs/qemu/rules.mk
index e087893..a8bc496 100644
--- a/system/dev/audio/intel-hda/codecs/qemu/rules.mk
+++ b/system/dev/audio/intel-hda/codecs/qemu/rules.mk
@@ -31,7 +31,7 @@
     system/ulib/zxcpp \
 
 MODULE_BANJO_LIBS := \
-    system/banjo/ddk-protocol-intelhda-codec \
+    system/banjo/ddk-protocol-intel-hda-codec \
     system/banjo/ddk-protocol-pci \
 
 include make/module.mk
diff --git a/system/dev/audio/intel-hda/codecs/realtek/rules.mk b/system/dev/audio/intel-hda/codecs/realtek/rules.mk
index 0e7b362..3e84f8d 100644
--- a/system/dev/audio/intel-hda/codecs/realtek/rules.mk
+++ b/system/dev/audio/intel-hda/codecs/realtek/rules.mk
@@ -29,7 +29,7 @@
     system/ulib/zxcpp \
 
 MODULE_BANJO_LIBS := \
-    system/banjo/ddk-protocol-intelhda-codec \
+    system/banjo/ddk-protocol-intel-hda-codec \
     system/banjo/ddk-protocol-pci \
 
 include make/module.mk
diff --git a/system/dev/audio/intel-hda/controller/rules.mk b/system/dev/audio/intel-hda/controller/rules.mk
index 5a0414c..59fb141 100644
--- a/system/dev/audio/intel-hda/controller/rules.mk
+++ b/system/dev/audio/intel-hda/controller/rules.mk
@@ -38,8 +38,8 @@
     system/ulib/zxcpp \
 
 MODULE_BANJO_LIBS := \
-    system/banjo/ddk-protocol-intelhda-codec \
-    system/banjo/ddk-protocol-intelhda-dsp \
+    system/banjo/ddk-protocol-intel-hda-codec \
+    system/banjo/ddk-protocol-intel-hda-dsp \
     system/banjo/ddk-protocol-pci \
 
 include make/module.mk
diff --git a/system/dev/audio/intel-hda/dsp/rules.mk b/system/dev/audio/intel-hda/dsp/rules.mk
index 08a96dc..a80ed58 100644
--- a/system/dev/audio/intel-hda/dsp/rules.mk
+++ b/system/dev/audio/intel-hda/dsp/rules.mk
@@ -40,8 +40,8 @@
     system/ulib/zxcpp \
 
 MODULE_BANJO_LIBS := \
-    system/banjo/ddk-protocol-intelhda-codec \
-    system/banjo/ddk-protocol-intelhda-dsp \
+    system/banjo/ddk-protocol-intel-hda-codec \
+    system/banjo/ddk-protocol-intel-hda-dsp \
     system/banjo/ddk-protocol-pci \
 
 include make/module.mk
diff --git a/system/dev/board/astro/rules.mk b/system/dev/board/astro/rules.mk
index 51a0db5..44938b6 100644
--- a/system/dev/board/astro/rules.mk
+++ b/system/dev/board/astro/rules.mk
@@ -41,7 +41,7 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-gpio \
-    system/banjo/ddk-protocol-gpioimpl \
+    system/banjo/ddk-protocol-gpio-impl \
     system/banjo/ddk-protocol-iommu \
     system/banjo/ddk-protocol-platform-bus \
     system/banjo/ddk-protocol-platform-device \
diff --git a/system/dev/board/gauss/rules.mk b/system/dev/board/gauss/rules.mk
index 9fff98c..1bfc74d 100644
--- a/system/dev/board/gauss/rules.mk
+++ b/system/dev/board/gauss/rules.mk
@@ -33,7 +33,7 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-gpio \
-    system/banjo/ddk-protocol-gpioimpl \
+    system/banjo/ddk-protocol-gpio-impl \
     system/banjo/ddk-protocol-iommu \
     system/banjo/ddk-protocol-platform-bus \
     system/banjo/ddk-protocol-platform-device \
diff --git a/system/dev/board/hikey960/rules.mk b/system/dev/board/hikey960/rules.mk
index d035daf..2d2574d 100644
--- a/system/dev/board/hikey960/rules.mk
+++ b/system/dev/board/hikey960/rules.mk
@@ -24,12 +24,12 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-gpio \
-    system/banjo/ddk-protocol-gpioimpl \
+    system/banjo/ddk-protocol-gpio-impl \
     system/banjo/ddk-protocol-i2c \
     system/banjo/ddk-protocol-iommu \
     system/banjo/ddk-protocol-platform-bus \
     system/banjo/ddk-protocol-platform-device \
-    system/banjo/ddk-protocol-usb-modeswitch \
+    system/banjo/ddk-protocol-usb-mode-switch \
 
 include make/module.mk
 
diff --git a/system/dev/board/imx8mevk/rules.mk b/system/dev/board/imx8mevk/rules.mk
index 6e9408b..ea4f2dd 100644
--- a/system/dev/board/imx8mevk/rules.mk
+++ b/system/dev/board/imx8mevk/rules.mk
@@ -29,10 +29,10 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-gpio \
-    system/banjo/ddk-protocol-gpioimpl \
+    system/banjo/ddk-protocol-gpio-impl \
     system/banjo/ddk-protocol-iommu \
     system/banjo/ddk-protocol-platform-bus \
     system/banjo/ddk-protocol-platform-device \
-    system/banjo/ddk-protocol-usb-modeswitch \
+    system/banjo/ddk-protocol-usb-mode-switch \
 
 include make/module.mk
diff --git a/system/dev/board/imx8mmevk/rules.mk b/system/dev/board/imx8mmevk/rules.mk
index 6500aa3..e5c2120 100644
--- a/system/dev/board/imx8mmevk/rules.mk
+++ b/system/dev/board/imx8mmevk/rules.mk
@@ -28,7 +28,7 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-gpio \
-    system/banjo/ddk-protocol-gpioimpl \
+    system/banjo/ddk-protocol-gpio-impl \
     system/banjo/ddk-protocol-iommu \
     system/banjo/ddk-protocol-platform-bus \
     system/banjo/ddk-protocol-platform-device \
diff --git a/system/dev/board/mt8167s_ref/rules.mk b/system/dev/board/mt8167s_ref/rules.mk
index a96023d..4b57dde 100644
--- a/system/dev/board/mt8167s_ref/rules.mk
+++ b/system/dev/board/mt8167s_ref/rules.mk
@@ -39,7 +39,7 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-gpio \
-    system/banjo/ddk-protocol-gpioimpl \
+    system/banjo/ddk-protocol-gpio-impl \
     system/banjo/ddk-protocol-platform-bus \
     system/banjo/ddk-protocol-platform-device \
     system/banjo/ddk-protocol-scpi \
diff --git a/system/dev/board/sherlock/rules.mk b/system/dev/board/sherlock/rules.mk
index 5f33a35..84d90c1 100644
--- a/system/dev/board/sherlock/rules.mk
+++ b/system/dev/board/sherlock/rules.mk
@@ -43,7 +43,7 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-gpio \
-    system/banjo/ddk-protocol-gpioimpl \
+    system/banjo/ddk-protocol-gpio-impl \
     system/banjo/ddk-protocol-iommu \
     system/banjo/ddk-protocol-platform-bus \
     system/banjo/ddk-protocol-platform-device \
diff --git a/system/dev/board/vim/rules.mk b/system/dev/board/vim/rules.mk
index 33ee830..41f0108 100644
--- a/system/dev/board/vim/rules.mk
+++ b/system/dev/board/vim/rules.mk
@@ -39,7 +39,7 @@
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-ethernet \
     system/banjo/ddk-protocol-gpio \
-    system/banjo/ddk-protocol-gpioimpl \
+    system/banjo/ddk-protocol-gpio-impl \
     system/banjo/ddk-protocol-iommu \
     system/banjo/ddk-protocol-platform-bus \
     system/banjo/ddk-protocol-platform-device \
diff --git a/system/dev/bus/acpi/rules.mk b/system/dev/bus/acpi/rules.mk
index c419193..3f4cdbb 100644
--- a/system/dev/bus/acpi/rules.mk
+++ b/system/dev/bus/acpi/rules.mk
@@ -77,7 +77,7 @@
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-acpi \
     system/banjo/ddk-protocol-hidbus \
-    system/banjo/ddk-protocol-intelhda-dsp \
+    system/banjo/ddk-protocol-intel-hda-dsp \
     system/banjo/ddk-protocol-pciroot \
     system/banjo/ddk-protocol-platform-device \
     system/banjo/ddk-protocol-scpi \
diff --git a/system/dev/bus/platform/rules.mk b/system/dev/bus/platform/rules.mk
index f02f350..059468d 100644
--- a/system/dev/bus/platform/rules.mk
+++ b/system/dev/bus/platform/rules.mk
@@ -36,9 +36,9 @@
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-clk \
     system/banjo/ddk-protocol-gpio \
-    system/banjo/ddk-protocol-gpioimpl \
+    system/banjo/ddk-protocol-gpio-impl \
     system/banjo/ddk-protocol-i2c \
-    system/banjo/ddk-protocol-i2cimpl \
+    system/banjo/ddk-protocol-i2c-impl \
     system/banjo/ddk-protocol-iommu \
     system/banjo/ddk-protocol-platform-bus \
     system/banjo/ddk-protocol-platform-device \
@@ -74,9 +74,9 @@
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-clk \
     system/banjo/ddk-protocol-gpio \
-    system/banjo/ddk-protocol-gpioimpl \
+    system/banjo/ddk-protocol-gpio-impl \
     system/banjo/ddk-protocol-i2c \
-    system/banjo/ddk-protocol-i2cimpl \
+    system/banjo/ddk-protocol-i2c-impl \
     system/banjo/ddk-protocol-platform-bus \
     system/banjo/ddk-protocol-platform-device \
     system/banjo/ddk-protocol-platform-proxy \
diff --git a/system/dev/display/aml-canvas/rules.mk b/system/dev/display/aml-canvas/rules.mk
index 45fee7e..4d3379e 100644
--- a/system/dev/display/aml-canvas/rules.mk
+++ b/system/dev/display/aml-canvas/rules.mk
@@ -18,7 +18,7 @@
 MODULE_LIBS := system/ulib/driver system/ulib/zircon system/ulib/c
 
 MODULE_BANJO_LIBS := \
-    system/banjo/ddk-protocol-amlogiccanvas \
+    system/banjo/ddk-protocol-amlogic-canvas \
     system/banjo/ddk-protocol-platform-bus \
     system/banjo/ddk-protocol-platform-device \
     system/banjo/ddk-protocol-platform-proxy \
@@ -39,7 +39,7 @@
 MODULE_LIBS := system/ulib/driver system/ulib/zircon system/ulib/c
 
 MODULE_BANJO_LIBS := \
-    system/banjo/ddk-protocol-amlogiccanvas \
+    system/banjo/ddk-protocol-amlogic-canvas \
     system/banjo/ddk-protocol-platform-bus \
     system/banjo/ddk-protocol-platform-device \
     system/banjo/ddk-protocol-platform-proxy \
diff --git a/system/dev/display/astro-display/rules.mk b/system/dev/display/astro-display/rules.mk
index 649b2c4..edaec21 100644
--- a/system/dev/display/astro-display/rules.mk
+++ b/system/dev/display/astro-display/rules.mk
@@ -35,7 +35,7 @@
     system/ulib/c \
 
 MODULE_BANJO_LIBS := \
-    system/banjo/ddk-protocol-amlogiccanvas \
+    system/banjo/ddk-protocol-amlogic-canvas \
     system/banjo/ddk-protocol-display-controller \
     system/banjo/ddk-protocol-gpio \
     system/banjo/ddk-protocol-i2c \
diff --git a/system/dev/display/display/rules.mk b/system/dev/display/display/rules.mk
index 6c7621b..1a6a172 100644
--- a/system/dev/display/display/rules.mk
+++ b/system/dev/display/display/rules.mk
@@ -40,7 +40,7 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-display-controller \
-    system/banjo/ddk-protocol-i2cimpl \
+    system/banjo/ddk-protocol-i2c-impl \
 
 ifeq ($(call TOBOOL,$(ENABLE_DRIVER_TRACING)),true)
 MODULE_STATIC_LIBS += system/ulib/trace.driver
diff --git a/system/dev/display/intel-i915/rules.mk b/system/dev/display/intel-i915/rules.mk
index 7f0c957..09baff3 100644
--- a/system/dev/display/intel-i915/rules.mk
+++ b/system/dev/display/intel-i915/rules.mk
@@ -39,8 +39,8 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-display-controller \
-    system/banjo/ddk-protocol-i2cimpl \
-    system/banjo/ddk-protocol-intelgpucore \
+    system/banjo/ddk-protocol-i2c-impl \
+    system/banjo/ddk-protocol-intel-gpu-core \
     system/banjo/ddk-protocol-pci \
 
 include make/module.mk
diff --git a/system/dev/display/vim-display/rules.mk b/system/dev/display/vim-display/rules.mk
index 27a38d8..1f836f8 100644
--- a/system/dev/display/vim-display/rules.mk
+++ b/system/dev/display/vim-display/rules.mk
@@ -39,10 +39,10 @@
                system/ulib/c
 
 MODULE_BANJO_LIBS := \
-    system/banjo/ddk-protocol-amlogiccanvas \
+    system/banjo/ddk-protocol-amlogic-canvas \
     system/banjo/ddk-protocol-display-controller \
     system/banjo/ddk-protocol-gpio \
-    system/banjo/ddk-protocol-i2cimpl \
+    system/banjo/ddk-protocol-i2c-impl \
     system/banjo/ddk-protocol-platform-device \
 
 MODULE_HEADER_DEPS := \
diff --git a/system/dev/gpio/aml-axg-gpio/rules.mk b/system/dev/gpio/aml-axg-gpio/rules.mk
index 147e05f..2652e9a 100644
--- a/system/dev/gpio/aml-axg-gpio/rules.mk
+++ b/system/dev/gpio/aml-axg-gpio/rules.mk
@@ -22,7 +22,7 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-gpio \
-    system/banjo/ddk-protocol-gpioimpl \
+    system/banjo/ddk-protocol-gpio-impl \
     system/banjo/ddk-protocol-platform-bus \
     system/banjo/ddk-protocol-platform-device \
 
diff --git a/system/dev/gpio/aml-gxl-gpio/rules.mk b/system/dev/gpio/aml-gxl-gpio/rules.mk
index f9a5a8f..b0bf286 100644
--- a/system/dev/gpio/aml-gxl-gpio/rules.mk
+++ b/system/dev/gpio/aml-gxl-gpio/rules.mk
@@ -26,7 +26,7 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-gpio \
-    system/banjo/ddk-protocol-gpioimpl \
+    system/banjo/ddk-protocol-gpio-impl \
     system/banjo/ddk-protocol-platform-bus \
     system/banjo/ddk-protocol-platform-device \
 
diff --git a/system/dev/gpio/gpio-test/rules.mk b/system/dev/gpio/gpio-test/rules.mk
index 28ad996..aa450f9 100644
--- a/system/dev/gpio/gpio-test/rules.mk
+++ b/system/dev/gpio/gpio-test/rules.mk
@@ -16,7 +16,7 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-gpio \
-    system/banjo/ddk-protocol-gpioimpl \
+    system/banjo/ddk-protocol-gpio-impl \
     system/banjo/ddk-protocol-platform-device \
 
 include make/module.mk
diff --git a/system/dev/gpio/imx8/rules.mk b/system/dev/gpio/imx8/rules.mk
index da25f00..2067ae5 100644
--- a/system/dev/gpio/imx8/rules.mk
+++ b/system/dev/gpio/imx8/rules.mk
@@ -25,7 +25,7 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-gpio \
-    system/banjo/ddk-protocol-gpioimpl \
+    system/banjo/ddk-protocol-gpio-impl \
     system/banjo/ddk-protocol-platform-bus \
     system/banjo/ddk-protocol-platform-device \
 
@@ -49,7 +49,7 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-gpio \
-    system/banjo/ddk-protocol-gpioimpl \
+    system/banjo/ddk-protocol-gpio-impl \
     system/banjo/ddk-protocol-platform-bus \
     system/banjo/ddk-protocol-platform-device \
 
diff --git a/system/dev/gpio/mt-8167/rules.mk b/system/dev/gpio/mt-8167/rules.mk
index 1681b91..26d56d1 100644
--- a/system/dev/gpio/mt-8167/rules.mk
+++ b/system/dev/gpio/mt-8167/rules.mk
@@ -28,7 +28,7 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-gpio \
-    system/banjo/ddk-protocol-gpioimpl \
+    system/banjo/ddk-protocol-gpio-impl \
     system/banjo/ddk-protocol-platform-bus \
     system/banjo/ddk-protocol-platform-device \
 
diff --git a/system/dev/gpio/pl061/rules.mk b/system/dev/gpio/pl061/rules.mk
index dd120bc..62e4eb1 100644
--- a/system/dev/gpio/pl061/rules.mk
+++ b/system/dev/gpio/pl061/rules.mk
@@ -20,7 +20,7 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-gpio \
-    system/banjo/ddk-protocol-gpioimpl \
+    system/banjo/ddk-protocol-gpio-impl \
     system/banjo/ddk-protocol-platform-device \
 
 include make/module.mk
diff --git a/system/dev/i2c/aml-i2c/rules.mk b/system/dev/i2c/aml-i2c/rules.mk
index 68d4037..95f5920 100644
--- a/system/dev/i2c/aml-i2c/rules.mk
+++ b/system/dev/i2c/aml-i2c/rules.mk
@@ -24,7 +24,7 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-i2c \
-    system/banjo/ddk-protocol-i2cimpl \
+    system/banjo/ddk-protocol-i2c-impl \
     system/banjo/ddk-protocol-platform-bus \
     system/banjo/ddk-protocol-platform-device \
 
diff --git a/system/dev/i2c/dw-i2c/rules.mk b/system/dev/i2c/dw-i2c/rules.mk
index d6de940..6b201d6 100644
--- a/system/dev/i2c/dw-i2c/rules.mk
+++ b/system/dev/i2c/dw-i2c/rules.mk
@@ -22,7 +22,7 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-i2c \
-    system/banjo/ddk-protocol-i2cimpl \
+    system/banjo/ddk-protocol-i2c-impl \
     system/banjo/ddk-protocol-platform-bus \
     system/banjo/ddk-protocol-platform-device \
 
diff --git a/system/dev/i2c/imx-i2c/rules.mk b/system/dev/i2c/imx-i2c/rules.mk
index d203bb4..0623f18 100644
--- a/system/dev/i2c/imx-i2c/rules.mk
+++ b/system/dev/i2c/imx-i2c/rules.mk
@@ -28,7 +28,7 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-i2c \
-    system/banjo/ddk-protocol-i2cimpl \
+    system/banjo/ddk-protocol-i2c-impl \
     system/banjo/ddk-protocol-platform-bus \
     system/banjo/ddk-protocol-platform-device \
 
diff --git a/system/dev/i2c/intel-i2c/rules.mk b/system/dev/i2c/intel-i2c/rules.mk
index 76edc90..cb55529 100644
--- a/system/dev/i2c/intel-i2c/rules.mk
+++ b/system/dev/i2c/intel-i2c/rules.mk
@@ -26,7 +26,7 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-i2c \
-    system/banjo/ddk-protocol-i2cimpl \
+    system/banjo/ddk-protocol-i2c-impl \
     system/banjo/ddk-protocol-pci \
 
 include make/module.mk
diff --git a/system/dev/i2c/mt8167-i2c/rules.mk b/system/dev/i2c/mt8167-i2c/rules.mk
index ad517cb..46f0fd2 100644
--- a/system/dev/i2c/mt8167-i2c/rules.mk
+++ b/system/dev/i2c/mt8167-i2c/rules.mk
@@ -30,7 +30,7 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-i2c \
-    system/banjo/ddk-protocol-i2cimpl \
+    system/banjo/ddk-protocol-i2c-impl \
     system/banjo/ddk-protocol-platform-device \
     system/banjo/ddk-protocol-platform-bus \
 
diff --git a/system/dev/lib/hi3660/rules.mk b/system/dev/lib/hi3660/rules.mk
index d90bf05..848f47c 100644
--- a/system/dev/lib/hi3660/rules.mk
+++ b/system/dev/lib/hi3660/rules.mk
@@ -27,7 +27,7 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-gpio \
-    system/banjo/ddk-protocol-gpioimpl \
+    system/banjo/ddk-protocol-gpio-impl \
     system/banjo/ddk-protocol-platform-device \
 
 include make/module.mk
diff --git a/system/dev/nand/nandpart/rules.mk b/system/dev/nand/nandpart/rules.mk
index b81b465..1e7afb9 100644
--- a/system/dev/nand/nandpart/rules.mk
+++ b/system/dev/nand/nandpart/rules.mk
@@ -34,7 +34,7 @@
     system/fidl/zircon-nand \
 
 MODULE_BANJO_LIBS := \
-    system/banjo/ddk-protocol-badblock \
+    system/banjo/ddk-protocol-bad-block \
     system/banjo/ddk-protocol-nand \
 
 include make/module.mk
diff --git a/system/dev/nand/skip-block/rules.mk b/system/dev/nand/skip-block/rules.mk
index 00f776c..bb31ad9 100644
--- a/system/dev/nand/skip-block/rules.mk
+++ b/system/dev/nand/skip-block/rules.mk
@@ -32,7 +32,7 @@
     system/fidl/zircon-nand.skipblock
 
 MODULE_BANJO_LIBS := \
-    system/banjo/ddk-protocol-badblock \
+    system/banjo/ddk-protocol-bad-block \
     system/banjo/ddk-protocol-nand \
 
 include make/module.mk
diff --git a/system/dev/serial/aml-uart/rules.mk b/system/dev/serial/aml-uart/rules.mk
index 42b58d2..c64d4b8 100644
--- a/system/dev/serial/aml-uart/rules.mk
+++ b/system/dev/serial/aml-uart/rules.mk
@@ -30,7 +30,7 @@
     system/banjo/ddk-protocol-platform-bus \
     system/banjo/ddk-protocol-platform-device \
     system/banjo/ddk-protocol-serial \
-    system/banjo/ddk-protocol-serialimpl \
+    system/banjo/ddk-protocol-serial-impl \
 
 MODULE_HEADER_DEPS := system/dev/lib/amlogic
 
diff --git a/system/dev/serial/ftdi/rules.mk b/system/dev/serial/ftdi/rules.mk
index 806d8ae..b738a9c 100644
--- a/system/dev/serial/ftdi/rules.mk
+++ b/system/dev/serial/ftdi/rules.mk
@@ -15,7 +15,7 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-serial \
-    system/banjo/ddk-protocol-serialimpl \
+    system/banjo/ddk-protocol-serial-impl \
     system/banjo/ddk-protocol-usb-composite \
     system/banjo/ddk-protocol-usb-request \
 
diff --git a/system/dev/serial/serial/rules.mk b/system/dev/serial/serial/rules.mk
index 74c659b..68e8d5d 100644
--- a/system/dev/serial/serial/rules.mk
+++ b/system/dev/serial/serial/rules.mk
@@ -22,6 +22,6 @@
 
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-serial \
-    system/banjo/ddk-protocol-serialimpl \
+    system/banjo/ddk-protocol-serial-impl \
 
 include make/module.mk
diff --git a/system/dev/usb/dwc3/rules.mk b/system/dev/usb/dwc3/rules.mk
index 0847583..cb98567 100644
--- a/system/dev/usb/dwc3/rules.mk
+++ b/system/dev/usb/dwc3/rules.mk
@@ -34,7 +34,7 @@
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-platform-device \
     system/banjo/ddk-protocol-usb-dci \
-    system/banjo/ddk-protocol-usb-modeswitch \
+    system/banjo/ddk-protocol-usb-mode-switch \
     system/banjo/ddk-protocol-usb-request \
 
 include make/module.mk
diff --git a/system/dev/usb/hikey-usb/rules.mk b/system/dev/usb/hikey-usb/rules.mk
index 746b832..0d73ce5 100644
--- a/system/dev/usb/hikey-usb/rules.mk
+++ b/system/dev/usb/hikey-usb/rules.mk
@@ -26,6 +26,6 @@
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-gpio \
     system/banjo/ddk-protocol-platform-device \
-    system/banjo/ddk-protocol-usb-modeswitch \
+    system/banjo/ddk-protocol-usb-mode-switch \
 
 include make/module.mk
diff --git a/system/dev/usb/usb-peripheral/rules.mk b/system/dev/usb/usb-peripheral/rules.mk
index e8ca014..361f1e3 100644
--- a/system/dev/usb/usb-peripheral/rules.mk
+++ b/system/dev/usb/usb-peripheral/rules.mk
@@ -25,7 +25,7 @@
 MODULE_BANJO_LIBS := \
     system/banjo/ddk-protocol-usb-dci \
     system/banjo/ddk-protocol-usb-function \
-    system/banjo/ddk-protocol-usb-modeswitch \
+    system/banjo/ddk-protocol-usb-mode-switch \
     system/banjo/ddk-protocol-usb-request \
 
 # Set default configuration here, rather than relying on usbctl to do it
diff --git a/system/uapp/banjo-dummy/rules.mk b/system/uapp/banjo-dummy/rules.mk
index 9a07312..b152d3b 100644
--- a/system/uapp/banjo-dummy/rules.mk
+++ b/system/uapp/banjo-dummy/rules.mk
@@ -17,6 +17,6 @@
     system/ulib/zircon \
 
 MODULE_BANJO_LIBS := \
-    system/banjo/ddk-protocol-bt-gattsvc
+    system/banjo/ddk-protocol-bt-gatt-svc
 
 include make/module.mk
diff --git a/system/uapp/usbctl/rules.mk b/system/uapp/usbctl/rules.mk
index 7ff90bf..3bd52d9 100644
--- a/system/uapp/usbctl/rules.mk
+++ b/system/uapp/usbctl/rules.mk
@@ -23,6 +23,6 @@
 MODULE_FIDL_LIBS := system/fidl/zircon-usb-peripheral
 
 MODULE_BANJO_LIBS := \
-    system/banjo/ddk-protocol-usb-modeswitch \
+    system/banjo/ddk-protocol-usb-mode-switch \
 
 include make/module.mk
diff --git a/system/ulib/intel-hda/rules.mk b/system/ulib/intel-hda/rules.mk
index 1c1ae22..24c64f2 100644
--- a/system/ulib/intel-hda/rules.mk
+++ b/system/ulib/intel-hda/rules.mk
@@ -25,6 +25,6 @@
     system/ulib/zx \
 
 MODULE_BANJO_LIBS := \
-    system/banjo/ddk-protocol-intelhda-codec \
+    system/banjo/ddk-protocol-intel-hda-codec \
 
 include make/module.mk