some naming updates