Fix name clash