From f1489c8e319df1094261b934dd172875dfe74c6b Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Thu, 12 Jan 2012 20:07:13 -0600
Subject: [PATCH] Replaced NAME with SimpleName.

This patch is based on Adam's patch. It replaces the NAME constants
defined in various extensions with their class's simple name.

Ticket #2
---
 pki/base/ca/src/com/netscape/ca/CAService.java     |    4 +-
 .../ca/src/com/netscape/ca/CMSCRLExtensions.java   |   75 ++++++++++----------
 .../ca/src/com/netscape/ca/CRLIssuingPoint.java    |   22 +++---
 .../constraints/UniqueSubjectNameConstraints.java  |    2 +-
 .../cms/policy/extensions/AuthInfoAccessExt.java   |    6 +-
 .../extensions/AuthorityKeyIdentifierExt.java      |    8 +-
 .../cms/policy/extensions/BasicConstraintsExt.java |   12 ++--
 .../extensions/CRLDistributionPointsExt.java       |    6 +-
 .../policy/extensions/CertificatePoliciesExt.java  |    4 +-
 .../extensions/CertificateRenewalWindowExt.java    |    4 +-
 .../cms/policy/extensions/ExtendedKeyUsageExt.java |    4 +-
 .../cms/policy/extensions/IssuerAltNameExt.java    |    4 +-
 .../cms/policy/extensions/KeyUsageExt.java         |    4 +-
 .../cms/policy/extensions/NSCCommentExt.java       |    4 +-
 .../cms/policy/extensions/NSCertTypeExt.java       |    8 +-
 .../cms/policy/extensions/NameConstraintsExt.java  |    6 +-
 .../cms/policy/extensions/OCSPNoCheckExt.java      |    4 +-
 .../policy/extensions/PolicyConstraintsExt.java    |    4 +-
 .../cms/policy/extensions/PolicyMappingsExt.java   |    6 +-
 .../extensions/PrivateKeyUsagePeriodExt.java       |    4 +-
 .../extensions/RemoveBasicConstraintsExt.java      |    2 +-
 .../cms/policy/extensions/SubjAltNameExt.java      |    4 +-
 .../cms/policy/extensions/SubjectAltNameExt.java   |    4 +-
 .../extensions/SubjectDirectoryAttributesExt.java  |    6 +-
 .../policy/extensions/SubjectKeyIdentifierExt.java |    6 +-
 .../constraint/UniqueSubjectNameConstraint.java    |    2 +-
 .../netscape/cms/publish/mappers/AVAPattern.java   |    2 +-
 .../cms/publish/mappers/MapAVAPattern.java         |    2 +-
 .../publishers/LdapEncryptCertPublisher.java       |    2 +-
 .../cms/servlet/admin/CMSAdminServlet.java         |    4 +-
 .../com/netscape/cms/servlet/base/CMSServlet.java  |    2 +-
 .../cms/servlet/cert/HashEnrollServlet.java        |    6 +-
 .../cms/servlet/cert/scep/CRSEnrollment.java       |    4 +-
 .../cms/servlet/request/ProcessCertReq.java        |    8 +-
 .../src/com/netscape/cmscore/cert/CertUtils.java   |    2 +-
 .../netscape/cmscore/cert/OidLoaderSubsystem.java  |   14 ++--
 .../netscape/cmscore/dbs/RevocationInfoMapper.java |    4 +-
 .../netscape/cmscore/dbs/X509CertImplMapper.java   |    4 +-
 .../notification/ReqCertSANameEmailResolver.java   |    2 +-
 .../netscape/cmscore/security/CertificateInfo.java |    4 +-
 .../netscape/cmscore/security/JssSubsystem.java    |    2 +-
 .../com/netscape/cmscore/security/KeyCertUtil.java |   18 +++---
 .../src/com/netscape/cmstools/PrettyPrintCrl.java  |    8 +-
 .../extensions/AuthInfoAccessExtension.java        |    9 +--
 .../CertificateRenewalWindowExtension.java         |    5 --
 .../extensions/CertificateScopeOfUseExtension.java |    4 -
 .../extensions/ExtendedKeyUsageExtension.java      |    7 +--
 .../extensions/InhibitAnyPolicyExtension.java      |    7 +--
 .../security/extensions/NSCertTypeExtension.java   |    8 --
 .../security/extensions/OCSPNoCheckExtension.java  |    7 +--
 .../extensions/PresenceServerExtension.java        |    7 --
 .../extensions/SubjectInfoAccessExtension.java     |    9 ---
 .../x509/AuthorityKeyIdentifierExtension.java      |    7 --
 .../security/x509/BasicConstraintsExtension.java   |    7 --
 .../x509/CRLDistributionPointsExtension.java       |    9 +--
 .../netscape/security/x509/CRLNumberExtension.java |    7 --
 .../netscape/security/x509/CRLReasonExtension.java |    8 --
 .../security/x509/CertificateIssuerExtension.java  |    9 +--
 .../x509/CertificatePoliciesExtension.java         |    8 --
 .../security/x509/DeltaCRLIndicatorExtension.java  |    9 +--
 .../util/src/netscape/security/x509/Extension.java |    5 ++
 .../src/netscape/security/x509/Extensions.java     |    2 +-
 .../security/x509/FreshestCRLExtension.java        |   11 +---
 .../security/x509/HoldInstructionExtension.java    |    9 +--
 .../security/x509/InvalidityDateExtension.java     |    9 +--
 .../x509/IssuerAlternativeNameExtension.java       |    7 --
 .../x509/IssuingDistributionPointExtension.java    |    9 +--
 .../netscape/security/x509/KeyUsageExtension.java  |    7 --
 .../security/x509/NSCCommentExtension.java         |    8 --
 .../security/x509/NameConstraintsExtension.java    |    7 --
 .../util/src/netscape/security/x509/OIDMap.java    |   28 ++++----
 .../security/x509/PolicyConstraintsExtension.java  |    8 --
 .../security/x509/PolicyMappingsExtension.java     |    8 --
 .../security/x509/PrivateKeyUsageExtension.java    |    7 --
 .../x509/SubjectAlternativeNameExtension.java      |    7 --
 .../x509/SubjectDirAttributesExtension.java        |   12 +---
 .../x509/SubjectKeyIdentifierExtension.java        |    7 --
 77 files changed, 188 insertions(+), 393 deletions(-)

diff --git a/pki/base/ca/src/com/netscape/ca/CAService.java b/pki/base/ca/src/com/netscape/ca/CAService.java
index d086ee551ae25b9f893c63d2160471e6ecf2e51e..ae01ccdd72f13b7d42d98bbd13e89fbecd5e1a26 100644
--- a/pki/base/ca/src/com/netscape/ca/CAService.java
+++ b/pki/base/ca/src/com/netscape/ca/CAService.java
@@ -995,7 +995,7 @@ public class CAService implements ICAService, IService {
         if (exts != null) {
             try {
                 reasonext = (CRLReasonExtension)
-                        exts.get(CRLReasonExtension.NAME);
+                        exts.get(CRLReasonExtension.class.getSimpleName());
             } catch (X509ExtensionException e) {
                 // this means no crl reason extension set.
             }
@@ -1081,7 +1081,7 @@ public class CAService implements ICAService, IService {
         if (exts != null) {
             try {
                 reasonext = (CRLReasonExtension)
-                        exts.get(CRLReasonExtension.NAME);
+                        exts.get(CRLReasonExtension.class.getSimpleName());
             } catch (X509ExtensionException e) {
                 mCA.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CA_CERT_ON_HOLD", serialNo.toString()));
                 throw new ECAException(CMS.getUserMessage("CMS_CA_IS_NOT_ON_HOLD",
diff --git a/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java b/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java
index 0d98b96319539c896f5b7d7f88950baef4c96a1d..6f3213e4cbc76697a692604fa1fb49811df6794a 100644
--- a/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java
+++ b/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java
@@ -88,75 +88,75 @@ public class CMSCRLExtensions implements ICMSCRLExtensions {
     static {
 
         /* Default CRL Extensions */
-        mDefaultCRLExtensionNames.addElement(AuthorityKeyIdentifierExtension.NAME);
-        mDefaultCRLExtensionNames.addElement(IssuerAlternativeNameExtension.NAME);
-        mDefaultCRLExtensionNames.addElement(CRLNumberExtension.NAME);
-        mDefaultCRLExtensionNames.addElement(DeltaCRLIndicatorExtension.NAME);
-        mDefaultCRLExtensionNames.addElement(IssuingDistributionPointExtension.NAME);
-        mDefaultCRLExtensionNames.addElement(FreshestCRLExtension.NAME);
-        mDefaultCRLExtensionNames.addElement(AuthInfoAccessExtension.NAME2);
+        mDefaultCRLExtensionNames.addElement(AuthorityKeyIdentifierExtension.class.getSimpleName());
+        mDefaultCRLExtensionNames.addElement(IssuerAlternativeNameExtension.class.getSimpleName());
+        mDefaultCRLExtensionNames.addElement(CRLNumberExtension.class.getSimpleName());
+        mDefaultCRLExtensionNames.addElement(DeltaCRLIndicatorExtension.class.getSimpleName());
+        mDefaultCRLExtensionNames.addElement(IssuingDistributionPointExtension.class.getSimpleName());
+        mDefaultCRLExtensionNames.addElement(FreshestCRLExtension.class.getSimpleName());
+        mDefaultCRLExtensionNames.addElement(AuthInfoAccessExtension.class.getSimpleName());
 
         /* Default CRL Entry Extensions */
-        mDefaultCRLEntryExtensionNames.addElement(CRLReasonExtension.NAME);
+        mDefaultCRLEntryExtensionNames.addElement(CRLReasonExtension.class.getSimpleName());
         //mDefaultCRLEntryExtensionNames.addElement(HoldInstructionExtension.NAME);
-        mDefaultCRLEntryExtensionNames.addElement(InvalidityDateExtension.NAME);
+        mDefaultCRLEntryExtensionNames.addElement(InvalidityDateExtension.class.getSimpleName());
         //mDefaultCRLEntryExtensionNames.addElement(CertificateIssuerExtension.NAME);
 
         /* Default Enabled CRL Extensions */
-        mDefaultEnabledCRLExtensions.addElement(CRLNumberExtension.NAME);
+        mDefaultEnabledCRLExtensions.addElement(CRLNumberExtension.class.getSimpleName());
         //mDefaultEnabledCRLExtensions.addElement(DeltaCRLIndicatorExtension.NAME);
-        mDefaultEnabledCRLExtensions.addElement(CRLReasonExtension.NAME);
-        mDefaultEnabledCRLExtensions.addElement(InvalidityDateExtension.NAME);
+        mDefaultEnabledCRLExtensions.addElement(CRLReasonExtension.class.getSimpleName());
+        mDefaultEnabledCRLExtensions.addElement(InvalidityDateExtension.class.getSimpleName());
 
         /* Default Critical CRL Extensions */
-        mDefaultCriticalCRLExtensions.addElement(DeltaCRLIndicatorExtension.NAME);
-        mDefaultCriticalCRLExtensions.addElement(IssuingDistributionPointExtension.NAME);
+        mDefaultCriticalCRLExtensions.addElement(DeltaCRLIndicatorExtension.class.getSimpleName());
+        mDefaultCriticalCRLExtensions.addElement(IssuingDistributionPointExtension.class.getSimpleName());
         //mDefaultCriticalCRLExtensions.addElement(CertificateIssuerExtension.NAME);
 
         /* CRL extension IDs */
         mDefaultCRLExtensionIDs.put(PKIXExtensions.AuthorityKey_Id.toString(),
-                AuthorityKeyIdentifierExtension.NAME);
+                AuthorityKeyIdentifierExtension.class.getSimpleName());
         mDefaultCRLExtensionIDs.put(PKIXExtensions.IssuerAlternativeName_Id.toString(),
-                IssuerAlternativeNameExtension.NAME);
+                IssuerAlternativeNameExtension.class.getSimpleName());
         mDefaultCRLExtensionIDs.put(PKIXExtensions.CRLNumber_Id.toString(),
-                CRLNumberExtension.NAME);
+                CRLNumberExtension.class.getSimpleName());
         mDefaultCRLExtensionIDs.put(PKIXExtensions.DeltaCRLIndicator_Id.toString(),
-                DeltaCRLIndicatorExtension.NAME);
+                DeltaCRLIndicatorExtension.class.getSimpleName());
         mDefaultCRLExtensionIDs.put(PKIXExtensions.IssuingDistributionPoint_Id.toString(),
-                IssuingDistributionPointExtension.NAME);
+                IssuingDistributionPointExtension.class.getSimpleName());
         mDefaultCRLExtensionIDs.put(PKIXExtensions.ReasonCode_Id.toString(),
-                CRLReasonExtension.NAME);
+                CRLReasonExtension.class.getSimpleName());
         mDefaultCRLExtensionIDs.put(PKIXExtensions.HoldInstructionCode_Id.toString(),
-                HoldInstructionExtension.NAME);
+                HoldInstructionExtension.class.getSimpleName());
         mDefaultCRLExtensionIDs.put(PKIXExtensions.InvalidityDate_Id.toString(),
-                InvalidityDateExtension.NAME);
+                InvalidityDateExtension.class.getSimpleName());
         //mDefaultCRLExtensionIDs.put(PKIXExtensions.CertificateIssuer_Id.toString(),
         //                     CertificateIssuerExtension.NAME);
         mDefaultCRLExtensionIDs.put(PKIXExtensions.FreshestCRL_Id.toString(),
-                FreshestCRLExtension.NAME);
+                FreshestCRLExtension.class.getSimpleName());
         mDefaultCRLExtensionIDs.put(AuthInfoAccessExtension.ID.toString(),
                 AuthInfoAccessExtension.NAME2);
 
         /* Class names */
