Merge pull request #2171 from reaperhulk/refactor-gn-encoding

refactor general name encoding to its own function