Rename C++ variables to avoid use of reserved identifiers
Merge pull request #2464 from ianthomas23/2463_reserved_identifiers

Rename C++ variables to avoid use of reserved identifiers