Some minor var naming modification