Change method names to match class updates