Rename arguments to avoid using C++ reserved word class
Merge pull request #664 from tiagomnh/objcpp-fix

Rename arguments to avoid using C++ reserved word class