diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index 526fd86..9e7a1d8 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -19,7 +19,7 @@
 
     rustlibs: [
         "android.system.keystore2-rust",
-        "libandroid_hardware_keymint",
+        "libandroid_hardware_keymint_keystore2",
         "libanyhow",
         "libbinder_rs",
         "libkeystore2_selinux",
@@ -41,7 +41,7 @@
     rustlibs: [
         "android.system.keystore2-rust",
         "libandroid_logger",
-        "libandroid_hardware_keymint",
+        "libandroid_hardware_keymint_keystore2",
         "libanyhow",
         "libbinder_rs",
         "libkeystore2_crypto_bindgen",
@@ -87,7 +87,7 @@
 // This is a placeholder for the libraries that will be generated from the AIDL specs
 // eventually.
 rust_library {
-    name: "libandroid_hardware_keymint",
+    name: "libandroid_hardware_keymint_keystore2",
     crate_name: "android_hardware_keymint",
 
     srcs: ["src/android_hardware_keymint.rs"],