diff --git a/include/boost/mysql/detail/aux/bytestr.hpp b/include/boost/mysql/detail/auxiliar/bytestring.hpp
similarity index 54%
rename from include/boost/mysql/detail/aux/bytestr.hpp
rename to include/boost/mysql/detail/auxiliar/bytestring.hpp
index c8154737..19ca2aa6 100644
--- a/include/boost/mysql/detail/aux/bytestr.hpp
+++ b/include/boost/mysql/detail/auxiliar/bytestring.hpp
@@ -1,5 +1,5 @@
-#ifndef INCLUDE_BOOST_MYSQL_DETAIL_AUX_BYTESTR_HPP_
-#define INCLUDE_BOOST_MYSQL_DETAIL_AUX_BYTESTR_HPP_
+#ifndef INCLUDE_BOOST_MYSQL_DETAIL_AUXILIAR_BYTESTRING_HPP_
+#define INCLUDE_BOOST_MYSQL_DETAIL_AUXILIAR_BYTESTRING_HPP_
 
 #include <vector>
 
@@ -18,4 +18,4 @@ using bytestring = std::vector<std::uint8_t>;
 
 
 
-#endif /* INCLUDE_BOOST_MYSQL_DETAIL_AUX_BYTESTR_HPP_ */
+#endif /* INCLUDE_BOOST_MYSQL_DETAIL_AUXILIAR_BYTESTRING_HPP_ */
diff --git a/include/boost/mysql/detail/aux/container_equals.hpp b/include/boost/mysql/detail/auxiliar/container_equals.hpp
similarity index 100%
rename from include/boost/mysql/detail/aux/container_equals.hpp
rename to include/boost/mysql/detail/auxiliar/container_equals.hpp
diff --git a/include/boost/mysql/detail/aux/get_struct_fields.hpp b/include/boost/mysql/detail/auxiliar/get_struct_fields.hpp
similarity index 71%
rename from include/boost/mysql/detail/aux/get_struct_fields.hpp
rename to include/boost/mysql/detail/auxiliar/get_struct_fields.hpp
index 1003a5e5..fa29aa35 100644
--- a/include/boost/mysql/detail/aux/get_struct_fields.hpp
+++ b/include/boost/mysql/detail/auxiliar/get_struct_fields.hpp
@@ -1,5 +1,5 @@
-#ifndef INCLUDE_BOOST_MYSQL_DETAIL_AUX_GET_STRUCT_FIELDS_HPP_
-#define INCLUDE_BOOST_MYSQL_DETAIL_AUX_GET_STRUCT_FIELDS_HPP_
+#ifndef INCLUDE_BOOST_MYSQL_DETAIL_AUXILIAR_GET_STRUCT_FIELDS_HPP_
+#define INCLUDE_BOOST_MYSQL_DETAIL_AUXILIAR_GET_STRUCT_FIELDS_HPP_
 
 namespace boost {
 namespace mysql {
@@ -23,4 +23,4 @@ struct get_struct_fields
 } // boost
 
 
-#endif /* INCLUDE_BOOST_MYSQL_DETAIL_AUX_GET_STRUCT_FIELDS_HPP_ */
+#endif /* INCLUDE_BOOST_MYSQL_DETAIL_AUXILIAR_GET_STRUCT_FIELDS_HPP_ */
diff --git a/include/boost/mysql/detail/aux/stringize.hpp b/include/boost/mysql/detail/auxiliar/stringize.hpp
similarity index 60%
rename from include/boost/mysql/detail/aux/stringize.hpp
rename to include/boost/mysql/detail/auxiliar/stringize.hpp
index 1b5930be..86a58a17 100644
--- a/include/boost/mysql/detail/aux/stringize.hpp
+++ b/include/boost/mysql/detail/auxiliar/stringize.hpp
@@ -1,5 +1,5 @@
-#ifndef INCLUDE_BOOST_MYSQL_DETAIL_AUX_STRINGIZE_HPP_
-#define INCLUDE_BOOST_MYSQL_DETAIL_AUX_STRINGIZE_HPP_
+#ifndef INCLUDE_BOOST_MYSQL_DETAIL_AUXILIAR_STRINGIZE_HPP_
+#define INCLUDE_BOOST_MYSQL_DETAIL_AUXILIAR_STRINGIZE_HPP_
 
 #include <string>
 #include <sstream>
@@ -22,4 +22,4 @@ std::string stringize(const Types&... inputs)
 
 
 
-#endif /* INCLUDE_BOOST_MYSQL_DETAIL_AUX_STRINGIZE_HPP_ */
+#endif /* INCLUDE_BOOST_MYSQL_DETAIL_AUXILIAR_STRINGIZE_HPP_ */
diff --git a/include/boost/mysql/detail/aux/tmp.hpp b/include/boost/mysql/detail/auxiliar/tmp.hpp
similarity index 75%
rename from include/boost/mysql/detail/aux/tmp.hpp
rename to include/boost/mysql/detail/auxiliar/tmp.hpp
index bca5349c..13962df5 100644
--- a/include/boost/mysql/detail/aux/tmp.hpp
+++ b/include/boost/mysql/detail/auxiliar/tmp.hpp
@@ -1,5 +1,5 @@
-#ifndef INCLUDE_BOOST_MYSQL_DETAIL_AUX_TMP_HPP_
-#define INCLUDE_BOOST_MYSQL_DETAIL_AUX_TMP_HPP_
+#ifndef INCLUDE_BOOST_MYSQL_DETAIL_AUXILIAR_TMP_HPP_
+#define INCLUDE_BOOST_MYSQL_DETAIL_AUXILIAR_TMP_HPP_
 
 #include <type_traits>
 
@@ -28,4 +28,4 @@ constexpr bool is_one_of_v = is_one_of<T, Types...>::value;
 } // boost
 
 
