update names

google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpTransport.java

@@ -299,22 +299,22 @@ public Builder trustCertificates(KeyStore trustStore) throws GeneralSecurityExce
      *
      * @param trustStore certificate trust store (use for example {@link SecurityUtils#loadKeyStore}
      *     or {@link SecurityUtils#loadKeyStoreFromCertificates})
-     * @param keyStore key store for client certificate and key. It is used to establish mutual TLS.
-     * @param keystorePassword password for keyStore parameter
+     * @param mtlsKeyStore key store for client certificate and key to establish mutual TLS.
+     * @param mtlsKeystorePassword password for mtlsKeyStore parameter
      */
     public Builder trustCertificates(
-        KeyStore trustStore, KeyStore keyStore, String keystorePassword)
+        KeyStore trustStore, KeyStore mtlsKeyStore, String mtlsKeystorePassword)
         throws GeneralSecurityException {
-      if (keyStore != null && keyStore.size() > 0) {
+      if (mtlsKeyStore != null && mtlsKeyStore.size() > 0) {
         this.isMtls = true;
       }
       SSLContext sslContext = SslUtils.getTlsSslContext();
       SslUtils.initSslContext(
           sslContext,
           trustStore,
           SslUtils.getPkixTrustManagerFactory(),
-          keyStore,
-          keystorePassword,
+          mtlsKeyStore,
+          mtlsKeystorePassword,
           SslUtils.getDefaultKeyManagerFactory());
       return setSslSocketFactory(sslContext.getSocketFactory());
     }

google-http-client/src/main/java/com/google/api/client/util/SslUtils.java

@@ -119,21 +119,21 @@ public static SSLContext initSslContext(
    *     SecurityUtils#getJavaKeyStore()})
    * @param trustManagerFactory trust manager factory (for example {@link
    *     #getPkixTrustManagerFactory()})
-   * @param keyStore key store for client certificate and key
-   * @param keystorePassword password for keyStore parameter
+   * @param mtlsKeyStore key store for client certificate and key to establish mutual TLS
+   * @param mtlsKeystorePassword password for mtlsKeyStore parameter
    * @param keyManagerFactory key manager factory (for example {@link
    *     #getDefaultKeyManagerFactory()})
    */
   public static SSLContext initSslContext(
       SSLContext sslContext,
       KeyStore trustStore,
       TrustManagerFactory trustManagerFactory,
-      KeyStore keyStore,
-      String keystorePassword,
+      KeyStore mtlsKeyStore,
+      String mtlsKeystorePassword,
       KeyManagerFactory keyManagerFactory)
       throws GeneralSecurityException {
     trustManagerFactory.init(trustStore);
-    keyManagerFactory.init(keyStore, keystorePassword.toCharArray());
+    keyManagerFactory.init(mtlsKeyStore, mtlsKeystorePassword.toCharArray());
     sslContext.init(
         keyManagerFactory.getKeyManagers(), trustManagerFactory.getTrustManagers(), null);
     return sslContext;