Refactored method names and POMs.