Cleaned up some of the filenames