Some minor naming changes