Repair missing files and rename problem