Added servername to GetUnitName-calls