Changed Naming

The important part of this pull requests are the issues #21 and #22.

The rest of the functionality isn't really important. It's just some mock functionality from my tests.