Rename and remove some methods.
Update docs and readme.