Recommit to fix errors caused in renaming files