[tor-commits] [stem/master] Variable naming consistency