Tweaked var names