diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c
index 54f8d72213..8265391e11 100644
--- a/wolfcrypt/test/test.c
+++ b/wolfcrypt/test/test.c
@@ -20192,10 +20192,10 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t random_bank_test(void)
                     return WC_TEST_RET_ENC_EC(MEMORY_E));
     XMEMSET(bank, 0, sizeof(*bank));
 
+#ifdef WC_DRBG_BANKREF
     WC_ALLOC_VAR_EX(rng, WC_RNG, 1, HEAP_HINT,
                     DYNAMIC_TYPE_TMP_BUFFER,
                     return WC_TEST_RET_ENC_EC(MEMORY_E));
-#ifdef WC_DRBG_BANKREF
     XMEMSET(rng, 0, sizeof(*rng));
 #endif
 
diff --git a/wolfssl/openssl/obj_mac.h b/wolfssl/openssl/obj_mac.h
index d0eb3d3501..78b11f1f79 100644
--- a/wolfssl/openssl/obj_mac.h
+++ b/wolfssl/openssl/obj_mac.h
@@ -82,8 +82,6 @@
 
 #endif /* !OPENSSL_COEXIST */
 
-/* the definition is for Qt Unit test */
-#define SN_jurisdictionCountryName "jurisdictionC"
 #ifdef __cplusplus
     } /* extern "C" */
 #endif
diff --git a/wolfssl/wolfcrypt/asn.h b/wolfssl/wolfcrypt/asn.h
index a772af30e6..6ebbb45ff4 100644
--- a/wolfssl/wolfcrypt/asn.h
+++ b/wolfssl/wolfcrypt/asn.h
@@ -946,29 +946,91 @@ extern const WOLFSSL_ObjectInfo wolfssl_object_info[];
 #define WC_NID_tlsfeature TLS_FEATURE_OID              /* id-pe 24 */
 #define WC_NID_buildingName 1494
 
+#define WC_SN_dnQualifier "dnQualifier"
+#define WC_LN_dnQualifier "dnQualifier"
 #define WC_NID_dnQualifier 174              /* 2.5.4.46 */
+
+#define WC_SN_commonName "CN"
+#define WC_LN_commonName "commonName"
 #define WC_NID_commonName 14                /* CN Changed to not conflict
-                                    * with PBE_SHA1_DES3 */
+                                             * with PBE_SHA1_DES3 */
+#define WC_LN_name "name"
+#define WC_SN_name "name"
 #define WC_NID_name 173                     /* N , OID = 2.5.4.41 */
+
+#define WC_LN_surname "surname"
+#define WC_SN_surname "SN"
 #define WC_NID_surname 0x04                 /* SN */
+
+#define WC_LN_serialNumber "serialNumber"
 #define WC_NID_serialNumber 0x05            /* serialNumber */
+
+#define WC_LN_countryName "countryName"
+#define WC_SN_countryName "C"
 #define WC_NID_countryName 0x06             /* C  */
+
+#define WC_LN_localityName "localityName"
+#define WC_SN_localityName "L"
 #define WC_NID_localityName 0x07            /* L  */
+
+#define WC_LN_stateOrProvinceName "stateOrProvinceName"
+#define WC_SN_stateOrProvinceName "ST"
 #define WC_NID_stateOrProvinceName 0x08     /* ST */
+
+#define WC_LN_streetAddress "streetAddress"
+#define WC_SN_streetAddress "street"
 #define WC_NID_streetAddress ASN_STREET_ADDR  /* street */
+
+#define WC_LN_organizationName "organizationName"
+#define WC_SN_organizationName "O"
 #define WC_NID_organizationName 0x0a        /* O  */
+
+#define WC_LN_organizationalUnitName "organizationalUnitName"
+#define WC_SN_organizationalUnitName "OU"
 #define WC_NID_organizationalUnitName 0x0b  /* OU */
+
+#define WC_LN_jurisdictionCountryName "jurisdictionCountryName"
+#define WC_SN_jurisdictionCountryName "jurisdictionC"
 #define WC_NID_jurisdictionCountryName 0xc
