Changed order of source name attribute setting