I've just realised that Dùn Èideann (Edinburgh)...
... is the inspiration for Dunedin, on the south island of New Zealand. facepalm
I'm sure this is a well known fact. I've even been there myself. It's literally just dawned on me, when listening to the audio files in the course.
I know someone who is compiling an entire OS 1:50,000 scale map of Scotland with all the place names in Gaelic. I asked what he was doing with places where the name doesn't have a Gaelic origin and he said, I translate the name into Gaelic from whatever language it was in originally.
He says there are Gaelic-root place names all over Scotland, don't let anyone tell you there is any part of Scotland where "Gaelic was never spoken". Of course a couple of miles from here we have Garvald (garbh allt) and similar. However my friend did start moaning about Elsrickle. "I mean it's just a string of letters, what do you do with that?"