better handling of C++ names.
5 files changed