Merge "Trim " (deleted)" from map names" into nyc-dev