Change name

I thought that name sounded familiar...
Add info on merging