Rename some functions
Merge pull request #7 from jimmed/ui-rewrite

Rename some functions