Fixup variable and definition names in rbtree code