renaming args to be more consistent w wp codex