Update functions to reflect file name changes