Try not to replace names when updating entities.