Fix name
Propagate the server merging