diff --git a/include/etl/alignment.h b/include/etl/alignment.h
index 6b2fcbe4..8b299f39 100644
--- a/include/etl/alignment.h
+++ b/include/etl/alignment.h
@@ -196,7 +196,7 @@ namespace etl
     };
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <const size_t LENGTH, const size_t ALIGNMENT>
   using aligned_storage_t = typename aligned_storage<LENGTH, ALIGNMENT>::type;
 #endif
@@ -210,7 +210,7 @@ namespace etl
   {
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <size_t LENGTH, typename T>
   using aligned_storage_as_t = typename aligned_storage_as<LENGTH, T>::type;
 #endif
diff --git a/include/etl/generators/largest_generator.h b/include/etl/generators/largest_generator.h
index c95a7d5e..4f2512d1 100644
--- a/include/etl/generators/largest_generator.h
+++ b/include/etl/generators/largest_generator.h
@@ -122,7 +122,7 @@ namespace etl
     };
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename... T>
   using largest_type_t = typename largest_type<T...>::type;
 #endif
@@ -319,7 +319,7 @@ namespace etl
     typedef typename etl::smallest_int_for_bits<etl::integral_limits<typename etl::make_signed<T>::type>::bits + 1>::type type;
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using larger_int_type_t = typename larger_int_type<T>::type;
 #endif
@@ -337,7 +337,7 @@ namespace etl
     typedef typename etl::smallest_uint_for_bits<etl::integral_limits<typename etl::make_unsigned<T>::type>::bits + 1>::type type;
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using larger_uint_type_t = typename larger_uint_type<T>::type;
 #endif
@@ -367,7 +367,7 @@ namespace etl
     typedef typename etl::smallest_int_for_bits<etl::integral_limits<T>::bits + 1>::type type;
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using larger_type_t = typename larger_type<T>::type;
 #endif
@@ -390,7 +390,7 @@ namespace etl
     };
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
     template <typename... T>
     using largest_t = typename largest<T...>::type;
 #endif
diff --git a/include/etl/generators/smallest_generator.h b/include/etl/generators/smallest_generator.h
index 71b62846..5bd7ef59 100644
--- a/include/etl/generators/smallest_generator.h
+++ b/include/etl/generators/smallest_generator.h
@@ -122,7 +122,7 @@ namespace etl
     };
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename... T>
   using smallest_type_t = typename smallest_type<T...>::type;
 #endif
@@ -329,7 +329,7 @@ namespace etl
     typedef typename private_smallest::best_fit_uint_type<TYPE_INDEX>::type type;
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <size_t NBITS>
   using smallest_uint_for_bits_t = typename smallest_uint_for_bits<NBITS>::type;
 #endif
@@ -355,7 +355,7 @@ namespace etl
     typedef typename private_smallest::best_fit_int_type<TYPE_INDEX>::type type;
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <size_t NBITS>
   using smallest_int_for_bits_t = typename smallest_int_for_bits<NBITS>::type;
 #endif
@@ -381,7 +381,7 @@ namespace etl
     typedef typename private_smallest::best_fit_uint_type<TYPE_INDEX>::type type;
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <uintmax_t VALUE>
   using smallest_uint_for_value_t = typename smallest_uint_for_value<VALUE>::type;
 #endif
@@ -407,7 +407,7 @@ namespace etl
     typedef typename private_smallest::best_fit_int_type<TYPE_INDEX>::type type;
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <intmax_t VALUE>
   using smallest_int_for_value_t = typename smallest_int_for_value<VALUE>::type;
 #endif
diff --git a/include/etl/generators/type_lookup_generator.h b/include/etl/generators/type_lookup_generator.h
index a16564d3..901ec71d 100644
--- a/include/etl/generators/type_lookup_generator.h
+++ b/include/etl/generators/type_lookup_generator.h
@@ -129,7 +129,7 @@ namespace etl
       static_assert(!(etl::is_same<nulltype, type>::value), "Invalid id");
     };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
     template <int ID>
     using type_from_id_t = typename type_from_id<ID>::type;
 #endif
@@ -225,7 +225,7 @@ namespace etl
       static_assert(!etl::is_same<type, nulltype>::value, "Type match not found");
     };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
     // Template alias.
     template <typename T>
     using type_from_type_t = typename type_from_type<T>::type;
