change the class names
class name changes
Merge branch 'issue_8'