Minor naming changes