Fixing reserved C++ identifier violations

Refs #145