+
+#define WC_LN_jurisdictionStateOrProvinceName "jurisdictionStateOrProvinceName"
+#define WC_SN_jurisdictionStateOrProvinceName "jurisdictionST"
 #define WC_NID_jurisdictionStateOrProvinceName 0xd
+
+#define WC_LN_businessCategory "businessCategory"
 #define WC_NID_businessCategory ASN_BUS_CAT
+
+#define WC_SN_domainComponent "DC"
+#define WC_LN_domainComponent "domainComponent"
 #define WC_NID_domainComponent ASN_DOMAIN_COMPONENT
+
+#define WC_LN_postalCode "postalCode"
 #define WC_NID_postalCode ASN_POSTAL_CODE   /* postalCode */
+
+#define WC_SN_rfc822Mailbox "mail"
+#define WC_LN_rfc822Mailbox "rfc822Mailbox"
 #define WC_NID_rfc822Mailbox 460
+
+#define WC_SN_favouriteDrink "coldBrew"
+#define WC_LN_favouriteDrink "favouriteDrink"
 #define WC_NID_favouriteDrink 462
+
+#define WC_SN_userId "UID"
+#define WC_LN_userId "userId"
 #define WC_NID_userId 458
+
+#define WC_LN_registeredAddress "registeredAddress"
 #define WC_NID_registeredAddress 870
+
+#define WC_LN_emailAddress "emailAddress"
 #define WC_NID_emailAddress 0x30            /* emailAddress */
+
+#define WC_SN_id_on_dnsSRV "id-on-dnsSRV"
+#define WC_LN_id_on_dnsSRV "SRVName"
 #define WC_NID_id_on_dnsSRV 82              /* 1.3.6.1.5.5.7.8.7 */
+
+#define WC_SN_ms_upn "msUPN"
+#define WC_LN_ms_upn "Microsoft User Principal Name"
 #define WC_NID_ms_upn UPN_OID               /* 1.3.6.1.4.1.311.20.2.3 */
 
 #define WC_NID_X9_62_prime_field 406        /* 1.2.840.10045.1.1 */
@@ -1021,27 +1083,91 @@ extern const WOLFSSL_ObjectInfo wolfssl_object_info[];
 #define NID_tlsfeature WC_NID_tlsfeature
 #define NID_buildingName WC_NID_buildingName
 
+#define SN_dnQualifier WC_SN_dnQualifier
+#define LN_dnQualifier WC_LN_dnQualifier
 #define NID_dnQualifier WC_NID_dnQualifier
+
+#define SN_commonName WC_SN_commonName
+#define LN_commonName WC_LN_commonName
 #define NID_commonName WC_NID_commonName
+
+#define LN_name WC_LN_name
+#define SN_name WC_SN_name
 #define NID_name WC_NID_name
+
+#define LN_surname WC_LN_surname
+#define SN_surname WC_SN_surname
 #define NID_surname WC_NID_surname
+
+#define LN_serialNumber WC_LN_serialNumber
 #define NID_serialNumber WC_NID_serialNumber
+
+#define LN_countryName WC_LN_countryName
+#define SN_countryName WC_SN_countryName
 #define NID_countryName WC_NID_countryName
+
+#define LN_localityName WC_LN_localityName
+#define SN_localityName WC_SN_localityName
 #define NID_localityName WC_NID_localityName
+
+#define LN_stateOrProvinceName WC_LN_stateOrProvinceName
+#define SN_stateOrProvinceName WC_SN_stateOrProvinceName
 #define NID_stateOrProvinceName WC_NID_stateOrProvinceName
+
+#define LN_streetAddress WC_LN_streetAddress
+#define SN_streetAddress WC_SN_streetAddress
 #define NID_streetAddress WC_NID_streetAddress
+
+#define LN_organizationName WC_LN_organizationName
+#define SN_organizationName WC_SN_organizationName
 #define NID_organizationName WC_NID_organizationName