diff --git a/include/etl/generators/type_select_generator.h b/include/etl/generators/type_select_generator.h
index 4add070c..cb0e9ce6 100644
--- a/include/etl/generators/type_select_generator.h
+++ b/include/etl/generators/type_select_generator.h
@@ -94,7 +94,7 @@ namespace etl
       using type = typename type_select_helper<ID, 0, TTypes...>::type;
     };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
     template <size_t ID>
     using select_t = typename select<ID>::type;
 #endif
diff --git a/include/etl/generators/type_traits_generator.h b/include/etl/generators/type_traits_generator.h
index 6377889a..d5f15c17 100644
--- a/include/etl/generators/type_traits_generator.h
+++ b/include/etl/generators/type_traits_generator.h
@@ -136,7 +136,7 @@ namespace etl
   template <typename T> struct remove_reference { typedef T type; };
   template <typename T> struct remove_reference<T&> { typedef T type; };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_reference_t = typename remove_reference<T>::type;
 #endif
@@ -153,7 +153,7 @@ namespace etl
   template <typename T> struct remove_pointer<volatile T* const> { typedef volatile T type; };
   template <typename T> struct remove_pointer<const volatile T* const> { typedef const volatile T type; };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_pointer_t = typename remove_pointer<T>::type;
 #endif
@@ -162,7 +162,7 @@ namespace etl
   /// add_pointer
   template <typename T> struct add_pointer { typedef typename remove_reference<T>::type* type; };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_pointer_t = typename add_pointer<T>::type;
 #endif
@@ -183,7 +183,7 @@ namespace etl
   template <typename T> struct remove_const { typedef T type; };
   template <typename T> struct remove_const<const T> { typedef T type; };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_const_t = typename remove_const<T>::type;
 #endif
@@ -193,7 +193,7 @@ namespace etl
   template <typename T> struct add_const { typedef const T type; };
   template <typename T> struct add_const<const T> { typedef const T type; };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_const_t = typename add_const<T>::type;
 #endif
@@ -214,7 +214,7 @@ namespace etl
   template <typename T> struct remove_volatile { typedef T type; };
   template <typename T> struct remove_volatile<volatile T> { typedef T type; };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_volatile_t = typename remove_volatile<T>::type;
 #endif
@@ -224,7 +224,7 @@ namespace etl
   template <typename T> struct add_volatile { typedef volatile T type; };
   template <typename T> struct add_volatile<volatile T> { typedef volatile T type; };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_volatile_t = typename add_volatile<T>::type;
 #endif
@@ -236,7 +236,7 @@ namespace etl
     typedef typename remove_volatile<typename remove_const<T>::type>::type type;
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_cv_t = typename remove_cv<T>::type;
 #endif
@@ -248,7 +248,7 @@ namespace etl
     typedef typename add_volatile<typename add_const<T>::type>::type type;
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_cv_t = typename add_cv<T>::type;
 #endif
@@ -527,7 +527,7 @@ namespace etl
   template <typename T> struct make_signed<volatile T> : add_volatile<typename make_signed<T>::type> {};
   template <typename T> struct make_signed<const volatile T> : add_const<typename add_volatile<typename make_signed<T>::type>::type> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using make_signed_t = typename make_signed<T>::type;
 #endif
@@ -555,7 +555,7 @@ namespace etl
   template <typename T> struct make_unsigned<volatile T> : add_volatile<typename make_unsigned<T>::type> {};
   template <typename T> struct make_unsigned<const volatile T> : add_const<typename add_volatile<typename make_unsigned<T>::type>::type> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using make_unsigned_t = typename make_unsigned<T>::type;
 #endif
@@ -565,7 +565,7 @@ namespace etl
   template <bool B, typename T = void> struct enable_if {};
   template <typename T> struct enable_if<true, T> { typedef T type; };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <bool B, typename T = void>
   using enable_if_t = typename enable_if<B, T>::type;
 #endif
@@ -598,7 +598,7 @@ namespace etl
   template <typename T> struct remove_extent<T[]> { typedef T type; };
   template <typename T, size_t MAXN> struct remove_extent<T[MAXN]> { typedef T type; };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_extent_t = typename remove_extent<T>::type;
 #endif
@@ -609,7 +609,7 @@ namespace etl
   template <typename T> struct remove_all_extents<T[]> { typedef typename remove_all_extents<T>::type type; };
   template <typename T, size_t MAXN> struct remove_all_extents<T[MAXN]> { typedef typename remove_all_extents<T>::type type; };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_all_extents_t = typename remove_all_extents<T>::type;
 #endif
