diff --git a/pwndbg/typeinfo.py b/pwndbg/typeinfo.py
index 78e189449..17ffd85dd 100644
--- a/pwndbg/typeinfo.py
+++ b/pwndbg/typeinfo.py
@@ -49,19 +49,19 @@ def update():
 
     module.char   = gdb.lookup_type('char')
     module.ulong  = lookup_types('unsigned long', 'uint', 'u32')
-    module.long   = lookup_types('long', 'int')
-    module.uchar  = lookup_types('unsigned char', 'ubyte')
+    module.long   = lookup_types('long', 'int', 'i32')
+    module.uchar  = lookup_types('unsigned char', 'ubyte', 'u8')
     module.ushort = lookup_types('unsigned short', 'ushort', 'u16')
-    module.uint   = lookup_types('unsigned int', 'uint')
+    module.uint   = lookup_types('unsigned int', 'uint', 'u32')
     module.void   = lookup_types('void', '()')
     module.uint8  = module.uchar
     module.uint16 = module.ushort
     module.uint32 = module.uint
     module.uint64 = lookup_types('unsigned long long', 'ulong', 'u64')
 
-    module.int8   = gdb.lookup_type('char')
+    module.int8   = lookup_types('char', 'i8')
     module.int16  = lookup_types('short', 'i16')
-    module.int32  = gdb.lookup_type('int')
+    module.int32  = lookup_types('int', 'i32')
     module.int64  = lookup_types('long long', 'long', 'i64')
 
     module.ssize_t = module.long