Performance fixes + custom name on maps.