For the moment, I've reverted my name change while leaving the wikidata connection, so that there's a distinction in the data between the two buildings. I'll leave this note open for someone local or otherwise knowledgable to clean up.