Currently my "<NUM_INST>X" looks like this:

2X ...

I would like it to look like this:

(2x) ...

Where do I go to change this?  Also, my "<hw-threaddesc>" gives me this:

M6X1.0

I would like it to look like this:

M6

Where do I go to change this?