diff --git a/src/io.c b/src/io.c
index 6e40639b2..3c54becc3 100644
--- a/src/io.c
+++ b/src/io.c
@@ -866,7 +866,7 @@ static int process_http_response(int sfd, byte** respBuf,
         }
     } while (state != phr_http_end);
 
-    recvBuf = (byte*)XMALLOC(recvBufSz, NULL, DYNAMIC_TYPE_IN_BUFFER);
+    recvBuf = (byte*)XMALLOC(recvBufSz, NULL, DYNAMIC_TYPE_OCSP);
     if (recvBuf == NULL) {
         WOLFSSL_MSG("process_http_response couldn't create response buffer");
         return -1;
@@ -936,7 +936,7 @@ int EmbedOcspLookup(void* ctx, const char* url, int urlSz,
          * free this buffer. */
         int   httpBufSz = SCRATCH_BUFFER_SIZE;
         byte* httpBuf   = (byte*)XMALLOC(httpBufSz, NULL, 
-                                                        DYNAMIC_TYPE_IN_BUFFER);
+                                                        DYNAMIC_TYPE_OCSP);
 
         if (httpBuf == NULL) {
             WOLFSSL_MSG("Unable to create OCSP response buffer");
@@ -962,7 +962,7 @@ int EmbedOcspLookup(void* ctx, const char* url, int urlSz,
             }
 
             close(sfd);
-            XFREE(httpBuf, NULL, DYNAMIC_TYPE_IN_BUFFER);
+            XFREE(httpBuf, NULL, DYNAMIC_TYPE_OCSP);
         }
     }
 
@@ -980,7 +980,7 @@ void EmbedOcspRespFree(void* ctx, byte *resp)
     (void)ctx;
 
     if (resp)
-        XFREE(resp, NULL, DYNAMIC_TYPE_IN_BUFFER);
+        XFREE(resp, NULL, DYNAMIC_TYPE_OCSP);
 }
 
 
diff --git a/src/ocsp.c b/src/ocsp.c
index 7283e66ad..a1fd6dc25 100644
--- a/src/ocsp.c
+++ b/src/ocsp.c
@@ -290,7 +290,7 @@ int CheckOcspRequest(WOLFSSL_OCSP* ocsp, OcspRequest* ocspRequest,
         return 0;
     }
 
-    request = (byte*)XMALLOC(requestSz, NULL, DYNAMIC_TYPE_IN_BUFFER);
+    request = (byte*)XMALLOC(requestSz, NULL, DYNAMIC_TYPE_OCSP);
     if (request == NULL) {
         WOLFSSL_LEAVE("CheckCertOCSP", MEMORY_ERROR);
         return MEMORY_ERROR;
@@ -306,7 +306,7 @@ int CheckOcspRequest(WOLFSSL_OCSP* ocsp, OcspRequest* ocspRequest,
         if (newStatus)    XFREE(newStatus,    NULL, DYNAMIC_TYPE_TMP_BUFFER);
         if (ocspResponse) XFREE(ocspResponse, NULL, DYNAMIC_TYPE_TMP_BUFFER);
 
-        XFREE(request, NULL, DYNAMIC_TYPE_TMP_BUFFER);
+        XFREE(request, NULL, DYNAMIC_TYPE_OCSP);
 
         WOLFSSL_LEAVE("CheckCertOCSP", MEMORY_ERROR);
         return MEMORY_E;
diff --git a/src/ssl.c b/src/ssl.c
index bc4c97368..db8027e53 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -1031,7 +1031,7 @@ int wolfSSL_ALPN_GetPeerProtocol(WOLFSSL* ssl, char **list, word16 *listSz)
     if (*listSz == 0)
         return BUFFER_ERROR;
 
-    *list = (char *)XMALLOC((*listSz)+1, NULL, DYNAMIC_TYPE_OUT_BUFFER);
+    *list = (char *)XMALLOC((*listSz)+1, NULL, DYNAMIC_TYPE_TLSX);
     if (*list == NULL)
         return MEMORY_ERROR;
 
@@ -14110,7 +14110,7 @@ int wolfSSL_PEM_write_mem_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher,
     if (cipherInfo != NULL)
         XFREE(cipherInfo, NULL, DYNAMIC_TYPE_TMP_BUFFER);
 
-    *pem = (byte*)XMALLOC((*plen)+1, NULL, DYNAMIC_TYPE_OUT_BUFFER);
+    *pem = (byte*)XMALLOC((*plen)+1, NULL, DYNAMIC_TYPE_KEY);
     if (*pem == NULL) {
         WOLFSSL_MSG("malloc failed");
         XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER);
@@ -14120,7 +14120,7 @@ int wolfSSL_PEM_write_mem_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher,
 
     if (XMEMCPY(*pem, tmp, *plen) == NULL) {
         WOLFSSL_MSG("XMEMCPY failed");
-        XFREE(pem, NULL, DYNAMIC_TYPE_OUT_BUFFER);
+        XFREE(pem, NULL, DYNAMIC_TYPE_KEY);
         XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER);
         return SSL_FAILURE;
     }
@@ -14164,7 +14164,7 @@ int wolfSSL_PEM_write_RSAPrivateKey(FILE *fp, WOLFSSL_RSA *rsa,
         return SSL_FAILURE;
     }
 
-    XFREE(pem, NULL, DYNAMIC_TYPE_OUT_BUFFER);
+    XFREE(pem, NULL, DYNAMIC_TYPE_KEY);
     return SSL_SUCCESS;
 }
 #endif /* NO_FILESYSTEM */
