change names of some routines.