Started renaming files to match combined version