I'm mapping a building in my neighbourhood which is called 'Wadham Gospel Hall'. It's quite an old building and I'm sure it's had various occupants over the years-- the current one is the 'Rivers of Life Church'. My question is, should I use the 'name' tag to tag the name of the building itself, or it's its present occupant? Or to put it another way, how do I get both sets of information tagged? There doesn't seem to be a separate tag for a building name specifically that I have seen.

I'm mapping a building in my neighbourhood which is called 'Wadham Gospel Hall'. It's quite an old building and I'm sure it's had various occupants over the years-- the current one is the 'Rivers of Life Church'. My question is, should I use the 'name' tag to tag the name of the building itself, or it's present occupant? Or to put it another way, how do I get both sets of information tagged? There doesn't seem to be a separate tag for a building name specifically that I have seen.