Changed terminology and URL scheme