Updating functions and variables

Fixes #7
Merge branch 'rename-functions'