PR fixup: better names