rename things
Merge pull request #5 from shapesecurity/renaming

rename things