Using up-to-date function names in a few final places; small fix