Update function calls for correct names