Fix name remapping
Update README