Naming update

Fixes #8.
Merge pull request #9 from idris-hackers/feature/renaming

Naming update