Fixup name vs ID terminology
Merge pull request #1137 from derekwaynecarr/name_vs_id_fixup

Fixup name vs ID terminology