Updated name of file and class to better represent current status.