Renamed some routines.