diff --git a/librz/arch/types/types-16.sdb.txt b/librz/arch/types/types-16.sdb.txt
index 3f02b390599..eea9ee9903c 100644
--- a/librz/arch/types/types-16.sdb.txt
+++ b/librz/arch/types/types-16.sdb.txt
@@ -51,6 +51,36 @@ type.id_t=w
 type.id_t.size=16
 type.id_t.typeclass=Integral
 
+long=type
+type.long=d
+type.long.size=32
+type.long.typeclass=Signed Integral
+
+long int=type
+type.long int=d
+type.long int.size=32
+type.long int.typeclass=Signed 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
+
 unknown_t=type
 type.unknown_t=w
 type.unknown_t.size=16
diff --git a/librz/arch/types/types-32.sdb.txt b/librz/arch/types/types-32.sdb.txt
index f953fef485f..a134b22eadb 100644
--- a/librz/arch/types/types-32.sdb.txt
+++ b/librz/arch/types/types-32.sdb.txt
@@ -51,6 +51,36 @@ type.id_t=d
 type.id_t.size=32
 type.id_t.typeclass=Integral
 
+long=type
+type.long=d
+type.long.size=32
+type.long.typeclass=Signed Integral
+
+long int=type
+type.long int=d
+type.long int.size=32
+type.long int.typeclass=Signed 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
+
 unknown_t=type
 type.unknown_t=d
 type.unknown_t.size=32
diff --git a/librz/arch/types/types-64.sdb.txt b/librz/arch/types/types-64.sdb.txt
index dba63afd0c8..92654f2b559 100644
--- a/librz/arch/types/types-64.sdb.txt
+++ b/librz/arch/types/types-64.sdb.txt
@@ -51,6 +51,36 @@ type.id_t=q
 type.id_t.size=64
 type.id_t.typeclass=Integral
 
+long=type
+type.long=q
+type.long.size=64
+type.long.typeclass=Signed Integral
+
+long int=type
+type.long int=q
+type.long int.size=64
+type.long int.typeclass=Signed Integral
+
+unsigned long=type
+type.unsigned long=q
+type.unsigned long.size=64
+type.unsigned long.typeclass=Unsigned Integral
+
+long unsigned=type
+type.long unsigned=q
+type.long unsigned.size=64
+type.long unsigned.typeclass=Unsigned Integral
+
+unsigned long int=type
+type.unsigned long int=q
+type.unsigned long int.size=64
+type.unsigned long int.typeclass=Unsigned Integral
+
+long unsigned int=type
+type.long unsigned int=q
+type.long unsigned int.size=64
+type.long unsigned int.typeclass=Unsigned Integral
+
 unknown_t=type
 type.unknown_t=q
 type.unknown_t.size=64
diff --git a/librz/arch/types/types-atomic.sdb.txt b/librz/arch/types/types-atomic.sdb.txt
index 437093b70d4..a1e327699e2 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,16 +20,16 @@ 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
 type.int.typeclass=Signed Integral
 
-long=type
-type.long=x
-type.long.size=64
-type.long.typeclass=Signed Integral
-
 float=type
 type.float=f
 type.float.size=32
@@ -36,6 +40,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,20 +120,35 @@ type.unsigned short=w
 type.unsigned short.size=16
 type.unsigned short.typeclass=Unsigned Integral
 
-unsigned long=type
-type.unsigned long=d
-type.unsigned long.size=32
-type.unsigned long.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 long=type
 type.unsigned long long=q
 type.unsigned long long.size=64
 type.unsigned long long.typeclass=Unsigned Integral
 
-long int=type
-type.long int=x
-type.long int.size=64
-type.long int.typeclass=Signed 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 double=type
 type.long double=F
diff --git a/test/db/analysis/x86_64 b/test/db/analysis/x86_64
index b7fbbee0474..1f3218149bf 100644
--- a/test/db/analysis/x86_64
+++ b/test/db/analysis/x86_64
@@ -4311,10 +4311,10 @@ arg int64_t arg2 @ rsi
 void fcn.00010270(int64_t arg1, int64_t arg2, const char **s, int64_t arg4, int64_t arg5);
 var const char *s2 @ stack - 0xc8
 var void *s1 @ stack - 0xc0
-var uint64_t var_b8h @ stack - 0xb8
+var unsigned long long var_b8h @ stack - 0xb8
 var int64_t var_b0h @ stack - 0xb0
 var int64_t var_a8h @ stack - 0xa8
-var uint64_t var_98h @ stack - 0x98
+var unsigned long long var_98h @ stack - 0x98
 var int64_t var_94h @ stack - 0x94
 var int64_t var_90h @ stack - 0x90
 var int64_t var_88h @ stack - 0x88
