Swap names for consistency