Minor modifications
Change serverHostname -> serverName