Worked on naming checks for C++.