Add namespace to some function calls