pull-request-28

- [ ] These class names are too ambiguous. Rename them to something more meaningful.