Rename some routines to better reflect what they do.