Preparing for the next round

Hi Antoine

There is something I would like to have your help on.
I am referring to to the correct way everyone needs to define teams that are advancing to the next round i.e. the Round of 16

From the match types section it is clear that one needs to make visible the round of 16. Now the user will see something like the following :

and subsequently when the use edit for example the First Group A team he will get the following image:

I also see that this team is available in the “Round of 16” matches pre-selected in a drop-down select form control.

So the question is:

1. Do I edit the team in the teams page and assign all its team attributes ? [takes more time i suppose] OR
2. I select the real team that came first in the Group A in the Group Stage?

Is there a preferred solution? Or maybe one of them is not a solution at all.

Thank you