Fix to include mandatory name attribute