diff --git a/doc/headers.html b/doc/headers.html
index b26fb96..7728e18 100644
--- a/doc/headers.html
+++ b/doc/headers.html
@@ -231,7 +231,7 @@
       <li><a href="headers/variadic.html">variadic.hpp</a></li>
       <li>variadic/</li>
       <li class="ps"><a href="headers/variadic/elem.html">elem.hpp</a> <a href="topics/variadic_macros.html#VNotation">(v)</a></li>
-      <li class="ps"><a href="headers/variadic/opt.html">opt.hpp</a> </li>
+      <li class="ps"><a href="headers/variadic/has_opt.html">has_opt.hpp</a> </li>
       <li class="ps"><a href="headers/variadic/size.html">size.hpp</a> <a href="topics/variadic_macros.html#VNotation">(v)</a></li>
       <li class="ps"><a href="headers/variadic/to_array.html">to_array.hpp</a> <a
           href="topics/variadic_macros.html#VNotation">(v)</a></li>
diff --git a/doc/headers/variadic.html b/doc/headers/variadic.html
index c555e95..3a5e4f4 100644
--- a/doc/headers/variadic.html
+++ b/doc/headers/variadic.html
@@ -14,7 +14,7 @@
 	<h4>Includes</h4>
 		<ul>
 			<li><a href="variadic/elem.html">&lt;boost/preprocessor/variadic/elem.hpp&gt;</a> <a href="../topics/variadic_macros.html#VNotation" target="_self">(v)</a></li>
-			<li><a href="variadic/opt.html">&lt;boost/preprocessor/variadic/opt.hpp&gt;</a> </li>
+			<li><a href="variadic/has_opt.html">&lt;boost/preprocessor/variadic/has_opt.hpp&gt;</a> </li>
 			<li><a href="variadic/size.html">&lt;boost/preprocessor/variadic/size.hpp&gt;</a> <a href="../topics/variadic_macros.html#VNotation" target="_self">(v)</a></li>
 			<li><a href="variadic/to_array.html">&lt;boost/preprocessor/variadic/to_array.hpp&gt;</a> <a href="../topics/variadic_macros.html#VNotation" target="_self">(v)</a></li>
 			<li><a href="variadic/to_list.html">&lt;boost/preprocessor/variadic/to_list.hpp&gt;</a> <a href="../topics/variadic_macros.html#VNotation" target="_self">(v)</a></li>
diff --git a/doc/headers/variadic/opt.html b/doc/headers/variadic/has_opt.html
similarity index 67%
rename from doc/headers/variadic/opt.html
rename to doc/headers/variadic/has_opt.html
index 586f63e..6471cac 100644
--- a/doc/headers/variadic/opt.html
+++ b/doc/headers/variadic/has_opt.html
@@ -1,16 +1,16 @@
 <html><head>
-  <title>variadic/opt.hpp</title>
+  <title>variadic/has_opt.hpp</title>
   <link rel="stylesheet" type="text/css" href="../../styles.css"></head><body>
    <div style="margin-left: 0px;">
-   The <b>variadic/opt.hpp</b> header defines a macro that determines whether or not the __VA_OPT__ construct is supported.
+   The <b>variadic/has_opt.hpp</b> header defines a macro that determines whether or not the __VA_OPT__ construct is supported.
    </div>
    <h4>Usage</h4>
    <div class="code">
-   #include <b>&lt;boost/preprocessor/variadic/opt.hpp&gt;</b>
+   #include <b>&lt;boost/preprocessor/variadic/has_opt.hpp&gt;</b>
    </div>
    <h4>Contents</h4>
    <ul>
-   <li><a href="../../ref/variadic_opt.html">BOOST_PP_VARIADIC_HAS_OPT</a> <br>
+   <li><a href="../../ref/variadic_has_opt.html">BOOST_PP_VARIADIC_HAS_OPT</a> <br>
    </li>
    </ul>
    <hr size="1">
diff --git a/doc/ref.html b/doc/ref.html
index 1a56029..f518c42 100644
--- a/doc/ref.html
+++ b/doc/ref.html
@@ -299,7 +299,7 @@
       <li><a href="ref/value.html">VALUE</a></li>
       <li><a href="ref/variadics.html">VARIADICS</a></li>
       <li><a href="ref/variadic_elem.html">VARIADIC_ELEM</a> <a href="topics/variadic_macros.html#VNotation">(v)</a></li>
