Cleaned up some file names.