diff --git a/base/ca/shared/profiles/ca/caCMCECserverCertWithCRLDP.cfg b/base/ca/shared/profiles/ca/caCMCECserverCertWithCRLDP.cfg
index 341c6714d91..aabdbe26b52 100644
--- a/base/ca/shared/profiles/ca/caCMCECserverCertWithCRLDP.cfg
+++ b/base/ca/shared/profiles/ca/caCMCECserverCertWithCRLDP.cfg
@@ -1,4 +1,4 @@
-desc=This certificate profile is for enrolling server certificates with ECC keys using CMC and CRL-DP extention for certificate validation.
+desc=This certificate profile is for enrolling server certificates with ECC keys using CMC and CRL-DP extension for certificate validation.
 visible=false
 enable=false
 enableBy=admin
diff --git a/base/ca/shared/profiles/ca/caCMCserverCertWithCRLDP.cfg b/base/ca/shared/profiles/ca/caCMCserverCertWithCRLDP.cfg
index eef991e0973..870981d5c1a 100644
--- a/base/ca/shared/profiles/ca/caCMCserverCertWithCRLDP.cfg
+++ b/base/ca/shared/profiles/ca/caCMCserverCertWithCRLDP.cfg
@@ -1,4 +1,4 @@
-desc=This certificate profile is for enrolling server certificates using CMC and CRL-DP extention for certificate validation.
+desc=This certificate profile is for enrolling server certificates using CMC and CRL-DP extension for certificate validation.
 visible=false
 enable=false
 enableBy=admin
diff --git a/base/ca/shared/profiles/ca/caECServerCertWithCRLDP.cfg b/base/ca/shared/profiles/ca/caECServerCertWithCRLDP.cfg
index f260adb5ebb..7fc4fc35921 100644
--- a/base/ca/shared/profiles/ca/caECServerCertWithCRLDP.cfg
+++ b/base/ca/shared/profiles/ca/caECServerCertWithCRLDP.cfg
@@ -1,4 +1,4 @@
-desc=This certificate profile is for enrolling server certificates with ECC keys and CRL-DP extention for certificate validation.
+desc=This certificate profile is for enrolling server certificates with ECC keys and CRL-DP extension for certificate validation.
 visible=false
 enable=false
 enableBy=admin
diff --git a/base/ca/shared/profiles/ca/caServerCertWithCRLDP.cfg b/base/ca/shared/profiles/ca/caServerCertWithCRLDP.cfg
index 50e0c3f276f..c0ca88da78b 100644
--- a/base/ca/shared/profiles/ca/caServerCertWithCRLDP.cfg
+++ b/base/ca/shared/profiles/ca/caServerCertWithCRLDP.cfg
@@ -1,4 +1,4 @@
-desc=This certificate profile is for enrolling server certificates and CRL-DP extention for certificate validation.
+desc=This certificate profile is for enrolling server certificates and CRL-DP extension for certificate validation.
 visible=false
 enable=false
 enableBy=admin
diff --git a/base/common/src/main/java/com/netscape/cmsutil/crypto/CryptoUtil.java b/base/common/src/main/java/com/netscape/cmsutil/crypto/CryptoUtil.java
index 28eb8bd85b7..4f5a902747a 100644
--- a/base/common/src/main/java/com/netscape/cmsutil/crypto/CryptoUtil.java
+++ b/base/common/src/main/java/com/netscape/cmsutil/crypto/CryptoUtil.java
@@ -1416,7 +1416,7 @@ public static String getSKIString(X509CertImpl cert) throws IOException {
     }
 
     /*
-     * get extention from  PKCS10 request
+     * get extension from  PKCS10 request
      */
     public static org.mozilla.jss.netscape.security.x509.Extension getExtensionFromPKCS10(PKCS10 pkcs10,
             String extnName)
diff --git a/base/console/src/main/java/com/netscape/admin/certsrv/UIMapperRegistry.java b/base/console/src/main/java/com/netscape/admin/certsrv/UIMapperRegistry.java
index d7987b8427d..34c91853500 100644
--- a/base/console/src/main/java/com/netscape/admin/certsrv/UIMapperRegistry.java
+++ b/base/console/src/main/java/com/netscape/admin/certsrv/UIMapperRegistry.java
@@ -48,7 +48,7 @@ public class UIMapperRegistry {
      *
      * @param className fully qualified class name implementing CertAttrSet
      * @param oid the string representation of the object identifier
-     * @param extentionName the name of the attribute.
+     * @param attrName the name of the attribute.
      * @param mapperClassName fully qualified class name implementing UI
      */
     /* XXX WE DON'T NEED THIS
@@ -68,7 +68,7 @@ public static void registerCertAttrUI(String className, String oid,
      * internal register new cert attr
      *
      * @param className fully qualified class name implementing CertAttrSet
-     * @param extentionName the name of the attribute.
+     * @param attrName the name of the attribute.
      * @param mapperClassName fully qualified class name implementing UI
      */
     public static void registerCertAttrUI(String attrName, String mapperClassName) {