Don't these two contradict each other?
1. Name as close to original name as possible, language, geography and time period to be taken into consideration
2. Gaelic names for Scottish/Gaelic speaking people as far as possible. Use “add a language” to enter names in Scottish Gaelic.