Merge "Rename problematic entries." into nyc-mr1-dev