[tor-commits] [tpo/develop] keep the naming convention, take space out of url