Merge pull request #9504 from leoetlino/ios-class-name-cleanup IOS: Use less ambiguous names for classes
