Add custom file/directory names
Merge branch 'release/1.2.0'