Update README, rename some methods