@@ -15492,7 +15492,7 @@ int wolfSSL_PEM_write_mem_ECPrivateKey(WOLFSSL_EC_KEY* ecc,
     if (cipherInfo != NULL)
         XFREE(cipherInfo, NULL, DYNAMIC_TYPE_TMP_BUFFER);
 
-    *pem = (byte*)XMALLOC((*plen)+1, NULL, DYNAMIC_TYPE_OUT_BUFFER);
+    *pem = (byte*)XMALLOC((*plen)+1, NULL, DYNAMIC_TYPE_KEY);
     if (*pem == NULL) {
         WOLFSSL_MSG("malloc failed");
         XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER);
@@ -15502,7 +15502,7 @@ int wolfSSL_PEM_write_mem_ECPrivateKey(WOLFSSL_EC_KEY* ecc,
 
     if (XMEMCPY(*pem, tmp, *plen) == NULL) {
         WOLFSSL_MSG("XMEMCPY failed");
-        XFREE(pem, NULL, DYNAMIC_TYPE_OUT_BUFFER);
+        XFREE(pem, NULL, DYNAMIC_TYPE_KEY);
         XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER);
         return SSL_FAILURE;
     }
@@ -15545,7 +15545,7 @@ int wolfSSL_PEM_write_ECPrivateKey(FILE *fp, WOLFSSL_EC_KEY *ecc,
         return SSL_FAILURE;
     }
 
-    XFREE(pem, NULL, DYNAMIC_TYPE_OUT_BUFFER);
+    XFREE(pem, NULL, DYNAMIC_TYPE_KEY);
     return SSL_SUCCESS;
 }
 
@@ -15667,7 +15667,7 @@ int wolfSSL_PEM_write_mem_DSAPrivateKey(WOLFSSL_DSA* dsa,
     if (cipherInfo != NULL)
         XFREE(cipherInfo, NULL, DYNAMIC_TYPE_TMP_BUFFER);
 
-    *pem = (byte*)XMALLOC((*plen)+1, NULL, DYNAMIC_TYPE_OUT_BUFFER);
+    *pem = (byte*)XMALLOC((*plen)+1, NULL, DYNAMIC_TYPE_KEY);
     if (*pem == NULL) {
         WOLFSSL_MSG("malloc failed");
         XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER);
@@ -15677,7 +15677,7 @@ int wolfSSL_PEM_write_mem_DSAPrivateKey(WOLFSSL_DSA* dsa,
 
     if (XMEMCPY(*pem, tmp, *plen) == NULL) {
         WOLFSSL_MSG("XMEMCPY failed");
-        XFREE(pem, NULL, DYNAMIC_TYPE_OUT_BUFFER);
+        XFREE(pem, NULL, DYNAMIC_TYPE_KEY);
         XFREE(tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER);
         return SSL_FAILURE;
     }
@@ -15720,7 +15720,7 @@ int wolfSSL_PEM_write_DSAPrivateKey(FILE *fp, WOLFSSL_DSA *dsa,
         return SSL_FAILURE;
     }
 
-    XFREE(pem, NULL, DYNAMIC_TYPE_OUT_BUFFER);
+    XFREE(pem, NULL, DYNAMIC_TYPE_KEY);
     return SSL_SUCCESS;
 }
 
diff --git a/tests/api.c b/tests/api.c
index 745557cf2..07b5dce6f 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -1449,7 +1449,7 @@ static void verify_ALPN_client_list(WOLFSSL* ssl)
     AssertIntEQ(1, sizeof(alpn_list) == clistSz);
     AssertIntEQ(0, XMEMCMP(alpn_list, clist, clistSz));
 
-    XFREE(clist, 0, DYNAMIC_TYPE_OUT_BUFFER);
+    XFREE(clist, 0, DYNAMIC_TYPE_TLSX);
 }
 
 static void test_wolfSSL_UseALPN_connection(void)