-        mDefaultCRLExtensionClassNames.put(AuthorityKeyIdentifierExtension.NAME,
+        mDefaultCRLExtensionClassNames.put(AuthorityKeyIdentifierExtension.class.getSimpleName(),
                 "com.netscape.cms.crl.CMSAuthorityKeyIdentifierExtension");
-        mDefaultCRLExtensionClassNames.put(IssuerAlternativeNameExtension.NAME,
+        mDefaultCRLExtensionClassNames.put(IssuerAlternativeNameExtension.class.getSimpleName(),
                 "com.netscape.cms.crl.CMSIssuerAlternativeNameExtension");
-        mDefaultCRLExtensionClassNames.put(CRLNumberExtension.NAME,
+        mDefaultCRLExtensionClassNames.put(CRLNumberExtension.class.getSimpleName(),
                 "com.netscape.cms.crl.CMSCRLNumberExtension");
-        mDefaultCRLExtensionClassNames.put(DeltaCRLIndicatorExtension.NAME,
+        mDefaultCRLExtensionClassNames.put(DeltaCRLIndicatorExtension.class.getSimpleName(),
                 "com.netscape.cms.crl.CMSDeltaCRLIndicatorExtension");
-        mDefaultCRLExtensionClassNames.put(IssuingDistributionPointExtension.NAME,
+        mDefaultCRLExtensionClassNames.put(IssuingDistributionPointExtension.class.getSimpleName(),
                 "com.netscape.cms.crl.CMSIssuingDistributionPointExtension");
-        mDefaultCRLExtensionClassNames.put(CRLReasonExtension.NAME,
+        mDefaultCRLExtensionClassNames.put(CRLReasonExtension.class.getSimpleName(),
                 "com.netscape.cms.crl.CMSCRLReasonExtension");
-        mDefaultCRLExtensionClassNames.put(HoldInstructionExtension.NAME,
+        mDefaultCRLExtensionClassNames.put(HoldInstructionExtension.class.getSimpleName(),
                 "com.netscape.cms.crl.CMSHoldInstructionExtension");
-        mDefaultCRLExtensionClassNames.put(InvalidityDateExtension.NAME,
+        mDefaultCRLExtensionClassNames.put(InvalidityDateExtension.class.getSimpleName(),
                 "com.netscape.cms.crl.CMSInvalidityDateExtension");
         //mDefaultCRLExtensionClassNames.put(CertificateIssuerExtension.NAME,
         //        "com.netscape.cms.crl.CMSCertificateIssuerExtension");
-        mDefaultCRLExtensionClassNames.put(FreshestCRLExtension.NAME,
+        mDefaultCRLExtensionClassNames.put(FreshestCRLExtension.class.getSimpleName(),
                 "com.netscape.cms.crl.CMSFreshestCRLExtension");
         mDefaultCRLExtensionClassNames.put(AuthInfoAccessExtension.NAME2,
                 "com.netscape.cms.crl.CMSAuthInfoAccessExtension");
@@ -164,25 +164,25 @@ public class CMSCRLExtensions implements ICMSCRLExtensions {
         try {
             OIDMap.addAttribute(DeltaCRLIndicatorExtension.class.getName(),
                     DeltaCRLIndicatorExtension.OID,
-                    DeltaCRLIndicatorExtension.NAME);
+                    DeltaCRLIndicatorExtension.class.getSimpleName());
         } catch (CertificateException e) {
         }
         try {
             OIDMap.addAttribute(HoldInstructionExtension.class.getName(),
                     HoldInstructionExtension.OID,
-                    HoldInstructionExtension.NAME);
+                    HoldInstructionExtension.class.getSimpleName());
         } catch (CertificateException e) {
         }
         try {
             OIDMap.addAttribute(InvalidityDateExtension.class.getName(),
                     InvalidityDateExtension.OID,
-                    InvalidityDateExtension.NAME);
+                    InvalidityDateExtension.class.getSimpleName());
         } catch (CertificateException e) {
         }
         try {
             OIDMap.addAttribute(FreshestCRLExtension.class.getName(),
                     FreshestCRLExtension.OID,
-                    FreshestCRLExtension.NAME);
+                    FreshestCRLExtension.class.getSimpleName());
         } catch (CertificateException e) {
         }
     }
@@ -624,7 +624,8 @@ public class CMSCRLExtensions implements ICMSCRLExtensions {
                 CMSCRLExtensions cmsCRLExtensions = (CMSCRLExtensions) ip.getCRLExtensions();
                 if (cmsCRLExtensions != null) {
                     issuingDistPointExtEnabled =
-                            cmsCRLExtensions.isCRLExtensionEnabled(IssuingDistributionPointExtension.NAME);
+                            cmsCRLExtensions.isCRLExtensionEnabled(IssuingDistributionPointExtension.class
+                                    .getSimpleName());
                 }
 
                 CMS.debug("issuingDistPointExtEnabled = " + issuingDistPointExtEnabled);
diff --git a/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java b/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
index 46ddb544d08c1fc52cd597e88a63128e026e169e..668d96fadb6a7f9590e4a9ceea21fa198fe94ec3 100644
--- a/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
+++ b/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
@@ -1141,7 +1141,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
                 }
 
                 if (name.equals(Constants.PR_CA_CERTS_ONLY)) {
-                    Extension distExt = getCRLExtension(IssuingDistributionPointExtension.NAME);
+                    Extension distExt = getCRLExtension(IssuingDistributionPointExtension.class.getSimpleName());
                     IssuingDistributionPointExtension iExt = (IssuingDistributionPointExtension) distExt;
                     IssuingDistributionPoint issuingDistributionPoint = null;
                     if (iExt != null)
@@ -1168,7 +1168,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
                                     crlSubStore.getSubStore(ICertificateAuthority.PROP_CRLEXT_SUBSTORE);
                             crlExtsSubStore =
                                     crlExtsSubStore
-                                            .getSubStore(IssuingDistributionPointExtension.NAME);
+                                            .getSubStore(IssuingDistributionPointExtension.class.getSimpleName());
 
                             if (crlExtsSubStore != null) {
                                 String val = "";
@@ -2232,9 +2232,9 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
 
     public boolean isDeltaCRLEnabled() {
         return (mAllowExtensions && mEnableCRLCache &&
-                mCMSCRLExtensions.isCRLExtensionEnabled(DeltaCRLIndicatorExtension.NAME) &&
-                mCMSCRLExtensions.isCRLExtensionEnabled(CRLNumberExtension.NAME) &&
-                mCMSCRLExtensions.isCRLExtensionEnabled(CRLReasonExtension.NAME));
+                mCMSCRLExtensions.isCRLExtensionEnabled(DeltaCRLIndicatorExtension.class.getSimpleName()) &&
+                mCMSCRLExtensions.isCRLExtensionEnabled(CRLNumberExtension.class.getSimpleName()) &&
+                mCMSCRLExtensions.isCRLExtensionEnabled(CRLReasonExtension.class.getSimpleName()));
     }
 
     public boolean isThisCurrentDeltaCRL(X509CRLImpl deltaCRL) {
@@ -2471,7 +2471,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
                     String extName = extNames.elementAt(i);
 
                     if (mCMSCRLExtensions.isCRLExtensionEnabled(extName) &&
-                            (!extName.equals(FreshestCRLExtension.NAME))) {
+                            (!extName.equals(FreshestCRLExtension.class.getSimpleName()))) {
                         mCMSCRLExtensions.addToCRLExtensions(ext, extName, null);
                     }
                 }
@@ -2635,7 +2635,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
                     String extName = extNames.elementAt(i);
 
                     if (mCMSCRLExtensions.isCRLExtensionEnabled(extName) &&
-                            (!extName.equals(DeltaCRLIndicatorExtension.NAME))) {
+                            (!extName.equals(DeltaCRLIndicatorExtension.class.getSimpleName()))) {
                         mCMSCRLExtensions.addToCRLExtensions(ext, extName, null);
                     }
                 }
@@ -3018,7 +3018,7 @@ class CertRecProcessor implements IElementProcessor {
         }
         boolean isIssuingDistPointExtEnabled = false;
         isIssuingDistPointExtEnabled =
-                exts.isCRLExtensionEnabled(IssuingDistributionPointExtension.NAME);
+                exts.isCRLExtensionEnabled(IssuingDistributionPointExtension.class.getSimpleName());
         if (isIssuingDistPointExtEnabled == false) {
             mIssuingDistPointEnabled = false;
             return false;
@@ -3031,13 +3031,13 @@ class CertRecProcessor implements IElementProcessor {
         Vector<String> extNames = exts.getCRLExtensionNames();
         for (int i = 0; i < extNames.size(); i++) {
             String extName = extNames.elementAt(i);
-            if (extName.equals(IssuingDistributionPointExtension.NAME)) {
+            if (extName.equals(IssuingDistributionPointExtension.class.getSimpleName())) {
                 exts.addToCRLExtensions(ext, extName, null);
             }
         }
         Extension issuingDistExt = null;
         try {
-            issuingDistExt = ext.get(IssuingDistributionPointExtension.NAME);
+            issuingDistExt = ext.get(IssuingDistributionPointExtension.class.getSimpleName());
         } catch (Exception e) {
         }
 
@@ -3077,7 +3077,7 @@ class CertRecProcessor implements IElementProcessor {
 
         Extension crlReasonExt = null;
         try {
-            crlReasonExt = entryExts.get(CRLReasonExtension.NAME);
+            crlReasonExt = entryExts.get(CRLReasonExtension.class.getSimpleName());
         } catch (Exception e) {
             return includeCert;
         }
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java
index 8c106800aac0df1919fda0cbe537cdab5cf61fd3..adf912dfa358ddcd5219e92e154b8846d99f7815 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java
+++ b/pki/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java
@@ -253,7 +253,7 @@ public class UniqueSubjectNameConstraints extends APolicyRule
         } else {
             try {
                 ext = (KeyUsageExtension) extensions.get(
-                            KeyUsageExtension.NAME);
+                            KeyUsageExtension.class.getSimpleName());
             } catch (IOException e) {
                 // extension isn't there.
             }
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java
index fea1265679f18608c0e88fdc296aceeef7408028..2619890ab1c8dac1d8897fb446470b854f525603 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java
@@ -261,9 +261,9 @@ public class AuthInfoAccessExt extends APolicyRule implements
                 } else {
                     // check to see if AIA is already exist
                     try {
-                        extensions.delete(AuthInfoAccessExtension.NAME);
+                        extensions.delete(AuthInfoAccessExtension.class.getSimpleName());
                         log(ILogger.LL_WARN,
-                                "Previous extension deleted: " + AuthInfoAccessExtension.NAME);
+                                "Previous extension deleted: " + AuthInfoAccessExtension.class.getSimpleName());
                     } catch (IOException ex) {
                     }
                 }
@@ -280,7 +280,7 @@ public class AuthInfoAccessExt extends APolicyRule implements
 
                     aiaExt.addAccessDescription(oid, gn);
                 }
-                extensions.set(AuthInfoAccessExtension.NAME, aiaExt);
+                extensions.set(AuthInfoAccessExtension.class.getSimpleName(), aiaExt);
 
             } catch (IOException e) {
                 log(ILogger.LL_FAILURE, CMS.getLogMessage("POLICY_UNEXPECTED_POLICY_ERROR", NAME, e.getMessage()));
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java
index 971379a46e61821b2c06cb09d17f97ddce6495fd..63b84a391986f646358d53dd9e0c44fcfe8fcbd8 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java
@@ -225,7 +225,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule
             try {
                 if (extensions != null) {
                     authorityKeyIdExt = (AuthorityKeyIdentifierExtension)
-                            extensions.get(AuthorityKeyIdentifierExtension.NAME);
+                            extensions.get(AuthorityKeyIdentifierExtension.class.getSimpleName());
                 }
             } catch (IOException e) {
                 // extension isn't there. 
@@ -241,7 +241,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule
                     CMS.debug(
                             "AuthorityKeyIdentifierKeyExt: request id from user " + req.getRequestId() +
                                     " had authority key identifier - deleted");
-                    extensions.delete(AuthorityKeyIdentifierExtension.NAME);
+                    extensions.delete(AuthorityKeyIdentifierExtension.class.getSimpleName());
                 }
             }
 
@@ -258,7 +258,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule
                 certInfo.set(X509CertInfo.EXTENSIONS, extensions);
             }
             extensions.set(
-                    AuthorityKeyIdentifierExtension.NAME, mTheExtension);
+                    AuthorityKeyIdentifierExtension.class.getSimpleName(), mTheExtension);
             CMS.debug(
                     "AuthorityKeyIdentifierKeyExt: added authority key id ext to request " + req.getRequestId());
             return PolicyResult.ACCEPTED;
@@ -361,7 +361,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule
 
         try {
             subjKeyIdExt = (SubjectKeyIdentifierExtension)
-                    exts.get(SubjectKeyIdentifierExtension.NAME);
+                    exts.get(SubjectKeyIdentifierExtension.class.getSimpleName());
         } catch (IOException e) {
             // extension isn't there.
             CMS.debug(
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java
index 1d22d48ecb72b6fc1aba893c4b5829712ed6cbba..df96bd0720440e8befd669c8167e3f620eb7c4a1 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java
@@ -256,7 +256,7 @@ public class BasicConstraintsExt extends APolicyRule
                     certInfo.get(X509CertInfo.EXTENSIONS);
             if (extensions != null) {
                 basicExt = (BasicConstraintsExtension)
-                        extensions.get(BasicConstraintsExtension.NAME);
+                        extensions.get(BasicConstraintsExtension.class.getSimpleName());
             }
         } catch (IOException e) {
             // no extensions or basic constraints extension.
@@ -281,7 +281,7 @@ public class BasicConstraintsExt extends APolicyRule
             }
             if (basicExt != null) {
                 try {
-                    extensions.delete(BasicConstraintsExtension.NAME);
+                    extensions.delete(BasicConstraintsExtension.class.getSimpleName());
                 } catch (IOException e) {
                 }
             }
@@ -300,7 +300,7 @@ public class BasicConstraintsExt extends APolicyRule
             }
 
             try {
-                extensions.set(BasicConstraintsExtension.NAME, critExt);
+                extensions.set(BasicConstraintsExtension.class.getSimpleName(), critExt);
             } catch (IOException e) {
             }
             CMS.debug(
@@ -377,8 +377,8 @@ public class BasicConstraintsExt extends APolicyRule
                                 CMS.getUserMessage("CMS_POLICY_BASIC_CONSTRAINTS_ERROR", NAME), "");
                         return PolicyResult.REJECTED; // unrecoverable error.
                     }
-                    extensions.delete(BasicConstraintsExtension.NAME);
-                    extensions.set(BasicConstraintsExtension.NAME, critExt);
+                    extensions.delete(BasicConstraintsExtension.class.getSimpleName());
+                    extensions.set(BasicConstraintsExtension.class.getSimpleName(), critExt);
                 }
             } catch (IOException e) {
                 // not possible in these cases.
@@ -449,7 +449,7 @@ public class BasicConstraintsExt extends APolicyRule
             return PolicyResult.REJECTED; // unrecoverable error.
         }
         try {
-            extensions.set(BasicConstraintsExtension.NAME, newExt);
+            extensions.set(BasicConstraintsExtension.class.getSimpleName(), newExt);
         } catch (IOException e) {
             // doesn't happen.
         }
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java
index 1ede3d5d0741a4a928c52178c658d3b8d1569e32..5c8c3851c0c902fc7c42ec3fc927c2766eecd7f5 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java
@@ -222,7 +222,7 @@ public class CRLDistributionPointsExt extends APolicyRule
             netscape.security.x509.OIDMap.addAttribute(
                     CRLDistributionPointsExtension.class.getName(),
                     CRLDistributionPointsExtension.OID,
-                    CRLDistributionPointsExtension.NAME);
+                    CRLDistributionPointsExtension.class.getSimpleName());
         } catch (CertificateException e) {
             // ignore, just means it has already been added
         }
