minor naming changes 2