Small naming changes.