Fixing reserved C++ identifier violations

Refs #145
Merge pull request #147 from Uncodin/reserved_identifiers

Fixing reserved C++ identifier violations