fixed method names
Merge commit '3818ed4c3e233f4728629697dcd3c3f0a18adf73'