Print out the name mappings in main and clean up the types a bit.