new minor naming changes