Update function names and file