Changed names and links to use underscores.