Tweaked var names.