Improve some variable and function names.