Update deprecated function names
Update deprecated function names

Orodan/Hilary,simong/Hilary,mrvisser/Hilary,ExC0d3/Hilary,stuartf/Hilary,Orodan/Hilary,simong/Hilary,stuartf/Hilary,nicolaasmatthijs/Hilary,mrvisser/Hilary,jfederico/Hilary,ExC0d3/Hilary,jfederico/Hilary,nicolaasmatthijs/Hilary,timdegroote/Hilary,timdegroote/Hilary