Added missing "name" attributes