[mapping] Fix some references to typos and bugs