@@ -438,12 +438,12 @@ public class CRLDistributionPointsExt extends APolicyRule
             } else {
                 // remove any previously computed version of the extension
                 try {
-                    extensions.delete(CRLDistributionPointsExtension.NAME);
+                    extensions.delete(CRLDistributionPointsExtension.class.getSimpleName());
                 } catch (IOException e) {
                     // extension isn't there
                 }
             }
-            extensions.set(CRLDistributionPointsExtension.NAME, mCrldpExt);
+            extensions.set(CRLDistributionPointsExtension.class.getSimpleName(), mCrldpExt);
 
             return PolicyResult.ACCEPTED;
 
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java
index 7ea2d6fb86988b7461485a8017e406679a5493ba..8fde4cbc2e323a010fc0027932c5f9e0c24207ad 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java
@@ -200,7 +200,7 @@ public class CertificatePoliciesExt extends APolicyRule
             } else {
                 // remove any previously computed version of the extension
                 try {
-                    extensions.delete(CertificatePoliciesExtension.NAME);
+                    extensions.delete(CertificatePoliciesExtension.class.getSimpleName());
                 } catch (IOException e) {
                     // this is the hack: for some reason, the key which is the name
                     // of the policy has been converted into the OID 
@@ -210,7 +210,7 @@ public class CertificatePoliciesExt extends APolicyRule
                     }
                 }
             }
