modified classnames to match C++ recommended naming rules