Fix method names, signatures and other fixes