diff --git a/libs/binder/tests/RpcCertificateVerifierSimple.cpp b/libs/binder/tests/RpcCertificateVerifierSimple.cpp
index 0cf0e1c..4694d1b 100644
--- a/libs/binder/tests/RpcCertificateVerifierSimple.cpp
+++ b/libs/binder/tests/RpcCertificateVerifierSimple.cpp
@@ -33,7 +33,7 @@
     return PERMISSION_DENIED;
 }
 
-status_t RpcCertificateVerifierSimple::addTrustedPeerCertificate(CertificateFormat format,
+status_t RpcCertificateVerifierSimple::addTrustedPeerCertificate(RpcCertificateFormat format,
                                                                  const std::vector<uint8_t>& cert) {
     bssl::UniquePtr<X509> x509 = deserializeCertificate(cert, format);
     if (x509 == nullptr) {
diff --git a/libs/binder/tests/RpcCertificateVerifierSimple.h b/libs/binder/tests/RpcCertificateVerifierSimple.h
index 02aa3c6..1f2e531 100644
--- a/libs/binder/tests/RpcCertificateVerifierSimple.h
+++ b/libs/binder/tests/RpcCertificateVerifierSimple.h
@@ -22,7 +22,7 @@
 
 #include <openssl/ssl.h>
 
-#include <binder/CertificateFormat.h>
+#include <binder/RpcCertificateFormat.h>
 #include <binder/RpcCertificateVerifier.h>
 
 namespace android {
@@ -42,7 +42,7 @@
     // Caller must ensure that RpcTransportCtx::newTransport() are called after all trusted peer
     // certificates are added. Otherwise, RpcTransport-s created before may not trust peer
     // certificates added later.
-    [[nodiscard]] status_t addTrustedPeerCertificate(CertificateFormat format,
+    [[nodiscard]] status_t addTrustedPeerCertificate(RpcCertificateFormat format,
                                                      const std::vector<uint8_t>& cert);
 
 private:
diff --git a/libs/binder/tests/binderRpcTest.cpp b/libs/binder/tests/binderRpcTest.cpp
index 8ffd68d..a4e37ad 100644
--- a/libs/binder/tests/binderRpcTest.cpp
+++ b/libs/binder/tests/binderRpcTest.cpp
@@ -556,15 +556,16 @@
 
                     BinderRpcTestServerInfo serverInfo;
                     serverInfo.port = static_cast<int64_t>(outPort);
-                    serverInfo.cert.data = server->getCertificate(CertificateFormat::PEM);
+                    serverInfo.cert.data = server->getCertificate(RpcCertificateFormat::PEM);
                     writeToFd(writeEnd, serverInfo);
                     auto clientInfo = readFromFd<BinderRpcTestClientInfo>(readEnd);
 
                     if (rpcSecurity == RpcSecurity::TLS) {
                         for (const auto& clientCert : clientInfo.certs) {
                             CHECK_EQ(OK,
-                                     certVerifier->addTrustedPeerCertificate(CertificateFormat::PEM,
-                                                                             clientCert.data));
+                                     certVerifier
+                                             ->addTrustedPeerCertificate(RpcCertificateFormat::PEM,
+                                                                         clientCert.data));
                         }
                     }
 
@@ -587,7 +588,7 @@
         BinderRpcTestClientInfo clientInfo;
         for (const auto& session : sessions) {
             auto& parcelableCert = clientInfo.certs.emplace_back();
-            parcelableCert.data = session->getCertificate(CertificateFormat::PEM);
+            parcelableCert.data = session->getCertificate(RpcCertificateFormat::PEM);
         }
         writeToFd(ret.host.writeEnd(), clientInfo);
 
@@ -599,7 +600,8 @@
         if (rpcSecurity == RpcSecurity::TLS) {
             const auto& serverCert = serverInfo.cert.data;
             CHECK_EQ(OK,
-                     certVerifier->addTrustedPeerCertificate(CertificateFormat::PEM, serverCert));
+                     certVerifier->addTrustedPeerCertificate(RpcCertificateFormat::PEM,
+                                                             serverCert));
         }
 
         status_t status;
@@ -1433,7 +1435,7 @@
                         BinderRpcSimple::PrintTestParam);
 
 class RpcTransportTest
-      : public ::testing::TestWithParam<std::tuple<SocketType, RpcSecurity, CertificateFormat>> {
+      : public ::testing::TestWithParam<std::tuple<SocketType, RpcSecurity, RpcCertificateFormat>> {
 public:
     using ConnectToServer = std::function<base::unique_fd()>;
     static inline std::string PrintParamInfo(const testing::TestParamInfo<ParamType>& info) {
@@ -1727,17 +1729,17 @@
     maliciousClient.run(true, readOk);
 }
 
-std::vector<CertificateFormat> testCertificateFormats() {
+std::vector<RpcCertificateFormat> testRpcCertificateFormats() {
     return {
-            CertificateFormat::PEM,
-            CertificateFormat::DER,
+            RpcCertificateFormat::PEM,
+            RpcCertificateFormat::DER,
     };
 }
 
 INSTANTIATE_TEST_CASE_P(BinderRpc, RpcTransportTest,
                         ::testing::Combine(::testing::ValuesIn(testSocketTypes(false)),
                                            ::testing::ValuesIn(RpcSecurityValues()),
-                                           ::testing::ValuesIn(testCertificateFormats())),
+                                           ::testing::ValuesIn(testRpcCertificateFormats())),
                         RpcTransportTest::PrintParamInfo);
 
 } // namespace android