Change method names
Fix method names