Switched nomenclature for better readability
Merge pull request #14 from whyohwhyamihere/master

Switched nomenclature for better readability