diff --git a/src/crl.c b/src/crl.c
index bdf3bac9f..b41bd6b34 100644
--- a/src/crl.c
+++ b/src/crl.c
@@ -143,9 +143,9 @@ static void FreeCRL_Entry(CRL_Entry* crle, void* heap)
         tmp = next;
     }
     if (crle->signature != NULL)
-        XFREE(crle->signature, heap, DYNAMIC_TYPE_REVOKED);
+        XFREE(crle->signature, heap, DYNAMIC_TYPE_CRL_ENTRY);
     if (crle->toBeSigned != NULL)
-        XFREE(crle->toBeSigned, heap, DYNAMIC_TYPE_REVOKED);
+        XFREE(crle->toBeSigned, heap, DYNAMIC_TYPE_CRL_ENTRY);
 
     (void)heap;
 }
diff --git a/src/internal.c b/src/internal.c
index b66d3f311..91cf9c7e6 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -11806,13 +11806,13 @@ int DoVerifyCallback(WOLFSSL_CERT_MANAGER* cm, WOLFSSL* ssl, int ret,
         x509 = (WOLFSSL_X509*)XMALLOC(sizeof(WOLFSSL_X509), heap,
             DYNAMIC_TYPE_X509);
         if (x509 == NULL) {
-            XFREE(store, heap, DYNAMIC_TYPE_X509);
+            XFREE(store, heap, DYNAMIC_TYPE_X509_STORE);
             return MEMORY_E;
         }
         #endif
         domain = (char*)XMALLOC(ASN_NAME_MAX, heap, DYNAMIC_TYPE_STRING);
         if (domain == NULL) {
-            XFREE(store, heap, DYNAMIC_TYPE_X509);
+            XFREE(store, heap, DYNAMIC_TYPE_X509_STORE);
             #if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL)
             XFREE(x509, heap, DYNAMIC_TYPE_X509);
             #endif
diff --git a/src/pk.c b/src/pk.c
index fef36acc7..2bcb9e809 100644
--- a/src/pk.c
+++ b/src/pk.c
@@ -1565,7 +1565,7 @@ int wolfSSL_PEM_write_mem_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher,
             DYNAMIC_TYPE_TMP_BUFFER);
         if (tmpBuf == NULL) {
             WOLFSSL_MSG("Extending DER buffer failed");
-            XFREE(derBuf, NULL, DYNAMIC_TYPE_DER);
+            XFREE(derBuf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
             ret = 0;
         }
         else {
@@ -1616,7 +1616,7 @@ int wolfSSL_PEM_write_mem_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher,
 
     XFREE(tmp, NULL, DYNAMIC_TYPE_KEY);
     XFREE(cipherInfo, NULL, DYNAMIC_TYPE_STRING);
-    XFREE(derBuf, rsa->heap, DYNAMIC_TYPE_DER);
+    XFREE(derBuf, rsa->heap, DYNAMIC_TYPE_TMP_BUFFER);
     return ret;
 }
 
@@ -5151,7 +5151,7 @@ int wolfSSL_PEM_write_bio_DSAPrivateKey(WOLFSSL_BIO* bio, WOLFSSL_DSA* dsa,
     derSz = wc_DsaKeyToDer((DsaKey*)dsa->internal, derBuf, der_max_len);
     if (derSz < 0) {
         WOLFSSL_MSG("wc_DsaKeyToDer failed");
-        XFREE(derBuf, NULL, DYNAMIC_TYPE_DER);
+        XFREE(derBuf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
         wolfSSL_EVP_PKEY_free(pkey);
         return 0;
     }
@@ -10765,7 +10765,7 @@ int wolfSSL_PEM_write_bio_ECPrivateKey(WOLFSSL_BIO* bio, WOLFSSL_EC_KEY* ec,
     derSz = wc_EccKeyToDer((ecc_key*)ec->internal, derBuf, der_max_len);
     if (derSz < 0) {
         WOLFSSL_MSG("wc_EccKeyToDer failed");
-        XFREE(derBuf, NULL, DYNAMIC_TYPE_DER);
+        XFREE(derBuf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
         wolfSSL_EVP_PKEY_free(pkey);
         return 0;
     }
diff --git a/src/ssl.c b/src/ssl.c
index 202577d3a..1afe54ac1 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -19512,7 +19512,7 @@ WOLFSSL_SESSION* wolfSSL_NewSession(void* heap)
         if (wolfSSL_SESSION_set_ex_data(ret, 0, (void *)(-1))
                 != WOLFSSL_SUCCESS) {
             WOLFSSL_MSG("Error setting up ex data for stunnel");
-            XFREE(ret, NULL, DYNAMIC_TYPE_OPENSSL);
+            XFREE(ret, NULL, DYNAMIC_TYPE_SESSION);
             return NULL;
         }
 #endif
@@ -35512,7 +35512,7 @@ char *wolfSSL_BN_bn2dec(const WOLFSSL_BIGNUM *bn)
     }
 
     if (mp_todecimal((mp_int*)bn->internal, buf) != MP_OKAY) {
-        XFREE(buf, NULL, DYNAMIC_TYPE_ECC);
+        XFREE(buf, NULL, DYNAMIC_TYPE_OPENSSL);
         return NULL;
     }
 
diff --git a/src/x509_str.c b/src/x509_str.c
index 37e223ba5..fc35572fa 100644
--- a/src/x509_str.c
+++ b/src/x509_str.c
@@ -1071,7 +1071,7 @@ WOLFSSL_API int wolfSSL_X509_STORE_load_locations(WOLFSSL_X509_STORE *str,
         }
 
         #ifdef WOLFSSL_SMALL_STACK
-            XFREE(readCtx, ctx->heap, DYNAMIC_TYPE_DIRCTX);
+            XFREE(readCtx, ctx->heap, DYNAMIC_TYPE_TMP_BUFFER);
         #endif
     }