[5.1] Fix some functions that have been replaced

[5.1] Fix some functions that have been replaced #68