@@ -636,7 +636,7 @@ namespace etl
       typename etl::remove_cv<U>::type>::type type;
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using decay_t = typename decay<T>::type;
 #endif
@@ -700,7 +700,7 @@ namespace etl
   template <>           struct add_lvalue_reference<volatile void> { typedef volatile void type; };
   template <>           struct add_lvalue_reference<const volatile void> { typedef const volatile void type; };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_lvalue_reference_t = typename etl::add_lvalue_reference<T>::type;
 #endif
@@ -716,7 +716,7 @@ namespace etl
   template <>           struct add_rvalue_reference<const volatile void> { using type = const volatile void; };
 #endif
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_rvalue_reference_t = typename etl::add_rvalue_reference<T>::type;
 #endif
@@ -830,7 +830,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct remove_reference : std::remove_reference<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_reference_t = std::remove_reference_t<T>;
 #endif
@@ -840,7 +840,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct remove_pointer : std::remove_pointer<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_pointer_t = std::remove_pointer_t<T>;
 #endif
@@ -850,7 +850,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct add_pointer : std::add_pointer<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_pointer_t = std::add_pointer_t<T>;
 #endif
@@ -870,7 +870,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct remove_const : std::remove_const<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_const_t = std::remove_const_t<T>;
 #endif
@@ -880,7 +880,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct add_const : std::add_const<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_const_t = std::add_const_t<T>;
 #endif
@@ -900,7 +900,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct remove_volatile : std::remove_volatile<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_volatile_t = std::remove_volatile_t<T>;
 #endif
@@ -910,7 +910,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct add_volatile : std::add_volatile<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_volatile_t = std::add_volatile_t<T>;
 #endif
@@ -920,7 +920,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct remove_cv : std::remove_cv<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_cv_t = std::remove_cv_t<T>;
 #endif
@@ -930,7 +930,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct add_cv : std::add_cv<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_cv_t = std::add_cv_t<T>;
 #endif
@@ -1207,7 +1207,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct make_signed : std::make_signed<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using make_signed_t = std::make_signed_t<T>;
 #endif
@@ -1217,7 +1217,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct make_unsigned : std::make_unsigned<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using make_unsigned_t = std::make_unsigned_t<T>;
 #endif
@@ -1227,7 +1227,7 @@ namespace etl
   ///\ingroup type_traits
   template <bool B, typename T = void> struct enable_if : std::enable_if<B, T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <bool B, typename T = void>
   using enable_if_t = std::enable_if_t<B, T>;
 #endif
@@ -1248,7 +1248,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct remove_extent : std::remove_extent<T> { };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_extent_t = std::remove_extent_t<T>;
 #endif
@@ -1258,7 +1258,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct remove_all_extents : std::remove_all_extents<T> { };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_all_extents_t = std::remove_all_extents_t<T>;
 #endif
@@ -1278,7 +1278,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct decay : std::decay<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using decay_t = std::decay_t<T>;
 #endif
@@ -1306,7 +1306,7 @@ namespace etl
   /// add_lvalue_reference
   template <typename T> struct add_lvalue_reference : std::add_lvalue_reference<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_lvalue_reference_t = std::add_lvalue_reference_t<T>;
 #endif
@@ -1317,7 +1317,7 @@ namespace etl
   template <typename T> struct add_rvalue_reference : std::add_rvalue_reference<T> {};
 #endif
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_rvalue_reference_t = std::add_rvalue_reference_t<T>;
 #endif
diff --git a/include/etl/largest.h b/include/etl/largest.h
index 98578ee1..cb5f390b 100644
--- a/include/etl/largest.h
+++ b/include/etl/largest.h
@@ -110,7 +110,7 @@ namespace etl
     };
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename... T>
   using largest_type_t = typename largest_type<T...>::type;
 #endif
@@ -271,7 +271,7 @@ namespace etl
     typedef typename etl::smallest_int_for_bits<etl::integral_limits<typename etl::make_signed<T>::type>::bits + 1>::type type;
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using larger_int_type_t = typename larger_int_type<T>::type;
 #endif
@@ -289,7 +289,7 @@ namespace etl
     typedef typename etl::smallest_uint_for_bits<etl::integral_limits<typename etl::make_unsigned<T>::type>::bits + 1>::type type;
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using larger_uint_type_t = typename larger_uint_type<T>::type;
 #endif