-            extensions.set(CertificatePoliciesExtension.NAME,
+            extensions.set(CertificatePoliciesExtension.class.getSimpleName(),
                     mCertificatePoliciesExtension);
         } catch (IOException e) {
             log(ILogger.LL_FAILURE, CMS.getLogMessage("POLICY_ERROR_CERTIFICATE_POLICIES_1",
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java
index 28366ade84ae2a8fff6d986e29971ae75db0d4ba..357f8595b602efaa1b77034adb1d2739f959b6c5 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java
@@ -135,7 +135,7 @@ public class CertificateRenewalWindowExt extends APolicyRule
         } else {
             // remove any previously computed version of the extension
             try {
-                extensions.delete(CertificateRenewalWindowExtension.NAME);
+                extensions.delete(CertificateRenewalWindowExtension.class.getSimpleName());
 
             } catch (IOException e) {
                 // this is the hack: for some reason, the key which is the name
@@ -162,7 +162,7 @@ public class CertificateRenewalWindowExt extends APolicyRule
                             getDateValue(now, mBeginTime),
                             getDateValue(now, mEndTime));
             }
-            extensions.set(CertificateRenewalWindowExtension.NAME,
+            extensions.set(CertificateRenewalWindowExtension.class.getSimpleName(),
                     crwExt);
         } catch (Exception e) {
             log(ILogger.LL_FAILURE,
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java
index 65ef6b937817e6b43c6d5dfd58f80cf0904a01ca..f031428518b055abd9eb09403d43152c59431eac 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java
@@ -130,13 +130,13 @@ public class ExtendedKeyUsageExt extends APolicyRule
                 certInfo.set(X509CertInfo.EXTENSIONS, extensions);
             } else {
                 try {
-                    extensions.delete(ExtendedKeyUsageExtension.NAME);
+                    extensions.delete(ExtendedKeyUsageExtension.class.getSimpleName());
                 } catch (IOException ex) {
                     // ExtendedKeyUsage extension is not already there
                 }
             }
 
-            extensions.set(ExtendedKeyUsageExtension.NAME, mExtendedKeyUsage);
+            extensions.set(ExtendedKeyUsageExtension.class.getSimpleName(), mExtendedKeyUsage);
 
             return PolicyResult.ACCEPTED;
         } catch (IOException e) {
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java
index 21afaa18858138478a473abcae071166c7ee41e1..4124b7be791cac157ecc9ce0cb8ff76990b8c634 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java
@@ -198,7 +198,7 @@ public class IssuerAltNameExt extends APolicyRule
 
             // remove any previously computed version of the extension
             try {
-                extensions.delete(IssuerAlternativeNameExtension.NAME);
+                extensions.delete(IssuerAlternativeNameExtension.class.getSimpleName());
 
             } catch (IOException e) {
                 // this is the hack
@@ -212,7 +212,7 @@ public class IssuerAltNameExt extends APolicyRule
         }
 
         try {
-            extensions.set(IssuerAlternativeNameExtension.NAME, mExtension);
+            extensions.set(IssuerAlternativeNameExtension.class.getSimpleName(), mExtension);
         } catch (Exception e) {
             if (e instanceof RuntimeException)
                 throw (RuntimeException) e;
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java
index 037206b89e3b6e84ab0151effc33b222fe80f2b4..8d04b69d6c59a0f3710027098a31e948cec760e1 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java
@@ -187,7 +187,7 @@ public class KeyUsageExt extends APolicyRule
             if (extensions != null) {
                 try {
                     ext = (KeyUsageExtension)
-                            extensions.get(KeyUsageExtension.NAME);
+                            extensions.get(KeyUsageExtension.class.getSimpleName());
                 } catch (IOException e) {
                     // extension isn't there.
                     ext = null;
@@ -262,7 +262,7 @@ public class KeyUsageExt extends APolicyRule
                 mKeyUsage = new KeyUsageExtension(mCritical, bits);
             } catch (IOException e) {
             }
-            extensions.set(KeyUsageExtension.NAME, mKeyUsage);
+            extensions.set(KeyUsageExtension.class.getSimpleName(), mKeyUsage);
             return PolicyResult.ACCEPTED;
         } catch (IOException e) {
             log(ILogger.LL_FAILURE, CMS.getLogMessage("BASE_IO_ERROR", e.getMessage()));
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java
index f3ae4efa4d5472c3559f0045ec00a2284b7652b6..3619985660d12b9f61282f8bdf74c8be9e02fa16 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java
@@ -196,7 +196,7 @@ public class NSCCommentExt extends APolicyRule
         } else {
             // remove any previously computed version of the extension
             try {
-                extensions.delete(NSCCommentExtension.NAME);
+                extensions.delete(NSCCommentExtension.class.getSimpleName());
 
             } catch (IOException e) {
                 // this is the hack: for some reason, the key which is the name
@@ -240,7 +240,7 @@ public class NSCCommentExt extends APolicyRule
             NSCCommentExtension cpExt =
                     new NSCCommentExtension(mCritical, mUserNoticeDisplayText);
 
-            extensions.set(NSCCommentExtension.NAME, cpExt);
+            extensions.set(NSCCommentExtension.class.getSimpleName(), cpExt);
         } catch (Exception e) {
             log(ILogger.LL_FAILURE,
                     CMS.getLogMessage("POLICY_ERROR_CERTIFICATE_POLICIES_1", NAME));
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java
index 8903535dd2700249093d02e6ac4bee96665cf8b5..a0db6c04946c12db9f1e21152929d23c5cfcb487 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java
@@ -192,7 +192,7 @@ public class NSCertTypeExt extends APolicyRule
                 // See if extension is already set and contains correct values.
                 try {
                     nsCertTypeExt = (NSCertTypeExtension)
-                            extensions.get(NSCertTypeExtension.NAME);
+                            extensions.get(NSCertTypeExtension.class.getSimpleName());
                 } catch (IOException e) {
                     // extension isn't there.
                     nsCertTypeExt = null;
@@ -208,7 +208,7 @@ public class NSCertTypeExt extends APolicyRule
                         (certType.equals("ocspResponder"))) {
                     // Fix for #528732 : Always delete
                     // this extension from OCSP signing cert
-                    extensions.delete(NSCertTypeExtension.NAME);
+                    extensions.delete(NSCertTypeExtension.class.getSimpleName());
                     return PolicyResult.ACCEPTED;
                 }
             } else {
@@ -241,7 +241,7 @@ public class NSCertTypeExt extends APolicyRule
             if (nsCertTypeExt != null) {
                 // replace with correct bits to comply to policy.
                 // take all that are true.
-                extensions.delete(NSCertTypeExtension.NAME);
+                extensions.delete(NSCertTypeExtension.class.getSimpleName());
             }
 
             int j;
@@ -259,7 +259,7 @@ public class NSCertTypeExt extends APolicyRule
             }
 
             nsCertTypeExt = new NSCertTypeExtension(mCritical, bits);
-            extensions.set(NSCertTypeExtension.NAME, nsCertTypeExt);
+            extensions.set(NSCertTypeExtension.class.getSimpleName(), nsCertTypeExt);
             return PolicyResult.ACCEPTED;
         } catch (IOException e) {
             log(ILogger.LL_FAILURE, CMS.getLogMessage("BASE_IO_ERROR", e.getMessage()));
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java
index f010bf3f1c5fe02206c6227346f3a7b06113d991..d0db570840022c5ada696c4a4d96fcc384ae59c3 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java
@@ -272,7 +272,7 @@ public class NameConstraintsExt extends APolicyRule
             try {
                 if (extensions != null) {
                     nameConstraintsExt = (NameConstraintsExtension)
-                            extensions.get(NameConstraintsExtension.NAME);
+                            extensions.get(NameConstraintsExtension.class.getSimpleName());
                 }
             } catch (IOException e) {
                 // extension isn't there. 
@@ -288,7 +288,7 @@ public class NameConstraintsExt extends APolicyRule
                     CMS.debug(
                             "NameConstraintsExt: request id " + req.getRequestId() + " from user " +
                                     " already has name constraints - deleted");
-                    extensions.delete(NameConstraintsExtension.NAME);
+                    extensions.delete(NameConstraintsExtension.class.getSimpleName());
                 }
             }
 
@@ -299,7 +299,7 @@ public class NameConstraintsExt extends APolicyRule
                 certInfo.set(X509CertInfo.EXTENSIONS, extensions);
             }
             extensions.set(
-                    NameConstraintsExtension.NAME, mNameConstraintsExtension);
+                    NameConstraintsExtension.class.getSimpleName(), mNameConstraintsExtension);
             CMS.debug(
                     "NameConstraintsExt: added Name Constraints Extension to request " +
                             req.getRequestId());
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java
index 33f2f85e04aa84a2ff3862876c7ff8b31d1d0a51..6056eb1b54b318e8c1071d924c8f024a541189fd 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java
@@ -142,14 +142,14 @@ public class OCSPNoCheckExt extends APolicyRule
                 certInfo.set(X509CertInfo.EXTENSIONS, extensions);
             } else {
                 try {
-                    extensions.delete(OCSPNoCheckExtension.NAME);
+                    extensions.delete(OCSPNoCheckExtension.class.getSimpleName());
                 } catch (IOException ex) {
                     // OCSPNoCheck extension is not already there
                     //  log(ILogger.LL_FAILURE, "No previous extension: "+OCSPNoCheckExtension.NAME+" "+ex.getMessage());
                 }
             }
 
-            extensions.set(OCSPNoCheckExtension.NAME, mOCSPNoCheck);
+            extensions.set(OCSPNoCheckExtension.class.getSimpleName(), mOCSPNoCheck);
 
             return PolicyResult.ACCEPTED;
 
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java
index 861107b8e9ec8e4aca22f8e208ed5f3ceb9b9e55..b7966330ade22c7ff0e056c898609b53fb62711a 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java
@@ -207,7 +207,7 @@ public class PolicyConstraintsExt extends APolicyRule
             try {
                 if (extensions != null) {
                     policyConstraintsExt = (PolicyConstraintsExtension)
-                            extensions.get(PolicyConstraintsExtension.NAME);
+                            extensions.get(PolicyConstraintsExtension.class.getSimpleName());
                 }
             } catch (IOException e) {
                 // extension isn't there. 
@@ -217,7 +217,7 @@ public class PolicyConstraintsExt extends APolicyRule
                 if (agentApproved(req)) {
                     return PolicyResult.ACCEPTED;
                 } else {
-                    extensions.delete(PolicyConstraintsExtension.NAME);
+                    extensions.delete(PolicyConstraintsExtension.class.getSimpleName());
                 }
             }
 
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java
index 7623f455f414289c5428a2301a3a880f7b98bbaa..21f19b455210f6c6b2e388446c2f19bf80ede0f7 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java
@@ -218,7 +218,7 @@ public class PolicyMappingsExt extends APolicyRule
             try {
                 if (extensions != null) {
                     policyMappingsExt = (PolicyMappingsExtension)
-                            extensions.get(PolicyMappingsExtension.NAME);
+                            extensions.get(PolicyMappingsExtension.class.getSimpleName());
                 }
             } catch (IOException e) {
                 // extension isn't there. 
@@ -228,7 +228,7 @@ public class PolicyMappingsExt extends APolicyRule
                 if (agentApproved(req)) {
                     return PolicyResult.ACCEPTED;
                 } else {
-                    extensions.delete(PolicyMappingsExtension.NAME);
+                    extensions.delete(PolicyMappingsExtension.class.getSimpleName());
                 }
             }
 
@@ -239,7 +239,7 @@ public class PolicyMappingsExt extends APolicyRule
                 certInfo.set(X509CertInfo.EXTENSIONS, extensions);
             }
             extensions.set(
-                    PolicyMappingsExtension.NAME, mPolicyMappingsExtension);
+                    PolicyMappingsExtension.class.getSimpleName(), mPolicyMappingsExtension);
             return PolicyResult.ACCEPTED;
         } catch (IOException e) {
             log(ILogger.LL_FAILURE,
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java
index 52c8f1f6965aff1da79ce585aace1b2b5c9d97a1..60c0dfbc2a5cd57c4447900afa7c2bc032ec3534 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java
@@ -199,7 +199,7 @@ public class PrivateKeyUsagePeriodExt extends APolicyRule
         } else {
             // remove any previously computed version of the extension
             try {
-                extensions.delete(PrivateKeyUsageExtension.NAME);
+                extensions.delete(PrivateKeyUsageExtension.class.getSimpleName());
 
             } catch (IOException e) {
             }
@@ -212,7 +212,7 @@ public class PrivateKeyUsagePeriodExt extends APolicyRule
                         formatter.parse(mNotAfter));
             certInfo.set(X509CertInfo.VERSION,
                     new CertificateVersion(CertificateVersion.V3));
-            extensions.set(PrivateKeyUsageExtension.NAME, ext);
+            extensions.set(PrivateKeyUsageExtension.class.getSimpleName(), ext);
         } catch (Exception e) {
             if (e instanceof RuntimeException)
                 throw (RuntimeException) e;
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java
index 0af977a2430cda8e72d8bbfeabb85b86b94131b0..fd87c0eb95a2e3d7100357f4b8925545dc59a59f 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java
@@ -94,7 +94,7 @@ public class RemoveBasicConstraintsExt extends APolicyRule
                     certInfo.get(X509CertInfo.EXTENSIONS);
             if (extensions != null) {
                 try {
-                    extensions.delete(BasicConstraintsExtension.NAME);
+                    extensions.delete(BasicConstraintsExtension.class.getSimpleName());
                     CMS.debug("PolicyRule RemoveBasicConstraintsExt: removed the extension from request "
                             + req.getRequestId().toString());
                 } catch (IOException e) {
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java
index 63bd8804cd27a10e1e3ce6f1641da1893307cef2..f45107ed41c9046b4d529da0519e89a64666f9d3 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java
@@ -179,7 +179,7 @@ public class SubjAltNameExt extends APolicyRule
                 // Remove any previously computed version of the extension
                 //
                 try {
-                    extensions.delete(SubjectAlternativeNameExtension.NAME);
+                    extensions.delete(SubjectAlternativeNameExtension.class.getSimpleName());
                 } catch (IOException e) {
                     // extension isn't there
                 }
@@ -219,7 +219,7 @@ public class SubjAltNameExt extends APolicyRule
             if (extensions == null)
                 extensions = createCertificateExtensions(certInfo);
 
-            extensions.set(SubjectAlternativeNameExtension.NAME,
+            extensions.set(SubjectAlternativeNameExtension.class.getSimpleName(),
                     subjAltNameExt);
 
         } catch (IOException e) {
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java
index 62f0b21da3186a6d845bb396065a6c296bdf1afe..31cc73f16e421006662ca798b1bccfd9311135fd 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java
@@ -195,7 +195,7 @@ public class SubjectAltNameExt extends APolicyRule
                 if (sourceId != null && sourceId.length() > 0)
                     return res; // accepted
                 try {
-                    extensions.delete(SubjectAlternativeNameExtension.NAME);
+                    extensions.delete(SubjectAlternativeNameExtension.class.getSimpleName());
                 } catch (IOException e) {
                     // extension isn't there
                 }
@@ -239,7 +239,7 @@ public class SubjectAltNameExt extends APolicyRule
             if (extensions == null)
                 extensions = createCertificateExtensions(certInfo);
 
-            extensions.set(SubjectAlternativeNameExtension.NAME, sa);
+            extensions.set(SubjectAlternativeNameExtension.class.getSimpleName(), sa);
 
             return res; // accepted.
 
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java
index 6c1c6a4e819bb8c1b171daca805b66185747c746..2344ccfd8006efe4264d08fef80f91e1720009ab 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java
@@ -156,7 +156,7 @@ public class SubjectDirectoryAttributesExt extends APolicyRule
                 certInfo.set(X509CertInfo.EXTENSIONS, extensions);
             } else {
                 try {
-                    extensions.delete(SubjectDirAttributesExtension.NAME);
+                    extensions.delete(SubjectDirAttributesExtension.class.getSimpleName());
                 } catch (IOException ee) {
                     // if name is not found, try deleting the extension using the OID
                     try {
@@ -168,12 +168,12 @@ public class SubjectDirectoryAttributesExt extends APolicyRule
 
             // form extension and set.
             if (mExt != null) {
-                extensions.set(SubjectDirAttributesExtension.NAME, mExt);
+                extensions.set(SubjectDirAttributesExtension.class.getSimpleName(), mExt);
             } else {
                 SubjectDirAttributesExtension ext = formExt(req);
 
                 if (ext != null)
-                    extensions.set(SubjectDirAttributesExtension.NAME, formExt(req));
+                    extensions.set(SubjectDirAttributesExtension.class.getSimpleName(), formExt(req));
             }
             return PolicyResult.ACCEPTED;
         } catch (CertificateException e) {
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java
index 32d254c40dca8443f7ac798eeaf7f98de378ba60..bcf6544f0d368fc45b04ee8524041d79cfd5cbf1 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java
@@ -191,7 +191,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule
             try {
                 if (extensions != null) {
                     subjectKeyIdExt = (SubjectKeyIdentifierExtension)
-                            extensions.get(SubjectKeyIdentifierExtension.NAME);
+                            extensions.get(SubjectKeyIdentifierExtension.class.getSimpleName());
                 }
             } catch (IOException e) {
                 // extension isn't there. 
@@ -207,7 +207,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule
                     CMS.debug(
                             "SubjectKeyIdentifierExt: request id from user " + req.getRequestId() +
                                     " had subject key identifier - deleted to be replaced");
-                    extensions.delete(SubjectKeyIdentifierExtension.NAME);
+                    extensions.delete(SubjectKeyIdentifierExtension.class.getSimpleName());
                 }
             }
 
@@ -232,7 +232,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule
                 certInfo.set(X509CertInfo.EXTENSIONS, extensions);
             }
             extensions.set(
-                    SubjectKeyIdentifierExtension.NAME, subjectKeyIdExt);
+                    SubjectKeyIdentifierExtension.class.getSimpleName(), subjectKeyIdExt);
             CMS.debug(
                     "SubjectKeyIdentifierExt: added subject key id ext to request " + req.getRequestId());
             return PolicyResult.ACCEPTED;
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java
index 7a985b631f2142d76f715cc2ed391853cbb3f914..04429cc7fc08ce0a0cfb675078e27f38ef2313c5 100644
--- a/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java
+++ b/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java
@@ -110,7 +110,7 @@ public class UniqueSubjectNameConstraint extends EnrollConstraint {
         } else {
             try {
                 ext = (KeyUsageExtension) extensions.get(
-                        KeyUsageExtension.NAME);
+                        KeyUsageExtension.class.getSimpleName());
             } catch (IOException e) {
                 // extension isn't there.
             }
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java b/pki/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java
index 7f70722d0506c39d3169f198843acb3fab4ab371..754386d30abbf869f9395d9d439602f4c569995b 100644
--- a/pki/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java
+++ b/pki/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java
@@ -448,7 +448,7 @@ class AVAPattern {
                         // For now, just give subjectAltName
                         // as an example.
                         if (mValue.equalsIgnoreCase(
-                                SubjectAlternativeNameExtension.NAME)) {
+                                SubjectAlternativeNameExtension.class.getSimpleName())) {
                             try {
                                 GeneralNames subjectNames = (GeneralNames)
                                         ((SubjectAlternativeNameExtension)
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java b/pki/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java
index 7aeb672d038c0b33c67122a00cc262e6626d5b3c..26dc46f4f11ee7ae3b6dd00ce5d816eb74711f96 100644
--- a/pki/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java
+++ b/pki/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java
@@ -532,7 +532,7 @@ class MapAVAPattern {
                     if (extName.equals(mValue)) {
                         // Check the extensions one by one.
                         // For now, just give subjectAltName as an example.
-                        if (mValue.equalsIgnoreCase(SubjectAlternativeNameExtension.NAME)) {
+                        if (mValue.equalsIgnoreCase(SubjectAlternativeNameExtension.class.getSimpleName())) {
                             try {
                                 GeneralNames subjectNames =
                                         (GeneralNames)
diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java
index d5cbfb323ee1decf1a77ee170c35c8f9451b1a74..184febf16910fc53e96e3c5189fdb43bc8270a2c 100644
--- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java
+++ b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java
@@ -284,7 +284,7 @@ public class LdapEncryptCertPublisher implements ILdapPublisher, IExtendedPlugin
         CRLExtensions crlentryexts = new CRLExtensions();
 
         try {
-            crlentryexts.set(CRLReasonExtension.NAME, reasonExt);
+            crlentryexts.set(CRLReasonExtension.class.getSimpleName(), reasonExt);
         } catch (IOException e) {
             log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_SET_CRL_REASON", reason.toString(), e.toString()));
 
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
index 41f0c248f8a1f16e6b322254bc9486606f2aabe9..6d5904857afdae2f269cc346a4148a55ee17c8ca 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
@@ -1744,7 +1744,7 @@ public final class CMSAdminServlet extends AdminServlet {
                     if (extensions != null) {
                         BasicConstraintsExtension basic =
                                 (BasicConstraintsExtension)
-                                extensions.get(BasicConstraintsExtension.NAME);
+                                extensions.get(BasicConstraintsExtension.class.getSimpleName());
 
                         if (basic == null)
                             log(CMS.getLogMessage("ADMIN_SRVLT_BASIC_CONSTRAIN_NULL"));
@@ -2156,7 +2156,7 @@ public final class CMSAdminServlet extends AdminServlet {
                     if (extensions != null) {
                         BasicConstraintsExtension basic =
                                 (BasicConstraintsExtension)
-                                extensions.get(BasicConstraintsExtension.NAME);
+                                extensions.get(BasicConstraintsExtension.class.getSimpleName());
 
                         if (basic == null)
                             log(CMS.getLogMessage("ADMIN_SRVLT_BASIC_CONSTRAIN_NULL"));
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java b/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
index e292e501a460a14ea60104579a4c811f3388c3fe..d45535fd5dd8c07b36658ee89d22d6feb84dce25 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
@@ -1523,7 +1523,7 @@ public abstract class CMSServlet extends HttpServlet {
         CRLExtensions crlentryexts = new CRLExtensions();
 
         try {
-            crlentryexts.set(CRLReasonExtension.NAME, reasonExt);
+            crlentryexts.set(CRLReasonExtension.class.getSimpleName(), reasonExt);
         } catch (IOException e) {
             log(ILogger.LL_FAILURE,
                     CMS.getLogMessage("CMSGW_ERR_CRL_REASON", reason.toString(), e.toString()));
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
index 1ff056ab781dc692cb320131ff07b549fe8518ca..8a28c186326bab2becb5d7ee8ceb20f6b00c28de 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
@@ -1207,7 +1207,7 @@ public class HashEnrollServlet extends CMSServlet {
                     continue;
                 }
                 KeyUsageExtension ext = (KeyUsageExtension)
-                        exts.get(KeyUsageExtension.NAME);
+                        exts.get(KeyUsageExtension.class.getSimpleName());
 
                 if (ext == null)
                     // should not happen 
@@ -1239,8 +1239,8 @@ public class HashEnrollServlet extends CMSServlet {
                             new KeyUsageExtension(Boolean.valueOf(true),
                                     (Object) newvalue);
 
-                    exts.delete(KeyUsageExtension.NAME);
-                    exts.set(KeyUsageExtension.NAME, newext);
+                    exts.delete(KeyUsageExtension.class.getSimpleName());
+                    exts.set(KeyUsageExtension.class.getSimpleName(), newext);
                 }
             } catch (IOException e) {
                 // should never happen 
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
index 3fa4a1ad8bdf60c2266afa0122064dfd76725cc9..d2f829d0f2561f72bd5b237ccaa6e33a7f10857b 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
@@ -1339,12 +1339,12 @@ public class CRSEnrollment extends HttpServlet {
             CertificateExtensions ext = new CertificateExtensions();
 
             if (kue != null) {
-                ext.set(KeyUsageExtension.NAME, kue);
+                ext.set(KeyUsageExtension.class.getSimpleName(), kue);
             }
 
             // add subjectAltName extension, if present
             if (sane != null) {
-                ext.set(SubjectAlternativeNameExtension.NAME, sane);
+                ext.set(SubjectAlternativeNameExtension.class.getSimpleName(), sane);
             }
 
             certInfo.set(X509CertInfo.EXTENSIONS, ext);
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java b/pki/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java
index 3fd83452ff37f51eda8cc9b5044ce5645297a1cb..d3682dbff47988e94b0040faad0be2861c1cf3f3 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java
@@ -653,7 +653,7 @@ public class ProcessCertReq extends CMSServlet {
                                     NSCertTypeExtension nsExtensions =
                                             (NSCertTypeExtension)
                                             extensions.get(
-                                                    NSCertTypeExtension.NAME);
+                                                    NSCertTypeExtension.class.getSimpleName());
 
                                     if (nsExtensions != null) {
                                         updateNSExtension(req, nsExtensions);
@@ -671,7 +671,7 @@ public class ProcessCertReq extends CMSServlet {
                                         BasicConstraintsExtension bcExt =
                                                 (BasicConstraintsExtension)
                                                 extensions.get(
-                                                        BasicConstraintsExtension.NAME);
+                                                        BasicConstraintsExtension.class.getSimpleName());
 
                                         if (bcExt != null) {
                                             Integer bcPathLen = (Integer) bcExt.get(BasicConstraintsExtension.PATH_LEN);
@@ -683,8 +683,8 @@ public class ProcessCertReq extends CMSServlet {
                                                 BasicConstraintsExtension bcExt0 =
                                                         new BasicConstraintsExtension(isCA.booleanValue(), pathLen);
 
-                                                extensions.delete(BasicConstraintsExtension.NAME);
-                                                extensions.set(BasicConstraintsExtension.NAME,
+                                                extensions.delete(BasicConstraintsExtension.class.getSimpleName());
+                                                extensions.set(BasicConstraintsExtension.class.getSimpleName(),
                                                         (Extension) bcExt0);
                                                 alterationCounter++;
                                             }
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java b/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java
index c66d8a71db2af64dff208aaa903ab67037e0c0f9..9dd3127c82079190f4ab41be881451ee4a193ea6 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java
+++ b/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java
@@ -474,7 +474,7 @@ public class CertUtils {
 
             if (extns != null) {
                 NSCertTypeExtension nsExtn = (NSCertTypeExtension)
-                        extns.get(NSCertTypeExtension.NAME);
+                        extns.get(NSCertTypeExtension.class.getSimpleName());
 
                 if (nsExtn != null) {
                     String nsType = getNSExtensionInfo(nsExtn);
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java b/pki/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java
index dfd7dbab8e5f840abb55c9679e004d82838b66c5..bbf75713eecd053dbf565ce58b3704268b82d4ad 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java
+++ b/pki/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java
@@ -87,28 +87,28 @@ public class OidLoaderSubsystem implements ISubsystem {
     private static final String[][] oidMapEntries = new String[][] {
             { NSCertTypeExtension.class.getName(),
                     CertType_Id.toString(),
-                    NSCertTypeExtension.NAME },
+                    NSCertTypeExtension.class.getSimpleName() },
             { CertificateRenewalWindowExtension.class.getName(),
                     CertificateRenewalWindowExtension.ID.toString(),
-                    CertificateRenewalWindowExtension.NAME },
+                    CertificateRenewalWindowExtension.class.getSimpleName() },
             { CertificateScopeOfUseExtension.class.getName(),
                     CertificateScopeOfUseExtension.ID.toString(),
                     CertificateScopeOfUseExtension.NAME },
             { DeltaCRLIndicatorExtension.class.getName(),
                     DeltaCRLIndicatorExtension.OID,
-                    DeltaCRLIndicatorExtension.NAME },
+                    DeltaCRLIndicatorExtension.class.getSimpleName() },
             { HoldInstructionExtension.class.getName(),
                     HoldInstructionExtension.OID,
-                    HoldInstructionExtension.NAME },
+                    HoldInstructionExtension.class.getSimpleName() },
             { InvalidityDateExtension.class.getName(),
                     InvalidityDateExtension.OID,
-                    InvalidityDateExtension.NAME },
+                    InvalidityDateExtension.class.getSimpleName() },
             { IssuingDistributionPointExtension.class.getName(),
                     IssuingDistributionPointExtension.OID,
-                    IssuingDistributionPointExtension.NAME },
+                    IssuingDistributionPointExtension.class.getSimpleName() },
             { FreshestCRLExtension.class.getName(),
                     FreshestCRLExtension.OID,
-                    FreshestCRLExtension.NAME },
+                    FreshestCRLExtension.class.getSimpleName() },
         };
 
     /**
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java
index 7cf39dcef8eb987fc63cb5387d65e417dd6c609d..23f3e46cb7489f601868bca5ad9b6e69567fb306 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java
+++ b/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java
@@ -141,14 +141,14 @@ public class RevocationInfoMapper implements IDBAttrMapper {
                                 Integer.parseInt(reasonStr));
                         CRLReasonExtension ext = new CRLReasonExtension(reason);
 
-                        exts.set(CRLReasonExtension.NAME, ext);
+                        exts.set(CRLReasonExtension.class.getSimpleName(), ext);
                     } else if (str.startsWith("InvalidityDateExtension=")) {
                         String invalidityDateStr = str.substring(24);
                         Date invalidityDate = DateMapper.dateFromDB(invalidityDateStr);
                         InvalidityDateExtension ext =
                                 new InvalidityDateExtension(invalidityDate);
 
-                        exts.set(InvalidityDateExtension.NAME, ext);
+                        exts.set(InvalidityDateExtension.class.getSimpleName(), ext);
                     } else {
                         Debug.trace("XXX skipped extension");
                     }
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java
index 856a8c59193740db53d61aa1ada8e8246a51183b..4598f28692bb8a68d19da9bf2d527edc5f93867d 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java
+++ b/pki/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java
@@ -170,7 +170,7 @@ public class X509CertImplMapper implements IDBAttrMapper {
             if (ext == null) {
                 // sometime time (during installation) it
                 // is named differently
-                ext = cert.getExtension(NSCertTypeExtension.NAME);
+                ext = cert.getExtension(NSCertTypeExtension.class.getSimpleName());
                 if (ext == null)
                     return null;
             }
@@ -216,7 +216,7 @@ public class X509CertImplMapper implements IDBAttrMapper {
             if (ext == null) {
                 // sometime time (during installation) it
                 // is named differently
-                ext = cert.getExtension(BasicConstraintsExtension.NAME);
+                ext = cert.getExtension(BasicConstraintsExtension.class.getSimpleName());
                 if (ext == null)
                     return null;
             }
diff --git a/pki/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java b/pki/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java
index 68556dfc00d083ce677ccf8d7f3800f80f98a885..bc54a7d4c0b754f5285d95174bc24762a68668b6 100644
--- a/pki/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java
+++ b/pki/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java
@@ -171,7 +171,7 @@ public class ReqCertSANameEmailResolver implements IEmailResolver {
                     try {
                         ext =
                                 (SubjectAlternativeNameExtension)
-                                exts.get(SubjectAlternativeNameExtension.NAME);
+                                exts.get(SubjectAlternativeNameExtension.class.getSimpleName());
                     } catch (IOException e) {
                         log(ILogger.LL_FAILURE,
                                 CMS.getLogMessage("CMSCORE_NOTIFY_GET_EXT", e.toString()));
diff --git a/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java b/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java
index 3eeb39e0c08d26f9ac6aa56a09815e1898ce9380..e28e3a517eb386b394ef3bc432d4347411671a4b 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java
+++ b/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java
@@ -260,7 +260,7 @@ public abstract class CertificateInfo {
 
         try {
             subjKeyExt =
-                    (SubjectKeyIdentifierExtension) caexts.get(SubjectKeyIdentifierExtension.NAME);
+                    (SubjectKeyIdentifierExtension) caexts.get(SubjectKeyIdentifierExtension.class.getSimpleName());
         } catch (IOException e) {
         }
 
@@ -272,7 +272,7 @@ public abstract class CertificateInfo {
             AuthorityKeyIdentifierExtension authExt =
                     new AuthorityKeyIdentifierExtension(false, keyId, null, null);
 
-            ext.set(AuthorityKeyIdentifierExtension.NAME, authExt);
+            ext.set(AuthorityKeyIdentifierExtension.class.getSimpleName(), authExt);
         }
     }
 }
diff --git a/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java b/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
index a4f6ee9a02cb0e6f1054dab2ccf40d3435872f68..c0a84ff4cb28a97e9a4f4cc9ed99181fc5e255de 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
+++ b/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
@@ -2124,7 +2124,7 @@ public final class JssSubsystem implements ICryptoSubsystem {
                 else {
                     try {
                         BasicConstraintsExtension ext = (BasicConstraintsExtension)
-                                exts.get(BasicConstraintsExtension.NAME);
+                                exts.get(BasicConstraintsExtension.class.getSimpleName());
 
                         if (ext == null)
                             return false;
diff --git a/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java b/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
index 1d03911b45f2be6a225961f4886bab15af932e57..606c140f10f04631041f6e423e27a97498aa97e3 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
+++ b/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
@@ -850,7 +850,7 @@ public class KeyCertUtil {
         BasicConstraintsExtension basic = new BasicConstraintsExtension(
                 bool, len);
 
-        ext.set(BasicConstraintsExtension.NAME, basic);
+        ext.set(BasicConstraintsExtension.class.getSimpleName(), basic);
     }
 
     public static void setExtendedKeyUsageExtension(
@@ -901,7 +901,7 @@ public class KeyCertUtil {
         }
 
         if (anyExt)
-            ext.set(ExtendedKeyUsageExtension.NAME, ns);
+            ext.set(ExtendedKeyUsageExtension.class.getSimpleName(), ns);
     }
 
     public static void setNetscapeCertificateExtension(
@@ -960,7 +960,7 @@ public class KeyCertUtil {
             anyExt = true;
         }
         if (anyExt)
-            ext.set(NSCertTypeExtension.NAME, ns);
+            ext.set(NSCertTypeExtension.class.getSimpleName(), ns);
     }
 
     public static void setOCSPNoCheck(KeyPair keypair,
@@ -972,7 +972,7 @@ public class KeyCertUtil {
             OCSPNoCheckExtension noCheckExt =
                     new OCSPNoCheckExtension();
 
-            ext.set(OCSPNoCheckExtension.NAME, noCheckExt);
+            ext.set(OCSPNoCheckExtension.class.getSimpleName(), noCheckExt);
         }
     }
 
@@ -988,7 +988,7 @@ public class KeyCertUtil {
                             ExtendedKeyUsageExtension.OID_OCSPSigning));
             ExtendedKeyUsageExtension ocspExt =
                     new ExtendedKeyUsageExtension(false, oidSet);
-            ext.set(ExtendedKeyUsageExtension.NAME, ocspExt);
+            ext.set(ExtendedKeyUsageExtension.class.getSimpleName(), ocspExt);
         }
     }
 
@@ -1007,7 +1007,7 @@ public class KeyCertUtil {
                 aiaExt.addAccessDescription(AuthInfoAccessExtension.METHOD_OCSP, ocspName);
             }
 
-            ext.set(AuthInfoAccessExtension.NAME, aiaExt);
+            ext.set(AuthInfoAccessExtension.class.getSimpleName(), aiaExt);
         }
     }
 
@@ -1021,7 +1021,7 @@ public class KeyCertUtil {
             AuthorityKeyIdentifierExtension akiExt =
                     new AuthorityKeyIdentifierExtension(id, null, null);
 
-            ext.set(AuthorityKeyIdentifierExtension.NAME, akiExt);
+            ext.set(AuthorityKeyIdentifierExtension.class.getSimpleName(), akiExt);
         }
     }
 
@@ -1036,13 +1036,13 @@ public class KeyCertUtil {
             SubjectKeyIdentifierExtension skiExt =
                     new SubjectKeyIdentifierExtension(id.getIdentifier());
 
-            ext.set(SubjectKeyIdentifierExtension.NAME, skiExt);
+            ext.set(SubjectKeyIdentifierExtension.class.getSimpleName(), skiExt);
         }
     }
 
     public static void setKeyUsageExtension(CertificateExtensions ext,
             KeyUsageExtension keyUsage) throws IOException {
-        ext.set(KeyUsageExtension.NAME, keyUsage);
+        ext.set(KeyUsageExtension.class.getSimpleName(), keyUsage);
     }
 
     public static KeyIdentifier createKeyIdentifier(KeyPair keypair)
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java b/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java
index e191de0274737d2fb4d3b3c4adee1e4248fac1f6..b55b62bf21addbe86b47363c1004837a52e968d4 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java
@@ -90,25 +90,25 @@ public class PrettyPrintCrl {
         try {
             OIDMap.addAttribute(DeltaCRLIndicatorExtension.class.getName(),
                     DeltaCRLIndicatorExtension.OID,
-                    DeltaCRLIndicatorExtension.NAME);
+                    DeltaCRLIndicatorExtension.class.getSimpleName());
         } catch (CertificateException e) {
         }
         try {
             OIDMap.addAttribute(HoldInstructionExtension.class.getName(),
                     HoldInstructionExtension.OID,
-                    HoldInstructionExtension.NAME);
+                    HoldInstructionExtension.class.getSimpleName());
         } catch (CertificateException e) {
         }
         try {
             OIDMap.addAttribute(InvalidityDateExtension.class.getName(),
                     InvalidityDateExtension.OID,
-                    InvalidityDateExtension.NAME);
+                    InvalidityDateExtension.class.getSimpleName());
         } catch (CertificateException e) {
         }
         try {
             OIDMap.addAttribute(IssuingDistributionPointExtension.class.getName(),
                     IssuingDistributionPointExtension.OID,
-                    IssuingDistributionPointExtension.NAME);
+                    IssuingDistributionPointExtension.class.getSimpleName());
         } catch (CertificateException e) {
         }
 
diff --git a/pki/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java b/pki/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java
index 0bafcedd072ff608c3f1f01426c962216c5b577b..ba469be606ad1dac6a14b48ea200d4dccc9badb5 100644
--- a/pki/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java
+++ b/pki/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java
@@ -63,7 +63,7 @@ import netscape.security.x509.URIName;
  */
 public class AuthInfoAccessExtension extends Extension implements CertAttrSet {
     private static final long serialVersionUID = 7373316523212538446L;
-    public static final String NAME = "AuthInfoAccessExtension";
+
     public static final String NAME2 = "AuthorityInformationAccess";
 
     public static final int OID_OCSP[] = { 1, 3, 6, 1, 5, 5, 7, 48, 1 };
@@ -139,13 +139,6 @@ public class AuthInfoAccessExtension extends Extension implements CertAttrSet {
     }
 
     /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return NAME;
-    }
-
-    /**
      * Adds Access Description.
      */
     public void addAccessDescription(
diff --git a/pki/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java b/pki/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java
index 018fd71c84bec4c1f44b91eaca22116692ebe909..b2b034a2af93ae99db5b8045b0fdcbec9b6adc1e 100644
--- a/pki/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java
+++ b/pki/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java
@@ -44,7 +44,6 @@ import netscape.security.x509.Extension;
 public class CertificateRenewalWindowExtension extends Extension
         implements CertAttrSet {
     private static final long serialVersionUID = 4470220533545299271L;
-    public static final String NAME = "CertificateRenewalWindow";
     public static final int OID[] = { 2, 16, 840, 1, 113730, 1, 15 };
     public static final ObjectIdentifier ID = new ObjectIdentifier(OID);
 
@@ -74,10 +73,6 @@ public class CertificateRenewalWindowExtension extends Extension
         decodeThis();
     }
 
-    public String getName() {
-        return NAME;
-    }
-
     /**
      * Sets extension attribute.
      */
diff --git a/pki/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java b/pki/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java
index 16641f36bc7d24106c51a5ecffcac0ad95d5c593..b7f33295f95af785b470ef9f493ecfc62a59b622 100644
--- a/pki/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java
+++ b/pki/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java
@@ -87,10 +87,6 @@ public class CertificateScopeOfUseExtension extends Extension
         decodeThis();
     }
 
-    public String getName() {
-        return NAME;
-    }
-
     public Vector<CertificateScopeEntry> getCertificateScopeEntries() {
         return mEntries;
     }
diff --git a/pki/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java b/pki/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java
index 939da036f7d3466e7affd440e7ac44e4cad32a8b..5ed3feb733c71950ad6a4673487cc3dd2a6107f2 100644
--- a/pki/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java
+++ b/pki/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java
@@ -41,7 +41,6 @@ public class ExtendedKeyUsageExtension extends Extension implements CertAttrSet
      */
     private static final long serialVersionUID = 765403075764697489L;
     public static final String OID = "2.5.29.37";
-    public static final String NAME = OIDMap.EXT_KEY_USAGE_NAME;
     public static final String OID_OCSPSigning = "1.3.6.1.5.5.7.3.9";
     public static final String OID_CODESigning = "1.3.6.1.5.5.7.3.3";
 
@@ -61,7 +60,7 @@ public class ExtendedKeyUsageExtension extends Extension implements CertAttrSet
     static {
         try {
             OIDMap.addAttribute(ExtendedKeyUsageExtension.class.getName(),
-                    OID, ExtendedKeyUsageExtension.NAME);
+                    OID, ExtendedKeyUsageExtension.class.getSimpleName());
         } catch (CertificateException e) {
         }
     }
@@ -176,10 +175,6 @@ public class ExtendedKeyUsageExtension extends Extension implements CertAttrSet
         return null;
     }
 
-    public String getName() {
-        return NAME;
-    }
-
     public void delete(String name)
             throws CertificateException, IOException {
         // NOT USED
diff --git a/pki/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java b/pki/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java
index 81b8cf5b5656d670517b260e0e375086f87944dc..1564489d5637ec26215cc8a7ec1542bd69019809 100644
--- a/pki/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java
+++ b/pki/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java
@@ -49,14 +49,13 @@ public class InhibitAnyPolicyExtension
      */
     private static final long serialVersionUID = -8963439897419343166L;
     public static final String OID = "2.5.29.54";
-    public static final String NAME = OIDMap.EXT_INHIBIT_ANY_POLICY_NAME;
 
     private BigInt mSkipCerts = new BigInt(-1);
 
     static {
         try {
             OIDMap.addAttribute(InhibitAnyPolicyExtension.class.getName(),
-                    OID, NAME);
+                    OID, InhibitAnyPolicyExtension.class.getSimpleName());
         } catch (CertificateException e) {
         }
     }
@@ -135,10 +134,6 @@ public class InhibitAnyPolicyExtension
         return null;
     }
 
-    public String getName() {
-        return NAME;
-    }
-
     public void delete(String name)
             throws CertificateException, IOException {
         // NOT USED
diff --git a/pki/base/util/src/netscape/security/extensions/NSCertTypeExtension.java b/pki/base/util/src/netscape/security/extensions/NSCertTypeExtension.java
index 04b3038e515aa1a6838e9db626015bfa27f0cf12..1f9f5145783e899b952085df3e8a1bbce87e5086 100644
--- a/pki/base/util/src/netscape/security/extensions/NSCertTypeExtension.java
+++ b/pki/base/util/src/netscape/security/extensions/NSCertTypeExtension.java
@@ -60,7 +60,6 @@ public class NSCertTypeExtension extends Extension implements CertAttrSet {
     /**
      * Attribute names.
      */
-    public static final String NAME = "NSCertType";
     public static final String SSL_CLIENT = "ssl_client";
     public static final String SSL_SERVER = "ssl_server";
     public static final String EMAIL = "email";
@@ -365,13 +364,6 @@ public class NSCertTypeExtension extends Extension implements CertAttrSet {
         return mAttributeNames.elements();
     }
 
-    /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return (NAME);
-    }
-
     public static void main(String[] argv) {
     }
 }
diff --git a/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java b/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java
index 28da8085f787c8cc3b23e00b04e013f4a1bb8444..0a308d8ea7bfc0b3c6ae5d5933c1be43902c6624 100644
--- a/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java
+++ b/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java
@@ -39,14 +39,13 @@ public class OCSPNoCheckExtension extends Extension implements CertAttrSet {
      */
     private static final long serialVersionUID = -4692759557964594790L;
     public static final String OID = "1.3.6.1.5.5.7.48.1.5";
-    public static final String NAME = "OCSPNoCheckExtension";
 
     private byte mCached[] = null;
 
     static {
         try {
             OIDMap.addAttribute(OCSPNoCheckExtension.class.getName(),
-                    OID, NAME);
+                    OID, OCSPNoCheckExtension.class.getSimpleName());
         } catch (CertificateException e) {
         }
     }
@@ -142,10 +141,6 @@ public class OCSPNoCheckExtension extends Extension implements CertAttrSet {
         return null;
     }
 
-    public String getName() {
-        return NAME;
-    }
-
     public void delete(String name)
             throws CertificateException, IOException {
         // NOT USED
diff --git a/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java b/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java
index a90abe7e354accaf442dca2987ec4b0fa8f4ed69..15222cb3a95c684318f0d2ad34902410af1f821e 100644
--- a/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java
+++ b/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java
@@ -235,13 +235,6 @@ public class PresenceServerExtension extends Extension implements CertAttrSet {
     }
 
     /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return "PresenceServerExtension";
-    }
-
-    /**
      * Set the name of this attribute.
      */
     public void setName(String name) {
diff --git a/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java b/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java
index d78ad0344633c51c441f159dbc8a7cb86ff1202b..f9ad051e47bbe93ad52714027c91f463f447a8dd 100644
--- a/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java
+++ b/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java
@@ -46,8 +46,6 @@ import netscape.security.x509.URIName;
 public class SubjectInfoAccessExtension extends Extension implements CertAttrSet {
     private static final long serialVersionUID = 7237321566602583325L;
 
-    public static final String NAME = "SubjectInfoAccessExtension";
-
     public static final int OID_OCSP[] = { 1, 3, 6, 1, 5, 5, 7, 48, 1 };
     public static final ObjectIdentifier METHOD_OCSP = new
             ObjectIdentifier(OID_OCSP);
@@ -121,13 +119,6 @@ public class SubjectInfoAccessExtension extends Extension implements CertAttrSet
     }
 
     /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return NAME;
-    }
-
-    /**
      * Adds Access Description.
      */
     public void addAccessDescription(
diff --git a/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java b/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java
index 91b6c2598d90e137534940557552239753f3dcf4..2a48376edbee01d4b846df51e16f7a0af8eddaf4 100644
--- a/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java
+++ b/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java
@@ -67,7 +67,6 @@ public class AuthorityKeyIdentifierExtension extends Extension
     /**
      * Attribute names.
      */
-    public static final String NAME = "AuthorityKeyIdentifier";
     public static final String KEY_ID = "key_id";
     public static final String AUTH_NAME = "auth_name";
     public static final String SERIAL_NUMBER = "serial_number";
@@ -331,10 +330,4 @@ public class AuthorityKeyIdentifierExtension extends Extension
         return (elements.elements());
     }
 
-    /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return (NAME);
-    }
 }
diff --git a/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java
index 2688e961db1ad0c044574a2ca2ed82d60d0d5fd8..e574a40d4abdc1a7a02c5abf76bef44f89472964 100644
--- a/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java
+++ b/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java
@@ -63,7 +63,6 @@ public class BasicConstraintsExtension extends Extension
     /**
      * Attribute names.
      */
-    public static final String NAME = "BasicConstraints";
     public static final String IS_CA = "is_ca";
     public static final String PATH_LEN = "path_len";
 
@@ -286,10 +285,4 @@ public class BasicConstraintsExtension extends Extension
         return (elements.elements());
     }
 
-    /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return (NAME);
-    }
 }
diff --git a/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java b/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java
index c939a7431718d3d7fc5e5df02f2db034003cbbbd..e966688df8dbae6f999ea9043b92d075897ae5e8 100644
--- a/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java
+++ b/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java
@@ -176,18 +176,17 @@ public class CRLDistributionPointsExtension extends Extension
     // because it is so complicated. Therefore, we only provide a
     // minimal implementation.
     /////////////////////////////////////////////////////////////
-    public static final String NAME = "CRLDistributionPoints";
 
     static {
         try {
             OIDMap.addAttribute(CRLDistributionPointsExtension.class.getName(),
-                                OID, NAME);
+                                OID, CRLDistributionPointsExtension.class.getSimpleName());
         } catch (CertificateException e) {
         }
     }
 
     public String toString() {
-        return NAME;
+        return this.getClass().getSimpleName();
     }
 
     /**
@@ -234,10 +233,6 @@ public class CRLDistributionPointsExtension extends Extension
         return (new Vector<String>()).elements();
     }
 
-    public String getName() {
-        return NAME;
-    }
-
     /**
      * Test driver.
      */
diff --git a/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java b/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java
index 7c89b179fe8c63054161768a0db18c341889f43e..848c2f70c5e8d34849afe9173c1af52eaf38ea6d 100755
--- a/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java
+++ b/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java
@@ -52,7 +52,6 @@ public class CRLNumberExtension extends Extension
     /**
      * Attribute name.
      */
-    public static final String NAME = "CRLNumber";
     public static final String NUMBER = "value";
 
     private BigInt crlNumber = null;
@@ -217,10 +216,4 @@ public class CRLNumberExtension extends Extension
         return (elements.elements());
     }
 
-    /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return (NAME);
-    }
 }
diff --git a/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java b/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java
index 3c11fc70bcc9c6195150fbd1aaef5f7ad2a5a4b7..6911d5e73d1df740a4a1587fd39ba186de3b9be8 100644
--- a/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java
+++ b/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java
@@ -64,7 +64,6 @@ public final class CRLReasonExtension extends Extension implements CertAttrSet {
     /**
      * Attribute names.
      */
-    public static final String NAME = "CRLReason";
     public static final String REASON = "value";
 
     private RevocationReason mReason = null;
@@ -214,13 +213,6 @@ public final class CRLReasonExtension extends Extension implements CertAttrSet {
         return (elements.elements());
     }
 
-    /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return (NAME);
-    }
-
     public boolean equals(Object other) {
         if (this == other)
             return true;
diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java b/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java
index 774116bcc16ce825132c57d3d19816395601e3cf..33be54378aa6a4c84a1ffc84d92bbaa8e8d2c653 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java
+++ b/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java
@@ -48,7 +48,6 @@ public class CertificateIssuerExtension extends Extension
     /**
      * Attribute name.
      */
-    public static final String NAME = "CertificateIssuer";
     public static final String CERTIFICATE_ISSUER = "value";
 
     /**
@@ -62,7 +61,7 @@ public class CertificateIssuerExtension extends Extension
     static {
         try {
             OIDMap.addAttribute(CertificateIssuerExtension.class.getName(),
-                                OID, NAME);
+                                OID, CertificateIssuerExtension.class.getSimpleName());
         } catch (CertificateException e) {
         }
     }
@@ -233,10 +232,4 @@ public class CertificateIssuerExtension extends Extension
         return (elements.elements());
     }
 
-    /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return (NAME);
-    }
 }
diff --git a/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java b/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java
index 1c72e7fa3a3ebac67fb9e8bf700410f3f8297ca6..eb80ff9196bbd5ea1cb2f7f058ee44b004e85339 100644
--- a/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java
+++ b/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java
@@ -64,7 +64,6 @@ public class CertificatePoliciesExtension extends Extension
     /**
      * Attribute names.
      */
-    public static final String NAME = "CertificatePolicies";
     public static final String INFOS = "infos";
 
     // Private data members 
@@ -240,13 +239,6 @@ public class CertificatePoliciesExtension extends Extension
         return Collections.enumeration(Arrays.asList(NAMES));
     }
 
-    /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return (NAME);
-    }
-
     public static void main(String args[]) {
 
         /**
diff --git a/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java b/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java
index da870f4fdf15a9213d083ab25b8b23a0c538301e..5a6be134ee4945cc4a329790b652ce79522a7678 100755
--- a/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java
+++ b/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java
@@ -51,7 +51,6 @@ public class DeltaCRLIndicatorExtension extends Extension
     /**
      * Attribute name.
      */
-    public static final String NAME = "DeltaCRLIndicator";
     public static final String NUMBER = "value";
 
     /**
@@ -64,7 +63,7 @@ public class DeltaCRLIndicatorExtension extends Extension
     static {
         try {
             OIDMap.addAttribute(DeltaCRLIndicatorExtension.class.getName(),
-                                OID, NAME);
+                                OID, DeltaCRLIndicatorExtension.class.getSimpleName());
         } catch (CertificateException e) {
         }
     }
@@ -230,10 +229,4 @@ public class DeltaCRLIndicatorExtension extends Extension
         return (elements.elements());
     }
 
-    /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return (NAME);
-    }
 }
diff --git a/pki/base/util/src/netscape/security/x509/Extension.java b/pki/base/util/src/netscape/security/x509/Extension.java
index 5d0029875a243457cafe3f88f40c0543d809efdd..1dd68d6e1f290919c3e366291f620c4722341814 100644
--- a/pki/base/util/src/netscape/security/x509/Extension.java
+++ b/pki/base/util/src/netscape/security/x509/Extension.java
@@ -196,4 +196,9 @@ public class Extension implements Serializable {
         }
         return (s);
     }
+
+    public String getName() {
+        return this.getClass().getSimpleName();
+    }
+
 }
diff --git a/pki/base/util/src/netscape/security/x509/Extensions.java b/pki/base/util/src/netscape/security/x509/Extensions.java
index 622367ab606fedd69aaba84c911cedb0170eadc8..e7113ce46cd03c85316264393afb7affacb69a8b 100644
--- a/pki/base/util/src/netscape/security/x509/Extensions.java
+++ b/pki/base/util/src/netscape/security/x509/Extensions.java
@@ -221,6 +221,6 @@ public class Extensions extends Vector<Extension>
      * Return the name of this attribute.
      */
     public String getName() {
-        return (NAME);
+        return getClass().getSimpleName();
     }
 }
diff --git a/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java b/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java
index 320bbf3df24df42461626b833fc820091ec9baa7..a029c62f3db9cca6131234a9e71b097d3d10d366 100644
--- a/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java
+++ b/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java
@@ -81,16 +81,13 @@ public class FreshestCRLExtension extends Extension
     // Cached DER-encoding to improve performance.
     private byte[] cachedEncoding = null;
 
-    // Attribute name
-    public static final String NAME = "FreshestCRL";
-
     // The Object Identifier for this extension.
     public static final String OID = "2.5.29.46";
 
     static {
         try {
             OIDMap.addAttribute(FreshestCRLExtension.class.getName(),
-                                OID, NAME);
+                                OID, FreshestCRLExtension.class.getSimpleName());
         } catch (CertificateException e) {
         }
     }
@@ -193,7 +190,7 @@ public class FreshestCRLExtension extends Extension
     // minimal implementation.
     /////////////////////////////////////////////////////////////
     public String toString() {
-        return NAME;
+        return FreshestCRLExtension.class.getSimpleName();
     }
 
     /**
@@ -240,10 +237,6 @@ public class FreshestCRLExtension extends Extension
         return (new Vector<String>()).elements();
     }
 
-    public String getName() {
-        return NAME;
-    }
-
     /**
      * Test driver.
      */
diff --git a/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java b/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java
index b42bb6ac91268ea49d6d2cc1790508d3a858599a..35f13dad8ce468226bb1d363c8731d5d1700feda 100644
--- a/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java
+++ b/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java
@@ -51,7 +51,6 @@ public class HoldInstructionExtension extends Extension
     /**
      * Attribute name.
      */
-    public static final String NAME = "HoldInstruction";
     public static final String HOLD_INSTRUCTION = "value";
 
     /**
@@ -86,7 +85,7 @@ public class HoldInstructionExtension extends Extension
     static {
         try {
             OIDMap.addAttribute(HoldInstructionExtension.class.getName(),
-                                OID, NAME);
+                                OID, HoldInstructionExtension.class.getSimpleName());
         } catch (CertificateException e) {
         }
     }
@@ -345,10 +344,4 @@ public class HoldInstructionExtension extends Extension
         return (elements.elements());
     }
 
-    /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return (NAME);
-    }
 }
diff --git a/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java b/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java
index 44c76275f17179bcb129982b1c7202f7c6445308..14992dcf5f3995043811d07fc9f73d7e6ccde4bd 100755
--- a/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java
+++ b/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java
@@ -52,7 +52,6 @@ public class InvalidityDateExtension extends Extension
     /**
      * Attribute name.
      */
-    public static final String NAME = "InvalidityDate";
     public static final String INVALIDITY_DATE = "value";
 
     /**
@@ -65,7 +64,7 @@ public class InvalidityDateExtension extends Extension
     static {
         try {
             OIDMap.addAttribute(InvalidityDateExtension.class.getName(),
-                                OID, NAME);
+                                OID, InvalidityDateExtension.class.getSimpleName());
         } catch (CertificateException e) {
         }
     }
@@ -232,10 +231,4 @@ public class InvalidityDateExtension extends Extension
         return (elements.elements());
     }
 
-    /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return (NAME);
-    }
 }
diff --git a/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java b/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java
index df0289f9e008fc059d4bf67dda055df3513e9fe0..9bb0fba10841bd2776d210000eb5fd941082ea6d 100644
--- a/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java
+++ b/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java
@@ -59,7 +59,6 @@ public class IssuerAlternativeNameExtension
     /**
      * Attribute names.
      */
-    public static final String NAME = "IssuerAlternativeName";
     public static final String ISSUER_NAME = "issuer_name";
 
     // private data members
@@ -231,10 +230,4 @@ public class IssuerAlternativeNameExtension
         return (elements.elements());
     }
 
-    /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return (NAME);
-    }
 }
diff --git a/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java b/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java
index fc7e837ce9d5b30e131fe0d315cf81c5d01c7783..f3b7ccfed0df67fa86ba0056cfa87f3457d60c7f 100644
--- a/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java
+++ b/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java
@@ -105,7 +105,6 @@ public class IssuingDistributionPointExtension extends Extension
     /**
      * Attribute names.
      */
-    public static final String NAME = "IssuingDistributionPoint";
     public static final String ISSUING_DISTRIBUTION_POINT = "issuing_distribution_point";
 
     // Private data members
@@ -117,7 +116,7 @@ public class IssuingDistributionPointExtension extends Extension
     static {
         try {
             OIDMap.addAttribute(IssuingDistributionPointExtension.class.getName(),
-                                OID, NAME);
+                                OID, IssuingDistributionPointExtension.class.getSimpleName());
         } catch (CertificateException e) {
         }
     }
@@ -285,7 +284,7 @@ public class IssuingDistributionPointExtension extends Extension
      */
 
     public String toString() {
-        return NAME;
+        return IssuingDistributionPointExtension.class.getSimpleName();
     }
 
     /**
@@ -347,10 +346,6 @@ public class IssuingDistributionPointExtension extends Extension
         //        return (new Vector()).elements();
     }
 
-    public String getName() {
-        return NAME;
-    }
-
     /**
      * Test driver.
      */
diff --git a/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java b/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java
index 56084dbcfd7d83fbc98280af441bda39b22c0ecd..a6cd2bbec0fab66a0437347e2f922af976f95789 100644
--- a/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java
+++ b/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java
@@ -57,7 +57,6 @@ public class KeyUsageExtension extends Extension
     /**
      * Attribute names.
      */
-    public static final String NAME = "KeyUsage";
     public static final String DIGITAL_SIGNATURE = "digital_signature";
     public static final String NON_REPUDIATION = "non_repudiation";
     public static final String KEY_ENCIPHERMENT = "key_encipherment";
@@ -405,10 +404,4 @@ public class KeyUsageExtension extends Extension
         return (boolean[]) bitString.clone();
     }
 
