Class rename
Merge pull request #10 from garoevans/feature/naming

Class rename