Merge "More renames for API council"