Template var naming cleanup.