Made changes to function names.
Merge branch 'master' of github.com:elderberry-capstone/elderberry