Fixing name attribute