diff --git a/index.bs b/index.bs
index 8eb55bb..4a91d42 100644
--- a/index.bs
+++ b/index.bs
@@ -5030,7 +5030,7 @@ referenced.
 
 ## Definitions ## {#bluetooth-bidi-definitions}
 
-<pre class="cddl remote-cddl local-cddl">
+<pre class="cddl" data-cddl-module="remote-cddl,local-cddl">
 bluetooth.BluetoothUuid = text;
 bluetooth.BluetoothManufacturerData = { key: uint, data: tstr };
 bluetooth.CharacteristicProperties = {
@@ -5061,7 +5061,7 @@ The bluetooth module contains commands for managing the remote end Bluetooth beh
 
 #### The bluetooth.RequestDevice Type #### {#bluetooth-requestdevice-type}
 
-<pre highlight="cddl" class="cddl remote-cddl local-cddl">
+<pre highlight="cddl" class="cddl" data-cddl-module="remote-cddl,local-cddl">
 bluetooth.RequestDevice = text
 </pre>
 
@@ -5075,7 +5075,7 @@ device=].
 
 #### The bluetooth.RequestDeviceInfo Type #### {#bluetooth-requestdeviceinfo-type}
 
-<pre highlight="cddl" class="cddl remote-cddl local-cddl">
+<pre highlight="cddl" class="cddl" data-cddl-module="remote-cddl,local-cddl">
 bluetooth.RequestDeviceInfo = {
    id: bluetooth.RequestDevice,
    name: text / null,
@@ -5095,7 +5095,7 @@ To <dfn>serialize a device</dfn> given a {{BluetoothDevice}} |device|:
 
 #### The bluetooth.RequestDevicePrompt Type #### {#bluetooth-requestdeviceprompt-type}
 
-<pre highlight="cddl" class="cddl remote-cddl local-cddl">
+<pre highlight="cddl" class="cddl" data-cddl-module="remote-cddl,local-cddl">
 bluetooth.RequestDevicePrompt = text
 </pre>
 
@@ -5138,7 +5138,7 @@ To <dfn>serialize prompt devices</dfn> given [=device prompt=] |prompt|:
 
 #### The bluetooth.ScanRecord Type #### {#bluetooth-scanrecord-type}
 
-<pre highlight="cddl" class="cddl remote-cddl local-cddl">
+<pre highlight="cddl" class="cddl" data-cddl-module="remote-cddl,local-cddl">
 
 bluetooth.ScanRecord = {
   ? name: text,
@@ -5180,7 +5180,7 @@ This specification extends the set of [=error codes=] from
 
 ### Commands ### {#bidi-commands}
 
-<pre highlight="cddl" class="cddl remote-cddl local-cddl">
+<pre highlight="cddl" class="cddl" data-cddl-module="remote-cddl,local-cddl">
 BluetoothCommand = (
   bluetooth.HandleRequestDevicePrompt //
   bluetooth.SimulateAdapter //
@@ -5199,7 +5199,7 @@ BluetoothCommand = (
 
 #### The bluetooth.handleRequestDevicePrompt Command #### {#bluetooth-handlerequestdeviceprompt-command}
 
-<pre highlight="cddl" class="cddl remote-cddl local-cddl">
+<pre highlight="cddl" class="cddl" data-cddl-module="remote-cddl,local-cddl">
 bluetooth.HandleRequestDevicePrompt = (
    method: "bluetooth.handleRequestDevicePrompt",
    params: bluetooth.HandleRequestDevicePromptParameters,
@@ -5259,7 +5259,7 @@ A [=local end=] could dismiss a prompt by sending the following message:
 
 #### The bluetooth.simulateAdapter Command #### {#bluetooth-simulateAdapter-command}
 
-<pre highlight="cddl" class="cddl remote-cddl local-cddl">
+<pre highlight="cddl" class="cddl" data-cddl-module="remote-cddl,local-cddl">
 bluetooth.SimulateAdapter = (
    method: "bluetooth.simulateAdapter",
    params: bluetooth.SimulateAdapterParameters,
@@ -5324,7 +5324,7 @@ A [=local end=] could update the <a>adapter state</a> of an existing adapter by
 
 #### The bluetooth.disableSimulation Command #### {#bluetooth-disableSimulation-command}
 
-<pre highlight="cddl" class="cddl remote-cddl local-cddl">
+<pre highlight="cddl" class="cddl" data-cddl-module="remote-cddl,local-cddl">
 bluetooth.DisableSimulation = (
    method: "bluetooth.disableSimulation",
    params: bluetooth.DisableSimulationParameters,
@@ -5361,7 +5361,7 @@ A [=local end=] could disable the existing simulation by sending the following m
 
 #### The bluetooth.simulatePreconnectedPeripheral Command #### {#bluetooth-simulateconnectedperipheral-command}
 
-<pre highlight="cddl" class="cddl remote-cddl local-cddl">
+<pre highlight="cddl" class="cddl" data-cddl-module="remote-cddl,local-cddl">
 bluetooth.SimulatePreconnectedPeripheral = (
    method: "bluetooth.simulatePreconnectedPeripheral",
    params: bluetooth.SimulatePreconnectedPeripheralParameters,
@@ -5418,7 +5418,7 @@ A [=local end=] could simulate a preconnected peripheral by sending the followin
 
 #### The bluetooth.simulateAdvertisement Command #### {#bluetooth-simulateadvertisement-command}
 
-<pre highlight="cddl" class="cddl remote-cddl local-cddl">
+<pre highlight="cddl" class="cddl" data-cddl-module="remote-cddl,local-cddl">
 bluetooth.SimulateAdvertisement = (
    method: "bluetooth.simulateAdvertisement",
    params: bluetooth.SimulateAdvertisementParameters,
@@ -5491,7 +5491,7 @@ A [=local end=] could simulate a device advertisement by sending the following m
 
 #### The bluetooth.simulateGattConnectionResponse Command #### {#bluetooth-simulategattconnectionresponse-command}
 
-<pre highlight="cddl" class="cddl remote-cddl local-cddl">
+<pre highlight="cddl" class="cddl" data-cddl-module="remote-cddl,local-cddl">
 bluetooth.SimulateGattConnectionResponse = (
    method: "bluetooth.simulateGattConnectionResponse",
    params: bluetooth.SimulateGattConnectionResponseParameters,
@@ -5543,7 +5543,7 @@ A [=local end=] could simulate a device gatt connection response of success
 
 #### The bluetooth.simulateGattDisconnection Command #### {#bluetooth-simulategattdisconnection-command}
 
-<pre highlight="cddl" class="cddl remote-cddl local-cddl">
+<pre highlight="cddl" class="cddl" data-cddl-module="remote-cddl,local-cddl">
 bluetooth.SimulateGattDisconnection = (
    method: "bluetooth.simulateGattDisconnection",
    params: bluetooth.SimulateGattDisconnectionParameters,
@@ -5597,7 +5597,7 @@ A [=local end=] could simulate device GATT disconnection by sending the followin
 
 #### The bluetooth.simulateService Command #### {#bluetooth-simulateservice-command}
 
-<pre highlight="cddl" class="cddl remote-cddl local-cddl">
+<pre highlight="cddl" class="cddl" data-cddl-module="remote-cddl,local-cddl">
 bluetooth.SimulateService = (
    method: "bluetooth.simulateService",
    params: bluetooth.SimulateServiceParameters,
@@ -5680,7 +5680,7 @@ A [=local end=] could simulate removing a GATT service by sending the following
 
 #### The bluetooth.simulateCharacteristic Command #### {#bluetooth-simulatecharacteristic-command}
 
-<pre highlight="cddl" class="cddl remote-cddl local-cddl">
+<pre highlight="cddl" class="cddl" data-cddl-module="remote-cddl,local-cddl">
 bluetooth.SimulateCharacteristic = (
    method: "bluetooth.simulateCharacteristic",
    params: bluetooth.SimulateCharacteristicParameters,
@@ -5779,7 +5779,7 @@ A [=local end=] could simulate removing a GATT characteristic by sending the fol
 
 #### The bluetooth.simulateCharacteristicResponse Command #### {#bluetooth-simulatecharacteristicresponse-command}
 
-<pre highlight="cddl" class="cddl remote-cddl local-cddl">
+<pre highlight="cddl" class="cddl" data-cddl-module="remote-cddl,local-cddl">
 bluetooth.SimulateCharacteristicResponse = (
    method: "bluetooth.simulateCharacteristicResponse",
    params: bluetooth.SimulateCharacteristicResponseParameters,
@@ -5824,7 +5824,7 @@ with data for a characteristic read operation by sending the following message:
 
 #### The bluetooth.simulateDescriptor Command #### {#bluetooth-simulatedescriptor-command}
 
-<pre highlight="cddl" class="cddl remote-cddl local-cddl">
+<pre highlight="cddl" class="cddl" data-cddl-module="remote-cddl,local-cddl">
 bluetooth.SimulateDescriptor = (
    method: "bluetooth.simulateDescriptor",
    params: bluetooth.SimulateDescriptorParameters,
@@ -5884,7 +5884,7 @@ A [=local end=] could simulate removing a GATT descriptor by sending the followi
 
 #### The bluetooth.simulateDescriptorResponse Command #### {#bluetooth-simulatedescriptorresponse-command}
 
-<pre highlight="cddl" class="cddl remote-cddl local-cddl">
+<pre highlight="cddl" class="cddl" data-cddl-module="remote-cddl,local-cddl">
 bluetooth.SimulateDescriptorResponse = (
    method: "bluetooth.simulateDescriptorResponse",
    params: bluetooth.SimulateDescriptorResponseParameters,
@@ -5931,7 +5931,7 @@ with data for a descriptor read operation by sending the following message:
 
 ### Events ### {#bidi-events}
 
-<pre highlight="cddl" class="cddl remote-cddl local-cddl">
+<pre highlight="cddl" class="cddl" data-cddl-module="remote-cddl,local-cddl">
 BluetoothEvent = (
   bluetooth.RequestDevicePromptUpdated //
   bluetooth.GattConnectionAttempted
@@ -5940,7 +5940,7 @@ BluetoothEvent = (
 
 #### The bluetooth.requestDevicePromptUpdated Event #### {#bluetooth-requestdevicepromptupdated-event}
 
-<pre highlight="cddl" class="cddl local-cddl">
+<pre highlight="cddl" class="cddl" data-cddl-module="local-cddl">
 bluetooth.RequestDevicePromptUpdated = (
    method: "bluetooth.requestDevicePromptUpdated",
    params: bluetooth.RequestDevicePromptUpdatedParameters
@@ -5970,7 +5970,7 @@ To <dfn>trigger a prompt updated event</dfn> given a [=navigable=] |navigable|,
 
 #### The bluetooth.gattConnectionAttempted Event #### {#bluetooth-gattConnectionAttempted-event}
 
-<pre highlight="cddl" class="cddl local-cddl">
+<pre highlight="cddl" class="cddl" data-cddl-module="local-cddl">
 bluetooth.GattConnectionAttempted = (
    method: "bluetooth.gattConnectionAttempted",
    params: bluetooth.GattConnectionAttemptedParameters
@@ -5999,7 +5999,7 @@ To <dfn>trigger a gatt connection attempted event</dfn> given a [=navigable=] |n
 
 #### The bluetooth.characteristicEventGenerated Event #### {#bluetooth-characteristiceventgenerated-event}
 
-<pre highlight="cddl" class="cddl local-cddl">
+<pre highlight="cddl" class="cddl" data-cddl-module="local-cddl">
 bluetooth.CharacteristicEventGenerated = (
    method: "bluetooth.characteristicEventGenerated",
    params: bluetooth.CharacteristicEventGeneratedParameters
@@ -6023,7 +6023,7 @@ Issue: TODO: Finish the algorithm of bluetooth.characteristicEventGenerated.
 
 #### The bluetooth.descriptorEventGenerated Event #### {#bluetooth-descriptoreventgenerated-event}
 
-<pre highlight="cddl" class="cddl local-cddl">
+<pre highlight="cddl" class="cddl" data-cddl-module="local-cddl">
 bluetooth.DescriptorEventGenerated = (
    method: "bluetooth.descriptorEventGenerated",
    params: bluetooth.DescriptorEventGeneratedParameters