Merge "Docs: Fix links in section numbering."
diff --git a/2_device-types/2_2_handheld-reqs.md b/2_device-types/2_2_handheld-reqs.md
index 2fbc138..5ac722c 100644
--- a/2_device-types/2_2_handheld-reqs.md
+++ b/2_device-types/2_2_handheld-reqs.md
@@ -22,9 +22,9 @@
 
 Handheld device implementations:
 
-*   [[7.1](#7_1_display-and-graphics).1.1/H-0-1] MUST have a screen at least
+*   [[7.1](#7_1_display_and_graphics).1.1/H-0-1] MUST have a screen at least
 2.5 inches in physical diagonal size.
-*   [[7.1](#7_1_display-and-graphics).1.3/H-SR] Are STRONGLY RECOMMENDED to
+*   [[7.1](#7_1_display_and_graphics).1.3/H-SR] Are STRONGLY RECOMMENDED to
 provide users an affordance to change the display size.(Screen Density)
 
 If Handheld device implementations claim support for high dynamic range
@@ -39,23 +39,23 @@
 
 Handheld device implementations:
 
-*   [[7.1](#7_1_display-and-graphics).5/H-0-1] MUST include support for legacy
+*   [[7.1](#7_1_display_and_graphics).5/H-0-1] MUST include support for legacy
 application compatibility mode as implemented by the upstream Android open
 source code. That is, device implementations MUST NOT alter the triggers or
 thresholds at which compatibility mode is activated, and MUST NOT alter the
 behavior of the compatibility mode itself.
-*   [[7.2](#7_2_input-devices).1/H-0-1] MUST include support for third-party
+*   [[7.2](#7_2_input_devices).1/H-0-1] MUST include support for third-party
 Input Method Editor (IME) applications.
-*   [[7.2](#7_2_input-devices).3/H-0-1] MUST provide the Home, Recents, and Back
+*   [[7.2](#7_2_input_devices).3/H-0-1] MUST provide the Home, Recents, and Back
 functions.
-*   [[7.2](#7_2_input-devices).3/H-0-2] MUST send both the normal and long press
+*   [[7.2](#7_2_input_devices).3/H-0-2] MUST send both the normal and long press
 event of the Back function ([`KEYCODE_BACK`](
 http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_BACK))
 to the foreground application. These events MUST NOT be consumed by the system
 and CAN be triggerred by outside of the Android device (e.g. external hardware
 keyboard connected to the Android device).
-*   [[7.2](#7_2_input-devices).4/H-0-1] MUST support touchscreen input.
-*   [[7.2](#7_2_input-devices).4/H-SR] Are STRONGLY RECOMMENDED to launch the
+*   [[7.2](#7_2_input_devices).4/H-0-1] MUST support touchscreen input.
+*   [[7.2](#7_2_input_devices).4/H-SR] Are STRONGLY RECOMMENDED to launch the
 user-selected assist app, in other words the app that implements
 VoiceInteractionService, or an activity handling the [`ACTION_ASSIST`](https://developer.android.com/reference/android/content/Intent#ACTION_ASSIST)
 on long-press of [`KEYCODE_MEDIA_PLAY_PAUSE`](https://developer.android.com/reference/android/view/KeyEvent#KEYCODE_MEDIA_PLAY_PAUSE)
@@ -83,44 +83,44 @@
 
 *  [[7.3](#7_3_sensors).12/H-SR] Are RECOMMENDED to support pose sensor with 6
 degrees of freedom.
-*  [[7.4](#7_4_data-connectivity).3/H] SHOULD include support for Bluetooth and
+*  [[7.4](#7_4_data_connectivity).3/H] SHOULD include support for Bluetooth and
 Bluetooth LE.
 
 If Handheld device implementations include a metered connection, they:
 
-*  [[7.4](#7_4_data-connectivity).7/H-1-1] MUST provide the data saver mode.
+*  [[7.4](#7_4_data_connectivity).7/H-1-1] MUST provide the data saver mode.
 
 Handheld device implementations:
 
-*  [[7.6](#7_6_memory-and-storage).1/H-0-1] MUST have at least 4 GB of
+*  [[7.6](#7_6_memory_and_storage).1/H-0-1] MUST have at least 4 GB of
 non-volatile storage available for application private data
 (a.k.a. "/data" partition).
-*  [[7.6](#7_6_memory-and-storage).1/H-0-2] MUST return “true” for
+*  [[7.6](#7_6_memory_and_storage).1/H-0-2] MUST return “true” for
 `ActivityManager.isLowRamDevice()` when there is less than 1GB of memory
 available to the kernel and userspace.
 
 
 If Handheld device implementations are 32-bit:
 
-*   [[7.6](#7_6_memory-and-storage).1/H-1-1] The memory available to the kernel
+*   [[7.6](#7_6_memory_and_storage).1/H-1-1] The memory available to the kernel
 and userspace MUST be at least 512MB if any of the following densities are used:
      *    280dpi or lower on small/normal screens<sup>*</sup>
      *    ldpi or lower on extra large screens
      *    mdpi or lower on large screens
 
-*   [[7.6](#7_6_memory-and-storage).1/H-2-1] The memory available to the kernel
+*   [[7.6](#7_6_memory_and_storage).1/H-2-1] The memory available to the kernel
 and userspace MUST be at least 608MB if any of the following densities are used:
      *   xhdpi or higher on small/normal screens<sup>*</sup>
      *   hdpi or higher on large screens
      *   mdpi or higher on extra large screens
 
-*   [[7.6](#7_6_memory-and-storage).1/H-3-1] The memory available to the kernel
+*   [[7.6](#7_6_memory_and_storage).1/H-3-1] The memory available to the kernel
 and userspace MUST be at least 896MB if any of the following densities are used:
      *   400dpi or higher on small/normal screens<sup>*</sup>
      *   xhdpi or higher on large screens
      *   tvdpi or higher on extra large screens
 
-*    [[7.6](#7_6_memory-and-storage).1/H-4-1] The memory available to the kernel
+*    [[7.6](#7_6_memory_and_storage).1/H-4-1] The memory available to the kernel
 and userspace MUST be at least 1344MB if any of the following densities are used:
      *   560dpi or higher on small/normal screens<sup>*</sup>
      *   400dpi or higher on large screens
@@ -128,25 +128,25 @@
 
 If Handheld device implementations are 64-bit:
 
-*    [[7.6](#7_6_memory-and-storage).1/H-5-1] The memory available to the kernel
+*    [[7.6](#7_6_memory_and_storage).1/H-5-1] The memory available to the kernel
 and userspace MUST be at least 816MB if any of the following densities are used:
      *   280dpi or lower on small/normal screens<sup>*</sup>
      *   ldpi or lower on extra large screens
      *   mdpi or lower on large screens
 
-*    [[7.6](#7_6_memory-and-storage).1/H-6-1] The memory available to the kernel
+*    [[7.6](#7_6_memory_and_storage).1/H-6-1] The memory available to the kernel
 and userspace MUST be at least 944MB if any of the following densities are used:
      *   xhdpi or higher on small/normal screens<sup>*</sup>
      *   hdpi or higher on large screens
      *   mdpi or higher on extra large screens
 
-*    [[7.6](#7_6_memory-and-storage).1/H-7-1] The memory available to the kernel
+*    [[7.6](#7_6_memory_and_storage).1/H-7-1] The memory available to the kernel
 and userspace MUST be at least 1280MB if any of the following densities are used:
      *  400dpi or higher on small/normal screens<sup>*</sup>
      *  xhdpi or higher on large screens
      *  tvdpi or higher on extra large screens
 
-*    [[7.6](#7_6_memory-and-storage).1/H-8-1] The memory available to the kernel
+*    [[7.6](#7_6_memory_and_storage).1/H-8-1] The memory available to the kernel
 and userspace MUST be at least 1824MB if any of the following densities are used:
      *   560dpi or higher on small/normal screens<sup>*</sup>
      *   400dpi or higher on large screens
@@ -160,7 +160,7 @@
 
 Handheld device implementations:
 
-*   [[7.6](#7_6_memory-and-storage).2/H-0-1] MUST NOT provide an application
+*   [[7.6](#7_6_memory_and_storage).2/H-0-1] MUST NOT provide an application
 shared storage smaller than 1 GiB.
 *   [[7.7](#7_7_usb).1/H] SHOULD include a USB port supporting peripheral mode.
 
@@ -179,9 +179,9 @@
 If Handheld device implementations are capable of meeting all the performance
 requirements for supporting VR mode and include support for it, they:
 
-*   [[7.9](#7_9_virtual-reality).1/H-1-1] MUST declare the
+*   [[7.9](#7_9_virtual_reality).1/H-1-1] MUST declare the
 `android.hardware.vr.high_performance` feature flag.
-*   [[7.9](#7_9_virtual-reality).1/H-1-2] MUST include an application
+*   [[7.9](#7_9_virtual_reality).1/H-1-2] MUST include an application
 implementing `android.service.vr.VrListenerService` that can be enabled by VR
 applications via `android.app.Activity#setVrModeEnabled`.
 
@@ -190,36 +190,36 @@
 
 Handheld device implementations MUST support the following audio encoding:
 
-*    [[5.1](#5_1_media-codecs).1/H-0-1] AMR-NB
-*    [[5.1](#5_1_media-codecs).1/H-0-2] AMR-WB
-*    [[5.1](#5_1_media-codecs).1/H-0-3] MPEG-4 AAC Profile (AAC LC)
-*    [[5.1](#5_1_media-codecs).1/H-0-4] MPEG-4 HE AAC Profile (AAC+)
+*    [[5.1](#5_1_media_codecs).1/H-0-1] AMR-NB
+*    [[5.1](#5_1_media_codecs).1/H-0-2] AMR-WB
+*    [[5.1](#5_1_media_codecs).1/H-0-3] MPEG-4 AAC Profile (AAC LC)
+*    [[5.1](#5_1_media_codecs).1/H-0-4] MPEG-4 HE AAC Profile (AAC+)
 *    [[5.1](#5_1_media-codecs).1/H-0-5] AAC ELD (enhanced low delay AAC)
 
 Handheld device implementations MUST support the following audio decoding:
 
-*    [[5.1](#5_1_media-codecs).2/H-0-1] AMR-NB
-*    [[5.1](#5_1_media-codecs).2/H-0-2] AMR-WB
+*    [[5.1](#5_1_media_codecs).2/H-0-1] AMR-NB
+*    [[5.1](#5_1_media_codecs).2/H-0-2] AMR-WB
 
 Handheld device implementations MUST support the following video encoding and
 make it available to third-party applications:
 
-*    [[5.2](#5_2_video-encoding)/H-0-1] H.264 AVC
-*    [[5.2](#5_2_video-encoding)/H-0-2] VP8
+*    [[5.2](#5_2_video_encoding)/H-0-1] H.264 AVC
+*    [[5.2](#5_2_video_encoding)/H-0-2] VP8
 
 Handheld device implementations MUST support the following video decoding:
 
-*    [[5.3](#5_3_video-decoding)/H-0-1] H.264 AVC
-*    [[5.3](#5_3_video-decoding)/H-0-2] H.265 HEVC
-*    [[5.3](#5_3_video-decoding)/H-0-3] MPEG-4 SP
-*    [[5.3](#5_3_video-decoding)/H-0-4] VP8
-*    [[5.3](#5_3_video-decoding)/H-0-5] VP9
+*    [[5.3](#5_3_video_decoding)/H-0-1] H.264 AVC
+*    [[5.3](#5_3_video_decoding)/H-0-2] H.265 HEVC
+*    [[5.3](#5_3_video_decoding)/H-0-3] MPEG-4 SP
+*    [[5.3](#5_3_video_decoding)/H-0-4] VP8
+*    [[5.3](#5_3_video_decoding)/H-0-5] VP9
 
 ### 2.2.3\. Software
 
 Handheld device implementations:
 
-*   [[3.2.3.1](#3_2_3_1_core-application-intents)/H-0-1] MUST have an
+*   [[3.2.3.1](#3_2_3_1_core_application_intents)/H-0-1] MUST have an
 application that handles the [`ACTION_GET_CONTENT`](
 https://developer.android.com/reference/android/content/Intent.html#ACTION_GET_CONTENT),
 [`ACTION_OPEN_DOCUMENT`](
@@ -231,57 +231,57 @@
 intents as described in the SDK documents, and provide the user affordance
 to access the document provider data by using [`DocumentsProvider`](
 https://developer.android.com/reference/android/provider/DocumentsProvider) API.
-*   [[3.4](#3_4_web-compatibility).1/H-0-1] MUST provide a complete
+*   [[3.4](#3_4_web_compatibility).1/H-0-1] MUST provide a complete
 implementation of the `android.webkit.Webview` API.
-*   [[3.4](#3_4_web-compatibility).2/H-0-1] MUST include a standalone Browser
+*   [[3.4](#3_4_web_compatibility).2/H-0-1] MUST include a standalone Browser
 application for general user web browsing.
-*   [[3.8](#3_8_user-interface-compatibility).1/H-SR] Are STRONGLY RECOMMENDED
+*   [[3.8](#3_8_user_interface_compatibility).1/H-SR] Are STRONGLY RECOMMENDED
 to implement a default launcher that supports in-app pinning of shortcuts,
 widgets and [widgetFeatures](
 https://developer.android.com/reference/android/appwidget/AppWidgetProviderInfo.html#widgetFeatures).
-*   [[3.8](#3_8_user-interface-compatibility).1/H-SR] Are STRONGLY RECOMMENDED
+*   [[3.8](#3_8_user_interface_compatibility).1/H-SR] Are STRONGLY RECOMMENDED
 to implement a default launcher that provides quick access to the additional
 shortcuts provided by third-party apps through the [ShortcutManager](
 https://developer.android.com/reference/android/content/pm/ShortcutManager.html)
 API.
-*   [[3.8](#3_8_user-interface-compatibility).1/H-SR] Are STRONGLY RECOMMENDED
+*   [[3.8](#3_8_user_interface_compatibility).1/H-SR] Are STRONGLY RECOMMENDED
 to include a default launcher app that shows badges for the app icons.
-*   [[3.8](#3_8_user-interface-compatibility).2/H-SR] Are STRONGLY RECOMMENDED
+*   [[3.8](#3_8_user-interface_compatibility).2/H-SR] Are STRONGLY RECOMMENDED
 to support third-party app widgets.
-*   [[3.8](#3_8_user-interface-compatibility).3/H-0-1] MUST allow third-party
+*   [[3.8](#3_8_user-interface_compatibility).3/H-0-1] MUST allow third-party
 apps to notify users of notable events through the [`Notification`](
 https://developer.android.com/reference/android/app/Notification.html) and
 [`NotificationManager`](
 https://developer.android.com/reference/android/app/NotificationManager.html)
 API classes.
-*   [[3.8](#3_8_user-interface-compatibility).3/H-0-2] MUST support rich
+*   [[3.8](#3_8_user_interface_compatibility).3/H-0-2] MUST support rich
 notifications.
-*   [[3.8](#3_8_user-interface-compatibility).3/H-0-3] MUST support heads-up
+*   [[3.8](#3_8_user_interface_compatibility).3/H-0-3] MUST support heads-up
 notifications.
-*   [[3.8](#3_8_user-interface-compatibility).3/H-0-4] MUST include a
+*   [[3.8](#3_8_user_interface_compatibility).3/H-0-4] MUST include a
 notification shade, providing the user the ability to directly control (e.g.
 reply, snooze, dismiss, block) the notifications through user affordance such as
 action buttons or the control panel as implemented in the AOSP.
-*   [[3.8](#3_8_user-interface-compatibility).3/H-0-5] MUST display the choices
+*   [[3.8](#3_8_user_interface_compatibility).3/H-0-5] MUST display the choices
 provided through [`RemoteInput.Builder setChoices()`](
 https://developer.android.com/reference/android/app/RemoteInput.Builder.html#setChoices%28java.lang.CharSequence[]%29)
 in the notification shade.
-*   [[3.8](#3_8_user-interface-compatibility).3/H-SR] Are STRONGLY RECOMMENDED
+*   [[3.8](#3_8_user_interface_compatibility).3/H-SR] Are STRONGLY RECOMMENDED
 to display the first choice provided through [`RemoteInput.Builder setChoices()`](
 https://developer.android.com/reference/android/app/RemoteInput.Builder.html#setChoices%28java.lang.CharSequence[]%29)
 in the notification shade without additional user interaction.
-*   [[3.8](#3_8_user-interface-compatibility).3/H-SR] Are STRONGLY RECOMMENDED
+*   [[3.8](#3_8_user_interface_compatibility).3/H-SR] Are STRONGLY RECOMMENDED
 to display all the choices provided through [`RemoteInput.Builder setChoices()`](
 https://developer.android.com/reference/android/app/RemoteInput.Builder.html#setChoices%28java.lang.CharSequence[]%29)
 in the notification shade when the user expands all notifications in the
 notification shade.
-*   [[3.8](#3_8_user-interface-compatibility).4/H-SR] Are STRONGLY RECOMMENDED
+*   [[3.8](#3_8_user_interface_compatibility).4/H-SR] Are STRONGLY RECOMMENDED
 to implement an assistant on the device to handle the [Assist action](
 http://developer.android.com/reference/android/content/Intent.html#ACTION_ASSIST).
 
 If Handheld device implementations support Assist action, they:
 
-*   [[3.8](#3_8_user-interface-compatibility).4/H-SR] Are STRONGLY RECOMMENDED
+*   [[3.8](#3_8_user_interface_compatibility).4/H-SR] Are STRONGLY RECOMMENDED
 to use long press on `HOME` key as the designated interaction to launch the
 assist app as described in [section 7.2.3](#7_2_3_navigation_keys). MUST launch
 the user-selected assist app, in other words the app that implements
@@ -291,16 +291,16 @@
 
 If Android Handheld device implementations support a lock screen, they:
 
-*   [[3.8](#3_8_user-interface-compatibility).10/H-1-1] MUST display the Lock
+*   [[3.8](#3_8_user_interface_compatibility).10/H-1-1] MUST display the Lock
 screen Notifications including the Media Notification Template.
 
 If Handheld device implementations support a secure lock screen, they:
 
-*   [[3.9](#3_9_device-administration)/H-1-1] MUST implement the full range of
+*   [[3.9](#3_9_device_administration)/H-1-1] MUST implement the full range of
 [device administration](
 http://developer.android.com/guide/topics/admin/device-admin.html)
 policies defined in the Android SDK documentation.
-*   [[3.9](#3_9_device-administration)/H-1-2]  MUST declare the support of
+*   [[3.9](#3_9_device_administration)/H-1-2]  MUST declare the support of
 managed profiles via the `android.software.managed_users` feature flag, except when the device is configured so that it would [report](
 http://developer.android.com/reference/android/app/ActivityManager.html#isLowRamDevice%28%29)
 itself as a low RAM device or so that it allocates internal (non-removable)
@@ -315,9 +315,9 @@
 of the Switch Access and TalkBack (for languages supported by the preloaded
 Text-to-speech engine) accessibility services as provided in the [talkback open
 source project](https://github.com/google/talkback).
-*   [[3.11](#3_11_text-to-speech)/H-0-1] MUST support installation of
+*   [[3.11](#3_11_text_to_speech)/H-0-1] MUST support installation of
 third-party TTS engines.
-*   [[3.11](#3_11_text-to-speech)/H-SR] Are STRONGLY RECOMMENDED to include a
+*   [[3.11](#3_11_text_to_speech)/H-SR] Are STRONGLY RECOMMENDED to include a
 TTS engine supporting the languages available on the device.
 *   [[3.13](#3_13_quick_settings)/H-SR] Are STRONGLY RECOMMENDED to include a
 Quick Settings UI component.
@@ -330,60 +330,60 @@
 
 ### 2.2.4\. Performance and Power
 
-*   [[8.1](#8_1_user-experience-consistency)/H-0-1] **Consistent frame latency**.
+*   [[8.1](#8_1_user_experience_consistency)/H-0-1] **Consistent frame latency**.
 Inconsistent frame latency or a delay to render frames MUST NOT happen more
 often than 5 frames in a second, and SHOULD be below 1 frames in a second.
-*   [[8.1](#8_1_user-experience-consistency)/H-0-2] **User interface latency**.
+*   [[8.1](#8_1_user_experience_consistency)/H-0-2] **User interface latency**.
 Device implementations MUST ensure low latency user experience by scrolling a
 list of 10K list entries as defined by the Android Compatibility Test Suite
 (CTS) in less than 36 secs.
-*   [[8.1](#8_1_user-experience-consistency)/H-0-3] **Task switching**. When
+*   [[8.1](#8_1_user_experience_consistency)/H-0-3] **Task switching**. When
 multiple applications have been launched, re-launching an already-running
 application after it has been launched MUST take less than 1 second.
 
 Handheld device implementations:
 
-*   [[8.2](#8_2_file-io-access-performance)/H-0-1] MUST ensure a sequential
+*   [[8.2](#8_2_file_io_access_performance)/H-0-1] MUST ensure a sequential
 write performance of at least 5 MB/s.
-*   [[8.2](#8_2_file-io-access-performance)/H-0-2] MUST ensure a random write
+*   [[8.2](#8_2_file_io_access_performance)/H-0-2] MUST ensure a random write
 performance of at least 0.5 MB/s.
-*   [[8.2](#8_2_file-io-access-performance)/H-0-3] MUST ensure a sequential read
+*   [[8.2](#8_2_file_io_access_performance)/H-0-3] MUST ensure a sequential read
 performance of at least 15 MB/s.
-*   [[8.2](#8_2_file-io-access-performance)/H-0-4] MUST ensure a random read
+*   [[8.2](#8_2_file_io_access_performance)/H-0-4] MUST ensure a random read
 performance of at least 3.5 MB/s.
 
 If Handheld device implementations include features to improve device power
 management that are included in AOSP or extend the features that are included
 in AOSP, they:
 
-* [[8.3](#8_3_power-saving-modes)/H-1-1] MUST provide user affordance to enable
+* [[8.3](#8_3_power_saving_modes)/H-1-1] MUST provide user affordance to enable
   and disable the battery saver feature.
-* [[8.3](#8_3_power-saving-modes)/H-1-2] MUST provide user affordance to display
+* [[8.3](#8_3_power_saving_modes)/H-1-2] MUST provide user affordance to display
   all apps that are exempted from App Standby and Doze power-saving modes.
 
 Handheld device implementations:
 
-*    [[8.4](#8_4_power-consumption-accounting)/H-0-1] MUST provide a
+*    [[8.4](#8_4_power_consumption_accounting)/H-0-1] MUST provide a
 per-component power profile that defines the [current consumption value](
 http://source.android.com/devices/tech/power/values.html)
 for each hardware component and the approximate battery drain caused by the
 components over time as documented in the Android Open Source Project site.
-*    [[8.4](#8_4_power-consumption-accounting)/H-0-2] MUST report all power
+*    [[8.4](#8_4_power_consumption_accounting)/H-0-2] MUST report all power
 consumption values in milliampere hours (mAh).
-*    [[8.4](#8_4_power-consumption-accounting)/H-0-3] MUST report CPU power
+*    [[8.4](#8_4_power_consumption_accounting)/H-0-3] MUST report CPU power
 consumption per each process's UID. The Android Open Source Project meets the
 requirement through the `uid_cputime` kernel module implementation.
-*   [[8.4](#8_4_power-consumption-accounting)/H-0-4] MUST make this power usage
+*   [[8.4](#8_4_power_consumption_accounting)/H-0-4] MUST make this power usage
 available via the [`adb shell dumpsys batterystats`](
 http://source.android.com/devices/tech/power/batterystats.html)
 shell command to the app developer.
-*   [[8.4](#8_4_power-consumption-accounting)/H] SHOULD be attributed to the
+*   [[8.4](#8_4_power_consumption_accounting)/H] SHOULD be attributed to the
 hardware component itself if unable to attribute hardware component power usage
 to an application.
 
 If Handheld device implementations include a screen or video output, they:
 
-*   [[8.4](#8_4_power-consumption-accounting)/H-1-1] MUST honor the
+*   [[8.4](#8_4_power_consumption_accounting)/H-1-1] MUST honor the
 [`android.intent.action.POWER_USAGE_SUMMARY`](
 http://developer.android.com/reference/android/content/Intent.html#ACTION_POWER_USAGE_SUMMARY)
 intent and display a settings menu that shows this power usage.
diff --git a/2_device-types/2_3_television-reqs.md b/2_device-types/2_3_television-reqs.md
index bcd42fe..853173c 100644
--- a/2_device-types/2_3_television-reqs.md
+++ b/2_device-types/2_3_television-reqs.md
@@ -20,17 +20,17 @@
 
 Television device implementations:
 
-*   [[7.2](#7_2_input-devices).2/T-0-1] MUST support [D-pad](
+*   [[7.2](#7_2_input_devices).2/T-0-1] MUST support [D-pad](
 https://developer.android.com/reference/android/content/res/Configuration.html#NAVIGATION_DPAD).
-*   [[7.2](#7_2_input-devices).3/T-0-1] MUST provide the Home and Back
+*   [[7.2](#7_2_input_devices).3/T-0-1] MUST provide the Home and Back
 functions.
-*   [[7.2](#7_2_input-devices).3/T-0-2] MUST send both the normal and long press
+*   [[7.2](#7_2_input_devices).3/T-0-2] MUST send both the normal and long press
 event of the Back function ([`KEYCODE_BACK`](
 http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_BACK))
 to the foreground application.
-*   [[7.2](#7_2_input-devices).6.1/T-0-1] MUST include support for game
+*   [[7.2](#7_2_input_devices).6.1/T-0-1] MUST include support for game
 controllers and declare the `android.hardware.gamepad` feature flag.
-*   [[7.2](#7_2_input-devices).7/T] SHOULD provide a remote control from which
+*   [[7.2](#7_2_input_devices).7/T] SHOULD provide a remote control from which
 users can access [non-touch navigation](#7_2_2_non-touch_navigation) and
 [core navigation keys](#7_2_3_navigation_keys) inputs.
 
@@ -43,9 +43,9 @@
 
 Television device implementations:
 
-*   [[7.4](#7_4_data-connectivity).3/T-0-1] MUST support Bluetooth and
+*   [[7.4](#7_4_data_connectivity).3/T-0-1] MUST support Bluetooth and
 Bluetooth LE.
-*   [[7.6](#7_6_memory-and-storage).1/T-0-1] MUST have at least 4 GB of
+*   [[7.6](#7_6_memory_and_storage).1/T-0-1] MUST have at least 4 GB of
 non-volatile storage available for application private data
 (a.k.a. "/data" partition).
 
@@ -57,7 +57,7 @@
 
 If TV device implementations are 32-bit:
 
-*   [[7.6](#7_6_memory-and-storage).1/T-1-1] The memory available to the kernel
+*   [[7.6](#7_6_memory_and_storage).1/T-1-1] The memory available to the kernel
 and userspace MUST be at least 896MB if any of the following densities are used:
 
     *   400dpi or higher on small/normal screens
@@ -66,7 +66,7 @@
 
 If TV device implementations are 64-bit:
 
-*   [[7.6](#7_6_memory-and-storage).1/T-2-1] The memory available to the kernel
+*   [[7.6](#7_6_memory_and_storage).1/T-2-1] The memory available to the kernel
 and userspace MUST be at least 1280MB if any of the following densities are
 used:
 
@@ -89,95 +89,95 @@
 
 Television device implementations MUST support the following audio encoding formats:
 
-*    [[5.1](#5_1_media-codecs)/T-0-1] MPEG-4 AAC Profile (AAC LC)
-*    [[5.1](#5_1_media-codecs)/T-0-2] MPEG-4 HE AAC Profile (AAC+)
-*    [[5.1](#5_1_media-codecs)/T-0-3] AAC ELD (enhanced low delay AAC)
+*    [[5.1](#5_1_media_codecs)/T-0-1] MPEG-4 AAC Profile (AAC LC)
+*    [[5.1](#5_1_media_codecs)/T-0-2] MPEG-4 HE AAC Profile (AAC+)
+*    [[5.1](#5_1_media_codecs)/T-0-3] AAC ELD (enhanced low delay AAC)
 
 
 Television device implementations MUST support the following video encoding formats:
 
-*    [[5.2](#5_2_video-encoding)/T-0-1] H.264 
-*    [[5.2](#5_2_video-encoding)/T-0-2] VP8
+*    [[5.2](#5_2_video_encoding)/T-0-1] H.264 
+*    [[5.2](#5_2_video_encoding)/T-0-2] VP8
 
 Television device implementations:
 
-*   [[5.2](#5_2_video-encoding).2/T-SR] Are STRONGLY RECOMMENDED to support
+*   [[5.2](#5_2_video_encoding).2/T-SR] Are STRONGLY RECOMMENDED to support
 H.264 encoding of 720p and 1080p resolution videos at 30 frames per second.
 
 Television device implementations MUST support the following video decoding formats:
 
-*    [[5.3.3](#5_3_video-decoding)/T-0-1] MPEG-4 SP
-*    [[5.3.4](#5_3_video-decoding)/T-0-2] H.264 AVC
-*    [[5.3.5](#5_3_video-decoding)/T-0-3] H.265 HEVC
-*    [[5.3.6](#5_3_video-decoding)/T-0-4] VP8
-*    [[5.3.7](#5_3_video-decoding)/T-0-5] VP9
+*    [[5.3.3](#5_3_video_decoding)/T-0-1] MPEG-4 SP
+*    [[5.3.4](#5_3_video_decoding)/T-0-2] H.264 AVC
+*    [[5.3.5](#5_3_video_decoding)/T-0-3] H.265 HEVC
+*    [[5.3.6](#5_3_video_decoding)/T-0-4] VP8
+*    [[5.3.7](#5_3_video_decoding)/T-0-5] VP9
 
 Television device implementations are STRONGLY RECOMMENDED to support the
 following video decoding formats:
 
-*    [[5.3.1](#5_3_video-decoding)/T-SR] MPEG-2
+*    [[5.3.1](#5_3_video_decoding)/T-SR] MPEG-2
 
 Television device implementations MUST support H.264 decoding, as detailed in Section 5.3.4, 
 at standard video frame rates and resolutions up to and including:
 
-*   [[5.3.4](#5_3_video-decoding).4/T-1-1] HD 1080p at 60 frames per second with Basline Profile
-*   [[5.3.4](#5_3_video-decoding).4/T-1-2] HD 1080p at 60 frames per second with Main Profile 
-*   [[5.3.4](#5_3_video-decoding).4/T-1-3] HD 1080p at 60 frames per second with High Profile Level 4.2
+*   [[5.3.4](#5_3_video_decoding).4/T-1-1] HD 1080p at 60 frames per second with Basline Profile
+*   [[5.3.4](#5_3_video_decoding).4/T-1-2] HD 1080p at 60 frames per second with Main Profile 
+*   [[5.3.4](#5_3_video_decoding).4/T-1-3] HD 1080p at 60 frames per second with High Profile Level 4.2
 
 Television device implementations  with H.265 hardware decoders MUST support H.265 decoding, 
 as detailed in Section 5.3.5, at standard video frame rates and resolutions up to and including:
 
-*   [[5.3.5](#5_3_video-decoding).4/T-1-1] HD 1080p at 60 frames per second with Main Profile Level 4.1
+*   [[5.3.5](#5_3_video_decoding).4/T-1-1] HD 1080p at 60 frames per second with Main Profile Level 4.1
 
 If Television device implementations with H.265 hardware decoders support 
 H.265 decoding and the UHD decoding profile, they:
 
-*   [[5.3.5](#5_3_video-decoding).5/T-2-1] MUST support UHD 3480p at 60 frames per second with Main10 Level 5
+*   [[5.3.5](#5_3_video_decoding).5/T-2-1] MUST support UHD 3480p at 60 frames per second with Main10 Level 5
 Main Tier profile.
 
 Television device implementations MUST support VP8 decoding, as detailed in Section 5.3.6, 
 at standard video frame rates and resolutions up to and including:
 
-*   [[5.3.6](#5_3_video-decoding).4/T-1-1] HD 1080p at 60 frames per second decoding profile
+*   [[5.3.6](#5_3_video_decoding).4/T-1-1] HD 1080p at 60 frames per second decoding profile
 
 Television device implementations  with VP9 hardware decoders MUST support VP9 decoding, as detailed in Section 5.3.7, 
 at standard video frame rates and resolutions up to and including:
 
-*   [[5.3.7](#5_3_video-decoding).4/T-1-1] HD 1080p at 60 frames per second with profile 0 (8 bit colour depth) 
+*   [[5.3.7](#5_3_video_decoding).4/T-1-1] HD 1080p at 60 frames per second with profile 0 (8 bit colour depth) 
 
 If Television device implementations with VP9 hardware decoders support VP9 decoding and the UHD decoding
 profile, they:
 
-*   [[5.3.7](#5_3_video-decoding).5/T-2-1] MUST support UHD 3480p at 60 frames per second with profile 0 (8 bit colour depth).
-*   [[5.3.7](#5_3_video-decoding).5/T-2-1] Are STRONGLY RECOMMENDED to support UHD 3480p at 60 frames per second with profile 2 (10 bit colour depth).
+*   [[5.3.7](#5_3_video_decoding).5/T-2-1] MUST support UHD 3480p at 60 frames per second with profile 0 (8 bit colour depth).
+*   [[5.3.7](#5_3_video_decoding).5/T-2-1] Are STRONGLY RECOMMENDED to support UHD 3480p at 60 frames per second with profile 2 (10 bit colour depth).
 
 Television device implementations:
 
-*   [[5.5](#5_5_audio-playback).3/T-0-1] MUST include support for system Master
+*   [[5.5](#5_5_audio_playback).3/T-0-1] MUST include support for system Master
 Volume and digital audio output volume attenuation on supported outputs,
 except for compressed audio passthrough output (where no audio decoding is done
 on the device).
-*    [[5.8](#5_8_secure-media)/T-0-1] MUST set the HDMI output mode to
+*    [[5.8](#5_8_secure_media)/T-0-1] MUST set the HDMI output mode to
 select the maximum resolution that can be supported with either 50Hz or 60Hz
 refresh rate for all wired displays.
-*    [[5.8](#5_8_secure-media)/T-SR] Are STRONGLY RECOMMENDED to provide a user
+*    [[5.8](#5_8_secure_media)/T-SR] Are STRONGLY RECOMMENDED to provide a user
 configurable HDMI refresh rate selector for all wired displays.
-*    [[5.8](#5_8_secure-media)/T-SR] Are STRONGLY RECOMMENDED to support
+*    [[5.8](#5_8_secure_media)/T-SR] Are STRONGLY RECOMMENDED to support
 simultaneous decoding of secure streams. At minimum, simultaneous decoding of
 two steams is STRONGLY RECOMMENDED.
-*    [[5.8](#5_8_secure-media)] SHOULD set the HDMI output mode refresh rate
+*    [[5.8](#5_8_secure_media)] SHOULD set the HDMI output mode refresh rate
 to either 50Hz or 60Hz, depending on the video refresh rate for the region the
 device is sold in for all wired displays.
 
 If Television device implementations support UHD decoding and have support
 for external displays, they:
 
-*    [[5.8](#5_8_secure-media)/T-1-1] MUST support HDCP 2.2.
+*    [[5.8](#5_8_secure_media)/T-1-1] MUST support HDCP 2.2.
 
 If Television device implementations do not support UHD decoding but have
 support for external displays, they:
 
-*    [[5.8](#5_8_secure-media)/T-2-1] MUST support HDCP 1.4
+*    [[5.8](#5_8_secure_media)/T-2-1] MUST support HDCP 1.4
 
 
 
@@ -189,17 +189,17 @@
 [`android.software.leanback`](
 http://developer.android.com/reference/android/content/pm/PackageManager.html#FEATURE_LEANBACK)
 and `android.hardware.type.television`.
-*   [[3.4](#3_4_web-compatibility).1/T-0-1] MUST provide a complete
+*   [[3.4](#3_4_web_compatibility).1/T-0-1] MUST provide a complete
 implementation of the `android.webkit.Webview` API.
 
 If Android Television device implementations support a lock screen,they:
 
-*   [[3.8](#3_8_user-interface-compatibility).10/T-1-1] MUST display the Lock
+*   [[3.8](#3_8_user_interface_compatibility).10/T-1-1] MUST display the Lock
 screen Notifications including the Media Notification Template.
 
 Television device implementations:
 
-*   [[3.8](#3_8_user-interface-compatibility).14/T-SR] Are STRONGLY RECOMMENDED
+*   [[3.8](#3_8_user_interface_compatibility).14/T-SR] Are STRONGLY RECOMMENDED
 to support picture-in-picture (PIP) mode multi-window.
 *   [[3.10](#3_10_accessibility)/T-0-1] MUST support third-party accessibility
 services.
@@ -213,56 +213,56 @@
 If Television device implementations report the feature
 `android.hardware.audio.output`, they:
 
-*   [[3.11](#3_11_text-to-speech)/T-SR] Are STRONGLY RECOMMENDED to include a
+*   [[3.11](#3_11_text_to_speech)/T-SR] Are STRONGLY RECOMMENDED to include a
 TTS engine supporting the languages available on the device.
-*   [[3.11](#3_11_text-to-speech)/T-1-1] MUST support installation of
+*   [[3.11](#3_11_text_to_speech)/T-1-1] MUST support installation of
 third-party TTS engines.
 
 
 Television device implementations:
 
-*    [[3.12](#3_12_tv-input-framework)/T-0-1] MUST support TV Input Framework.
+*    [[3.12](#3_12_tv_input_framework)/T-0-1] MUST support TV Input Framework.
 
 
 ### 2.3.4\. Performance and Power
 
-*   [[8.1](#8_1_user-experience-consistency)/T-0-1] **Consistent frame latency**.
+*   [[8.1](#8_1_user_experience_consistency)/T-0-1] **Consistent frame latency**.
    Inconsistent frame latency or a delay to render frames MUST NOT happen more
    often than 5 frames in a second, and SHOULD be below 1 frames in a second.
-*   [[8.2](#8_2_file-io-access-performance)/T-0-1] MUST ensure a sequential
+*   [[8.2](#8_2_file_io_access_performance)/T-0-1] MUST ensure a sequential
    write performance of at least 5MB/s.
-*   [[8.2](#8_2_file-io-access-performance)/T-0-2] MUST ensure a random write
+*   [[8.2](#8_2_file_io_access_performance)/T-0-2] MUST ensure a random write
    performance of at least 0.5MB/s.
-*   [[8.2](#8_2_file-io-access-performance)/T-0-3] MUST ensure a sequential
+*   [[8.2](#8_2_file_io_access_performance)/T-0-3] MUST ensure a sequential
    read performance of at least 15MB/s.
-*   [[8.2](#8_2_file-io-access-performance)/T-0-4] MUST ensure a random read
+*   [[8.2](#8_2_file_io_access_performance)/T-0-4] MUST ensure a random read
    performance of at least 3.5MB/s.
 
 If Television device implementations include features to improve device power
 management that are included in AOSP or extend the features that are included
 in AOSP, they:
 
-* [[8.3](#8_3_power-saving-modes)/T-1-1] MUST provide user affordance to enable
+* [[8.3](#8_3_power_saving_modes)/T-1-1] MUST provide user affordance to enable
   and disable the battery saver feature.
-* [[8.3](#8_3_power-saving-modes)/T-1-2] MUST provide user affordance to display
+* [[8.3](#8_3_power_saving_modes)/T-1-2] MUST provide user affordance to display
   all apps that are exempted from App Standby and Doze power-saving modes.
 
 Television device implementations:
 
-*    [[8.4](#8_4_power-consumption-accounting)/T-0-1] MUST provide a
+*    [[8.4](#8_4_power_consumption_accounting)/T-0-1] MUST provide a
 per-component power profile that defines the [current consumption value](
 http://source.android.com/devices/tech/power/values.html)
 for each hardware component and the approximate battery drain caused by the
 components over time as documented in the Android Open Source Project site.
-*    [[8.4](#8_4_power-consumption-accounting)/T-0-2] MUST report all power
+*    [[8.4](#8_4_power_consumption_accounting)/T-0-2] MUST report all power
 consumption values in milliampere hours (mAh).
-*    [[8.4](#8_4_power-consumption-accounting)/T-0-3] MUST report CPU power
+*    [[8.4](#8_4_power_consumption_accounting)/T-0-3] MUST report CPU power
 consumption per each process's UID. The Android Open Source Project meets the
 requirement through the `uid_cputime` kernel module implementation.
-*    [[8.4](#8_4_power-consumption-accounting)/T] SHOULD be attributed to the
+*    [[8.4](#8_4_power_consumption_accounting)/T] SHOULD be attributed to the
 hardware component itself if unable to attribute hardware component power usage
 to an application.
-*   [[8.4](#8_4_power-consumption-accounting)/T-0-4] MUST make this power usage
+*   [[8.4](#8_4_power_consumption_accounting)/T-0-4] MUST make this power usage
 available via the [`adb shell dumpsys batterystats`](
 http://source.android.com/devices/tech/power/batterystats.html)
 shell command to the app developer.
diff --git a/2_device-types/2_4_watch-reqs.md b/2_device-types/2_4_watch-reqs.md
index 4a055a0..1d44f71 100644
--- a/2_device-types/2_4_watch-reqs.md
+++ b/2_device-types/2_4_watch-reqs.md
@@ -17,22 +17,22 @@
 
 Watch device implementations:
 
-*   [[7.1](#7_1_display-and-graphics).1.1/W-0-1] MUST have a screen with the
+*   [[7.1](#7_1_display_and_graphics).1.1/W-0-1] MUST have a screen with the
 physical diagonal size in the range from 1.1 to 2.5 inches.
 
-*   [[7.2](#7_2_input-devices).3/W-0-1] MUST have the Home function available
+*   [[7.2](#7_2_input_devices).3/W-0-1] MUST have the Home function available
 to the user, and the Back function except for when it is in `UI_MODE_TYPE_WATCH`.
 
-*   [[7.2](#7_2_input-devices).4/W-0-1] MUST support touchscreen input.
+*   [[7.2](#7_2_input_devices).4/W-0-1] MUST support touchscreen input.
 
 *   [[7.3](#7_3_sensors).1/W-SR] Are STRONGLY RECOMMENDED to include a 3-axis
 accelerometer.
 
-*   [[7.4](#7_4_data-connectivity).3/W-0-1] MUST support Bluetooth.
+*   [[7.4](#7_4_data_connectivity).3/W-0-1] MUST support Bluetooth.
 
-*   [[7.6](#7_6_memory-and-storage).1/W-0-1] MUST have at least 1 GB of
+*   [[7.6](#7_6_memory_and_storage).1/W-0-1] MUST have at least 1 GB of
 non-volatile storage available for application private data (a.k.a. "/data" partition).
-*   [[7.6](#7_6_memory-and-storage).1/W-0-2] MUST have at least 416 MB memory
+*   [[7.6](#7_6_memory_and_storage).1/W-0-2] MUST have at least 416 MB memory
 available to the kernel and userspace.
 
 *   [[7.8](#7_8_audio).1/W-0-1] MUST include a microphone.
@@ -55,7 +55,7 @@
 
 Watch device implementations:
 
-*   [[3.8](#3_8_user-interface-compatibility).4/W-SR] Are STRONGLY RECOMMENDED
+*   [[3.8](#3_8_user_interface_compatibility).4/W-SR] Are STRONGLY RECOMMENDED
 to implement an assistant on the device to handle the [Assist action](
 http://developer.android.com/reference/android/content/Intent.html#ACTION_ASSIST).
 
@@ -73,10 +73,10 @@
 If Watch device implementations report the feature android.hardware.audio.output,
 they:
 
-*   [[3.11](#3_11_text-to-speech)/W-SR] Are STRONGLY RECOMMENDED to include a
+*   [[3.11](#3_11_text_to_speech)/W-SR] Are STRONGLY RECOMMENDED to include a
 TTS engine supporting the languages available on the device.
 
-*   [[3.11](#3_11_text-to-speech)/W-0-1] MUST support installation of
+*   [[3.11](#3_11_text_to_speech)/W-0-1] MUST support installation of
 third-party TTS engines.
 
 ### 2.4.4\. Performance and Power
@@ -85,28 +85,28 @@
 management that are included in AOSP or extend the features that are included
 in AOSP, they:
 
-*   [[8.3](#8_3_power-saving-modes)/W-SR] Are STRONGLY RECOMMENDED to provide
+*   [[8.3](#8_3_power_saving_modes)/W-SR] Are STRONGLY RECOMMENDED to provide
     user affordance to display all apps that are exempted from App Standby and
     Doze power-saving modes.
-*   [[8.3](#8_3_power-saving-modes)/W-SR] Are STRONGLY RECOMMENDED to provide
+*   [[8.3](#8_3_power_saving_modes)/W-SR] Are STRONGLY RECOMMENDED to provide
     user affordance to enable and disable the battery saver feature.
 
 Watch device implementations:
 
-*    [[8.4](#8_4_power-consumption-accounting)/W-0-1] MUST provide a
+*    [[8.4](#8_4_power_consumption_accounting)/W-0-1] MUST provide a
 per-component power profile that defines the [current consumption value](
 http://source.android.com/devices/tech/power/values.html)
 for each hardware component and the approximate battery drain caused by the
 components over time as documented in the Android Open Source Project site.
-*    [[8.4](#8_4_power-consumption-accounting)/W-0-2] MUST report all power
+*    [[8.4](#8_4_power_consumption_accounting)/W-0-2] MUST report all power
 consumption values in milliampere hours (mAh).
-*    [[8.4](#8_4_power-consumption-accounting)/W-0-3] MUST report CPU power
+*    [[8.4](#8_4_power_consumption_accounting)/W-0-3] MUST report CPU power
 consumption per each process's UID. The Android Open Source Project meets the
 requirement through the `uid_cputime` kernel module implementation.
-*   [[8.4](#8_4_power-consumption-accounting)/W-0-4] MUST make this power usage
+*   [[8.4](#8_4_power_consumption_accounting)/W-0-4] MUST make this power usage
 available via the [`adb shell dumpsys batterystats`](
 http://source.android.com/devices/tech/power/batterystats.html)
 shell command to the app developer.
-*   [[8.4](#8_4_power-consumption-accounting)/W] SHOULD be attributed to the
+*   [[8.4](#8_4_power_consumption_accounting)/W] SHOULD be attributed to the
 hardware component itself if unable to attribute hardware component power usage
 to an application.
diff --git a/2_device-types/2_5_automotive-reqs.md b/2_device-types/2_5_automotive-reqs.md
index ce3b441..3b6d56e 100644
--- a/2_device-types/2_5_automotive-reqs.md
+++ b/2_device-types/2_5_automotive-reqs.md
@@ -18,14 +18,14 @@
 
 Automotive device implementations:
 
-*   [[7.1](#7_1_display-and-graphics).1.1/A-0-1] MUST have a screen at least 6
+*   [[7.1](#7_1_display_and-graphics).1.1/A-0-1] MUST have a screen at least 6
 inches in physical diagonal size.
-*   [[7.1](#7_1_display-and-graphics).1.1/A-0-2] MUST have a screen size layout
+*   [[7.1](#7_1_display_and_graphics).1.1/A-0-2] MUST have a screen size layout
 of at least 750 dp x 480 dp.
 
-*   [[7.2](#7_2_input-devices).3/A-0-1] MUST provide the Home function and MAY
+*   [[7.2](#7_2_input_devices).3/A-0-1] MUST provide the Home function and MAY
 provide Back and Recent functions.
-*   [[7.2](#7_2_input-devices).3/A-0-2] MUST send both the normal and long press
+*   [[7.2](#7_2_input_devices).3/A-0-2] MUST send both the normal and long press
 event of the Back function ([`KEYCODE_BACK`](
 http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_BACK))
 to the foreground application.
@@ -74,61 +74,61 @@
 *    [[7.3](#7_3_sensors).11.5/A-0-1] MUST provide parking brake status as
 defined by `SENSOR_TYPE_PARKING_BRAKE`.
 
-*    [[7.4](#7_4_data-connectivity).3/A-0-1] MUST support Bluetooth and SHOULD
+*    [[7.4](#7_4_data_connectivity).3/A-0-1] MUST support Bluetooth and SHOULD
 support Bluetooth LE.
-*    [[7.4](#7_4_data-connectivity).3/A-0-2] Android Automotive implementations
+*    [[7.4](#7_4_data_connectivity).3/A-0-2] Android Automotive implementations
 MUST support the following Bluetooth profiles:
      * Phone calling over Hands-Free Profile (HFP).
      * Media playback over Audio Distribution Profile (A2DP).
      * Media playback control over Remote Control Profile (AVRCP).
      * Contact sharing using the Phone Book Access Profile (PBAP).
-*    [[7.4](#7_4_data-connectivity).3/A-SR] Are STRONGLY RECOMMENDED to support
+*    [[7.4](#7_4_data_connectivity).3/A-SR] Are STRONGLY RECOMMENDED to support
 Message Access Profile (MAP).
 
-*   [[7.4](#7_4_data-connectivity).5/A] SHOULD include support for cellular
+*   [[7.4](#7_4_data_connectivity).5/A] SHOULD include support for cellular
 network-based data connectivity.
-*   [[7.4](#7_4_data-connectivity).5/A] MAY use the System API
+*   [[7.4](#7_4_data_connectivity).5/A] MAY use the System API
 `NetworkCapabilities#NET_CAPABILITY_OEM_PAID` constant for
 networks that should be available to system apps.
 
-*   [[7.6](#7_6_memory-and-storage).1/A-0-1] MUST have at least 4 GB of
+*   [[7.6](#7_6_memory_and_storage).1/A-0-1] MUST have at least 4 GB of
 non-volatile storage available for application private data
 (a.k.a. "/data" partition).
 
 Automotive device implementations:
 
-*   [[7.6](#7_6_memory-and-storage).1/A] SHOULD format the data partition
+*   [[7.6](#7_6_memory_and_storage).1/A] SHOULD format the data partition
 to offer improved performance and longevity on flash storage, for example
 using `f2fs` file-system.
 
 If Automotive device implementations provide shared external storage via a
 portion of the internal non-removable storage, they:
 
-*   [[7.6](#7_6_memory-and-storage).1/A-SR] Are STRONGLY RECOMMENDED to reduce
+*   [[7.6](#7_6_memory_and_storage).1/A-SR] Are STRONGLY RECOMMENDED to reduce
 I/O overhead on operations performed on the external storage, for example by
 using `SDCardFS`.
 
 If Automotive device implementations are 32-bit:
 
-*   [[7.6](#7_6_memory-and-storage).1/A-1-1] The memory available to the kernel
+*   [[7.6](#7_6_memory_and_storage).1/A-1-1] The memory available to the kernel
 and userspace MUST be at least 512MB if any of the following densities are used:
      *    280dpi or lower on small/normal screens
      *    ldpi or lower on extra large screens
      *    mdpi or lower on large screens
 
-*   [[7.6](#7_6_memory-and-storage).1/A-1-2] The memory available to the kernel
+*   [[7.6](#7_6_memory_and_storage).1/A-1-2] The memory available to the kernel
 and userspace MUST be at least 608MB if any of the following densities are used:
      *   xhdpi or higher on small/normal screens
      *   hdpi or higher on large screens
      *   mdpi or higher on extra large screens
 
-*   [[7.6](#7_6_memory-and-storage).1/A-1-3] The memory available to the kernel
+*   [[7.6](#7_6_memory_and_storage).1/A-1-3] The memory available to the kernel
 and userspace MUST be at least 896MB if any of the following densities are used:
      *   400dpi or higher on small/normal screens
      *   xhdpi or higher on large screens
      *   tvdpi or higher on extra large screens
 
-*   [[7.6](#7_6_memory-and-storage).1/A-1-4] The memory available to the kernel
+*   [[7.6](#7_6_memory_and_storage).1/A-1-4] The memory available to the kernel
 and userspace MUST be at least 1344MB if any of the following densities are
 used:
      *   560dpi or higher on small/normal screens
@@ -137,25 +137,25 @@
 
 If Automotive device implementations are 64-bit:
 
-*   [[7.6](#7_6_memory-and-storage).1/A-2-1] The memory available to the kernel
+*   [[7.6](#7_6_memory_and_storage).1/A-2-1] The memory available to the kernel
 and userspace MUST be at least 816MB if any of the following densities are used:
      *   280dpi or lower on small/normal screens
      *   ldpi or lower on extra large screens
      *   mdpi or lower on large screens
 
-*   [[7.6](#7_6_memory-and-storage).1/A-2-2] The memory available to the kernel
+*   [[7.6](#7_6_memory_and_storage).1/A-2-2] The memory available to the kernel
 and userspace MUST be at least 944MB if any of the following densities are used:
      *   xhdpi or higher on small/normal screens
      *   hdpi or higher on large screens
      *   mdpi or higher on extra large screens
 
-*   [[7.6](#7_6_memory-and-storage).1/A-2-3] The memory available to the kernel
+*   [[7.6](#7_6_memory_and_storage).1/A-2-3] The memory available to the kernel
 and userspace MUST be at least 1280MB if any of the following densities are used:
      *  400dpi or higher on small/normal screens
      *  xhdpi or higher on large screens
      *  tvdpi or higher on extra large screens
 
-*   [[7.6](#7_6_memory-and-storage).1/A-2-4] The memory available to the kernel
+*   [[7.6](#7_6_memory_and_storage).1/A-2-4] The memory available to the kernel
 and userspace MUST be at least 1824MB if any of the following densities are used:
      *   560dpi or higher on small/normal screens
      *   400dpi or higher on large screens
@@ -183,26 +183,26 @@
 
 Automotive device implementations MUST support the following audio encoding:
 
-*    [[5.1](#5_1_media-codecs)/A-0-1] MPEG-4 AAC Profile (AAC LC)
-*    [[5.1](#5_1_media-codecs)/A-0-2] MPEG-4 HE AAC Profile (AAC+)
-*    [[5.1](#5_1_media-codecs)/A-0-3] AAC ELD (enhanced low delay AAC)
+*    [[5.1](#5_1_media_codecs)/A-0-1] MPEG-4 AAC Profile (AAC LC)
+*    [[5.1](#5_1_media_codecs)/A-0-2] MPEG-4 HE AAC Profile (AAC+)
+*    [[5.1](#5_1_media_codecs)/A-0-3] AAC ELD (enhanced low delay AAC)
 
 Automotive device implementations MUST support the following video encoding:
 
-*    [[5.2](#5_2_video-encoding)/A-0-1] H.264 AVC
-*    [[5.2](#5_2_video-encoding)/A-0-2] VP8
+*    [[5.2](#5_2_video_encoding)/A-0-1] H.264 AVC
+*    [[5.2](#5_2_video_encoding)/A-0-2] VP8
 
 Automotive device implementations MUST support the following video decoding:
 
-*    [[5.3](#5_3_video-decoding)/A-0-1] H.264 AVC
-*    [[5.3](#5_3_video-decoding)/A-0-2] MPEG-4 SP
-*    [[5.3](#5_3_video-decoding)/A-0-3] VP8
-*    [[5.3](#5_3_video-decoding)/A-0-4] VP9
+*    [[5.3](#5_3_video_decoding)/A-0-1] H.264 AVC
+*    [[5.3](#5_3_video_decoding)/A-0-2] MPEG-4 SP
+*    [[5.3](#5_3_video_decoding)/A-0-3] VP8
+*    [[5.3](#5_3_video_decoding)/A-0-4] VP9
 
 Automotive device implementations are STRONGLY RECOMMENDED to support the
 following video decoding:
 
-*    [[5.3](#5_3_video-decoding)/A-SR] H.265 HEVC
+*    [[5.3](#5_3_video_decoding)/A-SR] H.265 HEVC
 
 
 ### 2.5.3\. Software
@@ -219,15 +219,15 @@
 [`android.car.*`](https://developer.android.com/reference/android/car/package-summary)
 namespace.
 
-*   [[3.4](#3_4_web-compatibility).1/A-0-1] MUST provide a complete
+*   [[3.4](#3_4_web_compatibility).1/A-0-1] MUST provide a complete
 implementation of the `android.webkit.Webview` API.
 
-*   [[3.8](#3_8_user-interface-compatibility).3/A-0-1] MUST display
+*   [[3.8](#3_8_user_interface_compatibility).3/A-0-1] MUST display
 notifications that use the [`Notification.CarExtender`](
 https://developer.android.com/reference/android/app/Notification.CarExtender.html)
 API when requested by third-party applications.
 
-*   [[3.8](#3_8_user-interface-compatibility).4/A-0-1] MUST implement an
+*   [[3.8](#3_8_user_interface_compatibility).4/A-0-1] MUST implement an
 assistant on the device that provides a default implementation of the
 [`VoiceInteractionSession`](https://developer.android.com/reference/android/service/voice/VoiceInteractionSession)
 service.
@@ -237,7 +237,7 @@
 
 If Automotive device implementations include a push-to-talk button, they:
 
-*   [[3.8](#3_8_user-interface-compatibility).4/A-1-1] MUST use a short press of
+*   [[3.8](#3_8_user_interface_compatibility).4/A-1-1] MUST use a short press of
 the push-to-talk button as the designated interaction to launch the
 user-selected assist app, in other words the app that implements
 [`VoiceInteractionService`](
@@ -255,32 +255,32 @@
 management that are included in AOSP or extend the features that are included
 in AOSP, they:
 
-* [[8.3](#8_3_power-saving-modes)/A-1-1] MUST provide user affordance to enable
+* [[8.3](#8_3_power_saving_modes)/A-1-1] MUST provide user affordance to enable
   and disable the battery saver feature.
-* [[8.3](#8_3_power-saving-modes)/A-1-2] MUST provide user affordance to display
+* [[8.3](#8_3_power_saving_modes)/A-1-2] MUST provide user affordance to display
   all apps that are exempted from App Standby and Doze power-saving modes.
 
 Automotive device implementations:
 
-*   [[8.2](#8.2_File I/O Access Performance)/A-0-1] MUST report the number of
+*   [[8.2](#8_2_file_i/o_access_performance)/A-0-1] MUST report the number of
 bytes read and written to non-volatile storage per each process's UID so the
 stats are available to developers through System API
 `android.car.storagemonitoring.CarStorageMonitoringManager`. The Android Open
 Source Project meets the requirement through the `uid_sys_stats` kernel module.
-*   [[8.4](#8_4_power-consumption-accounting)/A-0-1] MUST provide a
+*   [[8.4](#8_4_power_consumption_accounting)/A-0-1] MUST provide a
 per-component power profile that defines the [current consumption value](
 http://source.android.com/devices/tech/power/values.html)
 for each hardware component and the approximate battery drain caused by the
 components over time as documented in the Android Open Source Project site.
-*   [[8.4](#8_4_power-consumption-accounting)/A-0-2] MUST report all power
+*   [[8.4](#8_4_power_consumption_accounting)/A-0-2] MUST report all power
 consumption values in milliampere hours (mAh).
-*   [[8.4](#8_4_power-consumption-accounting)/A-0-3] MUST report CPU power
+*   [[8.4](#8_4_power_consumption_accounting)/A-0-3] MUST report CPU power
 consumption per each process's UID. The Android Open Source Project meets the
 requirement through the `uid_cputime` kernel module implementation.
-*   [[8.4](#8_4_power-consumption-accounting)/A] SHOULD be attributed to the
+*   [[8.4](#8_4_power_consumption_accounting)/A] SHOULD be attributed to the
 hardware component itself if unable to attribute hardware component power usage
 to an application.
-*   [[8.4](#8_4_power-consumption-accounting)/A-0-4] MUST make this power usage
+*   [[8.4](#8_4_power_consumption_accounting)/A-0-4] MUST make this power usage
 available via the [`adb shell dumpsys batterystats`](
 http://source.android.com/devices/tech/power/batterystats.html)
 shell command to the app developer.
@@ -290,22 +290,22 @@
 
 If Automotive device implementations support multiple users, they:
 
-*   [[9.5](#9_5_multi-user-support)/A-1-1] MUST include a guest account that
+*   [[9.5](#9_5_multi_user_support)/A-1-1] MUST include a guest account that
 allows all functions provided by the vehicle system without requiring a user to
 log in.
 
 If Automotive device implementations support a secure lock screen, they:
 
-*   [[9.9](#9_9_full-disk-encryption).2/A-1-1] MUST support encryption per
+*   [[9.9](#9_9_full_disk_encryption).2/A-1-1] MUST support encryption per
 user-specific authentication keys. [File-Based Encryption (FBE)](
 https://source.android.com/security/encryption/file-based) is one way to do it.
 
 Automotive device implementations:
 
-*   [[9.14](#9_14_automotive-system-isolation)/A-0-1] MUST gatekeep messages
+*   [[9.14](#9_14_automotive_system_isolation)/A-0-1] MUST gatekeep messages
 from Android framework vehicle subsystems, e.g., whitelisting permitted message
 types and message sources.
-*   [[9.14](#9_14_automotive-system-isolation)/A-0-2] MUST watchdog against
+*   [[9.14](#9_14_automotive_system_isolation)/A-0-2] MUST watchdog against
 denial of service attacks from the Android framework or third-party apps. This
 guards against malicious software flooding the vehicle network with traffic,
 which may lead to malfunctioning vehicle subsystems.
diff --git a/2_device-types/2_6_tablet-reqs.md b/2_device-types/2_6_tablet-reqs.md
index 9b362a0..c993ad0 100644
--- a/2_device-types/2_6_tablet-reqs.md
+++ b/2_device-types/2_6_tablet-reqs.md
@@ -17,7 +17,7 @@
 
 **Screen Size**
 
-*   [[7.1](#7_1_display-and-graphics).1.1/Tab-0-1] MUST have a screen in the range
+*   [[7.1](#7_1_display_and_graphics).1.1/Tab-0-1] MUST have a screen in the range
 of 7 to 18 inches.
 
 **Minimum Memory and Storage (Section 7.6.1)**