Fix function names

Somehow GitHub is not letting me PR against v3.0.15...but the commit below should be enough to cherry-pick.