Fix more broken function names