Shouldn't this also store the name like in other places like pull request #2424