Fix "name" variable clash