diff --git a/README.md b/README.md
index 84022fa..7f31eb3 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,8 @@
 
 Branch          | Travis | Appveyor | Azure Pipelines | codecov.io | Docs | Matrix |
 :-------------: | ------ | -------- | --------------- | ---------- | ---- | ------ |
-[`master`](https://github.com/sdkrystian/static_string/tree/master) | [![Build Status](https://travis-ci.org/sdkrystian/static_string.svg?branch=master)](https://travis-ci.org/sdkrystian/static_string) | [![Build status](https://ci.appveyor.com/api/projects/status/64es4wg4w7mc5wn2/branch/master?svg=true)](https://ci.appveyor.com/project/sdkrystian/static-string/branch/master) | [![Build Status](https://dev.azure.com/krystiands/static_string/_apis/build/status/sdkrystian.static_string?branchName=master)](https://dev.azure.com/krystiands/static_string/_build/latest?definitionId=1&branchName=master) | [![codecov](https://codecov.io/gh/sdkrystian/static_string/branch/master/graph/badge.svg)](https://codecov.io/gh/sdkrystian/static_string/branch/master) | [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](https://sdkrystian.github.io/doc/static_string) | [![Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](http://www.boost.org/development/tests/master/developer/static_string.html)
-[`develop`](https://github.com/sdkrystian/static_string/tree/develop) | [![Build Status](https://travis-ci.org/sdkrystian/static_string.svg?branch=develop)](https://travis-ci.org/sdkrystian/static_string) | [![Build status](https://ci.appveyor.com/api/projects/status/64es4wg4w7mc5wn2/branch/develop?svg=true)](https://ci.appveyor.com/project/sdkrystian/static-string/branch/develop) | [![Build Status](https://dev.azure.com/krystiands/static_string/_apis/build/status/sdkrystian.static_string?branchName=develop)](https://dev.azure.com/krystiands/static_string/_build/latest?definitionId=1&branchName=develop) | [![codecov](https://codecov.io/gh/sdkrystian/static_string/branch/develop/graph/badge.svg)](https://codecov.io/gh/sdkrystian/static_string/branch/develop) | [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](http://www.boost.org/doc/libs/develop/doc/html/static_string.html) | [![Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](http://www.boost.org/development/tests/develop/developer/static_string.html)
+[`master`](https://github.com/boostorg/static_string/tree/master) | [![Build Status](https://travis-ci.org/boostorg/static_string.svg?branch=master)](https://travis-ci.org/boostorg/static_string) | [![Build status](https://ci.appveyor.com/api/projects/status/64es4wg4w7mc5wn2/branch/master?svg=true)](https://ci.appveyor.com/project/sdkrystian/static-string/branch/master) | [![Build Status](https://dev.azure.com/krystiands/static_string/_apis/build/status/sdkrystian.static_string?branchName=master)](https://dev.azure.com/krystiands/static_string/_build/latest?definitionId=1&branchName=master) | [![codecov](https://codecov.io/gh/boostorg/static_string/branch/master/graph/badge.svg)](https://codecov.io/gh/boostorg/static_string/branch/master) | [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](https://sdkrystian.github.io/doc/static_string) | [![Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](http://www.boost.org/development/tests/master/developer/static_string.html)
+[`develop`](https://github.com/boostorg/static_string/tree/develop) | [![Build Status](https://travis-ci.org/boostorg/static_string.svg?branch=develop)](https://travis-ci.org/boostorg/static_string) | [![Build status](https://ci.appveyor.com/api/projects/status/64es4wg4w7mc5wn2/branch/develop?svg=true)](https://ci.appveyor.com/project/sdkrystian/static-string/branch/develop) | [![Build Status](https://dev.azure.com/krystiands/static_string/_apis/build/status/sdkrystian.static_string?branchName=develop)](https://dev.azure.com/krystiands/static_string/_build/latest?definitionId=1&branchName=develop) | [![codecov](https://codecov.io/gh/boostorg/static_string/branch/develop/graph/badge.svg)](https://codecov.io/gh/boostorg/static_string/branch/develop) | [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](http://www.boost.org/doc/libs/develop/doc/html/static_string.html) | [![Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](http://www.boost.org/development/tests/develop/developer/static_string.html)
 
 ## Introduction
 
diff --git a/doc/source.dox b/doc/source.dox
index 17c5cd1..8146ea4 100644
--- a/doc/source.dox
+++ b/doc/source.dox
@@ -35,7 +35,7 @@ INCLUDE_PATH           = ../
 INCLUDE_FILE_PATTERNS  =
 
 PREDEFINED             = \
-                        GENERATING_DOCUMENTATION
+                        BOOST_STATIC_STRING_DOCS
 EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 
diff --git a/include/boost/static_string/config.hpp b/include/boost/static_string/config.hpp
index ff9458e..fe234e5 100644
--- a/include/boost/static_string/config.hpp
+++ b/include/boost/static_string/config.hpp
@@ -64,35 +64,29 @@
 #define BOOST_STATIC_STRING_STANDARD_VERSION __cplusplus
 #endif
 
-#if BOOST_STATIC_STRING_STANDARD_VERSION > 201703L
-#define BOOST_STATIC_STRING_CPP20
-#define BOOST_STATIC_STRING_CPP17
-#define BOOST_STATIC_STRING_CPP14
-#define BOOST_STATIC_STRING_CPP11
-#define BOOST_STATIC_STRING_CPP20_CONSTEXPR constexpr
-#define BOOST_STATIC_STRING_CPP17_CONSTEXPR constexpr
-#define BOOST_STATIC_STRING_CPP14_CONSTEXPR constexpr
-#define BOOST_STATIC_STRING_CPP11_CONSTEXPR constexpr
-#elif BOOST_STATIC_STRING_STANDARD_VERSION >= 201703L
-#define BOOST_STATIC_STRING_CPP17
-#define BOOST_STATIC_STRING_CPP14
-#define BOOST_STATIC_STRING_CPP11
-#define BOOST_STATIC_STRING_CPP20_CONSTEXPR
-#define BOOST_STATIC_STRING_CPP17_CONSTEXPR constexpr
-#define BOOST_STATIC_STRING_CPP14_CONSTEXPR constexpr
-#define BOOST_STATIC_STRING_CPP11_CONSTEXPR constexpr
-#elif BOOST_STATIC_STRING_STANDARD_VERSION >= 201402L
-#define BOOST_STATIC_STRING_CPP14
-#define BOOST_STATIC_STRING_CPP11
-#define BOOST_STATIC_STRING_CPP20_CONSTEXPR
-#define BOOST_STATIC_STRING_CPP17_CONSTEXPR
-#define BOOST_STATIC_STRING_CPP14_CONSTEXPR constexpr
-#define BOOST_STATIC_STRING_CPP11_CONSTEXPR constexpr
-#else
-#define BOOST_STATIC_STRING_CPP11
 #define BOOST_STATIC_STRING_CPP20_CONSTEXPR
 #define BOOST_STATIC_STRING_CPP17_CONSTEXPR
 #define BOOST_STATIC_STRING_CPP14_CONSTEXPR
+#define BOOST_STATIC_STRING_CPP11_CONSTEXPR
+
+#if BOOST_STATIC_STRING_STANDARD_VERSION >= 202002L
+#define BOOST_STATIC_STRING_CPP20
+#undef BOOST_STATIC_STRING_CPP20_CONSTEXPR
+#define BOOST_STATIC_STRING_CPP20_CONSTEXPR constexpr
+#endif
+#if BOOST_STATIC_STRING_STANDARD_VERSION >= 201703L
+#define BOOST_STATIC_STRING_CPP17
+#undef BOOST_STATIC_STRING_CPP17_CONSTEXPR
+#define BOOST_STATIC_STRING_CPP17_CONSTEXPR constexpr
+#endif
+#if BOOST_STATIC_STRING_STANDARD_VERSION >= 201402L
+#define BOOST_STATIC_STRING_CPP14
+#undef BOOST_STATIC_STRING_CPP14_CONSTEXPR
+#define BOOST_STATIC_STRING_CPP14_CONSTEXPR constexpr
+#endif
+#if BOOST_STATIC_STRING_STANDARD_VERSION >= 201103L
+#define BOOST_STATIC_STRING_CPP11
+#undef BOOST_STATIC_STRING_CPP11_CONSTEXPR
 #define BOOST_STATIC_STRING_CPP11_CONSTEXPR constexpr
 #endif
 
@@ -173,6 +167,6 @@ using basic_string_view =
 #else
   std::basic_string_view<CharT, Traits>;
 #endif
-} // static_string
+} // static_strings
 } // boost
 #endif
\ No newline at end of file
diff --git a/include/boost/static_string/static_string.hpp b/include/boost/static_string/static_string.hpp
index bdbc14c..4b6ba5b 100644
--- a/include/boost/static_string/static_string.hpp
+++ b/include/boost/static_string/static_string.hpp
@@ -12,6 +12,7 @@
 #define BOOST_STATIC_STRING_STATIC_STRING_HPP
 
 #include <boost/static_string/config.hpp>
+
 #include <algorithm>
 #include <cstdint>
 #include <cstdio>
@@ -875,7 +876,6 @@ public:
   BOOST_STATIC_STRING_CPP14_CONSTEXPR
   basic_static_string(const_pointer s);
 
- 
   /** Construct a `basic_static_string`.
     
       Construct from a range of characters
@@ -4858,7 +4858,7 @@ hash_value(
   return boost::hash_range(str.begin(), str.end());
 }
 #endif
-} // static_string
+} // static_strings
 
 //------------------------------------------------------------------------------
 //
@@ -5498,7 +5498,7 @@ insert_unchecked(
   this->set_size(curr_size + count);
   return curr_data + index;
 }
-} // static_string
+} // static_strings
 } // boost
 #endif
 #endif
\ No newline at end of file