Tweaking variable names.