Discrete X-Section labels in view with multiple sections?

Using Creo 2.0, M240.

On drawings we use multiple cross sections in the same view. Creo attaches a label for each of the cross sections, but as a single bit of text that looks like:

SECTION A-A

                 B-B

Usually, this is fine, but sometimes we want to have discrete labels, i.e. "SECTION A-A" and "SECTION B-B" that can be moved to be adjacent to their respective geometry on the view. Currently, that's being done with a simple note, but the danger of this is that it is not tied to the actual section, it's just "dumb" text. If the section is, for some reason, changed to "D", the note on the drawing will not automatically update.

Is there a more elegant way of splitting up the section labels?