@@ -319,7 +319,7 @@ namespace etl
     typedef typename etl::smallest_int_for_bits<etl::integral_limits<T>::bits + 1>::type type;
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using larger_type_t = typename larger_type<T>::type;
 #endif
@@ -342,7 +342,7 @@ namespace etl
     };
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
     template <typename... T>
     using largest_t = typename largest<T...>::type;
 #endif
diff --git a/include/etl/memory.h b/include/etl/memory.h
index c491da92..cdc3d7ea 100644
--- a/include/etl/memory.h
+++ b/include/etl/memory.h
@@ -2088,7 +2088,7 @@ namespace etl
 #endif
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T, size_t N_Objects>
   using uninitialized_buffer_of_v = typename uninitialized_buffer_of<T, N_Objects>::buffer;
 #endif
diff --git a/include/etl/smallest.h b/include/etl/smallest.h
index d6e23c2d..fbd953f7 100644
--- a/include/etl/smallest.h
+++ b/include/etl/smallest.h
@@ -110,7 +110,7 @@ namespace etl
     };
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename... T>
   using smallest_type_t = typename smallest_type<T...>::type;
 #endif
@@ -299,7 +299,7 @@ namespace etl
     typedef typename private_smallest::best_fit_uint_type<TYPE_INDEX>::type type;
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <size_t NBITS>
   using smallest_uint_for_bits_t = typename smallest_uint_for_bits<NBITS>::type;
 #endif
@@ -325,7 +325,7 @@ namespace etl
     typedef typename private_smallest::best_fit_int_type<TYPE_INDEX>::type type;
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <size_t NBITS>
   using smallest_int_for_bits_t = typename smallest_int_for_bits<NBITS>::type;
 #endif
@@ -351,7 +351,7 @@ namespace etl
     typedef typename private_smallest::best_fit_uint_type<TYPE_INDEX>::type type;
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <uintmax_t VALUE>
   using smallest_uint_for_value_t = typename smallest_uint_for_value<VALUE>::type;
 #endif
@@ -377,7 +377,7 @@ namespace etl
     typedef typename private_smallest::best_fit_int_type<TYPE_INDEX>::type type;
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <intmax_t VALUE>
   using smallest_int_for_value_t = typename smallest_int_for_value<VALUE>::type;
 #endif
diff --git a/include/etl/type_lookup.h b/include/etl/type_lookup.h
index 1042eccd..c7f67eb1 100644
--- a/include/etl/type_lookup.h
+++ b/include/etl/type_lookup.h
@@ -117,7 +117,7 @@ namespace etl
       static_assert(!(etl::is_same<nulltype, type>::value), "Invalid id");
     };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
     template <int ID>
     using type_from_id_t = typename type_from_id<ID>::type;
 #endif
@@ -213,7 +213,7 @@ namespace etl
       static_assert(!etl::is_same<type, nulltype>::value, "Type match not found");
     };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
     // Template alias.
     template <typename T>
     using type_from_type_t = typename type_from_type<T>::type;
diff --git a/include/etl/type_select.h b/include/etl/type_select.h
index 44e15561..71ded97f 100644
--- a/include/etl/type_select.h
+++ b/include/etl/type_select.h
@@ -82,7 +82,7 @@ namespace etl
       using type = typename type_select_helper<ID, 0, TTypes...>::type;
     };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
     template <size_t ID>
     using select_t = typename select<ID>::type;
 #endif
diff --git a/include/etl/type_traits.h b/include/etl/type_traits.h
index 3112b967..18215892 100644
--- a/include/etl/type_traits.h
+++ b/include/etl/type_traits.h
@@ -124,7 +124,7 @@ namespace etl
   template <typename T> struct remove_reference { typedef T type; };
   template <typename T> struct remove_reference<T&> { typedef T type; };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_reference_t = typename remove_reference<T>::type;
 #endif
@@ -141,7 +141,7 @@ namespace etl
   template <typename T> struct remove_pointer<volatile T* const> { typedef volatile T type; };
   template <typename T> struct remove_pointer<const volatile T* const> { typedef const volatile T type; };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_pointer_t = typename remove_pointer<T>::type;
 #endif
@@ -150,7 +150,7 @@ namespace etl
   /// add_pointer
   template <typename T> struct add_pointer { typedef typename remove_reference<T>::type* type; };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_pointer_t = typename add_pointer<T>::type;
 #endif
