give consistency to map names
Merge branch 'master' into comments
Merge branch 'comments'