Squash a couple uses with deprecated method signatures and file locations.
Merge pull request #17 from adam-vessey/7.x-update-deprecated-calls

Squash a couple uses with deprecated method signatures and file locations.