diff --git a/src/ssl.c b/src/ssl.c
index d9a1cccd7..f7621b2c3 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -31487,7 +31487,7 @@ void* wolfSSL_sk_value(const WOLFSSL_STACK* sk, int i)
         case STACK_TYPE_X509_NAME:
             return (void*)sk->data.name;
         case STACK_TYPE_X509_NAME_ENTRY:
-            return (void*)sk->data.nameentry;
+            return (void*)sk->data.name_entry;
         case STACK_TYPE_CONF_VALUE:
             return (void*)sk->data.conf;
         case STACK_TYPE_X509_INFO:
@@ -48127,22 +48127,26 @@ WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* wolfSSL_sk_X509_NAME_ENTRY_new(
     }
     return sk;
 }
+
 int wolfSSL_sk_X509_NAME_ENTRY_push(WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* sk,
-    WOLFSSL_X509_NAME_ENTRY* nameentry)
+    WOLFSSL_X509_NAME_ENTRY* name_entry)
 {
-    return wolfSSL_sk_push(sk, nameentry);
+    return wolfSSL_sk_push(sk, name_entry);
 }
+
 WOLFSSL_X509_NAME_ENTRY* wolfSSL_sk_X509_NAME_ENTRY_value(
     const WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* sk, int i)
 {
     return (WOLFSSL_X509_NAME_ENTRY*)wolfSSL_sk_value(sk, i);
 }
+
 int wolfSSL_sk_X509_NAME_ENTRY_num(const WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* sk)
 {
     if (sk == NULL)
         return BAD_FUNC_ARG;
     return (int)sk->num;
 }
+
 void wolfSSL_sk_X509_NAME_ENTRY_free(WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* sk)
 {
     wolfSSL_sk_free(sk);
diff --git a/wolfssl/internal.h b/wolfssl/internal.h
index c98a252e9..e90ff9ceb 100644
--- a/wolfssl/internal.h
+++ b/wolfssl/internal.h
@@ -3861,7 +3861,7 @@ struct WOLFSSL_STACK {
     union {
         WOLFSSL_X509*          x509;
         WOLFSSL_X509_NAME*     name;
-        WOLFSSL_X509_NAME_ENTRY* nameentry;
+        WOLFSSL_X509_NAME_ENTRY* name_entry;
         WOLFSSL_X509_INFO*     info;
         WOLFSSL_BIO*           bio;
         WOLFSSL_ASN1_OBJECT*   obj;
diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h
index 5ba219d2e..02815ab4d 100644
--- a/wolfssl/ssl.h
+++ b/wolfssl/ssl.h
@@ -4383,13 +4383,13 @@ WOLFSSL_API void wolfSSL_sk_X509_NAME_pop_free(WOLF_STACK_OF(WOLFSSL_X509_NAME)*
 WOLFSSL_API void wolfSSL_sk_X509_NAME_free(WOLF_STACK_OF(WOLFSSL_X509_NAME) *);
 
 WOLFSSL_API WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)*
-                 wolfSSL_sk_X509_NAME_ENTRY_new(wolf_sk_compare_cb);
-WOLFSSL_API int  wolfSSL_sk_X509_NAME_ENTRY_push(WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)*,
-                                           WOLFSSL_X509_NAME_ENTRY*);
+                 wolfSSL_sk_X509_NAME_ENTRY_new(wolf_sk_compare_cb cb);
+WOLFSSL_API int  wolfSSL_sk_X509_NAME_ENTRY_push(WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* sk,
+                                           WOLFSSL_X509_NAME_ENTRY* name_entry);
 WOLFSSL_API WOLFSSL_X509_NAME_ENTRY*
-                 wolfSSL_sk_X509_NAME_ENTRY_value(const WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)*, int);
-WOLFSSL_API int  wolfSSL_sk_X509_NAME_ENTRY_num(const WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)*);
-WOLFSSL_API void wolfSSL_sk_X509_NAME_ENTRY_free(WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY) *);
+                 wolfSSL_sk_X509_NAME_ENTRY_value(const WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* sk, int i);
+WOLFSSL_API int  wolfSSL_sk_X509_NAME_ENTRY_num(const WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* sk);
+WOLFSSL_API void wolfSSL_sk_X509_NAME_ENTRY_free(WOLF_STACK_OF(WOLFSSL_X509_NAME_ENTRY)* sk);
 
 
 WOLFSSL_API int wolfSSL_sk_X509_OBJECT_num(const WOLF_STACK_OF(WOLFSSL_X509_OBJECT) *s);