Merge pull request #512 from rustyswayne/1.0.1

Renames Gateway Context methods for consistency