Streamlined a few file names