-#endif /* INCLUDE_BOOST_MYSQL_DETAIL_AUX_TMP_HPP_ */
+#endif /* INCLUDE_BOOST_MYSQL_DETAIL_AUXILIAR_TMP_HPP_ */
diff --git a/include/boost/mysql/detail/aux/value_holder.hpp b/include/boost/mysql/detail/auxiliar/value_holder.hpp
similarity index 84%
rename from include/boost/mysql/detail/aux/value_holder.hpp
rename to include/boost/mysql/detail/auxiliar/value_holder.hpp
index 6d9bd06d..7f1d6f54 100644
--- a/include/boost/mysql/detail/aux/value_holder.hpp
+++ b/include/boost/mysql/detail/auxiliar/value_holder.hpp
@@ -1,5 +1,5 @@
-#ifndef INCLUDE_BOOST_MYSQL_DETAIL_AUX_VALUE_HOLDER_HPP_
-#define INCLUDE_BOOST_MYSQL_DETAIL_AUX_VALUE_HOLDER_HPP_
+#ifndef INCLUDE_BOOST_MYSQL_DETAIL_AUXILIAR_VALUE_HOLDER_HPP_
+#define INCLUDE_BOOST_MYSQL_DETAIL_AUXILIAR_VALUE_HOLDER_HPP_
 
 #include <utility>
 
@@ -51,4 +51,4 @@ using get_value_type_t = typename get_value_type<T>::type;
 
 
 
-#endif /* INCLUDE_BOOST_MYSQL_DETAIL_AUX_VALUE_HOLDER_HPP_ */
+#endif /* INCLUDE_BOOST_MYSQL_DETAIL_AUXILIAR_VALUE_HOLDER_HPP_ */
diff --git a/include/boost/mysql/detail/protocol/channel.hpp b/include/boost/mysql/detail/protocol/channel.hpp
index db3c9001..3367b3f8 100644
--- a/include/boost/mysql/detail/protocol/channel.hpp
+++ b/include/boost/mysql/detail/protocol/channel.hpp
@@ -2,7 +2,7 @@
 #define MYSQL_ASIO_IMPL_CHANNEL_HPP
 
 #include "boost/mysql/error.hpp"
-#include "boost/mysql/detail/aux/bytestr.hpp"
+#include "boost/mysql/detail/auxiliar/bytestring.hpp"
 #include "boost/mysql/detail/protocol/capabilities.hpp"
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/async_result.hpp>
diff --git a/include/boost/mysql/detail/protocol/common_messages.hpp b/include/boost/mysql/detail/protocol/common_messages.hpp
index 8757f59e..435d4aac 100644
--- a/include/boost/mysql/detail/protocol/common_messages.hpp
+++ b/include/boost/mysql/detail/protocol/common_messages.hpp
@@ -2,7 +2,7 @@
 #define INCLUDE_BOOST_MYSQL_DETAIL_PROTOCOL_COMMON_MESSAGES_HPP_
 
 #include "boost/mysql/detail/protocol/deserialization_context.hpp"
