Updated file names and function calls