diff --git a/test/db/archos/linux-x64/debuginfod b/test/db/archos/linux-x64/debuginfod
index b82c11a64ad..71428931b6b 100644
--- a/test/db/archos/linux-x64/debuginfod
+++ b/test/db/archos/linux-x64/debuginfod
@@ -69,7 +69,7 @@ paddr      size  vaddr      vsize align perm name               type       flags
 |           ; var char **arg1 @ rdi
 |           ; var const char *arg2 @ rsi
 |           ; var int64_t arg7 @ xmm0
-|           ; var uintmax_t arg3 @ rdx
+|           ; var unsigned long long arg3 @ rdx
 |           ; var some_t *arg4 @ rcx
 |           ; arg int a @ stack - 0x10
 |           ; arg char *g @ stack - 0x18
diff --git a/test/db/cmd/cmd_open b/test/db/cmd/cmd_open
index e689dfce461..b807f89b70f 100644
--- a/test/db/cmd/cmd_open
+++ b/test/db/cmd/cmd_open
@@ -18,8 +18,8 @@ pfn~?
 ol~?
 EOF
 EXPECT=<<EOF
-41
-99
+63
+121
 1
 EOF
 RUN
diff --git a/test/db/cmd/dwarf b/test/db/cmd/dwarf
index 2aba7a33699..478d7fe9322 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 long 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..26e8fc0bdfb 100644
--- a/test/db/cmd/types
+++ b/test/db/cmd/types
@@ -216,7 +216,7 @@ pf "F long double"
 pf "f float"
 pf "d int"
 pf "w short"
-pf "x long"
+pf "q long"
 pf "q long long"
 pf "q size_t"
 pf "q uid_t"
@@ -1613,8 +1613,8 @@ ar bp=0x98
 afvd var_70h
 EOF
 EXPECT=<<EOF
-var uint64_t var_80h @ stack - 0x80
-var uint64_t var_71h @ stack - 0x71
+var unsigned long long var_80h @ stack - 0x80
+var unsigned long long var_71h @ stack - 0x71
 var int64_t var_70h @ stack - 0x70
 var char *var_60h @ stack - 0x60
 var int64_t var_58h @ stack - 0x58
@@ -1627,8 +1627,8 @@ var int64_t var_40h @ stack - 0x40
 arg int64_t arg_5h @ stack + 0x5
 arg int argc @ rdi
 arg char **argv @ rsi
-var uint64_t var_80h @ stack - 0x80
-var uint64_t var_71h @ stack - 0x71
+var unsigned long long var_80h @ stack - 0x80
+var unsigned long long var_71h @ stack - 0x71
 var char [20] var_70h @ stack - 0x70
 var int64_t var_58h @ stack - 0x58
 var int64_t var_56h @ stack - 0x56
@@ -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
@@ -2317,13 +2317,13 @@ EOF
 EXPECT=<<EOF
 int64_t
 const char *
-uint64_t
+unsigned long long
 int
 char **
 =
 int64_t
 const char *
-uint64_t
+unsigned long long
 const void *
 size_t
 mbstate_t *
diff --git a/test/db/formats/mdmp b/test/db/formats/mdmp
index f4b96958596..ac811b5875e 100644
--- a/test/db/formats/mdmp
+++ b/test/db/formats/mdmp
@@ -188,27 +188,27 @@ FILE=bins/mdmp/hello.dmp
 ARGS=-nn
 CMDS=pfn~mdmp
 EXPECT=<<EOF
-mdmp_directory "[4]E? (mdmp_stream_type)StreamType (mdmp_location_descriptor)Location"
-mdmp_location_descriptor64 "qq DataSize RVA"
-mdmp_exception_stream "dd?? ThreadId __Alignment (mdmp_exception)ExceptionRecord (mdmp_location_descriptor)ThreadContext"
-mdmp_header "[4]zddddt[8]B Signature Version NumberOfStreams StreamDirectoryRVA CheckSum TimeDateStamp (mdmp_type)Flags"
-mdmp_token_info "ddq TokenSize TokenId TokenHandle"
-mdmp_memory_info_list "ddq[127]? SizeOfHeader SizeOfEntry NumberOfEntries (mdmp_memory_info)MemoryInfo"
-mdmp_memory64_list "qq[83]? NumberOfMemoryRanges BaseRva (mdmp_memory_descriptor64)MemoryRanges"
+mdmp_memory_info "qq[4]Edq[4]E[4]E[4]Ed BaseAddress AllocationBase (mdmp_page_protect)AllocationProtect __Alignment1 RegionSize (mdmp_mem_state)State (mdmp_page_protect)Protect (mdmp_mem_type)Type __Alignment2"
 mdmp_exception "[4]E[4]Eqqdd[15]q (mdmp_exception_code)ExceptionCode (mdmp_exception_flags)ExceptionFlags ExceptionRecord ExceptionAddress NumberParameters __UnusedAlignment ExceptionInformation"
