Renaming some files, new naming system