Fix Method Name issues