Reveal Issue with Suffix & Truename

[Acenoid]

I don't have players looking into RW, but still I would like to setup thinks properly especially if I want to share some of my created adventures.

The case:
Let's say I have the topic "Warehouse". So initially the players don't know what's in the warehouse.

Later on the players find out the Warehouse belongs to Craig and I reveal the True Name: "Craig's Warehouse"

Later on in the adventures there will be for sure several more Warehouses, so I need to distinguish this Warehouse from the future one's - In fact I am used to provide Prefix + Suffix on a common basis.

So I named the Suffix "Craig".

The problem:
Once I reveal now the common name to the players: "Warehouse (Craig)" they see the suffix (!) therefore it would be already spoiled as they are led to believe that it is belonging to the guy.

Is it supposed to work like this?
How did you work around this?
Did you run into the same problem?

I suppose it should be selectable if the suffix should be visible to the players or not or maybe have a "normal" suffix and a "true name" suffix.