Switch to new names.
Update readme.md with new names.