Be more consistent with parameter names