Updated file and function names to be more representative