Minor naming changes.