Change method names to be more consistent with Scala style.