-    /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return (NAME);
-    }
 }
diff --git a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java b/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java
index b24ce1158881ee68bc41e6cc9de9b23f9dae4af4..291f83681a45745aeceec118e8a25af8997113f9 100644
--- a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java
+++ b/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java
@@ -51,7 +51,6 @@ public class NSCCommentExtension extends Extension
     /**
      * Attribute names.
      */
-    public static final String NAME = "NSCCommentExtension";
     public static final String INFOS = "infos";
     public static final ObjectIdentifier OID =
             new ObjectIdentifier("2.16.840.1.113730.1.13");
@@ -220,11 +219,4 @@ public class NSCCommentExtension extends Extension
         return (elements.elements());
     }
 
-    /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return (NAME);
-    }
-
 }
diff --git a/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java
index 948d0d8c9f519c39a6d26806a2a02bdcfa3bee67..cf585baa124f8cf20ada09a75b758629be5e6d05 100644
--- a/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java
+++ b/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java
@@ -71,7 +71,6 @@ public class NameConstraintsExtension extends Extension
     /**
      * Attribute names.
      */
-    public static final String NAME = "NameConstraints";
     public static final String PERMITTED_SUBTREES = "permitted_subtrees";
     public static final String EXCLUDED_SUBTREES = "excluded_subtrees";
 
