Fixed for new name attribute