Cleared up filenames