Cleanup tree names

Change so trees-after-checkpoint is final trees of new model, not delta
extra trees to build