Updated naming, links & version