Changed function and file names to appropriate
Changed function and file names to appropriate