Tweaked variable names.