Improve var names.