Align some types definition in UI