Better naming consistency.
AppleDoc comment style more consistent with rest of project.