They won't be staying as generic as they were, though they will stay "tags" as I'm sure of what your talking about.

We don't want to put all battles together, we just have a lot of battle already focused on tags.