fix method signatures and parameter names
Merge branch 'pagination'