-mdmp_memory_descriptor "q? StartOfMemoryRange (mdmp_location_descriptor)Memory"
-mdmp_thread_list "d[1]? NumberOfThreads (mdmp_thread)Threads"
-mdmp_string "dZ Length Buffer"
-mdmp_system_info "[2]EwwbBddd[4]Ed[2]Ew[2]q (mdmp_processor_architecture)ProcessorArchitecture ProcessorLevel ProcessorRevision NumberOfProcessors (mdmp_product_type)ProductType MajorVersion MinorVersion BuildNumber (mdmp_platform_id)PlatformId CsdVersionRva (mdmp_suite_mask)SuiteMask Reserved2 ProcessorFeatures"
-mdmp_vs_fixedfileinfo "ddddddddddddd dwSignature dwStrucVersion dwFileVersionMs dwFileVersionLs dwProductVersionMs dwProductVersionLs dwFileFlagsMask dwFileFlags dwFileOs dwFileType dwFileSubtype dwFileDateMs dwFileDateLs"
 mdmp_misc_info "d[4]Bdtttddddd SizeOfInfo (mdmp_misc1_flags)Flags1 ProcessId ProcessCreateTime ProcessUserTime ProcessKernelTime ProcessorMaxMhz ProcessorCurrentMhz ProcessorMhzLimit ProcessorMaxIdleState ProcessorCurrentIdleState"
-mdmp_memory_descriptor64 "qq StartOfMemoryRange DataSize"
-mdmp_module_list "d[10]? NumberOfModule (mdmp_module)Modules"
-mdmp_token_info_list "dddd TokenListSize TokenListEntries ListHeaderSize ElementHeaderSize"
 mdmp_module "qddtd???qq BaseOfImage SizeOfImage CheckSum TimeDateStamp ModuleNameRVA (mdmp_vs_fixedfileinfo)VersionInfo (mdmp_location_descriptor)CvRecord (mdmp_location_descriptor)MiscRecord Reserved0 Reserved1"
+mdmp_module_list "d[10]? NumberOfModule (mdmp_module)Modules"
+mdmp_system_info "[2]EwwbBddd[4]Ed[2]Ew[2]q (mdmp_processor_architecture)ProcessorArchitecture ProcessorLevel ProcessorRevision NumberOfProcessors (mdmp_product_type)ProductType MajorVersion MinorVersion BuildNumber (mdmp_platform_id)PlatformId CsdVersionRva (mdmp_suite_mask)SuiteMask Reserved2 ProcessorFeatures"
 mdmp_location_descriptor "dd DataSize RVA"
-mdmp_memory_info "qq[4]Edq[4]E[4]E[4]Ed BaseAddress AllocationBase (mdmp_page_protect)AllocationProtect __Alignment1 RegionSize (mdmp_mem_state)State (mdmp_page_protect)Protect (mdmp_mem_type)Type __Alignment2"
+mdmp_token_info "ddq TokenSize TokenId TokenHandle"
+mdmp_thread_list "d[1]? NumberOfThreads (mdmp_thread)Threads"
+mdmp_vs_fixedfileinfo "ddddddddddddd dwSignature dwStrucVersion dwFileVersionMs dwFileVersionLs dwProductVersionMs dwProductVersionLs dwFileFlagsMask dwFileFlags dwFileOs dwFileType dwFileSubtype dwFileDateMs dwFileDateLs"
+mdmp_memory_descriptor "q? StartOfMemoryRange (mdmp_location_descriptor)Memory"
+mdmp_memory_descriptor64 "qq StartOfMemoryRange DataSize"
+mdmp_string "dZ Length Buffer"
+mdmp_memory_info_list "ddq[127]? SizeOfHeader SizeOfEntry NumberOfEntries (mdmp_memory_info)MemoryInfo"
 mdmp_thread "ddddq?? ThreadId SuspendCount PriorityClass Priority Teb (mdmp_memory_descriptor)Stack (mdmp_location_descriptor)ThreadContext"
+mdmp_token_info_list "dddd TokenListSize TokenListEntries ListHeaderSize ElementHeaderSize"
+mdmp_location_descriptor64 "qq DataSize RVA"
+mdmp_directory "[4]E? (mdmp_stream_type)StreamType (mdmp_location_descriptor)Location"
+mdmp_header "[4]zddddt[8]B Signature Version NumberOfStreams StreamDirectoryRVA CheckSum TimeDateStamp (mdmp_type)Flags"
+mdmp_memory64_list "qq[83]? NumberOfMemoryRanges BaseRva (mdmp_memory_descriptor64)MemoryRanges"
+mdmp_exception_stream "dd?? ThreadId __Alignment (mdmp_exception)ExceptionRecord (mdmp_location_descriptor)ThreadContext"
 EOF
 RUN