diff --git a/include/etl/overload.h b/include/etl/overload.h
index 2fc7640b..fb9dd080 100644
--- a/include/etl/overload.h
+++ b/include/etl/overload.h
@@ -40,44 +40,45 @@ namespace etl
   //*************************************************************************
   /// Variadic template definition of overload.
   //*************************************************************************
-  template<class... Ts>
-  struct overload : Ts...
+  template<class... TOverloads>
+  struct overload : TOverloads...
   {
-    using Ts::operator()...;
+    using TOverloads::operator()...;
   };
 
   //*************************************************************************
   /// Template deduction guide.
   //*************************************************************************
-  template<class... Ts> overload(Ts...)->overload<Ts...>;
+  template<class... TOverloads> overload(TOverloads...)->overload<TOverloads...>;
 
 #else
   //*************************************************************************
   /// Variadic template definition of overload.
   //*************************************************************************
-  template <typename T, typename... Ts>
-  struct overload : T, overload<Ts...>
+  template <typename TOverload, typename... TOthers>
+  struct overload : TOverload, overload<TOthers...>
   {
-    using T::operator();
-    using overload<Ts...>::operator();
+    using TOverload::operator();
+    using overload<TOthers...>::operator();
   };
 
   //*************************************************************************
   /// Template specialisation of overload for one type.
   //*************************************************************************
-  template <typename T> struct overload<T> : T
+  template <typename TOverload> 
+  struct overload<TOverload> : TOverload
   {
-    using T::operator();
+    using TOverload::operator();
   };
 #endif
 
   //*************************************************************************
   /// Make an overload.
   //*************************************************************************
-  template <typename... T>
-  constexpr auto make_overload(T&&... t)
+  template <typename... TOverloads>
+  constexpr auto make_overload(TOverloads&&... overloads)
   {
-    return overload<T...>{ etl::forward<T>(t)... };
+    return overload<TOverloads...>{ etl::forward<TOverloads>(overloads)... };
   }
 }
 
diff --git a/test/etl_profile.h b/test/etl_profile.h
index bbb0926b..3212f83b 100644
--- a/test/etl_profile.h
+++ b/test/etl_profile.h
@@ -98,7 +98,7 @@ SOFTWARE.
   #define ETL_MEM_CAST_FORCE_CPP03
 #endif
 
-#define ETL_OVERLOAD_FORCE_CPP11
+//#define ETL_OVERLOAD_FORCE_CPP11
 
 #if defined(ETL_NO_STL)
   #define ETL_TIMER_SEMAPHORE_TYPE uint32_t