Update README, rename some fields