Change method names, remove some.