-      <li><a href="ref/variadic_opt.html">VARIADIC_HAS_OPT</a></li>
+      <li><a href="ref/variadic_has_opt.html">VARIADIC_HAS_OPT</a></li>
       <li><a href="ref/variadic_seq_to_seq.html">VARIADIC_SEQ_TO_SEQ</a> <a href="topics/variadic_macros.html#VNotation">(v)</a></li>
       <li><a href="ref/variadic_size.html">VARIADIC_SIZE</a> <a href="topics/variadic_macros.html#VNotation">(v)</a></li>
       <li><a href="ref/variadic_to_array.html">VARIADIC_TO_ARRAY</a> <a href="topics/variadic_macros.html#VNotation">(v)</a></li>
diff --git a/doc/ref/check_empty.html b/doc/ref/check_empty.html
index 4b24111..f370542 100644
--- a/doc/ref/check_empty.html
+++ b/doc/ref/check_empty.html
@@ -29,7 +29,7 @@ case this macro will expand to 1 just as if nothing has been passed.
 </div>
 <h4>See Also</h4>
 <ul>
-  <li><a href="variadic_opt.html">BOOST_PP_VARIADIC_HAS_OPT</a></li>
+  <li><a href="variadic_has_opt.html">BOOST_PP_VARIADIC_HAS_OPT</a></li>
 </ul>
 <h4>Requirements</h4>
 <div> <b>Header:</b> &nbsp;<a href="../headers/facilities/check_empty.html">&lt;boost/preprocessor/facilities/check_empty.hpp&gt;</a>
@@ -39,7 +39,7 @@ case this macro will expand to 1 just as if nothing has been passed.
 <pre>
 #include &lt;<a href="../headers/facilities/check_empty.html">boost/preprocessor/facilities/check_empty.hpp</a>&gt;
 
-# if <a href="variadic_opt.html">BOOST_PP_VARIADIC_HAS_OPT</a>()
+# if <a href="variadic_has_opt.html">BOOST_PP_VARIADIC_HAS_OPT</a>()
 
 #define DATA
 #define OBJECT OBJECT2
diff --git a/doc/ref/variadic_opt.html b/doc/ref/variadic_has_opt.html
similarity index 79%
rename from doc/ref/variadic_opt.html
rename to doc/ref/variadic_has_opt.html
index c2ce540..2017474 100644
--- a/doc/ref/variadic_opt.html
+++ b/doc/ref/variadic_has_opt.html
@@ -30,13 +30,13 @@ Expands to 1 if the __VA_OPT__ construct is supported, otherwise expands to 0.
 			0 for all lesser C++ standard levels.
 		</div>
 <h4>Requirements</h4>
-<div> <b>Header:</b> &nbsp;<a href="../headers/variadic/opt.html">&lt;boost/preprocessor/variadic/opt.hpp&gt;</a>
+<div> <b>Header:</b> &nbsp;<a href="../headers/variadic/has_opt.html">&lt;boost/preprocessor/variadic/has_opt.hpp&gt;</a>
 </div>
 <h4>Sample Code</h4>
 <div>
 <pre>
-#include &lt;<a href="../headers/variadic/opt.html">boost/preprocessor/variadic/opt.hpp</a>&gt;<br>
-#if <a href="variadic_opt.html">BOOST_PP_VARIADIC_HAS_OPT</a>()
+#include &lt;<a href="../headers/variadic/has_opt.html">boost/preprocessor/variadic/has_opt.hpp</a>&gt;<br>
+#if <a href="variadic_has_opt.html">BOOST_PP_VARIADIC_HAS_OPT</a>()
 // Preprocessor code which uses __VA_OPT__
 #else
 // Preprocessor code which does not use __VA_OPT__
@@ -46,8 +46,8 @@ Expands to 1 if the __VA_OPT__ construct is supported, otherwise expands to 0.
 or within a macro definition<br><br>
 <pre>
 #include &lt;boost/preprocessor/control/iif.hpp&gt;
-#include &lt;<a href="../headers/variadic/opt.html">boost/preprocessor/variadic/opt.hpp</a>&gt;<br>
-#define USE_OPT(...) BOOST_PP_IIF(<a href="variadic_opt.html">BOOST_PP_VARIADIC_HAS_OPT</a>(),MACRO_USING_OPT,MACRO_NOT_USING_OPT)(__VA_ARGS__)
+#include &lt;<a href="../headers/variadic/has_opt.html">boost/preprocessor/variadic/has_opt.hpp</a>&gt;<br>
+#define USE_OPT(...) BOOST_PP_IIF(<a href="variadic_has_opt.html">BOOST_PP_VARIADIC_HAS_OPT</a>(),MACRO_USING_OPT,MACRO_NOT_USING_OPT)(__VA_ARGS__)
 #define MACRO_USING_OPT(...) __VA_OPT__( preprocessor tokens ) anything
 #define MACRO_NOT_USING_OPT(...) anything
 </pre>
