Merge pull request #1367 from mcnewton/rname1