Fix for errors in CppNamingHelper