Renaming things to improve API usage.
Merge branch 'master' of https://github.com/aweiker/icfunky