Refactoring for useNameOnServer