Method names fix