Tweaks to reflect yb arg renaming