also some code clean up to change references of record hash
to name hash to be more clear about what it is actually storing.