diff --git a/kernel/include/console.hpp b/kernel/include/console.hpp
index 8f6852c4..cc2ef4bb 100644
--- a/kernel/include/console.hpp
+++ b/kernel/include/console.hpp
@@ -40,12 +40,12 @@ void k_print(int64_t number);
 void k_printf(const char* fmt, ...);
 
 template<typename... Arguments>
-typename std::enable_if<(sizeof...(Arguments) == 0), void>::type k_print_line(const Arguments&... args){
+typename std::enable_if_t<(sizeof...(Arguments) == 0)> k_print_line(const Arguments&... args){
     k_print('\n');
 }
 
 template<typename... Arguments>
-typename std::enable_if<(sizeof...(Arguments) > 0), void>::type k_print_line(const Arguments&... args){
+typename std::enable_if_t<(sizeof...(Arguments) > 0)> k_print_line(const Arguments&... args){
     k_print(args...);
     k_print('\n');
 }
diff --git a/tstl/include/memory.hpp b/tstl/include/memory.hpp
index e591df9a..f4dac6f2 100644
--- a/tstl/include/memory.hpp
+++ b/tstl/include/memory.hpp
@@ -36,13 +36,13 @@ struct has_overloaded_addressof {
 };
 
 template <typename T>
-constexpr typename std::disable_if<has_overloaded_addressof<T>::value, T*>::type
+constexpr typename std::disable_if_t<has_overloaded_addressof<T>::value, T*>
 static_addressof(T& ref){
   return &ref;
 }
 
 template <typename T>
-constexpr typename std::enable_if<has_overloaded_addressof<T>::value, T*>::type
+constexpr typename std::enable_if_t<has_overloaded_addressof<T>::value, T*>
 static_addressof(T& ref){
   return std::addressof(ref);
 }
diff --git a/tstl/include/type_traits.hpp b/tstl/include/type_traits.hpp
index 2f0d6b83..4b567bd1 100644
--- a/tstl/include/type_traits.hpp
+++ b/tstl/include/type_traits.hpp
@@ -36,12 +36,12 @@ template<typename T, typename Enable = void>
 struct add_rvalue_reference;
 
 template<typename T>
-struct add_rvalue_reference<T, typename std::enable_if<std::is_reference<T>::value>::type> {
+struct add_rvalue_reference<T, typename std::enable_if_t<std::is_reference<T>::value>> {
     typedef T type;
 };
 
 template<typename T>
-struct add_rvalue_reference<T, typename std::enable_if<!std::is_reference<T>::value>::type> {
+struct add_rvalue_reference<T, typename std::disable_if_t<!std::is_reference<T>::value>> {
     typedef T&& type;
 };