Fix mapping/alignment terminology

The CLI has a map command for alignment. In the code 'alignment' and 'map' (and aligning and mapping, etc.) are used interchangeably. Choose one or the other and be consistent.