fix up name mapping code, add rhelmer to name map

Refactor the name mapping code to be clearer, use the output, and add rhelmer to the name map