Fix bug where servers added by unitID aren't...

... ignored due to being added in proper case instead of lowercase.
- Move unitID to server name mapping code into separate function.