Change name, fix readme
Change name
Fix merge conflict