Normalize argument naming