fix name clash