Renamed some stuff. Probably broke everything.
Merge pull request #5 from Andrew-Dunn/consistent_tense

Renamed some stuff. Probably broke everything.