After the moving, all models will not depend on `util.Rename` so that I can do next step refactoring.