Breaking change: change public fn names