[KERNEL/USER] Update type consistency