This part was changed in master with better names, perhaps a refresh of the branch is in order?