rename my newly added functions.
rename some other internal functions (the once I touched).