diff --git a/AK/StdLibExtras.h b/AK/StdLibExtras.h
index 96a36c7ea9..bfaaa4aac1 100644
--- a/AK/StdLibExtras.h
+++ b/AK/StdLibExtras.h
@@ -321,52 +321,52 @@ struct MakeUnsigned {
 
 template<>
 struct MakeUnsigned<signed char> {
-    typedef unsigned char type;
+    typedef unsigned char Type;
 };
 
 template<>
 struct MakeUnsigned<short> {
-    typedef unsigned short type;
+    typedef unsigned short Type;
 };
 
 template<>
 struct MakeUnsigned<int> {
-    typedef unsigned type;
+    typedef unsigned Type;
 };
 
 template<>
 struct MakeUnsigned<long> {
-    typedef unsigned long type;
+    typedef unsigned long Type;
 };
 
 template<>
 struct MakeUnsigned<long long> {
-    typedef unsigned long long type;
+    typedef unsigned long long Type;
 };
 
 template<>
 struct MakeUnsigned<unsigned char> {
-    typedef unsigned char type;
+    typedef unsigned char Type;
 };
 
 template<>
 struct MakeUnsigned<unsigned short> {
-    typedef unsigned short type;
+    typedef unsigned short Type;
 };
 
 template<>
 struct MakeUnsigned<unsigned int> {
-    typedef unsigned type;
+    typedef unsigned Type;
 };
 
 template<>
 struct MakeUnsigned<unsigned long> {
-    typedef unsigned long type;
+    typedef unsigned long Type;
 };
 
 template<>
 struct MakeUnsigned<unsigned long long> {
-    typedef unsigned long long type;
+    typedef unsigned long long Type;
 };
 
 template<typename T>
@@ -375,52 +375,52 @@ struct MakeSigned {
 
 template<>
 struct MakeSigned<signed char> {
-    typedef signed char type;
+    typedef signed char Type;
 };
 
 template<>
 struct MakeSigned<short> {
-    typedef short type;
+    typedef short Type;
 };
 
 template<>
 struct MakeSigned<int> {
-    typedef int type;
+    typedef int Type;
 };
 
 template<>
 struct MakeSigned<long> {
-    typedef long type;
+    typedef long Type;
 };
 
 template<>
 struct MakeSigned<long long> {
-    typedef long long type;
+    typedef long long Type;
 };
 
 template<>
 struct MakeSigned<unsigned char> {
-    typedef char type;
+    typedef char Type;
 };
 
 template<>
 struct MakeSigned<unsigned short> {
-    typedef short type;
+    typedef short Type;
 };
 
 template<>
 struct MakeSigned<unsigned int> {
-    typedef int type;
+    typedef int Type;
 };
 
 template<>
 struct MakeSigned<unsigned long> {
-    typedef long type;
+    typedef long Type;
 };
 
 template<>
 struct MakeSigned<unsigned long long> {
-    typedef long long type;
+    typedef long long Type;
 };
 
 template<class T>
diff --git a/AK/Types.h b/AK/Types.h
index 58bb08cfe5..87acffceec 100644
--- a/AK/Types.h
+++ b/AK/Types.h
@@ -42,7 +42,7 @@ typedef __INT8_TYPE__ i8;
 #ifdef __serenity__
 
 typedef __SIZE_TYPE__ size_t;
-typedef MakeSigned<size_t>::type ssize_t;
+typedef MakeSigned<size_t>::Type ssize_t;
 
 typedef __PTRDIFF_TYPE__ ptrdiff_t;
 
diff --git a/Libraries/LibX86/Instruction.h b/Libraries/LibX86/Instruction.h
index 1c4f87e9e1..08cb5f38f4 100644
--- a/Libraries/LibX86/Instruction.h
+++ b/Libraries/LibX86/Instruction.h
@@ -47,7 +47,7 @@ template<typename T>
 struct TypeTrivia {
     static const size_t bits = sizeof(T) * 8;
     static const T sign_bit = 1 << (bits - 1);
-    static const T mask = typename MakeUnsigned<T>::type(-1);
+    static const T mask = typename MakeUnsigned<T>::Type(-1);
 };
 
 template<typename T, typename U>