fix param names and method names