Names fixed.
Added multi-record generation.
Refactor.