@@ -306,10 +305,4 @@ public class NameConstraintsExtension extends Extension
         return (elements.elements());
     }
 
-    /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return (NAME);
-    }
 }
diff --git a/pki/base/util/src/netscape/security/x509/OIDMap.java b/pki/base/util/src/netscape/security/x509/OIDMap.java
index 9c732d9386772d2a1c08bb463da6c7743b03be0a..7d21ab52586c269c61388d9fb008058203555ab3 100644
--- a/pki/base/util/src/netscape/security/x509/OIDMap.java
+++ b/pki/base/util/src/netscape/security/x509/OIDMap.java
@@ -58,38 +58,38 @@ public class OIDMap {
                                  X509CertInfo.NAME + "." +
                                  X509CertInfo.EXTENSIONS;
     private static final String AUTH_KEY_IDENTIFIER = ROOT + "." +
-                                          AuthorityKeyIdentifierExtension.NAME;
+                                          AuthorityKeyIdentifierExtension.class.getSimpleName();
     private static final String SUB_KEY_IDENTIFIER = ROOT + "." +
-                                          SubjectKeyIdentifierExtension.NAME;
+                                          SubjectKeyIdentifierExtension.class.getSimpleName();
     private static final String KEY_USAGE = ROOT + "." +
-                                          KeyUsageExtension.NAME;
+                                          KeyUsageExtension.class.getSimpleName();
     private static final String PRIVATE_KEY_USAGE = ROOT + "." +
-                                          PrivateKeyUsageExtension.NAME;
+                                          PrivateKeyUsageExtension.class.getSimpleName();
     private static final String POLICY_MAPPINGS = ROOT + "." +
-                                          PolicyMappingsExtension.NAME;
+                                          PolicyMappingsExtension.class.getSimpleName();
     private static final String SUB_ALT_NAME = ROOT + "." +
-                                          SubjectAlternativeNameExtension.NAME;
+                                          SubjectAlternativeNameExtension.class.getSimpleName();
     private static final String ISSUER_ALT_NAME = ROOT + "." +
-                                          IssuerAlternativeNameExtension.NAME;
+                                          IssuerAlternativeNameExtension.class.getSimpleName();
     private static final String BASIC_CONSTRAINTS = ROOT + "." +
-                                          BasicConstraintsExtension.NAME;
+                                          BasicConstraintsExtension.class.getSimpleName();
     private static final String NAME_CONSTRAINTS = ROOT + "." +
-                                          NameConstraintsExtension.NAME;
+                                          NameConstraintsExtension.class.getSimpleName();
     private static final String POLICY_CONSTRAINTS = ROOT + "." +
-                                          PolicyConstraintsExtension.NAME;
+                                          PolicyConstraintsExtension.class.getSimpleName();
     private static final String CERT_POLICIES = //ROOT + "." +
-            CertificatePoliciesExtension.NAME;
+            CertificatePoliciesExtension.class.getSimpleName();
     private static final String SUBJ_DIR_ATTR = //ROOT + "." +
-            SubjectDirAttributesExtension.NAME;
+            SubjectDirAttributesExtension.class.getSimpleName();
     public static final String EXT_KEY_USAGE_NAME = "ExtendedKeyUsageExtension";
     public static final String EXT_INHIBIT_ANY_POLICY_NAME = "InhibitAnyPolicyExtension";
     private static final String EXT_KEY_USAGE = //ROOT + "." +
             EXT_KEY_USAGE_NAME;
 
     private static final String CRL_NUMBER = ROOT + "." +
-                                          CRLNumberExtension.NAME;
+                                          CRLNumberExtension.class.getSimpleName();
     private static final String CRL_REASON = ROOT + "." +
-                                          CRLReasonExtension.NAME;
+                                          CRLReasonExtension.class.getSimpleName();
 
     private static final Hashtable<ObjectIdentifier, String> oid2Name = new Hashtable<ObjectIdentifier, String>();
     private static final Hashtable<String, ObjectIdentifier> name2OID = new Hashtable<String, ObjectIdentifier>();
diff --git a/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java b/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java
index 7d98b21ba5c68dca2ba825524bd72a9d744ddfcc..ffbc25e98b69d6b7888621018f75c1ff2bec94a5 100644
--- a/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java
+++ b/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java
@@ -67,7 +67,6 @@ public class PolicyConstraintsExtension extends Extension
     /**
      * Attribute names.
      */
-    public static final String NAME = "PolicyConstraints";
     public static final String REQUIRE = "require";
     public static final String INHIBIT = "inhibit";
 
@@ -284,13 +283,6 @@ public class PolicyConstraintsExtension extends Extension
     }
 
     /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return (NAME);
