Map names and added more postprocessing