follow-up to rename classes
Merge pull request #4 from castor4bit/follow_up_rename_classes

follow-up to rename classes