Rename functions and variables to more sensible names.