Update README and rename some methods