+
+#define LN_organizationalUnitName WC_LN_organizationalUnitName
+#define SN_organizationalUnitName WC_SN_organizationalUnitName
 #define NID_organizationalUnitName WC_NID_organizationalUnitName
+
+#define LN_jurisdictionCountryName WC_LN_jurisdictionCountryName
+#define SN_jurisdictionCountryName WC_SN_jurisdictionCountryName
 #define NID_jurisdictionCountryName WC_NID_jurisdictionCountryName
+
+#define LN_jurisdictionStateOrProvinceName WC_LN_jurisdictionStateOrProvinceName
+#define SN_jurisdictionStateOrProvinceName WC_SN_jurisdictionStateOrProvinceName
 #define NID_jurisdictionStateOrProvinceName WC_NID_jurisdictionStateOrProvinceName
+
+#define LN_businessCategory WC_LN_businessCategory
 #define NID_businessCategory WC_NID_businessCategory
+
+#define SN_domainComponent WC_SN_domainComponent
+#define LN_domainComponent WC_LN_domainComponent
 #define NID_domainComponent WC_NID_domainComponent
+
+#define LN_postalCode WC_LN_postalCode
 #define NID_postalCode WC_NID_postalCode
+
+#define SN_rfc822Mailbox WC_SN_rfc822Mailbox
+#define LN_rfc822Mailbox WC_LN_rfc822Mailbox
 #define NID_rfc822Mailbox WC_NID_rfc822Mailbox
+
+#define SN_favouriteDrink WC_SN_favouriteDrink
+#define LN_favouriteDrink WC_LN_favouriteDrink
 #define NID_favouriteDrink WC_NID_favouriteDrink
+
+#define SN_userId WC_SN_userId
+#define LN_userId WC_LN_userId
 #define NID_userId WC_NID_userId
+
+#define LN_registeredAddress WC_LN_registeredAddress
+#define NID_registeredAddress WC_NID_registeredAddress
+
+#define LN_emailAddress WC_LN_emailAddress
 #define NID_emailAddress WC_NID_emailAddress
+
+#define SN_id_on_dnsSRV WC_SN_id_on_dnsSRV
+#define LN_id_on_dnsSRV WC_LN_id_on_dnsSRV
 #define NID_id_on_dnsSRV WC_NID_id_on_dnsSRV
+
+#define SN_ms_upn WC_SN_ms_upn
+#define LN_ms_upn WC_LN_ms_upn
 #define NID_ms_upn WC_NID_ms_upn
 
 #define NID_X9_62_prime_field WC_NID_X9_62_prime_field
diff --git a/wolfssl/wolfcrypt/falcon.h b/wolfssl/wolfcrypt/falcon.h
index 904a68c23e..dd0079dbed 100644
--- a/wolfssl/wolfcrypt/falcon.h
+++ b/wolfssl/wolfcrypt/falcon.h
@@ -74,8 +74,8 @@
 /* Structs */
 
 struct falcon_key {
-    bool pubKeySet;
-    bool prvKeySet;
+    WC_BITFIELD pubKeySet:1;
+    WC_BITFIELD prvKeySet:1;
     byte level;
 
 #ifdef WOLF_CRYPTO_CB
diff --git a/wolfssl/wolfcrypt/sphincs.h b/wolfssl/wolfcrypt/sphincs.h
index 06928aa226..59fac81fe6 100644
--- a/wolfssl/wolfcrypt/sphincs.h
+++ b/wolfssl/wolfcrypt/sphincs.h
@@ -83,8 +83,8 @@
 /* Structs */
 
 struct sphincs_key {
-    bool pubKeySet;
-    bool prvKeySet;
+    WC_BITFIELD pubKeySet:1;
+    WC_BITFIELD prvKeySet:1;
     byte level; /* 1,3 or 5 */
     byte optim; /* FAST_VARIANT or SMALL_VARIANT */
     byte p[SPHINCS_MAX_PUB_KEY_SIZE];