Fixed file renaming issues
1.3.5