Correcting some function calls due to name change