Changed file names to conform with assignment 2