Fix naming and links
Update Readme