Fix method names so that all tests will pass