Added more name conversions and fixed naming conventions in C++.