some minor naming changes