update some naming