The Panopticon/Does anything define the Canary Wharf AREA in DWU fiction?

Army of Ghosts and Doomsday mostly just refer to the building known in the real world as One Canada Square as "Torchwood Tower" or "Torchwood", but does any DWU media other than Ghosts and Doomsday actually define the area by that name? Obviously in the real world, "Canary Wharf" is an area of London, but the usage in Ghosts, Doomsday and subsequent Torchwood media with the Battle of Canary Wharf is clearly using "Canary Wharf" as a synonym for the skyscraper Torchwood One is based. If other DWU media don't make the distinction between the two definitions of "Canary Wharf", or make note of the other skyscrapers near Torchwood Tower, might I suggest the two be merged?

This is exactly how Army of Ghosts defines it, by the way.

Yvonne: We've been getting warning signs for years. A radar black spot. So we built this place: Torchwood Tower. The breach was 600 feet above sea level. It was the only way to reach it.

Tenth Doctor: You built a skyscraper just to reach a spacial disturbance? How much money have you got?

Yvonne: Enough.

Jackie: Hold on a minute. We're in Canary Wharf. Must be. This building, it's Canary Wharf.

Yvonne: Well, that is the public name for it. But to those in the know, it's Torchwood.