some naming changes