rename things to map and chart