Handle new c++ scope name
Merge pull request #64 from atom/mb-new-cpp-scope-name

Handle new c++ scope name