diff --git a/base/common/python/pki/cli/pkcs12.py b/base/common/python/pki/cli/pkcs12.py
index 2f8aabfa139..950c9f6bea5 100644
--- a/base/common/python/pki/cli/pkcs12.py
+++ b/base/common/python/pki/cli/pkcs12.py
@@ -180,7 +180,7 @@ def execute(self, argv):
                         certs.append(cert_info)
                         continue
 
-                    match = re.match(r'  Nickname: (.*)$', line)
+                    match = re.match(r'  Friendly Name: (.*)$', line)
                     if match:
                         cert_info['nickname'] = match.group(1)
                         continue
diff --git a/base/server/cms/src/com/netscape/cms/realm/PKIRealm.java b/base/server/cms/src/com/netscape/cms/realm/PKIRealm.java
index 1031f84e80a..f99f5566c92 100644
--- a/base/server/cms/src/com/netscape/cms/realm/PKIRealm.java
+++ b/base/server/cms/src/com/netscape/cms/realm/PKIRealm.java
@@ -86,7 +86,7 @@ public Principal authenticate(String username, String password) {
     }
 
     @Override
-    public Principal authenticate(final X509Certificate certs[]) {
+    public Principal authenticate(final X509Certificate[] certs) {
         logger.info("Authenticating certificate chain:");
 
         // get the cert from the ssl client auth
diff --git a/base/server/tomcat8/src/com/netscape/cms/tomcat/ProxyRealm.java b/base/server/tomcat8/src/com/netscape/cms/tomcat/ProxyRealm.java
index 4c12b04d4bf..97c6998e9a8 100644
--- a/base/server/tomcat8/src/com/netscape/cms/tomcat/ProxyRealm.java
+++ b/base/server/tomcat8/src/com/netscape/cms/tomcat/ProxyRealm.java
@@ -84,7 +84,7 @@ public Principal authenticate(String username, String password) {
     }
 
     @Override
-    public Principal authenticate(X509Certificate certs[]) {
+    public Principal authenticate(X509Certificate[] certs) {
         if (realm == null) {
             throw new ServiceUnavailableException("Subsystem unavailable");
         }
diff --git a/base/util/src/netscape/security/pkcs/PKCS12Util.java b/base/util/src/netscape/security/pkcs/PKCS12Util.java
index a6a60183923..8c03c1938e5 100644
--- a/base/util/src/netscape/security/pkcs/PKCS12Util.java
+++ b/base/util/src/netscape/security/pkcs/PKCS12Util.java
@@ -551,7 +551,7 @@ public PKCS12KeyInfo getKeyInfo(SafeBag bag, Password password) throws Exception
                 BMPString friendlyName = (BMPString) new BMPString.Template().decode(bis);
 
                 keyInfo.setFriendlyName(friendlyName.toString());
-                logger.debug("   Friendly Name: " + keyInfo.getFriendlyName());
+                logger.debug("   Friendly name: " + keyInfo.getFriendlyName());
 
             } else if (oid.equals(SafeBag.LOCAL_KEY_ID)) {