rename method names appropriatly