[5.1] Fix some functions that have been replaced (#5480)

[5.1] Fix some functions that have been replaced (#5480) #81