Renaming methods and exceptions to conform to spec
Merge pull request #2 from toopher/bootstrap

Renaming methods and exceptions to conform to spec