Improve some variable names.