Fixing pesky file renaming issue again