merged and minor naming changes