diff --git a/doc/topics/emptiness.html b/doc/topics/emptiness.html
index d1494e3..04008dc 100644
--- a/doc/topics/emptiness.html
+++ b/doc/topics/emptiness.html
@@ -135,7 +135,7 @@
     </div>
     <b>See</b> <b>Also</b><br>
     <ul>
-      <li><a  href="../ref/variadic_opt.html">BOOST_PP_VARIADIC_HAS_OPT</a></li>
+      <li><a  href="../ref/variadic_has_opt.html">BOOST_PP_VARIADIC_HAS_OPT</a></li>
       <li><a  href="../ref/check_empty.html">BOOST_PP_CHECK_EMPTY</a></li>
     </ul>
     <hr  size="1">
diff --git a/include/boost/preprocessor/facilities/check_empty.hpp b/include/boost/preprocessor/facilities/check_empty.hpp
index 6d3d548..2a4cd6a 100644
--- a/include/boost/preprocessor/facilities/check_empty.hpp
+++ b/include/boost/preprocessor/facilities/check_empty.hpp
@@ -11,7 +11,7 @@
 #
 # ifndef BOOST_PREPROCESSOR_FACILITIES_CHECK_EMPTY_HPP
 # define BOOST_PREPROCESSOR_FACILITIES_CHECK_EMPTY_HPP
-# include <boost/preprocessor/variadic/opt.hpp>
+# include <boost/preprocessor/variadic/has_opt.hpp>
 # if BOOST_PP_VARIADIC_HAS_OPT()
 # include <boost/preprocessor/facilities/is_empty_variadic.hpp>
 # define BOOST_PP_CHECK_EMPTY(...) BOOST_PP_IS_EMPTY_OPT(__VA_ARGS__)
diff --git a/include/boost/preprocessor/facilities/is_empty_variadic.hpp b/include/boost/preprocessor/facilities/is_empty_variadic.hpp
index 55175cd..77ebf6d 100644
--- a/include/boost/preprocessor/facilities/is_empty_variadic.hpp
+++ b/include/boost/preprocessor/facilities/is_empty_variadic.hpp
@@ -38,7 +38,7 @@
 #define BOOST_PP_IS_EMPTY_ZERO(param) 0
 # else
 # if defined(__cplusplus) && __cplusplus > 201703L
