Won't bother with renaming the Objective-C classes I think, just to keep changes minimal. Change-Id: I683479fc32275a5ee2a1bc9c28275bc887c42474