More objects -> models renames