Method names fixed