minor naming changes