I’d explain what are Wagyu,Matcha,and Albeit like as you did. Fujisan and Sensoji are proper nouns, I’d stick to call those names as they are or Mt. Fuji. I call Sensoji as Sensoji temple on my tour first, then I point out the mistake and laugh.