Fix the name of some types to be exactly the name under which they are exposed. Put underscores in front of the CDataXxx type names and a docstring that explains why.