Fix $name?