Update rbtree.h

unify names and types