rename some nmap to map
Merge branch 'tmp'