@@ -171,7 +171,7 @@ namespace etl
   template <typename T> struct remove_const { typedef T type; };
   template <typename T> struct remove_const<const T> { typedef T type; };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_const_t = typename remove_const<T>::type;
 #endif
@@ -181,7 +181,7 @@ namespace etl
   template <typename T> struct add_const { typedef const T type; };
   template <typename T> struct add_const<const T> { typedef const T type; };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_const_t = typename add_const<T>::type;
 #endif
@@ -202,7 +202,7 @@ namespace etl
   template <typename T> struct remove_volatile { typedef T type; };
   template <typename T> struct remove_volatile<volatile T> { typedef T type; };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_volatile_t = typename remove_volatile<T>::type;
 #endif
@@ -212,7 +212,7 @@ namespace etl
   template <typename T> struct add_volatile { typedef volatile T type; };
   template <typename T> struct add_volatile<volatile T> { typedef volatile T type; };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_volatile_t = typename add_volatile<T>::type;
 #endif
@@ -224,7 +224,7 @@ namespace etl
     typedef typename remove_volatile<typename remove_const<T>::type>::type type;
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_cv_t = typename remove_cv<T>::type;
 #endif
@@ -236,7 +236,7 @@ namespace etl
     typedef typename add_volatile<typename add_const<T>::type>::type type;
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_cv_t = typename add_cv<T>::type;
 #endif
@@ -515,7 +515,7 @@ namespace etl
   template <typename T> struct make_signed<volatile T> : add_volatile<typename make_signed<T>::type> {};
   template <typename T> struct make_signed<const volatile T> : add_const<typename add_volatile<typename make_signed<T>::type>::type> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using make_signed_t = typename make_signed<T>::type;
 #endif
@@ -543,7 +543,7 @@ namespace etl
   template <typename T> struct make_unsigned<volatile T> : add_volatile<typename make_unsigned<T>::type> {};
   template <typename T> struct make_unsigned<const volatile T> : add_const<typename add_volatile<typename make_unsigned<T>::type>::type> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using make_unsigned_t = typename make_unsigned<T>::type;
 #endif
@@ -553,7 +553,7 @@ namespace etl
   template <bool B, typename T = void> struct enable_if {};
   template <typename T> struct enable_if<true, T> { typedef T type; };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <bool B, typename T = void>
   using enable_if_t = typename enable_if<B, T>::type;
 #endif
@@ -586,7 +586,7 @@ namespace etl
   template <typename T> struct remove_extent<T[]> { typedef T type; };
   template <typename T, size_t MAXN> struct remove_extent<T[MAXN]> { typedef T type; };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_extent_t = typename remove_extent<T>::type;
 #endif
@@ -597,7 +597,7 @@ namespace etl
   template <typename T> struct remove_all_extents<T[]> { typedef typename remove_all_extents<T>::type type; };
   template <typename T, size_t MAXN> struct remove_all_extents<T[MAXN]> { typedef typename remove_all_extents<T>::type type; };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_all_extents_t = typename remove_all_extents<T>::type;
 #endif
@@ -624,7 +624,7 @@ namespace etl
       typename etl::remove_cv<U>::type>::type type;
   };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using decay_t = typename decay<T>::type;
 #endif
@@ -688,7 +688,7 @@ namespace etl
   template <>           struct add_lvalue_reference<volatile void> { typedef volatile void type; };
   template <>           struct add_lvalue_reference<const volatile void> { typedef const volatile void type; };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_lvalue_reference_t = typename etl::add_lvalue_reference<T>::type;
 #endif
@@ -704,7 +704,7 @@ namespace etl
   template <>           struct add_rvalue_reference<const volatile void> { using type = const volatile void; };
 #endif
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_rvalue_reference_t = typename etl::add_rvalue_reference<T>::type;
 #endif
@@ -818,7 +818,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct remove_reference : std::remove_reference<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_reference_t = std::remove_reference_t<T>;
 #endif
@@ -828,7 +828,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct remove_pointer : std::remove_pointer<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_pointer_t = std::remove_pointer_t<T>;
 #endif
@@ -838,7 +838,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct add_pointer : std::add_pointer<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_pointer_t = std::add_pointer_t<T>;
 #endif
@@ -858,7 +858,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct remove_const : std::remove_const<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_const_t = std::remove_const_t<T>;
 #endif
@@ -868,7 +868,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct add_const : std::add_const<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_const_t = std::add_const_t<T>;
 #endif
