diff --git a/librz/arch/types/types-atomic.sdb.txt b/librz/arch/types/types-atomic.sdb.txt
index 437093b70d4..9807049ce9e 100644
--- a/librz/arch/types/types-atomic.sdb.txt
+++ b/librz/arch/types/types-atomic.sdb.txt
@@ -2,6 +2,10 @@ void=type
 type.void=
 type.void.size=0
 
+_Bool=type
+type._Bool=b
+type._Bool.size=8
+
 bool=type
 type.bool=b
 type.bool.size=8
@@ -16,6 +20,11 @@ type.short=w
 type.short.size=16
 type.short.typeclass=Signed Integral
 
+short int=type
+type.short int=w
+type.short int.size=16
+type.short int.typeclass=Signed Integral
+
 int=type
 type.int=d
 type.int.size=32
@@ -36,6 +45,71 @@ type.double=F
 type.double.size=64
 type.double.typeclass=Floating
 
+signed int=type
+type.signed int=i
+type.signed int.size=32
+type.signed int.typeclass=Signed Integral
+
+signed char=type
+type.signed char=b
+type.signed char.size=8
+type.signed char.typeclass=Signed Integral
+
+signed short=type
+type.signed short=w
+type.signed short.size=16
+type.signed short.typeclass=Signed Integral
+
+signed short int=type
+type.signed short int=w
+type.signed short int.size=16
+type.signed short int.typeclass=Signed Integral
+
+short signed int=type
+type.short signed int=w
+type.short signed int.size=16
+type.short signed int.typeclass=Signed Integral
+
+signed long=type
+type.signed long=d
+type.signed long.size=32
+type.signed long.typeclass=Signed Integral
+
+long unsigned=type
+type.long unsigned=d
+type.long unsigned.size=32
+type.long unsigned.typeclass=Signed Integral
+
+signed long int=type
+type.signed long int=d
+type.signed long int.size=32
+type.signed long int.typeclass=Signed Integral
+
+long signed int=type
+type.long signed int=d
+type.long signed int.size=32
+type.long signed int.typeclass=Signed Integral
+
+signed long long=type
+type.signed long long=q
+type.signed long long.size=64
+type.signed long long.typeclass=Signed Integral
+
+long long signed=type
+type.long long signed=q
+type.long long signed.size=64
+type.long long signed.typeclass=Signed Integral
+
+signed long long int=type
+type.signed long long int=q
+type.signed long long int.size=64
+type.signed long long int.typeclass=Signed Integral
+
+long long signed int=type
+type.long long signed int=q
+type.long long signed int.size=64
+type.long long signed int.typeclass=Signed Integral
+
 unsigned int=type
 type.unsigned int=i
 type.unsigned int.size=32
@@ -51,16 +125,56 @@ type.unsigned short=w
 type.unsigned short.size=16
 type.unsigned short.typeclass=Unsigned Integral
 
+unsigned short int=type
+type.unsigned short int=w
+type.unsigned short int.size=16
+type.unsigned short int.typeclass=Unsigned Integral
+
+short unsigned int=type
+type.short unsigned int=w
+type.short unsigned int.size=16
+type.short unsigned int.typeclass=Unsigned Integral
+
 unsigned long=type
 type.unsigned long=d
 type.unsigned long.size=32
 type.unsigned long.typeclass=Unsigned Integral
 
+long unsigned=type
+type.long unsigned=d
+type.long unsigned.size=32
+type.long unsigned.typeclass=Unsigned Integral
+
+unsigned long int=type
+type.unsigned long int=d
+type.unsigned long int.size=32
+type.unsigned long int.typeclass=Unsigned Integral
+
+long unsigned int=type
+type.long unsigned int=d
+type.long unsigned int.size=32
+type.long unsigned int.typeclass=Unsigned Integral
+
 unsigned long long=type
 type.unsigned long long=q
 type.unsigned long long.size=64
 type.unsigned long long.typeclass=Unsigned Integral
 
+long long unsigned=type
+type.long long unsigned=q
+type.long long unsigned.size=64
+type.long long unsigned.typeclass=Unsigned Integral
+
+unsigned long long int=type
+type.unsigned long long int=q
+type.unsigned long long int.size=64
+type.unsigned long long int.typeclass=Unsigned Integral
+
+long long unsigned int=type
+type.long long unsigned int=q
+type.long long unsigned int.size=64
+type.long long unsigned int.typeclass=Unsigned Integral
+
 long int=type
 type.long int=x
 type.long int.size=64
diff --git a/test/db/cmd/dwarf b/test/db/cmd/dwarf
index 2aba7a33699..e2f45f4673e 100644
--- a/test/db/cmd/dwarf
+++ b/test/db/cmd/dwarf
@@ -540,12 +540,12 @@ fn1
 arg int b origin=DWARF @ rbp-8
 arg int a origin=DWARF @ rbp-4
 var int arg1 @ rdi
