Change method names as well.