Change class names, add comments.