Fix naming and links