Upgrade deprecated methods

- Passing 1 test with only 1 deprecation.
- More to follow.