fix UT fail, some file renaming