Fix issue with Mercury editor (name clash)