Enhanced parsing of course name