Fixed C++ type names when the same type is referenced from multiple
modules