[OE-4309] Fix wrong package/function names due to bit rot/version skew