cleanup before renamings phase2