Rename wp methods

Fixes #17