-# include <boost/preprocessor/variadic/opt.hpp>
+# include <boost/preprocessor/variadic/has_opt.hpp>
 #define BOOST_PP_IS_EMPTY(...) \
     BOOST_PP_DETAIL_IS_EMPTY_IIF \
       ( \
diff --git a/include/boost/preprocessor/variadic.hpp b/include/boost/preprocessor/variadic.hpp
index c2c37f2..27bf402 100644
--- a/include/boost/preprocessor/variadic.hpp
+++ b/include/boost/preprocessor/variadic.hpp
@@ -14,7 +14,7 @@
 # define BOOST_PREPROCESSOR_VARIADIC_HPP
 #
 # include <boost/preprocessor/variadic/elem.hpp>
-# include <boost/preprocessor/variadic/opt.hpp>
+# include <boost/preprocessor/variadic/has_opt.hpp>
 # include <boost/preprocessor/variadic/size.hpp>
 # include <boost/preprocessor/variadic/to_array.hpp>
 # include <boost/preprocessor/variadic/to_list.hpp>
diff --git a/include/boost/preprocessor/variadic/detail/opt.hpp b/include/boost/preprocessor/variadic/detail/has_opt.hpp
similarity index 91%
rename from include/boost/preprocessor/variadic/detail/opt.hpp
rename to include/boost/preprocessor/variadic/detail/has_opt.hpp
index a8c629f..11b6552 100644
--- a/include/boost/preprocessor/variadic/detail/opt.hpp
+++ b/include/boost/preprocessor/variadic/detail/has_opt.hpp
@@ -9,8 +9,8 @@
 #
 # /* See http://www.boost.org for most recent version. */
 #
-# ifndef BOOST_PREPROCESSOR_VARIADIC_DETAIL_OPT_HPP
-# define BOOST_PREPROCESSOR_VARIADIC_DETAIL_OPT_HPP
+# ifndef BOOST_PREPROCESSOR_VARIADIC_DETAIL_HAS_OPT_HPP
+# define BOOST_PREPROCESSOR_VARIADIC_DETAIL_HAS_OPT_HPP
 #
 # include <boost/preprocessor/config/config.hpp>
 #
diff --git a/include/boost/preprocessor/variadic/opt.hpp b/include/boost/preprocessor/variadic/has_opt.hpp
similarity index 86%
rename from include/boost/preprocessor/variadic/opt.hpp
rename to include/boost/preprocessor/variadic/has_opt.hpp
index 0690ef5..3ab0890 100644
--- a/include/boost/preprocessor/variadic/opt.hpp
+++ b/include/boost/preprocessor/variadic/has_opt.hpp
@@ -9,15 +9,15 @@
 #
 # /* See http://www.boost.org for most recent version. */
 #
-# ifndef BOOST_PREPROCESSOR_VARIADIC_OPT_HPP
-# define BOOST_PREPROCESSOR_VARIADIC_OPT_HPP
+# ifndef BOOST_PREPROCESSOR_VARIADIC_HAS_OPT_HPP
+# define BOOST_PREPROCESSOR_VARIADIC_HAS_OPT_HPP
 #
 # include <boost/preprocessor/config/config.hpp>
 #
 # /* BOOST_PP_VARIADIC_HAS_OPT */
 #
 # if BOOST_PP_VARIADICS && defined(__cplusplus) && __cplusplus > 201703L
-# include <boost/preprocessor/variadic/detail/opt.hpp>
+# include <boost/preprocessor/variadic/detail/has_opt.hpp>
 # define BOOST_PP_VARIADIC_HAS_OPT() \
   BOOST_PP_VARIADIC_HAS_OPT_ELEM2(BOOST_PP_VARIADIC_HAS_OPT_FUNCTION(?),) \
 /**/
diff --git a/test/config_info.cpp b/test/config_info.cpp
index 10c3ab4..471d3df 100644
--- a/test/config_info.cpp
+++ b/test/config_info.cpp
@@ -13,7 +13,7 @@
 #include <iomanip>
 #include <string.h>
 #include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/variadic/opt.hpp>
+#include <boost/preprocessor/variadic/has_opt.hpp>
 
 static unsigned int indent = 4;
 static unsigned int width = 40;
diff --git a/test/isempty.cxx b/test/isempty.cxx
index 6f50a7f..f83fe7b 100644
--- a/test/isempty.cxx
+++ b/test/isempty.cxx
@@ -38,7 +38,7 @@
 
 #if BOOST_PP_VARIADICS
 
-# include <boost/preprocessor/variadic/opt.hpp>
+# include <boost/preprocessor/variadic/has_opt.hpp>
 
 #if defined(__cplusplus) && __cplusplus > 201703L && BOOST_PP_VARIADIC_HAS_OPT()
 
diff --git a/test/isempty_variadic_standard_failure.cxx b/test/isempty_variadic_standard_failure.cxx
index b68f032..5c7b03d 100644
--- a/test/isempty_variadic_standard_failure.cxx
+++ b/test/isempty_variadic_standard_failure.cxx
@@ -18,7 +18,7 @@
 
 #if defined(__cplusplus) && __cplusplus > 201703L
   
-# include <boost/preprocessor/variadic/opt.hpp>
+# include <boost/preprocessor/variadic/has_opt.hpp>
 
 BEGIN BOOST_PP_IS_EMPTY(FUNC_GEN8) == BOOST_PP_VARIADIC_HAS_OPT() END
 
diff --git a/test/isempty_variadic_standard_failure2.cxx b/test/isempty_variadic_standard_failure2.cxx
index 110a35e..7c9d1ad 100644
--- a/test/isempty_variadic_standard_failure2.cxx
+++ b/test/isempty_variadic_standard_failure2.cxx
@@ -18,7 +18,7 @@
   
 #if defined(__cplusplus) && __cplusplus > 201703L
   
-# include <boost/preprocessor/variadic/opt.hpp>
+# include <boost/preprocessor/variadic/has_opt.hpp>
 
 BEGIN BOOST_PP_IS_EMPTY(FUNC_GEN9) == BOOST_PP_VARIADIC_HAS_OPT() END
 
