[wip] Rename some models [ci skip]