Final round of func rename.