fix classes names