Refactor to clean up names.
Merge pull request #1336 from brendandburns/privilege

Refactor to clean up names.