@@ -888,7 +888,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct remove_volatile : std::remove_volatile<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_volatile_t = std::remove_volatile_t<T>;
 #endif
@@ -898,7 +898,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct add_volatile : std::add_volatile<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_volatile_t = std::add_volatile_t<T>;
 #endif
@@ -908,7 +908,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct remove_cv : std::remove_cv<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_cv_t = std::remove_cv_t<T>;
 #endif
@@ -918,7 +918,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct add_cv : std::add_cv<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_cv_t = std::add_cv_t<T>;
 #endif
@@ -1195,7 +1195,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct make_signed : std::make_signed<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using make_signed_t = std::make_signed_t<T>;
 #endif
@@ -1205,7 +1205,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct make_unsigned : std::make_unsigned<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using make_unsigned_t = std::make_unsigned_t<T>;
 #endif
@@ -1215,7 +1215,7 @@ namespace etl
   ///\ingroup type_traits
   template <bool B, typename T = void> struct enable_if : std::enable_if<B, T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <bool B, typename T = void>
   using enable_if_t = std::enable_if_t<B, T>;
 #endif
@@ -1236,7 +1236,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct remove_extent : std::remove_extent<T> { };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_extent_t = std::remove_extent_t<T>;
 #endif
@@ -1246,7 +1246,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct remove_all_extents : std::remove_all_extents<T> { };
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using remove_all_extents_t = std::remove_all_extents_t<T>;
 #endif
@@ -1266,7 +1266,7 @@ namespace etl
   ///\ingroup type_traits
   template <typename T> struct decay : std::decay<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using decay_t = std::decay_t<T>;
 #endif
@@ -1294,7 +1294,7 @@ namespace etl
   /// add_lvalue_reference
   template <typename T> struct add_lvalue_reference : std::add_lvalue_reference<T> {};
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_lvalue_reference_t = std::add_lvalue_reference_t<T>;
 #endif
@@ -1305,7 +1305,7 @@ namespace etl
   template <typename T> struct add_rvalue_reference : std::add_rvalue_reference<T> {};
 #endif
 
-#if ETL_CPP14_SUPPORTED
+#if ETL_CPP11_SUPPORTED
   template <typename T>
   using add_rvalue_reference_t = std::add_rvalue_reference_t<T>;
 #endif
diff --git a/include/etl/version.h b/include/etl/version.h
index d4712e24..e695ef3f 100644
--- a/include/etl/version.h
+++ b/include/etl/version.h
@@ -38,7 +38,7 @@ SOFTWARE.
 ///\ingroup utilities
 
 #define ETL_VERSION_MAJOR 20
-#define ETL_VERSION_MINOR  0
+#define ETL_VERSION_MINOR  1
 #define ETL_VERSION_PATCH  0
 #define ETL_VERSION       ETL_STRINGIFY(ETL_VERSION_MAJOR) "." ETL_STRINGIFY(ETL_VERSION_MINOR) "." ETL_STRINGIFY(ETL_VERSION_PATCH)
 #define ETL_VERSION_W     ETL_STRINGIFY(ETL_VERSION_MAJOR) L"." ETL_STRINGIFY(ETL_VERSION_MINOR) L"." ETL_STRINGIFY(ETL_VERSION_PATCH)
diff --git a/library.json b/library.json
index b493356a..6951afb2 100644
--- a/library.json
+++ b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "ETL Embedded Template Library",
-  "version": "20.0.0",
+  "version": "20.1.0",
   "author s": {
     "name": "John Wellbelove",
     "email": "john.wellbelove@etlcpp.com"
diff --git a/library.properties b/library.properties
index 2b145669..c22ca401 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=Embedded Template Library ETL
-version=20.0.0
+version=20.1.0
 author= John Wellbelove <john.wellbelove@etlcpp.com>
 maintainer=John Wellbelove <john.wellbelove@etlcpp.com>
 license=MIT
diff --git a/support/Release notes.txt b/support/Release notes.txt
index fca3d8c9..076aa18a 100644
--- a/support/Release notes.txt	
+++ b/support/Release notes.txt	
@@ -1,3 +1,7 @@
+===============================================================================
+20.1.0
+Changed template aliases so they are available for C++11 rather than C++14.
+
 ===============================================================================
 20.0.0
 Removed source 'etl::imessage_router&' parameter from the message framework 'receive'