renamed classes (and added a comment)