diff --git a/src/include/microhttpd2.h b/src/include/microhttpd2.h
index e606e504..c2d8f40b 100644
--- a/src/include/microhttpd2.h
+++ b/src/include/microhttpd2.h
@@ -8032,7 +8032,7 @@ MHD_FN_PAR_CSTR_ (3) MHD_FN_PAR_CSTR_ (4) MHD_FN_PAR_NONNULL_ (5);
  * @ingroup authentication
  */
 MHD_EXTERN_ enum MHD_StatusCode
-MHD_response_add_basic_auth_challenge (
+MHD_response_add_auth_basic_challenge (
   struct MHD_Response *MHD_RESTRICT response,
   const char *MHD_RESTRICT realm,
   enum MHD_Bool prefer_utf8)
@@ -8089,7 +8089,7 @@ MHD_action_basic_auth_challenge (struct MHD_Request *MHD_RESTRICT request,
                                  enum MHD_Bool abort_if_failed)
 {
   if ((MHD_SC_OK !=
-       MHD_response_add_basic_auth_challenge (response, realm, prefer_utf8))
+       MHD_response_add_auth_basic_challenge (response, realm, prefer_utf8))
       && (MHD_NO != abort_if_failed))
   {
     MHD_response_destroy (response);
diff --git a/src/include/microhttpd2_main.h.in b/src/include/microhttpd2_main.h.in
index 4debddeb..5e8fe425 100644
--- a/src/include/microhttpd2_main.h.in
+++ b/src/include/microhttpd2_main.h.in
@@ -3450,7 +3450,7 @@ MHD_FN_PAR_CSTR_ (3) MHD_FN_PAR_CSTR_ (4) MHD_FN_PAR_NONNULL_ (5);
  * @ingroup authentication
  */
 MHD_EXTERN_ enum MHD_StatusCode
-MHD_response_add_basic_auth_challenge (
+MHD_response_add_auth_basic_challenge (
   struct MHD_Response *MHD_RESTRICT response,
   const char *MHD_RESTRICT realm,
   enum MHD_Bool prefer_utf8)
@@ -3507,7 +3507,7 @@ MHD_action_basic_auth_challenge (struct MHD_Request *MHD_RESTRICT request,
                                  enum MHD_Bool abort_if_failed)
 {
   if ((MHD_SC_OK !=
-       MHD_response_add_basic_auth_challenge (response, realm, prefer_utf8))
+       MHD_response_add_auth_basic_challenge (response, realm, prefer_utf8))
       && (MHD_NO != abort_if_failed))
   {
     MHD_response_destroy (response);
diff --git a/src/mhd2/response_auth_basic.c b/src/mhd2/response_auth_basic.c
index a1340880..7d38ec10 100644
--- a/src/mhd2/response_auth_basic.c
+++ b/src/mhd2/response_auth_basic.c
@@ -20,7 +20,7 @@
 
 /**
  * @file src/mhd2/response_auth_basic.c
- * @brief  The definitions of MHD_response_add_basic_auth_challenge() function
+ * @brief  The definitions of MHD_response_add_auth_basic_challenge() function
  * @author Karlson2k (Evgeny Grin)
  */
 
@@ -39,8 +39,9 @@
 #include "mhd_public_api.h"
 
 
-static MHD_FN_PAR_NONNULL_ (2) MHD_FN_PAR_CSTR_ (2) enum MHD_StatusCode
-response_add_basic_auth_challenge_int (struct MHD_Response *restrict response,
+static MHD_FN_PAR_NONNULL_ALL_
+MHD_FN_PAR_CSTR_ (2) enum MHD_StatusCode
+response_add_auth_basic_challenge_int (struct MHD_Response *restrict response,
                                        const char *restrict realm,
                                        enum MHD_Bool prefer_utf8)
 {
@@ -139,7 +140,7 @@ response_add_basic_auth_challenge_int (struct MHD_Response *restrict response,
 MHD_EXTERN_
 MHD_FN_PAR_NONNULL_ (2)
 MHD_FN_PAR_CSTR_ (2) enum MHD_StatusCode
-MHD_response_add_basic_auth_challenge (
+MHD_response_add_auth_basic_challenge (
   struct MHD_Response *MHD_RESTRICT response,
   const char *realm,
   enum MHD_Bool prefer_utf8)
@@ -169,7 +170,7 @@ MHD_response_add_basic_auth_challenge (
   else if (response->cfg.has_bauth)
     res = MHD_SC_RESP_HEADERS_CONFLICT;
   else
-    res = response_add_basic_auth_challenge_int (response,
+    res = response_add_auth_basic_challenge_int (response,
                                                  realm,
                                                  prefer_utf8);