More efficient name lookup. Building name lookup table.
Merge remote-tracking branch 'origin/tyler'