2nd rename phase (some file remained uncommitted)