Rename stuff and update readme