-    }
-
-    /**
      * returns the requireExplicitMapping parameter.
      */
     public int getRequireExplicitMapping() {
diff --git a/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java b/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java
index 9bdfb611bd07edfb41120aa1f00eeb18df83b3fa..f97bf10de4478ec111a9cc8b096d14264d1fb408 100644
--- a/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java
+++ b/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java
@@ -61,7 +61,6 @@ public class PolicyMappingsExtension extends Extension
     /**
      * Attribute names.
      */
-    public static final String NAME = "PolicyMappings";
     public static final String MAP = "map";
 
     // Private data members
@@ -241,13 +240,6 @@ public class PolicyMappingsExtension extends Extension
     }
 
     /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return (NAME);
-    }
-
-    /**
      * Returns an enumeration of the mappings in the extension.
      */
     public Enumeration<CertificatePolicyMap> getMappings() {
diff --git a/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java b/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java
index e3ecdb33d49b1dcdc4612996117be56190f972f3..da44026f205d9fe1a337892479c013eac0a44575 100644
--- a/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java
+++ b/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java
@@ -68,7 +68,6 @@ public class PrivateKeyUsageExtension extends Extension
     /**
      * Sub attributes name for this CertAttrSet.
      */
-    public static final String NAME = "PrivateKeyUsage";
     public static final String NOT_BEFORE = "not_before";
     public static final String NOT_AFTER = "not_after";
 
@@ -330,10 +329,4 @@ public class PrivateKeyUsageExtension extends Extension
         return (elements.elements());
     }
 
