Renamed deprecated methods.

Closes #42