Merge "Revert "Rename more to other networks"" into nyc-dev