-    /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return (NAME);
-    }
 }
diff --git a/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java b/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java
index c30ae15761b388cb5cb5adb8ac4a9c5588c6150f..cca094d8a93f6a85ec24033d7910457a47bbddbe 100644
--- a/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java
+++ b/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java
@@ -66,7 +66,6 @@ public class SubjectAlternativeNameExtension extends Extension
     /**
      * Attribute names.
      */
-    public static final String NAME = "SubjectAlternativeName";
     public static final String SUBJECT_NAME = "subject_name";
 
     // private data members
@@ -233,10 +232,4 @@ public class SubjectAlternativeNameExtension extends Extension
         return (elements.elements());
     }
 
-    /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return (NAME);
-    }
 }
diff --git a/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java b/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java
index b249ef6005485dd28af4d72f7e1ebff98bb705c4..2d5712746219ab24aa8a2aad24a09749a1a4dadc 100644
--- a/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java
+++ b/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java
@@ -74,7 +74,6 @@ public class SubjectDirAttributesExtension extends Extension
     /**
      * Attribute names.
      */
-    public static final String NAME = "SubjectDirectoryAttributes";
 
     // Private data members
     private Vector<Attribute> attrList = new Vector<Attribute>();
@@ -104,7 +103,7 @@ public class SubjectDirAttributesExtension extends Extension
         }
 
         if (derVal.data.available() == 0) {
-            throw new IOException(NAME + " No data available in "
+            throw new IOException(this.getClass().getSimpleName() + " No data available in "
                                    + "passed DER encoded value.");
         }
 
@@ -161,7 +160,7 @@ public class SubjectDirAttributesExtension extends Extension
         this.critical = crit.booleanValue();
 
         if (!(value instanceof byte[]))
-            throw new IOException(NAME + "Illegal argument type");
+            throw new IOException(this.getClass().getSimpleName() + "Illegal argument type");
         int len = Array.getLength(value);
         byte[] extValue = new byte[len];
         System.arraycopy(value, 0, extValue, 0, len);
@@ -269,13 +268,6 @@ public class SubjectDirAttributesExtension extends Extension
     }
 
     /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return (NAME);
-    }
-
-    /**
      * Returns an enumeration of attributes in the extension.
      */
     public Enumeration<Attribute> getAttributesList() {
diff --git a/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java b/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java
index ea0ebae82328e9e19591a89f96ba3efe42c74723..e2daadc2802d29155040e15f3ce0895fbc489160 100644
--- a/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java
+++ b/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java
@@ -64,7 +64,6 @@ public class SubjectKeyIdentifierExtension extends Extension
     /**
      * Attribute names.
      */
-    public static final String NAME = "SubjectKeyIdentifier";
     public static final String KEY_ID = "key_id";
 
     // Private data member
@@ -213,10 +212,4 @@ public class SubjectKeyIdentifierExtension extends Extension
         return (elements.elements());
     }
 
-    /**
-     * Return the name of this attribute.
-     */
-    public String getName() {
-        return (NAME);
-    }
 }
-- 
1.7.5.1

