refactor
unify typedef names
unify typedef names
unify typedef names