Updates to naming conventions and other minor edits
merging pr #2188
Merge pull request #2262 from tysonn/master

Manually merging sendgrid commits