Replace C++ reserved words for future compatibility with C++
Merge branch 'maint'