Small name changes. Update readme.