diff --git a/security/keymint/README.md b/security/keymint/README.md
deleted file mode 100644
index 54647af..0000000
--- a/security/keymint/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# KeyMint HAL
-
-This directory contains the HAL definition for KeyMint. KeyMint provides
-cryptographic services in a hardware-isolated environment.
-
-Note that the `IRemotelyProvisionedComponent` HAL, and it's associated types,
-used to also be defined in this directory. As of Android U, this HAL has been
-moved to a different directory (../rkp). This move is ABI compatible, as the
-interfaces have been maintained. The build is split so that the generated
-code may be built with different options.
diff --git a/security/rkp/CHANGELOG.md b/security/keymint/RKP_CHANGELOG.md
similarity index 79%
rename from security/rkp/CHANGELOG.md
rename to security/keymint/RKP_CHANGELOG.md
index eb2041d..243fc26 100644
--- a/security/rkp/CHANGELOG.md
+++ b/security/keymint/RKP_CHANGELOG.md
@@ -19,12 +19,6 @@
   * `uniqueId` String added as a field in order to differentiate IRPC instances on device.
 
 ## IRemotelyProvisionedComponent 2 -> 3
-* The RKP HAL now builds separately from KeyMint.
-  * The HAL remains under the `android.hardware.security.keymint` package for
-    compatibility with previous releases. ABI compatibility requires this.
-  * Dependencies on the RKP HAL must add a dependency on
-    `"android.hardware.security.rkp"` generated code (instead of
-    `"android.hardward.security.keymint"`).
 * ProtectedData has been removed.
 * DeviceInfo
   * `version` has moved to a top-level field within the CSR generated by the HAL
diff --git a/security/rkp/README.md b/security/keymint/RKP_README.md
similarity index 95%
rename from security/rkp/README.md
rename to security/keymint/RKP_README.md
index 5fb4948..89a2598 100644
--- a/security/rkp/README.md
+++ b/security/keymint/RKP_README.md
@@ -6,8 +6,8 @@
 keys. The HAL must interact effectively with Keystore (and other daemons) and
 protect device privacy and security.
 
-Note that this API was originally designed for KeyMint, with the intention that
-it should be usable for other HALs that require certificate provisioning.
+Note that this API is designed for KeyMint, but with the intention that it
+should be usable for other HALs that require certificate provisioning.
 Throughout this document we'll refer to the Keystore and KeyMint (formerly
 called Keymaster) components, but only for concreteness and convenience; those
 labels could be replaced with the names of any system and secure area
@@ -312,7 +312,7 @@
 ```
 
 Please see
-[ProtectedData.aidl](https://cs.android.com/android/platform/superproject/+/master:hardware/interfaces/security/rkp/aidl/android/hardware/security/keymint/ProtectedData.aidl)
+[ProtectedData.aidl](https://cs.android.com/android/platform/superproject/+/master:hardware/interfaces/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl)
 for a full CDDL definition of the BCC.
 
 ### `CertificateRequest`
@@ -366,9 +366,9 @@
 following links:
 
 *   [IRemotelyProvisionedComponent
-    HAL](https://cs.android.com/android/platform/superproject/+/master:hardware/interfaces/security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl)
-*   [ProtectedData](https://cs.android.com/android/platform/superproject/+/master:hardware/interfaces/security/rkp/aidl/android/hardware/security/keymint/ProtectedData.aidl)
-*   [MacedPublicKey](https://cs.android.com/android/platform/superproject/+/master:hardware/interfaces/security/rkp/aidl/android/hardware/security/keymint/MacedPublicKey.aidl)
-*   [RpcHardwareInfo](https://cs.android.com/android/platform/superproject/+/master:hardware/interfaces/security/rkp/aidl/android/hardware/security/keymint/RpcHardwareInfo.aidl)
-*   [DeviceInfo](https://cs.android.com/android/platform/superproject/+/master:hardware/interfaces/security/rkp/aidl/android/hardware/security/keymint/DeviceInfo.aidl)
+    HAL](https://cs.android.com/android/platform/superproject/+/master:hardware/interfaces/security/keymint/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl)
+*   [ProtectedData](https://cs.android.com/android/platform/superproject/+/master:hardware/interfaces/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl)
+*   [MacedPublicKey](https://cs.android.com/android/platform/superproject/+/master:hardware/interfaces/security/keymint/aidl/android/hardware/security/keymint/MacedPublicKey.aidl)
+*   [RpcHardwareInfo](https://cs.android.com/android/platform/superproject/+/master:hardware/interfaces/security/keymint/aidl/android/hardware/security/keymint/RpcHardwareInfo.aidl)
+*   [DeviceInfo](https://cs.android.com/android/platform/superproject/+/master:hardware/interfaces/security/keymint/aidl/android/hardware/security/keymint/DeviceInfo.aidl)