Merge "Add missing network naming gen info"