Fix name shadows