-#include "boost/mysql/detail/aux/get_struct_fields.hpp"
+#include "boost/mysql/detail/auxiliar/get_struct_fields.hpp"
 #include "boost/mysql/detail/protocol/constants.hpp"
 #include "boost/mysql/collation.hpp"
 #include "boost/mysql/error.hpp"
diff --git a/include/boost/mysql/detail/protocol/handshake_messages.hpp b/include/boost/mysql/detail/protocol/handshake_messages.hpp
index 77f9a7c7..74aa0529 100644
--- a/include/boost/mysql/detail/protocol/handshake_messages.hpp
+++ b/include/boost/mysql/detail/protocol/handshake_messages.hpp
@@ -4,7 +4,7 @@
 #include "boost/mysql/detail/protocol/serialization_context.hpp"
 #include "boost/mysql/detail/protocol/deserialization_context.hpp"
 #include "boost/mysql/detail/protocol/protocol_types.hpp"
-#include "boost/mysql/detail/aux/get_struct_fields.hpp"
+#include "boost/mysql/detail/auxiliar/get_struct_fields.hpp"
 #include "boost/mysql/error.hpp"
 
 namespace boost {
diff --git a/include/boost/mysql/detail/protocol/impl/binary_deserialization.ipp b/include/boost/mysql/detail/protocol/impl/binary_deserialization.ipp
index 6a37dc9b..f2128b6b 100644
--- a/include/boost/mysql/detail/protocol/impl/binary_deserialization.ipp
+++ b/include/boost/mysql/detail/protocol/impl/binary_deserialization.ipp
@@ -4,7 +4,7 @@
 #include <variant>
 #include "boost/mysql/detail/protocol/serialization.hpp"
 #include "boost/mysql/detail/protocol/null_bitmap_traits.hpp"
-#include "boost/mysql/detail/aux/tmp.hpp"
+#include "boost/mysql/detail/auxiliar/tmp.hpp"
 
 namespace boost {
 namespace mysql {
diff --git a/include/boost/mysql/detail/protocol/prepared_statement_messages.hpp b/include/boost/mysql/detail/protocol/prepared_statement_messages.hpp
index c1e3e044..d1824e4b 100644
--- a/include/boost/mysql/detail/protocol/prepared_statement_messages.hpp
+++ b/include/boost/mysql/detail/protocol/prepared_statement_messages.hpp
@@ -5,7 +5,7 @@
 #include "boost/mysql/detail/protocol/serialization_context.hpp"
 #include "boost/mysql/detail/protocol/deserialization_context.hpp"
 #include "boost/mysql/detail/protocol/constants.hpp"
-#include "boost/mysql/detail/aux/get_struct_fields.hpp"
+#include "boost/mysql/detail/auxiliar/get_struct_fields.hpp"
 #include "boost/mysql/value.hpp"
 #include "boost/mysql/error.hpp"
 
diff --git a/include/boost/mysql/detail/protocol/protocol_types.hpp b/include/boost/mysql/detail/protocol/protocol_types.hpp
index 0ab0916c..8fdb7755 100644
--- a/include/boost/mysql/detail/protocol/protocol_types.hpp
+++ b/include/boost/mysql/detail/protocol/protocol_types.hpp
@@ -1,7 +1,7 @@
 #ifndef MYSQL_ASIO_IMPL_BASIC_TYPES_HPP
 #define MYSQL_ASIO_IMPL_BASIC_TYPES_HPP
 
-#include "boost/mysql/detail/aux/value_holder.hpp"
+#include "boost/mysql/detail/auxiliar/value_holder.hpp"
 #include <cstdint>
 #include <string_view>
 #include <array>
diff --git a/include/boost/mysql/detail/protocol/query_messages.hpp b/include/boost/mysql/detail/protocol/query_messages.hpp
index 270c5f0b..99e160e4 100644
--- a/include/boost/mysql/detail/protocol/query_messages.hpp
+++ b/include/boost/mysql/detail/protocol/query_messages.hpp
@@ -2,7 +2,7 @@
 #define INCLUDE_BOOST_MYSQL_DETAIL_PROTOCOL_QUERY_MESSAGES_HPP_
 
 #include "boost/mysql/detail/protocol/protocol_types.hpp"
-#include "boost/mysql/detail/aux/get_struct_fields.hpp"
+#include "boost/mysql/detail/auxiliar/get_struct_fields.hpp"
 #include <tuple>
 
 namespace boost {
diff --git a/include/boost/mysql/detail/protocol/serialization.hpp b/include/boost/mysql/detail/protocol/serialization.hpp
index ac6afc8f..dcbb8df6 100644
--- a/include/boost/mysql/detail/protocol/serialization.hpp
+++ b/include/boost/mysql/detail/protocol/serialization.hpp
@@ -7,8 +7,8 @@
 #include "boost/mysql/detail/protocol/protocol_types.hpp"
 #include "boost/mysql/detail/protocol/serialization_context.hpp"
 #include "boost/mysql/detail/protocol/deserialization_context.hpp"
-#include "boost/mysql/detail/aux/get_struct_fields.hpp"
-#include "boost/mysql/detail/aux/bytestr.hpp"
+#include "boost/mysql/detail/auxiliar/get_struct_fields.hpp"
+#include "boost/mysql/detail/auxiliar/bytestring.hpp"
 #include "boost/mysql/value.hpp"
 #include "boost/mysql/error.hpp"
 
diff --git a/include/boost/mysql/impl/prepared_statement.hpp b/include/boost/mysql/impl/prepared_statement.hpp
index b2d87603..aa53d209 100644
--- a/include/boost/mysql/impl/prepared_statement.hpp
+++ b/include/boost/mysql/impl/prepared_statement.hpp
@@ -3,7 +3,7 @@
 
 #include "boost/mysql/detail/network_algorithms/execute_statement.hpp"
 #include "boost/mysql/detail/network_algorithms/close_statement.hpp"
-#include "boost/mysql/detail/aux/stringize.hpp"
+#include "boost/mysql/detail/auxiliar/stringize.hpp"
 #include <boost/beast/core/bind_handler.hpp>
 
 template <typename Stream>
diff --git a/include/boost/mysql/impl/value.hpp b/include/boost/mysql/impl/value.hpp
index 659e3081..3c8ccb3c 100644
--- a/include/boost/mysql/impl/value.hpp
+++ b/include/boost/mysql/impl/value.hpp
@@ -1,7 +1,7 @@
 #ifndef MYSQL_ASIO_IMPL_VALUE_HPP
 #define MYSQL_ASIO_IMPL_VALUE_HPP
 
-#include "boost/mysql/detail/aux/container_equals.hpp"
+#include "boost/mysql/detail/auxiliar/container_equals.hpp"
 
 namespace boost {
 namespace mysql {
diff --git a/include/boost/mysql/metadata.hpp b/include/boost/mysql/metadata.hpp
index 39610a93..f4a83e8a 100644
--- a/include/boost/mysql/metadata.hpp
+++ b/include/boost/mysql/metadata.hpp
@@ -2,7 +2,7 @@
 #define MYSQL_ASIO_METADATA_HPP
 
 #include "boost/mysql/detail/protocol/common_messages.hpp"
-#include "boost/mysql/detail/aux/bytestr.hpp"
+#include "boost/mysql/detail/auxiliar/bytestring.hpp"
 #include "boost/mysql/field_type.hpp"
 
 namespace boost {
diff --git a/include/boost/mysql/resultset.hpp b/include/boost/mysql/resultset.hpp
index 42156a9c..8bf3ae2a 100644
--- a/include/boost/mysql/resultset.hpp
+++ b/include/boost/mysql/resultset.hpp
@@ -5,7 +5,7 @@
 #include "boost/mysql/metadata.hpp"
 #include "boost/mysql/detail/protocol/common_messages.hpp"
 #include "boost/mysql/detail/protocol/channel.hpp"
-#include "boost/mysql/detail/aux/bytestr.hpp"
+#include "boost/mysql/detail/auxiliar/bytestring.hpp"
 #include "boost/mysql/detail/network_algorithms/common.hpp" // deserialize_row_fn
 #include <boost/asio/ip/tcp.hpp>
 #include <cassert>
diff --git a/include/boost/mysql/row.hpp b/include/boost/mysql/row.hpp
index 38924872..352c944f 100644
--- a/include/boost/mysql/row.hpp
+++ b/include/boost/mysql/row.hpp
@@ -1,8 +1,8 @@
 #ifndef MYSQL_ASIO_ROW_HPP
 #define MYSQL_ASIO_ROW_HPP
 
-#include "boost/mysql/detail/aux/bytestr.hpp"
-#include "boost/mysql/detail/aux/container_equals.hpp"
+#include "boost/mysql/detail/auxiliar/bytestring.hpp"
+#include "boost/mysql/detail/auxiliar/container_equals.hpp"
 #include "boost/mysql/value.hpp"
 #include "boost/mysql/metadata.hpp"
 #include <algorithm>