fix name issues in map_logic