Use base fields when renaming files
Merge pull request #162 from aurimasv/master

Use base fields when renaming files