Overhaul variable names.