[tor-commits] [spec/master] Naming consistency changes