-var uintmax_t arg2 @ rsi
+var unsigned long long arg2 @ rsi
 fn2
 arg void *q origin=DWARF @ rbp-8
 var float *arg1 @ rdi
 main
-var uintmax_t var_18h @ stack - 0x18
+var unsigned long lone var_18h @ stack - 0x18
 var int64_t var_ch @ stack - 0xc
 EOF
 RUN
diff --git a/test/db/cmd/types b/test/db/cmd/types
index 892d609a136..2b1bcefbc86 100644
--- a/test/db/cmd/types
+++ b/test/db/cmd/types
@@ -1788,10 +1788,10 @@ s sym.funcarg
 pd 1
 EOF
 EXPECT=<<EOF
-sym.funcarg(const char *arg1, uint64_t arg2);
+sym.funcarg(const char *arg1, unsigned long long arg2);
 ; arg const char *arg1 @ rdi
-; arg uint64_t arg2 @ rsi
-; var uint64_t var_14h @ stack - 0x14
+; arg unsigned long long arg2 @ rsi
+; var unsigned long long var_14h @ stack - 0x14
 ; var const char *var_10h @ stack - 0x10
 0x0000068a      55             push  rbp
 EOF
@@ -1809,10 +1809,10 @@ s sym.funcarg
 pd 1
 EOF
 EXPECT=<<EOF
-sym.funcarg(const char *arg_4h, unsigned long arg_8h);
+sym.funcarg(const char *arg_4h, size_t arg_8h);
 ; var int32_t var_8h @ stack - 0x8
 ; arg const char *arg_4h @ stack + 0x4
-; arg unsigned long arg_8h @ stack + 0x8
+; arg size_t arg_8h @ stack + 0x8
 0x0000054d      55             push  ebp
 EOF
 RUN
@@ -1879,7 +1879,7 @@ EOF
 EXPECT=<<EOF
 var int var_3ch @ stack - 0x3c
 var int64_t var_38h @ stack - 0x38
-var uint64_t var_30h @ stack - 0x30
+var unsigned long long var_30h @ stack - 0x30
 EOF
 RUN
 
@@ -1893,7 +1893,7 @@ afvl
 EOF
 EXPECT=<<EOF
 var void *va_args @ stack - 0x3c
-var uint64_t var_34h @ stack - 0x34
+var unsigned long long var_34h @ stack - 0x34
 var FILE *stream @ stack - 0x30
 var const char *s @ stack - 0x28
 var const char *var_20h @ stack - 0x20
@@ -1932,9 +1932,9 @@ var int *wstatus @ stack - 0x14d4
 var int64_t var_14cch @ stack - 0x14cc
 var int64_t var_14c8h @ stack - 0x14c8
 var int64_t var_14c4h @ stack - 0x14c4
-var uint64_t pid @ stack - 0x14c0
-var uint64_t var_14bch @ stack - 0x14bc
-var uint64_t var_14b8h @ stack - 0x14b8
+var unsigned long long pid @ stack - 0x14c0
+var unsigned long long var_14bch @ stack - 0x14bc
+var unsigned long long var_14b8h @ stack - 0x14b8
 var int64_t var_14b4h @ stack - 0x14b4
 var const char *var_14b0h @ stack - 0x14b0
 var const char *s @ stack - 0x14a8
@@ -1950,9 +1950,9 @@ var int64_t var_20h @ stack - 0x20
 arg int argc @ rdi
 arg char **argv @ rsi
 var char *str @ stack - 0xb8
-var int64_t var_ach @ stack - 0xac
+var long long signed int var_ach @ stack - 0xac
 var int64_t var_a8h @ stack - 0xa8
-var uint64_t var_a4h @ stack - 0xa4
+var unsigned long long var_a4h @ stack - 0xa4
 var int var_a0h @ stack - 0xa0
 var int var_9ch @ stack - 0x9c
 var int var_98h @ stack - 0x98
@@ -1971,14 +1971,14 @@ var char *var_68h @ stack - 0x68
 var char *var_60h @ stack - 0x60
 var char *var_58h @ stack - 0x58
 var char *var_50h @ stack - 0x50
-var uint64_t var_48h @ stack - 0x48
+var unsigned long long var_48h @ stack - 0x48
 var const char *s1 @ stack - 0x40
 var const char *s @ stack - 0x38
 var const char *var_30h @ stack - 0x30
 var const char *var_28h @ stack - 0x28
 var int64_t var_20h @ stack - 0x20
 var int64_t var_10h @ stack - 0x10
-arg int64_t arg1 @ rdi
+arg long long signed int arg1 @ rdi
 arg char *arg2 @ rsi
 EOF
 RUN